@reown/appkit-ethers-react-native 0.0.0-fix-token-balance-20241017200828 → 0.0.0-fix-fetch-error-improvements-20241114124235

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-ethers-react-native",
-  "version": "0.0.0-fix-token-balance-20241017200828",
+  "version": "0.0.0-fix-fetch-error-improvements-20241114124235",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -38,11 +38,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "0.0.0-fix-token-balance-20241017200828",
-    "@reown/appkit-scaffold-react-native": "0.0.0-fix-token-balance-20241017200828",
-    "@reown/appkit-scaffold-utils-react-native": "0.0.0-fix-token-balance-20241017200828",
-    "@reown/appkit-siwe-react-native": "0.0.0-fix-token-balance-20241017200828",
-    "@walletconnect/ethereum-provider": "2.16.1"
+    "@reown/appkit-common-react-native": "0.0.0-fix-fetch-error-improvements-20241114124235",
+    "@reown/appkit-scaffold-react-native": "0.0.0-fix-fetch-error-improvements-20241114124235",
+    "@reown/appkit-scaffold-utils-react-native": "0.0.0-fix-fetch-error-improvements-20241114124235",
+    "@reown/appkit-siwe-react-native": "0.0.0-fix-fetch-error-improvements-20241114124235",
+    "@walletconnect/ethereum-provider": "2.17.2"
   },
   "peerDependencies": {
     "@react-native-async-storage/async-storage": ">=1.17.0",

package/src/client.ts

@@ -24,9 +24,10 @@ import {
   type SendTransactionArgs,
   type Token,
   AppKitScaffold,
-  type WriteContractArgs
+  type WriteContractArgs,
+  type AppKitFrameAccountType
 } from '@reown/appkit-scaffold-react-native';
-import { erc20ABI, NamesUtil, NetworkUtil } from '@reown/appkit-common-react-native';
+import { erc20ABI, ErrorUtil, NamesUtil, NetworkUtil } from '@reown/appkit-common-react-native';
 import {
   ConstantsUtil,
   PresetsUtil,
@@ -46,6 +47,7 @@ import {
 } from '@reown/appkit-scaffold-utils-react-native';
 import EthereumProvider, { OPTIONAL_METHODS } from '@walletconnect/ethereum-provider';
 import type { EthereumProviderOptions } from '@walletconnect/ethereum-provider';
+import { type JsonRpcError } from '@walletconnect/jsonrpc-types';
 
 import { getAuthCaipNetworks, getWalletConnectCaipNetworks } from './utils/helpers';
 import type { AppKitSIWEClient } from '@reown/appkit-siwe-react-native';
@@ -107,7 +109,7 @@ export class AppKit extends AppKitScaffold {
     }
 
     if (!appKitOptions.projectId) {
-      throw new Error('appkit:constructor - projectId is undefined');
+      throw new Error(ErrorUtil.ALERT_ERRORS.PROJECT_ID_NOT_CONFIGURED.shortMessage);
     }
 
     const networkControllerClient: NetworkControllerClient = {
@@ -126,9 +128,9 @@ export class AppKit extends AppKitScaffold {
         new Promise(async resolve => {
           const walletChoice = await StorageUtil.getConnectedConnector();
           const walletConnectType =
-            PresetsUtil.ConnectorTypesMap[ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID];
+            PresetsUtil.ConnectorTypesMap[ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID]!;
 
-          const authType = PresetsUtil.ConnectorTypesMap[ConstantsUtil.AUTH_CONNECTOR_ID];
+          const authType = PresetsUtil.ConnectorTypesMap[ConstantsUtil.AUTH_CONNECTOR_ID]!;
           if (walletChoice?.includes(walletConnectType)) {
             const provider = await this.getWalletConnectProvider();
             const result = getWalletConnectCaipNetworks(provider);
@@ -399,8 +401,8 @@ export class AppKit extends AppKitScaffold {
 
     this.createProvider();
 
-    EthersStoreUtil.subscribeKey('address', () => {
-      this.syncAccount();
+    EthersStoreUtil.subscribeKey('address', address => {
+      this.syncAccount({ address });
     });
 
     EthersStoreUtil.subscribeKey('chainId', () => {
@@ -505,6 +507,7 @@ export class AppKit extends AppKitScaffold {
     };
 
     this.walletConnectProvider = await EthereumProvider.init(walletConnectProviderOptions);
+    this.addWalletConnectListeners(this.walletConnectProvider);
 
     await this.checkActiveWalletConnectProvider();
   }
@@ -681,12 +684,10 @@ export class AppKit extends AppKitScaffold {
     }
   }
 
-  private async syncAccount() {
-    const address = EthersStoreUtil.state.address;
+  private async syncAccount({ address }: { address?: Address }) {
     const chainId = EthersStoreUtil.state.chainId;
     const isConnected = EthersStoreUtil.state.isConnected;
 
-    this.resetAccount();
     if (isConnected && address && chainId) {
       const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${chainId}:${address}`;
 
@@ -701,6 +702,7 @@ export class AppKit extends AppKitScaffold {
       ]);
       this.hasSyncedConnectedAccount = true;
     } else if (!isConnected && this.hasSyncedConnectedAccount) {
+      this.resetAccount();
       this.resetWcConnection();
       this.resetNetwork();
     }
@@ -874,6 +876,20 @@ export class AppKit extends AppKitScaffold {
     }
   }
 
+  private async handleAuthSetPreferredAccount(address: string, type: AppKitFrameAccountType) {
+    if (!address) {
+      return;
+    }
+
+    const chainId = this.getCaipNetwork()?.id;
+    const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${chainId}:${address}`;
+    this.setCaipAddress(caipAddress);
+    this.setPreferredAccountType(type);
+
+    await this.syncAccount({ address: address as Address });
+    this.setLoading(false);
+  }
+
   private syncConnectors(config: ProviderType) {
     const _connectors: Connector[] = [];
     const EXCLUDED_CONNECTORS = [ConstantsUtil.AUTH_CONNECTOR_ID];
@@ -932,6 +948,7 @@ export class AppKit extends AppKitScaffold {
 
     const connectedConnector = await StorageUtil.getItem('@w3m/connected_connector');
     if (connectedConnector === 'AUTH') {
+      // Set loader until it reconnects
       this.setLoading(true);
     }
 
@@ -939,5 +956,30 @@ export class AppKit extends AppKitScaffold {
     if (isConnected) {
       this.setAuthProvider();
     }
+
+    this.addAuthListeners(this.authProvider);
+  }
+
+  private async addAuthListeners(authProvider: AppKitFrameProvider) {
+    authProvider.onSetPreferredAccount(async ({ address, type }) => {
+      if (address) {
+        await this.handleAuthSetPreferredAccount(address, type);
+      }
+      this.setLoading(false);
+    });
+
+    authProvider.setOnTimeout(async () => {
+      this.handleAlertError(ErrorUtil.ALERT_ERRORS.SOCIALS_TIMEOUT);
+    });
+  }
+
+  private async addWalletConnectListeners(provider: EthereumProvider) {
+    if (provider) {
+      provider.signer.client.core.relayer.provider.on('payload', (payload: JsonRpcError) => {
+        if (payload?.error) {
+          this.handleAlertError(payload?.error.message);
+        }
+      });
+    }
   }
 }