Merge pull request #53 from paritytech/w3f-deploy-1.0.9.1

v1.0.9.1
w3f-webops · Sep 14, 2023 · ff27b60 · ff27b60
2 parents 919ef80 + a20e66d
commit ff27b60
Show file tree

Hide file tree

Showing 12 changed files with 905 additions and 913 deletions.
diff --git a/package.json b/package.json
@@ -29,8 +29,8 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@ledgerhq/hw-transport-webhid": "^6.27.19",
     "@polkadot-cloud/community": "0.1.11",
-    "@polkadot-cloud/core": "^0.1.20",
-    "@polkadot-cloud/react": "^0.1.39",
+    "@polkadot-cloud/core": "^0.1.27",
+    "@polkadot-cloud/react": "^0.1.44",
     "@polkadot-cloud/utils": "^0.0.11",
     "@polkadot/api": "^10.9.1",
     "@polkadot/keyring": "^12.1.1",

diff --git a/src/contexts/Payouts/index.tsx b/src/contexts/Payouts/index.tsx
@@ -269,11 +269,13 @@ export const PayoutsProvider = ({
               .dividedBy(total)
               .plus(isValidator ? valCut : 0);
 
-        unclaimed[era] = {
-          ...unclaimed[era],
-          [validator]: unclaimedPayout.toString(),
-        };
-        j++;
+        if (!unclaimedPayout.isZero()) {
+          unclaimed[era] = {
+            ...unclaimed[era],
+            [validator]: unclaimedPayout.toString(),
+          };
+          j++;
+        }
       }
 
       // This is not currently useful for preventing re-syncing. Need to know the eras that have
@@ -305,8 +307,9 @@ export const PayoutsProvider = ({
   // Fetch payouts if active account is nominating.
   useEffect(() => {
     if (!activeEra.index.isZero()) {
-      if (
-        isNominating() &&
+      if (!isNominating()) {
+        setStateWithRef('synced', setPayoutsSynced, payoutsSyncedRef);
+      } else if (
         unclaimedPayouts === null &&
         payoutsSyncedRef.current !== 'syncing'
       ) {
@@ -315,18 +318,12 @@ export const PayoutsProvider = ({
         checkEra(activeEra.index.minus(1));
       }
     }
-  }, [isNominating(), activeEra]);
+  }, [unclaimedPayouts, isNominating(), activeEra]);
 
   // Clear payout state on network / active account change.
   useEffect(() => {
-    if (unclaimedPayouts !== null) {
-      setUnclaimedPayouts(null);
-    }
-    if (!isNominating()) {
-      setStateWithRef('synced', setPayoutsSynced, payoutsSyncedRef);
-    } else {
-      setStateWithRef('unsynced', setPayoutsSynced, payoutsSyncedRef);
-    }
+    setUnclaimedPayouts(null);
+    setStateWithRef('unsynced', setPayoutsSynced, payoutsSyncedRef);
   }, [network, activeAccount]);
 
   return (

diff --git a/src/library/Help/index.tsx b/src/library/Help/index.tsx
@@ -4,9 +4,9 @@
 import { faTimes } from '@fortawesome/free-solid-svg-icons';
 import {
   ButtonPrimaryInvert,
-  ModalCanvas,
+  CanvasContainer,
   ModalContent,
-  ModalScroll,
+  CanvasScroll,
 } from '@polkadot-cloud/react';
 import { camelize } from '@polkadot-cloud/utils';
 import { useAnimation } from 'framer-motion';
@@ -131,7 +131,7 @@ export const Help = () => {
   });
 
   return (
-    <ModalCanvas
+    <CanvasContainer
       initial={{
         opacity: 0,
         scale: 1.05,
@@ -154,7 +154,7 @@ export const Help = () => {
         zIndex: 20,
       }}
     >
-      <ModalScroll>
+      <CanvasScroll>
         <ModalContent>
           <div className="buttons">
             <ButtonPrimaryInvert
@@ -206,10 +206,10 @@ export const Help = () => {
             </>
           )}
         </ModalContent>
-      </ModalScroll>
+      </CanvasScroll>
       <button type="button" className="close" onClick={() => closeHelp()}>
         &nbsp;
       </button>
-    </ModalCanvas>
+    </CanvasContainer>
   );
 };
diff --git a/src/locale/cn/modals.json b/src/locale/cn/modals.json
@@ -42,7 +42,6 @@
     "checking": "检验中...",
     "chooseLanguage": "选择语言",
     "claim": "申领",
-    "claimAll": "申领所有",
     "claimCommission": "申领佣金",
     "claimOutstandingCommission": "在提名池奖励帐户中申领任何未付佣金",
     "claimPayouts": "申领收益",
@@ -91,6 +90,7 @@
     "feedbackPage": "我们的反馈页面在",
     "for": "委托人 {{who}}",
     "forget": "清除",
+    "free": "可用余额",
     "getAnotherAccount": "获取更多帐户",
     "gettingAccount": "正在获取帐户",
     "gettingAddress": "正在获取地址...",

diff --git a/src/locale/cn/pages.json b/src/locale/cn/pages.json
@@ -99,6 +99,7 @@
       "proxy": "代理账户",
       "recentPayouts": "最近收益",
       "reserve": "储备",
+      "reserveBalance": "预存金额",
       "reserved": "己储备",
       "start": "开始",
       "subscanDisabled": "Subscan己断开",

diff --git a/src/locale/en/modals.json b/src/locale/en/modals.json
@@ -44,7 +44,6 @@
     "checking": "Checking...",
     "chooseLanguage": "Choose Language",
     "claim": "Claim",
-    "claimAll": "Claim All",
     "claimCommission": "Claim Commission",
     "claimOutstandingCommission": " Claim any outstanding commission in the pool reward account.",
     "claimPayouts": "Claim Payouts",
@@ -96,6 +95,7 @@
     "feedbackPage": "We host a feedback page on",
     "for": "For {{who}}",
     "forget": "Forget",
+    "free": "Free",
     "getAnotherAccount": "Get Another Account",
     "gettingAccount": "Getting Account",
     "gettingAddress": "Getting Address...",

diff --git a/src/locale/en/pages.json b/src/locale/en/pages.json
@@ -101,6 +101,7 @@
       "proxy": "Proxy",
       "recentPayouts": "Recent Payouts",
       "reserve": "Reserve",
+      "reserveBalance": "Reserve Balance",
       "reserved": "Reserved",
       "start": "Start",
       "subscanDisabled": "Subscan Disabled",

diff --git a/src/modals/Accounts/Account.tsx b/src/modals/Accounts/Account.tsx
@@ -137,7 +137,7 @@ export const AccountButton = ({
         </section>
         <section className="foot">
           <span className="balance">
-            {`Free: ${planckToUnit(freeBalance, units)
+            {`${t('free')}: ${planckToUnit(freeBalance, units)
               .decimalPlaces(3)
               .toFormat()} ${unit}`}
           </span>

diff --git a/src/modals/Accounts/index.tsx b/src/modals/Accounts/index.tsx
@@ -17,10 +17,7 @@ import { useConnect } from 'contexts/Connect';
 import { useExtensions } from 'contexts/Extensions';
 import { usePoolMemberships } from 'contexts/Pools/PoolMemberships';
 import { useProxies } from 'contexts/Proxies';
-import {
-  useEffectIgnoreInitial,
-  useOverlay,
-} from '@polkadot-cloud/react/hooks';
+import { useOverlay } from '@polkadot-cloud/react/hooks';
 import { AccountButton } from './Account';
 import { Delegates } from './Delegates';
 import { AccountSeparator, AccountWrapper } from './Wrappers';
@@ -118,7 +115,7 @@ export const Accounts = () => {
 
   useEffect(() => setLocalAccounts(accounts), [accounts]);
 
-  useEffectIgnoreInitial(() => {
+  useEffect(() => {
     if (modalStatus === 'open') setModalResize();
   }, [activeAccount, accounts, bondedAccounts, balances, ledgers, extensions]);
 

diff --git a/src/modals/ClaimPayouts/Overview.tsx b/src/modals/ClaimPayouts/Overview.tsx
@@ -1,10 +1,9 @@
 // Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
-import { ButtonSubmit, ModalNotes } from '@polkadot-cloud/react';
+import { ModalNotes } from '@polkadot-cloud/react';
 import { forwardRef } from 'react';
 import { usePayouts } from 'contexts/Payouts';
-import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { Item } from './Item';
 import { ContentWrapper } from './Wrappers';
@@ -15,33 +14,9 @@ export const Overview = forwardRef(
     const { t } = useTranslation('modals');
     const { unclaimedPayouts } = usePayouts();
 
-    const claimAllPayouts = Object.entries(unclaimedPayouts || {}).map(
-      ([era, validatorPayout]) => ({
-        era,
-        payout: Object.entries(validatorPayout)
-          .reduce(
-            (acc: BigNumber, [, amount]) => acc.plus(amount),
-            new BigNumber(0)
-          )
-          .toString(),
-        validators: Object.keys(validatorPayout),
-      })
-    );
-
     return (
       <ContentWrapper>
         <div className="padding" ref={ref}>
-          <div style={{ margin: '1rem 0 0.5rem 0' }}>
-            <ButtonSubmit
-              disabled={Object.values(unclaimedPayouts || {}).length === 0}
-              text={t('claimAll')}
-              onClick={() => {
-                setPayouts(claimAllPayouts);
-                setSection(1);
-              }}
-            />
-          </div>
-
           {Object.entries(unclaimedPayouts || {}).map(
             ([era, unclaimedPayout]: any, i: number) => (
               <Item

diff --git a/src/pages/Overview/BalanceChart.tsx b/src/pages/Overview/BalanceChart.tsx
@@ -243,7 +243,7 @@ export const BalanceChart = () => {
                   label=""
                   button={
                     <ButtonTertiary
-                      text="Reserve Balance"
+                      text={t('overview.reserveBalance')}
                       onClick={() =>
                         openModal({ key: 'UpdateReserve', size: 'sm' })
                       }