fix build error

polkadot-js · Jan 18, 2022 · bf20270 · bf20270
1 parent 7ad46f1
commit bf20270
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/packages/apps/public/locales/en/apps-routing.json b/packages/apps/public/locales/en/apps-routing.json
@@ -7,8 +7,8 @@
   "nav.claims": "Claim Tokens",
   "nav.contracts": "Contracts",
   "nav.council": "Council",
-  "nav.custom-signature": "Custom Signature",
   "nav.crowdloan": "Crowdloan",
+  "nav.custom-signature": "Custom Signature",
   "nav.democracy": "Democracy",
   "nav.explorer": "Explorer",
   "nav.extrinsics": "Extrinsics",
@@ -28,4 +28,4 @@
   "nav.teleport": "Teleport",
   "nav.transfer": "Transfer",
   "nav.treasury": "Treasury"
-}
+}
diff --git a/packages/apps/public/locales/en/index.json b/packages/apps/public/locales/en/index.json
@@ -8,7 +8,6 @@
   "app-contracts.json",
   "app-council.json",
   "app-custom-signature.json",
-  "app-crowdloan.json",
   "app-democracy.json",
   "app-explorer.json",
   "app-extrinsics.json",
@@ -32,4 +31,4 @@
   "react-params.json",
   "react-query.json",
   "react-signer.json"
-]
+]
diff --git a/packages/page-custom-signature/package.json b/packages/page-custom-signature/package.json
@@ -1,13 +1,20 @@
 {
+  "author": "Stake Technologies <[email protected]>",
+  "bugs": "https://github.com/polkadot-js/apps/issues",
+  "description": "A basic app for using the custom-signature Substrate Pallet",
+  "homepage": "https://github.com/polkadot-js/apps/tree/master/packages/page-custom-signature#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
   "name": "@polkadot/app-custom-signature",
   "private": true,
+  "repository": {
+    "directory": "packages/page-custom-signature",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/apps.git"
+  },
+  "sideEffects": false,
   "version": "0.98.2-30",
-  "description": "A basic app for using the custom-signature Substrate Pallet",
   "main": "index.js",
-  "scripts": {},
-  "author": "Stake Technologies <[email protected]>",
-  "maintainers": [],
-  "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
     "@polkadot/react-components": "^0.98.2-30",

diff --git a/packages/page-custom-signature/src/EcdsaCallSigner/CustomSignTx.tsx b/packages/page-custom-signature/src/EcdsaCallSigner/CustomSignTx.tsx
@@ -75,14 +75,15 @@ function CustomSignTx ({ className, signer }: Props): React.ReactElement<Props>
         <Modal
           className='app--accounts-Modal'
           header={t<string>('Transaction Confirmation')}
+          onClose={toggleModalView}
           size='large'
         >
           <Modal.Content>
             <Modal.Columns>
               <p>{t<string>('Submit the signed transaction to the chain.')}</p>
             </Modal.Columns>
           </Modal.Content>
-          <Modal.Actions onCancel={toggleModalView}>
+          <Modal.Actions>
             <TxButton
               icon='paper-plane'
               isDisabled={!callSignature}

diff --git a/packages/page-custom-signature/src/EcdsaCallSigner/EcdsaAccount.tsx b/packages/page-custom-signature/src/EcdsaCallSigner/EcdsaAccount.tsx
@@ -7,6 +7,7 @@ import styled from 'styled-components';
 // note: this pull the chain metadata from the settings page to make the code shorter
 import useChainInfo from '@polkadot/app-settings/useChainInfo';
 import { AddressMini, Button, Icon } from '@polkadot/react-components';
+import { useApi } from '@polkadot/react-hooks';
 
 import { useTranslation } from '../translate';
 import { EcdsaAddressFormat } from '../types';
@@ -22,6 +23,7 @@ function EcdsaAccount ({ className = '', onAccountChanged }: Props): React.React
   const { t } = useTranslation();
   const { activateMetaMask, loadedAccounts, requestSignature } = useMetaMask();
   const chainInfo = useChainInfo();
+  const { api } = useApi();
   // internal message state
   const [errorMessage, setErrorMessage] = useState<Error>();
   // note: currently, MetaMask will only export one account at a time.
@@ -62,13 +64,16 @@ function EcdsaAccount ({ className = '', onAccountChanged }: Props): React.React
       // note: the default prefix is `42`, which is for the dev node
       const ss58Address = utils.ecdsaPubKeyToSs58(pubKey, chainInfo?.ss58Format);
 
-      setEcdsaAccounts({ ethereum: loadingAddr, ss58: ss58Address });
+      // quick solution for reading the account nonce
+      const { nonce } = await api.query.system.account(ss58Address);
+
+      setEcdsaAccounts({ ethereum: loadingAddr, nonce: nonce.toNumber(), ss58: ss58Address });
     } catch (err) {
       setErrorMessage(err as Error);
     } finally {
       setIsBusy(false);
     }
-  }, [activateMetaMask, chainInfo, errorMessage, requestSignature]);
+  }, [activateMetaMask, api.query.system, chainInfo, errorMessage, requestSignature]);
 
   // reset the account cache if the user changes their account in MetaMask
   useEffect(() => {

diff --git a/packages/page-custom-signature/src/types.ts b/packages/page-custom-signature/src/types.ts
@@ -23,6 +23,7 @@ export interface EthereumProvider {
 export interface EcdsaAddressFormat {
   ethereum: string;
   ss58: string;
+  nonce: number;
 }
 
 declare global {