@matchain/matchid-sdk-react 0.1.42-alpha.10 → 0.1.42-alpha.12

package/dist/components/index.js

@@ -1895,24 +1895,35 @@ function useWallet() {
           const chainId = chain ? chain.id : await obj.getChainId();
           const _chain = chain || obj.chain;
           const transactionId = Date.now().toString() + Math.random().toString().slice(6);
-          const sendPrepareTransactionRequest = async () => {
-            const { chain: chain2, account, ...prepareTransactionRequest } = await obj.prepareTransactionRequest(transaction);
-            window.matchProvider.sendWalletMessage({
-              method: "prepareTransactionRequest",
-              data: {
-                prepareTransactionRequest,
-                transactionId
+          let interval = setInterval(() => {
+            const sendPrepareTransactionRequest = async () => {
+              try {
+                const {
+                  chain: chain2,
+                  account,
+                  ...prepareTransactionRequest
+                  // @ts-ignore
+                } = await obj.prepareTransactionRequest(transaction);
+                window.matchProvider.sendWalletMessage({
+                  method: "prepareTransactionRequest",
+                  data: {
+                    prepareTransactionRequest,
+                    transactionId
+                  }
+                });
+              } catch (error) {
+                console.error(error);
               }
-            });
-          };
-          let interval = null;
-          const timer = setTimeout(() => {
+            };
             sendPrepareTransactionRequest();
-            interval = setInterval(() => {
-              sendPrepareTransactionRequest();
-            }, 1e4);
-          }, 1500);
+          }, 1e4);
           try {
+            const {
+              chain: chain2,
+              account,
+              ...prepareTransactionRequest
+              // @ts-ignore
+            } = await obj.prepareTransactionRequest(transaction);
             const { serializedTransaction } = await window.matchProvider.waitUntilWalletMessage({
               method: "sendTransaction",
               data: {
@@ -1925,7 +1936,8 @@ function useWallet() {
                   id: chainId,
                   name: _chain?.name,
                   nativeCurrency: _chain?.nativeCurrency
-                }
+                },
+                prepareTransactionRequest
               }
             });
             openHashPanel();
@@ -1934,14 +1946,12 @@ function useWallet() {
             });
             openHashPanel({
               hash: txHash,
-              chain
+              chain: _chain
             });
-            clearTimeout(timer);
             clearInterval(interval);
             resolve(txHash);
           } catch (error) {
             console.error("qwe-sign-error", error);
-            clearTimeout(timer);
             clearInterval(interval);
             reject(error);
           }