chore: misc fixes

polkadot-cloud · Oct 26, 2024 · a36401d · a36401d
1 parent 52f2219
commit a36401d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/app/src/hooks/useBuildPayload/index.tsx b/packages/app/src/hooks/useBuildPayload/index.tsx
@@ -65,14 +65,14 @@ export const useBuildPayload = ({
         signedExtensions: api.registry.signedExtensions,
         tip: api.registry.createType('Compact<Balance>', 0).toHex(),
         version: tx.version,
-        withSignedTransaction: true,
       };
 
       // If the source is `ledger`, add the metadata hash to the payload.
       if (source === 'ledger') {
         const metadataHash = await fetchMetadataHash();
         payload.mode = 1;
         payload.metadataHash = metadataHash;
+        payload.withSignedTransaction = true;
       }
 
       // Create the payload bytes.

diff --git a/packages/app/src/library/ConnectOverlay/QrReader.tsx b/packages/app/src/library/ConnectOverlay/QrReader.tsx
@@ -31,7 +31,7 @@ export const QrReader = ({
   const valid =
     isValidAddress(qrData) &&
     !vaultAccountExists(directoryId, qrData) &&
-    !formatAccountSs58(qrData, ss58);
+    formatAccountSs58(qrData, ss58) !== null;
 
   useEffect(() => {
     // Add account and close overlay if valid.
@@ -54,7 +54,7 @@ export const QrReader = ({
     qrData === undefined
       ? 'Waiting for QR Code'
       : isValidAddress(qrData)
-        ? formatAccountSs58(qrData, ss58)
+        ? formatAccountSs58(qrData, ss58) === null
           ? 'Different Network Address'
           : exists
             ? 'Account Already Imported'

diff --git a/packages/app/src/library/SubmitTx/ManualSign/WalletConnect/index.tsx b/packages/app/src/library/SubmitTx/ManualSign/WalletConnect/index.tsx
@@ -36,8 +36,6 @@ export const WalletConnect = ({
   const { signWcTx, wcSessionActive, fetchAccounts, connectProvider } =
     useWalletConnect();
 
-  const from = getSender(instanceId);
-
   // Store whether the user is currently signing a transaction.
   const [isSgning, setIsSigning] = useState<boolean>(false);
 
@@ -62,6 +60,8 @@ export const WalletConnect = ({
     buttonOnClick = async () => {
       setIsSigning(true);
 
+      const sender = getSender(instanceId);
+
       // If Wallet Connect session is not active, re-connect.
       if (!wcSessionActive) {
         await connectProvider();
@@ -71,16 +71,17 @@ export const WalletConnect = ({
       const wcAccounts = await fetchAccounts(chainId as ChainId);
 
       // Re-fetch accounts here to ensure that the signer address still exists.
-      const accountExists = from && wcAccounts.includes(from);
+      const accountExists = sender && wcAccounts.includes(sender);
 
       const payload = getTxPayloadValue(instanceId);
-      if (!from || !payload || !accountExists) {
-        setIsSigning(false);
+      if (!sender || !payload || !accountExists) {
         return;
       }
 
+      setIsSigning(true);
+
       try {
-        const signature = await signWcTx(caip, payload, from);
+        const signature = await signWcTx(caip, payload, sender);
         if (signature) {
           setTxSignature(instanceId, signature);
         }