@txnlab/use-wallet 1.2.3 → 1.2.5

package/dist/cjs/index.js

@@ -1822,6 +1822,7 @@ class WalletConnectClient extends BaseClient {
         const decodedTxns = transactions.map((txn) => {
             return this.algosdk.decodeObj(txn);
         });
+        const signedIndexes = [];
         // Marshal the transactions,
         // and add the signers property if they shouldn't be signed.
         const txnsToSign = decodedTxns.reduce((acc, txn, i) => {
@@ -1829,12 +1830,14 @@ class WalletConnectClient extends BaseClient {
             if (indexesToSign &&
                 indexesToSign.length &&
                 indexesToSign.includes(i)) {
+                signedIndexes.push(i);
                 acc.push({
                     txn: Buffer.from(transactions[i]).toString("base64"),
                 });
             }
             else if (!isSigned &&
                 connectedAccounts.includes(this.algosdk.encodeAddress(txn["snd"]))) {
+                signedIndexes.push(i);
                 acc.push({
                     txn: Buffer.from(transactions[i]).toString("base64"),
                 });
@@ -1858,14 +1861,15 @@ class WalletConnectClient extends BaseClient {
         const result = await this.#client.sendCustomRequest(request);
         this.keepWCAliveStop();
         // Join the newly signed transactions with the original group of transactions.
-        const signedTxns = result.reduce((signedTxns, txn, i) => {
-            if (txn) {
-                signedTxns.push(new Uint8Array(Buffer.from(txn, "base64")));
+        const signedTxns = transactions.reduce((acc, txn, i) => {
+            if (signedIndexes.includes(i)) {
+                const signedByUser = result[i];
+                signedByUser && acc.push(new Uint8Array(Buffer.from(signedByUser, 'base64')));
             }
-            if (returnGroup) {
-                signedTxns.push(transactions[i]);
+            else if (returnGroup) {
+                acc.push(txn);
             }
-            return signedTxns;
+            return acc;
         }, []);
         return signedTxns;
     }
@@ -2401,12 +2405,25 @@ const initializeProviders = (providers, nodeConfig, algosdkStatic) => {
     return initializedProviders;
 };
 
+const getActiveProviders = () => {
+    const accounts = useWalletStore.getState().accounts;
+    return [...new Set(accounts.map((acct) => acct.providerId))];
+};
+const isActiveProvider = (id) => {
+    const activeProviders = getActiveProviders();
+    return activeProviders.includes(id);
+};
+
 const reconnectProviders = async (providers) => {
     try {
         const clients = Object.values(providers);
         for (const client of clients) {
             const c = await client;
-            c?.reconnect(() => clearAccounts(c?.metadata.id));
+            const id = c?.metadata.id;
+            // Only reconnect to active providers
+            if (id && isActiveProvider(id)) {
+                c.reconnect(() => clearAccounts(id));
+            }
         }
     }
     catch (e) {