From c72a86f3496f39dcf9a16b8ef7d2d63f778941bc Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 7 Dec 2020 12:17:15 +0100
Subject: [PATCH] 0.70 CHANGELOG (#4165)

---
 CHANGELOG.md                              | 25 ++++++++++++++++++
 packages/page-staking/src/Slashes/Era.tsx | 32 +++++++++++++----------
 packages/react-api/src/hoc/api.tsx        |  6 +++--
 packages/react-api/src/hoc/observable.tsx |  6 +++--
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1562d2d2ec..6c2f94c20c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # CHANGELOG
 
+## 0.70.1 Dec 7, 2020
+
+Contributed:
+
+- Add Polkadot/Kusama endpoints via PatractLabs (Thanks to https://github.com/toxotguo)
+- Add types for Bitfrost testnet (Thaks to https://github.com/janpo)
+- Adjust Crust network types & logo (Thanks to https://github.com/zikunfan)
+- Adjust types for Phala poc-3 (Thanks to https://github.com/LusWar)
+- Move to typesBundle for Moonbeam (Thanks to https://github.com/joelamouche)
+- Adjust import ordering with plugin (Thanks to https://github.com/ekowalsk)
+
+Changes:
+
+- Bump to latest Ledger libraries for Windows USB fixes
+- Store network endpoint affinity (last-used per network)
+- Only show links in sidebar for verified-good identities
+- Adjust staking pages to show loading indicators, optimize number of queries
+- Adjust staking target filters, including explicit identity grouping
+- Rework target/waiting loading with shared nominator loading
+- Cleanup calendar interface (ease of maintaining)
+- Remove sparsely-used classes utility (inconsistent use)
+- Swap to using TypeScript 4.1.2
+- Adjust dark theme to work with help overlays
+
+
 ## 0.69.1 Nov 30, 2020
 
 Contributed:
diff --git a/packages/page-staking/src/Slashes/Era.tsx b/packages/page-staking/src/Slashes/Era.tsx
index ae2734a3d4..a6d98b9ae1 100644
--- a/packages/page-staking/src/Slashes/Era.tsx
+++ b/packages/page-staking/src/Slashes/Era.tsx
@@ -64,20 +64,24 @@ function Slashes ({ buttons, councilId, councilThreshold, slash }: Props): React
       <Summary slash={slash} />
       <Button.Group>
         {buttons}
-        <TxButton
-          accountId={councilId}
-          extrinsic={txSome}
-          isDisabled={!txSome}
-          isToplevel
-          label={t('Cancel selected')}
-        />
-        <TxButton
-          accountId={councilId}
-          extrinsic={txAll}
-          isDisabled={!txAll}
-          isToplevel
-          label={t('Cancel all')}
-        />
+        {api.tx.council?.propose && (
+          <>
+            <TxButton
+              accountId={councilId}
+              extrinsic={txSome}
+              isDisabled={!txSome}
+              isToplevel
+              label={t('Cancel selected')}
+            />
+            <TxButton
+              accountId={councilId}
+              extrinsic={txAll}
+              isDisabled={!txAll}
+              isToplevel
+              label={t('Cancel all')}
+            />
+          </>
+        )}
       </Button.Group>
       <Table header={headerRef.current}>
         {slash.slashes.map((slash, index): React.ReactNode => (
diff --git a/packages/react-api/src/hoc/api.tsx b/packages/react-api/src/hoc/api.tsx
index 66d440934f..99a6c226ca 100644
--- a/packages/react-api/src/hoc/api.tsx
+++ b/packages/react-api/src/hoc/api.tsx
@@ -10,7 +10,7 @@ import type { DefaultProps } from './types';
 import { ApiConsumer } from '../ApiContext';
 
 export default function withApi <P extends ApiProps> (Inner: React.ComponentType<P>, defaultProps: DefaultProps = {}): React.ComponentType<any> {
-  return class WithApi extends React.PureComponent<SubtractProps<P, ApiProps>> {
+  class WithApi extends React.PureComponent<SubtractProps<P, ApiProps>> {
     private component: any = React.createRef();
 
     public render (): React.ReactNode {
@@ -32,5 +32,7 @@ export default function withApi <P extends ApiProps> (Inner: React.ComponentType
         </ApiConsumer>
       );
     }
-  };
+  }
+
+  return WithApi;
 }
diff --git a/packages/react-api/src/hoc/observable.tsx b/packages/react-api/src/hoc/observable.tsx
index 500f7daca5..43eb892446 100644
--- a/packages/react-api/src/hoc/observable.tsx
+++ b/packages/react-api/src/hoc/observable.tsx
@@ -18,7 +18,7 @@ interface State extends CallState {
 
 export default function withObservable<T, P> (observable: Observable<P>, { callOnResult, propName = 'value', transform = echoTransform }: Options = {}): HOC {
   return (Inner: React.ComponentType<any>, defaultProps: DefaultProps = {}, render?: RenderFn): React.ComponentType<any> => {
-    return class WithObservable extends React.Component<any, State> {
+    class WithObservable extends React.Component<any, State> {
       private isActive = true;
 
       public state: State = {
@@ -85,6 +85,8 @@ export default function withObservable<T, P> (observable: Observable<P>, { callO
           </Inner>
         );
       }
-    };
+    }
+
+    return WithObservable;
   };
 }