Fix wrong logic on switch/add network

aleph-im · Sep 6, 2024 · c3004f1 · c3004f1
1 parent 4f5604a
commit c3004f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/packages/evm/src/account.ts b/packages/evm/src/account.ts
@@ -47,9 +47,7 @@ export abstract class EVMAccount extends ECIESAccount {
   public async changeNetwork(chainOrRpc: RpcType | RpcId = RpcId.ETH): Promise<void> {
     if (this.wallet instanceof JsonRPCWallet) {
       await this.wallet.changeNetwork(chainOrRpc)
-    }
-    if (this.wallet instanceof ethers.Wallet) {
-      //await this.wallet.provider.send("wallet_switchEthereumChain", [{ chainId: chainId.toString(16) }]);
+    } else if (this.wallet instanceof ethers.Wallet) {
       throw new Error('Not implemented for ethers.Wallet')
     }
   }

diff --git a/packages/evm/src/provider/rpc.ts b/packages/evm/src/provider/rpc.ts
@@ -227,7 +227,8 @@ export class JsonRPCWallet extends BaseProviderWallet {
     try {
       await this.provider.send('wallet_switchEthereumChain', [{ chainId: chainData.chainId }])
     } catch (error) {
-      await this.addNetwork(chainData)
+      if ((error as { code: number }).code === 4001) console.log('User rejected the switch chain request')
+      else await this.addNetwork(chainData)
     }
   }
 

diff --git a/packages/superfluid/src/account.ts b/packages/superfluid/src/account.ts
@@ -21,7 +21,6 @@ import { Blockchain } from '@aleph-sdk/core'
  * It is used to represent a Superfluid account when publishing a message on the Aleph network.
  */
 
-
 export class SuperfluidAccount extends EVMAccount {
   public override wallet: JsonRPCWallet
   private account: EVMAccount