Fixes provider switch chain

Web3Auth · Feb 22, 2024 · 87c2339 · 87c2339
1 parent 342b183
commit 87c2339
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/demo/react-app/package-lock.json b/demo/react-app/package-lock.json
diff --git a/demo/react-app/src/services/web3auth.tsx b/demo/react-app/src/services/web3auth.tsx
@@ -276,14 +276,14 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
       return;
     }
     const newChain: CustomChainConfig = {
+      rpcTarget: "https://rpc.ankr.com/polygon",
+      blockExplorerUrl: "https://polygonscan.com/",
+      chainId: "0x89",
+      displayName: "Polygon Mainnet",
+      ticker: "matic",
+      tickerName: "Matic",
+      logo: "https://images.toruswallet.io/matic.svg",
       chainNamespace: CHAIN_NAMESPACES.EIP155,
-      chainId: "0xaa36a7",
-      rpcTarget: "https://rpc.ankr.com/eth_sepolia",
-      displayName: "Sepolia Testnet",
-      blockExplorerUrl: "https://sepolia.etherscan.io",
-      ticker: "ETH",
-      tickerName: "Ethereum",
-      logo: "https://images.toruswallet.io/eth.svg",
     };
     await web3Auth?.addChain(newChain);
     uiConsole("New Chain Added");
@@ -293,7 +293,7 @@ export const Web3AuthProvider: FunctionComponent<IWeb3AuthState> = ({ children,
       uiConsole("provider not initialized yet");
       return;
     }
-    await web3Auth?.switchChain({ chainId: "0xaa36a7" });
+    await web3Auth?.switchChain({ chainId: "0x89" });
     uiConsole("Chain Switched");
   };
 

diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
@@ -180,13 +180,17 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
   }
 
   public async addChain(chainConfig: CustomChainConfig): Promise<void> {
+    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName)
+      return this.walletAdapters[this.connectedAdapterName].addChain(chainConfig);
     if (this.commonJRPCProvider) {
       return this.commonJRPCProvider.addChain(chainConfig);
     }
     throw WalletInitializationError.notReady(`No wallet is ready`);
   }
 
   public async switchChain(params: { chainId: string }): Promise<void> {
+    if (this.status === ADAPTER_STATUS.CONNECTED && this.connectedAdapterName)
+      return this.walletAdapters[this.connectedAdapterName].switchChain(params);
     if (this.commonJRPCProvider) {
       return this.commonJRPCProvider.switchChain(params);
     }

diff --git a/packages/plugins/wallet-services-plugin/src/plugin.ts b/packages/plugins/wallet-services-plugin/src/plugin.ts
@@ -171,7 +171,7 @@ export class WalletServicesPlugin implements IPlugin {
         log.warn(`${web3Auth.connectedAdapterName} is not compatible with wallet services connector plugin`);
         return;
       }
-      this.provider = web3Auth.provider;
+      this.provider = web3Auth.walletAdapters[WALLET_ADAPTERS.OPENLOGIN].provider;
       if (!this.provider) throw WalletServicesPluginError.web3AuthNotConnected();
       this.subscribeToProviderEvents(this.provider);
     });
@@ -190,7 +190,7 @@ export class WalletServicesPlugin implements IPlugin {
     const [accounts, chainId, chainConfig] = await Promise.all([
       this.provider.request<never, string[]>({ method: "eth_accounts" }),
       this.provider.request<never, string>({ method: "eth_chainId" }),
-      this.provider.request<never, CustomChainConfig>({ method: "provider_config" }),
+      this.provider.request<never, CustomChainConfig>({ method: "eth_provider_config" }),
     ]);
     return {
       chainId: parseInt(chainId as string, 16),