@depay/web3-wallets-evm 12.4.0 → 12.4.1

package/dist/esm/index.js

@@ -715,17 +715,35 @@ class WalletConnect {
 
   switchTo(blockchainName) {
     return new Promise((resolve, reject)=>{
+      let resolved, rejected;
       const blockchain = Blockchain.findByName(blockchainName);
+      setTimeout(async()=>{
+        if(!(await this.connectedTo(blockchainName)) && !resolved && !rejected){
+          reject({ code: 'NOT_SUPPORTED' });
+        } else {
+          resolve();
+        }
+      }, 3000);
       this.connector.sendCustomRequest({ 
         method: 'wallet_switchEthereumChain',
         params: [{ chainId: blockchain.id }],
-      }).then(resolve).catch((error)=> {
-        if(error && typeof error.message == 'string' && error.message.match('wallet_addEthereumChain')){ // chain not yet added
+      }).then(()=>{
+        resolved = true;
+        resolve();
+      }).catch((error)=> {
+        if(error && typeof error.message == 'string' && error.message.match('addEthereumChain')){ // chain not yet added
           this.addNetwork(blockchainName)
-            .then(()=>this.switchTo(blockchainName).then(resolve))
-            .catch(reject);
+            .then(()=>this.switchTo(blockchainName).then(()=>{
+              resolved = true;
+              resolve();
+            }))
+            .catch(()=>{
+              rejected = true;
+              reject({ code: 'NOT_SUPPORTED' });
+            });
         } else {
-          reject(error);
+          rejected = true;
+          reject({ code: 'NOT_SUPPORTED' });
         }
       });
     })

package/dist/umd/index.js

@@ -713,17 +713,35 @@
 
     switchTo(blockchainName) {
       return new Promise((resolve, reject)=>{
+        let resolved, rejected;
         const blockchain = web3Blockchains.Blockchain.findByName(blockchainName);
+        setTimeout(async()=>{
+          if(!(await this.connectedTo(blockchainName)) && !resolved && !rejected){
+            reject({ code: 'NOT_SUPPORTED' });
+          } else {
+            resolve();
+          }
+        }, 3000);
         this.connector.sendCustomRequest({ 
           method: 'wallet_switchEthereumChain',
           params: [{ chainId: blockchain.id }],
-        }).then(resolve).catch((error)=> {
-          if(error && typeof error.message == 'string' && error.message.match('wallet_addEthereumChain')){ // chain not yet added
+        }).then(()=>{
+          resolved = true;
+          resolve();
+        }).catch((error)=> {
+          if(error && typeof error.message == 'string' && error.message.match('addEthereumChain')){ // chain not yet added
             this.addNetwork(blockchainName)
-              .then(()=>this.switchTo(blockchainName).then(resolve))
-              .catch(reject);
+              .then(()=>this.switchTo(blockchainName).then(()=>{
+                resolved = true;
+                resolve();
+              }))
+              .catch(()=>{
+                rejected = true;
+                reject({ code: 'NOT_SUPPORTED' });
+              });
           } else {
-            reject(error);
+            rejected = true;
+            reject({ code: 'NOT_SUPPORTED' });
           }
         });
       })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-wallets-evm",
   "moduleName": "Web3Wallets",
-  "version": "12.4.0",
+  "version": "12.4.1",
   "description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",
@@ -27,7 +27,7 @@
   "peerDependencies": {
     "@depay/coinbase-wallet-sdk": "^1.1.0",
     "@depay/walletconnect-v1": "^1.7.10",
-    "@depay/web3-blockchains": "^6.2.3",
+    "@depay/web3-blockchains": "^6.3.1",
     "@depay/web3-client-evm": "^10.2.1",
     "@depay/web3-constants": "^6.3.2",
     "ethers": "^5.7.1"