@reown/appkit-react-native 0.0.0-feat-multi-social-20250703185818 → 0.0.0-feat-multi-social-20250708154835

package/lib/typescript/partials/w3m-account-tokens/index.d.ts

@@ -1,7 +1,8 @@
 import { type StyleProp, type ViewStyle } from 'react-native';
 interface Props {
     style?: StyleProp<ViewStyle>;
+    isLoading?: boolean;
 }
-export declare function AccountTokens({ style }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function AccountTokens({ style, isLoading }: Props): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/partials/w3m-account-tokens/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-account-tokens/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAgBtB,UAAU,KAAK;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,2CAkE7C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-account-tokens/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAiBtB,UAAU,KAAK;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,aAAa,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,2CAqExD"}

package/lib/typescript/partials/w3m-account-wallet-features/index.d.ts

@@ -1,5 +1,5 @@
 export interface AccountWalletFeaturesProps {
-    value: string;
+    isBalanceLoading: boolean;
 }
-export declare function AccountWalletFeatures(): import("react/jsx-runtime").JSX.Element;
+export declare function AccountWalletFeatures({ isBalanceLoading }: AccountWalletFeaturesProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/partials/w3m-account-wallet-features/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-account-wallet-features/index.tsx"],"names":[],"mappings":"AAkBA,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,qBAAqB,4CA0HpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-account-wallet-features/index.tsx"],"names":[],"mappings":"AAkBA,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,qBAAqB,CAAC,EAAE,gBAAgB,EAAE,EAAE,0BAA0B,2CA4HrF"}

package/lib/typescript/views/w3m-account-default-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-default-view/index.tsx"],"names":[],"mappings":"AAmCA,wBAAgB,kBAAkB,4CAgSjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-default-view/index.tsx"],"names":[],"mappings":"AAmCA,wBAAgB,kBAAkB,4CAkRjC"}

package/lib/typescript/views/w3m-account-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-view/index.tsx"],"names":[],"mappings":"AAyBA,wBAAgB,WAAW,4CA+D1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-view/index.tsx"],"names":[],"mappings":"AAyBA,wBAAgB,WAAW,4CAkE1B"}

package/lib/typescript/views/w3m-network-switch-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-network-switch-view/index.tsx"],"names":[],"mappings":"AAwBA,wBAAgB,iBAAiB,4CAmHhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-network-switch-view/index.tsx"],"names":[],"mappings":"AAqBA,wBAAgB,iBAAiB,4CA0GhC"}

package/lib/typescript/views/w3m-swap-select-token-view/utils.d.ts

@@ -1,5 +1,5 @@
 import { type SwapTokenWithBalance } from '@reown/appkit-core-react-native';
-export declare function filterTokens(tokens: SwapTokenWithBalance[], searchValue?: string): SwapTokenWithBalance[];
+export declare function filterTokens(tokens?: SwapTokenWithBalance[], searchValue?: string): SwapTokenWithBalance[];
 export declare function createSections(isSourceToken: boolean, searchValue: string): {
     title: string;
     data: SwapTokenWithBalance[];

package/lib/typescript/views/w3m-swap-select-token-view/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-select-token-view/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAE5F,wBAAgB,YAAY,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,0BAUhF;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM;;;IAkBzE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-select-token-view/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAE5F,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,oBAAoB,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,0BAcjF;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM;;;IAkBzE"}

package/lib/typescript/views/w3m-wallet-send-preview-view/components/preview-send-details.d.ts

@@ -1,11 +1,11 @@
-import type { CaipNetwork } from '@reown/appkit-common-react-native';
+import type { AppKitNetwork } from '@reown/appkit-common-react-native';
 import { type StyleProp, type ViewStyle } from 'react-native';
 export interface PreviewSendDetailsProps {
     address?: string;
     name?: string;
-    caipNetwork?: CaipNetwork;
+    activeNetwork?: AppKitNetwork;
     networkFee?: number;
     style?: StyleProp<ViewStyle>;
 }
-export declare function PreviewSendDetails({ address, name, caipNetwork, networkFee, style }: PreviewSendDetailsProps): import("react/jsx-runtime").JSX.Element;
+export declare function PreviewSendDetails({ address, name, activeNetwork, networkFee, style }: PreviewSendDetailsProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=preview-send-details.d.ts.map

package/lib/typescript/views/w3m-wallet-send-preview-view/components/preview-send-details.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview-send-details.d.ts","sourceRoot":"","sources":["../../../../../src/views/w3m-wallet-send-preview-view/components/preview-send-details.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAUrE,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,IAAI,EACJ,WAAW,EACX,UAAU,EACV,KAAK,EACN,EAAE,uBAAuB,2CAmDzB"}
+{"version":3,"file":"preview-send-details.d.ts","sourceRoot":"","sources":["../../../../../src/views/w3m-wallet-send-preview-view/components/preview-send-details.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAUvE,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,kBAAkB,CAAC,EACjC,OAAO,EACP,IAAI,EACJ,aAAa,EACb,UAAU,EACV,KAAK,EACN,EAAE,uBAAuB,2CAmDzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-react-native",
-  "version": "0.0.0-feat-multi-social-20250703185818",
+  "version": "0.0.0-feat-multi-social-20250708154835",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -37,10 +37,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "0.0.0-feat-multi-social-20250703185818",
-    "@reown/appkit-core-react-native": "0.0.0-feat-multi-social-20250703185818",
-    "@reown/appkit-siwe-react-native": "0.0.0-feat-multi-social-20250703185818",
-    "@reown/appkit-ui-react-native": "0.0.0-feat-multi-social-20250703185818",
+    "@reown/appkit-common-react-native": "0.0.0-feat-multi-social-20250708154835",
+    "@reown/appkit-core-react-native": "0.0.0-feat-multi-social-20250708154835",
+    "@reown/appkit-siwe-react-native": "0.0.0-feat-multi-social-20250708154835",
+    "@reown/appkit-ui-react-native": "0.0.0-feat-multi-social-20250708154835",
     "@walletconnect/universal-provider": "2.20.2",
     "valtio": "^1.13.2"
   },

package/src/AppKit.ts

@@ -31,7 +31,8 @@ import type {
   Storage,
   AppKitConnectOptions,
   AppKitSIWEClient,
-  ConnectionProperties
+  ConnectionProperties,
+  AccountType
 } from '@reown/appkit-common-react-native';
 
 import { WalletConnectConnector } from './connectors/WalletConnectConnector';
@@ -268,6 +269,28 @@ export class AppKit {
     ModalController.close();
   }
 
+  async switchAccountType(namespace: ChainNamespace, type: AccountType, network: AppKitNetwork) {
+    const adapter = this.getAdapterByNamespace(namespace);
+    if (!adapter) throw new Error('No active adapter');
+
+    ConnectionsController.setAccountType(namespace, type);
+
+    // Get balances from API
+    ConnectionsController.fetchBalance();
+
+    // Sync balances from adapter
+    this.syncBalances(adapter, network);
+
+    EventsController.sendEvent({
+      type: 'track',
+      event: 'SET_PREFERRED_ACCOUNT_TYPE',
+      properties: {
+        accountType: type,
+        network: network?.caipNetworkId || ''
+      }
+    });
+  }
+
   private async createConnector(type: New_ConnectorType): Promise<WalletConnector> {
     // Check if an extra connector was provided by the developer
     const CustomConnector = this.extraConnectors.find(
@@ -384,25 +407,27 @@ export class AppKit {
     adapters.forEach(async adapter => {
       const namespace = adapter.getSupportedNamespace();
       const connection = ConnectionsController.state.connections.get(namespace);
-      if (connection) {
-        const accounts = adapter.getAccounts();
-        if (accounts && accounts.length > 0) {
-          ConnectionsController.updateAccounts(namespace, accounts);
+      const network = this.networks.find(
+        n => n.id?.toString() === connection?.caipNetwork?.split(':')[1]
+      );
 
-          const network = this.networks.find(
-            n => n.id?.toString() === connection?.caipNetwork?.split(':')[1]
-          );
+      this.syncBalances(adapter, network);
+    });
+  }
 
-          const address = accounts.find(
-            a => a.split(':')[1] === connection.caipNetwork?.split(':')[1]
-          );
+  private syncBalances(adapter: BlockchainAdapter, network?: AppKitNetwork) {
+    if (adapter && network) {
+      const accounts = adapter.getAccounts();
+      if (accounts && accounts.length > 0) {
+        const addresses = accounts.filter(a => a.split(':')[1] === network?.id?.toString());
 
-          if (address) {
+        if (addresses.length > 0) {
+          addresses.forEach(address => {
             adapter.getBalance({ address, network, tokens: this.config.tokens });
-          }
+          });
         }
       }
-    });
+    }
   }
 
   private setConnection(
@@ -457,17 +482,14 @@ export class AppKit {
     });
 
     adapter.on('chainChanged', ({ chainId }) => {
+      //eslint-disable-next-line no-console
+      console.log('chainChanged', chainId);
       const namespace = adapter.getSupportedNamespace();
       const chain = `${namespace}:${chainId}` as CaipNetworkId;
       ConnectionsController.setActiveNetwork(namespace, chain);
 
       const network = this.networks.find(n => n.id?.toString() === chainId);
-      if (network) {
-        adapter.getBalance({
-          network,
-          tokens: this.config.tokens
-        });
-      }
+      this.syncBalances(adapter, network);
 
       if (namespace === 'eip155') {
         this.handleSiweChange({ isNetworkChange: true });
@@ -481,6 +503,8 @@ export class AppKit {
 
     //TODO: Add types to this events
     adapter.on('balanceChanged', ({ address, balance }) => {
+      //eslint-disable-next-line no-console
+      console.log('balanceChanged', address, balance);
       const namespace = adapter.getSupportedNamespace();
       ConnectionsController.updateBalance(namespace, address, balance);
     });

package/src/AppKitContext.tsx

@@ -33,6 +33,7 @@ export const useAppKit = () => {
     open: context.appKit.open.bind(context.appKit),
     close: context.appKit.close.bind(context.appKit),
     switchNetwork: context.appKit.switchNetwork.bind(context.appKit),
-    getProvider: context.appKit.getProvider.bind(context.appKit)
+    getProvider: context.appKit.getProvider.bind(context.appKit),
+    switchAccountType: context.appKit.switchAccountType.bind(context.appKit)
   };
 };

package/src/connectors/WalletConnectConnector.ts

@@ -40,7 +40,7 @@ export class WalletConnectConnector extends WalletConnector {
     await this.restoreSession();
   }
 
-  private async restoreSession(): Promise<boolean> {
+  override async restoreSession(): Promise<boolean> {
     const provider = this.getProvider() as IUniversalProvider;
     if (!provider) {
       return false;

package/src/partials/w3m-account-tokens/index.tsx

@@ -18,14 +18,16 @@ import {
   Text,
   ListToken,
   useTheme,
-  Spacing
+  Spacing,
+  LoadingSpinner
 } from '@reown/appkit-ui-react-native';
 
 interface Props {
   style?: StyleProp<ViewStyle>;
+  isLoading?: boolean;
 }
 
-export function AccountTokens({ style }: Props) {
+export function AccountTokens({ style, isLoading }: Props) {
   const Theme = useTheme();
   const [refreshing, setRefreshing] = useState(false);
   const { activeNetwork, balances } = useSnapshot(ConnectionsController.state);
@@ -46,21 +48,24 @@ export function AccountTokens({ style }: Props) {
 
   if (!filteredBalances?.length) {
     return (
-      <ListItem
-        icon="arrowBottomCircle"
-        iconColor="magenta-100"
-        onPress={onReceivePress}
-        style={styles.receiveButton}
-      >
-        <FlexView flexDirection="column" alignItems="flex-start">
-          <Text variant="paragraph-500" color="fg-100">
-            Receive funds
-          </Text>
-          <Text variant="small-400" color="fg-200">
-            Transfer tokens on your wallet
-          </Text>
-        </FlexView>
-      </ListItem>
+      <>
+        <ListItem
+          icon="arrowBottomCircle"
+          iconColor="magenta-100"
+          onPress={onReceivePress}
+          style={styles.receiveButton}
+        >
+          <FlexView flexDirection="column" alignItems="flex-start">
+            <Text variant="paragraph-500" color="fg-100">
+              Receive funds
+            </Text>
+            <Text variant="small-400" color="fg-200">
+              Transfer tokens on your wallet
+            </Text>
+          </FlexView>
+        </ListItem>
+        {isLoading && <LoadingSpinner size="sm" style={styles.loadingSpinner} />}
+      </>
     );
   }
 
@@ -70,7 +75,7 @@ export function AccountTokens({ style }: Props) {
       style={style}
       refreshControl={
         <RefreshControl
-          refreshing={refreshing}
+          refreshing={isLoading || refreshing}
           onRefresh={onRefresh}
           tintColor={Theme['accent-100']}
           colors={[Theme['accent-100']]}
@@ -97,5 +102,8 @@ const styles = StyleSheet.create({
   receiveButton: {
     width: 'auto',
     marginHorizontal: Spacing.s
+  },
+  loadingSpinner: {
+    marginTop: Spacing.m
   }
 });

package/src/partials/w3m-account-wallet-features/index.tsx

@@ -17,10 +17,10 @@ import { AccountTokens } from '../w3m-account-tokens';
 import styles from './styles';
 
 export interface AccountWalletFeaturesProps {
-  value: string;
+  isBalanceLoading: boolean;
 }
 
-export function AccountWalletFeatures() {
+export function AccountWalletFeatures({ isBalanceLoading }: AccountWalletFeaturesProps) {
   const [activeTab, setActiveTab] = useState(0);
   const { features, isOnRampEnabled } = useSnapshot(OptionsController.state);
   const { activeNetwork, balances } = useSnapshot(ConnectionsController.state);
@@ -137,7 +137,9 @@ export function AccountWalletFeatures() {
         <Tabs tabs={['Tokens', 'Activity']} onTabChange={onTabChange} />
       </FlexView>
       <FlexView padding={['m', '0', '0', '0']} style={styles.tabContainer}>
-        {activeTab === 0 && <AccountTokens style={styles.tabContent} />}
+        {activeTab === 0 && (
+          <AccountTokens style={styles.tabContent} isLoading={isBalanceLoading} />
+        )}
         {activeTab === 1 && <AccountActivity style={styles.tabContent} />}
       </FlexView>
     </FlexView>

package/src/partials/w3m-send-input-token/index.tsx

@@ -41,9 +41,9 @@ export function SendInputToken({
   const onMaxPress = () => {
     if (token?.quantity && gasPrice) {
       const isNetworkToken =
-        token.contractAddress === undefined ||
+        token.address === undefined ||
         Object.values(ConstantsUtil.NATIVE_TOKEN_ADDRESS).some(
-          nativeAddress => token?.contractAddress?.split(':')[2] === nativeAddress
+          nativeAddress => token?.address?.split(':')[2] === nativeAddress
         );
 
       const numericGas = NumberUtil.bigNumber(gasPrice).shiftedBy(-token.quantity.decimals);

package/src/views/w3m-account-default-view/index.tsx

@@ -34,6 +34,7 @@ import { AuthButtons } from './components/auth-buttons';
 import styles from './styles';
 
 export function AccountDefaultView() {
+  const { switchAccountType, disconnect } = useAppKit();
   const { profileName, profileImage } = useSnapshot(AccountController.state);
   const { loading } = useSnapshot(ModalController.state);
   const {
@@ -50,14 +51,13 @@ export function AccountDefaultView() {
   const { history } = useSnapshot(RouterController.state);
   const networkImage = AssetUtil.getNetworkImage(activeNetwork?.id);
   const showCopy = OptionsController.isClipboardAvailable();
-  const isAuth = connection?.properties?.email || connection?.properties?.username;
+  const isAuth = !!connection?.properties?.provider;
   const showBalance = balance && !isAuth;
   const showExplorer = Object.keys(activeNetwork?.blockExplorers ?? {}).length > 0 && !isAuth;
   const showBack = history.length > 1;
-  const showSwitchAccountType = isAuth;
+  const showSwitchAccountType = isAuth && activeNamespace === 'eip155';
   const showActivity =
     !isAuth &&
-    activeNamespace &&
     activeNetwork?.caipNetworkId &&
     ConstantsUtil.ACTIVITY_SUPPORTED_CHAINS.includes(activeNetwork.caipNetworkId);
   const showSwaps =
@@ -66,7 +66,6 @@ export function AccountDefaultView() {
     activeNetwork?.caipNetworkId &&
     ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(activeNetwork.caipNetworkId);
   const { padding } = useCustomDimensions();
-  const { disconnect } = useAppKit();
 
   async function onDisconnect() {
     setDisconnecting(true);
@@ -76,26 +75,13 @@ export function AccountDefaultView() {
 
   const onSwitchAccountType = async () => {
     try {
-      if (isAuth && ConnectionsController.state.activeNamespace) {
+      const namespace = ConnectionsController.state.activeNamespace;
+      const network = ConnectionsController.state.activeNetwork;
+      if (isAuth && namespace && network) {
         const newType = ConnectionsController.state.accountType === 'eoa' ? 'smartAccount' : 'eoa';
-        ConnectionsController.setAccountType(
-          ConnectionsController.state.activeNamespace,
-          ConnectionsController.state.accountType === 'eoa' ? 'smartAccount' : 'eoa'
-        );
-        ConnectionsController.fetchBalance();
-
-        EventsController.sendEvent({
-          type: 'track',
-          event: 'SET_PREFERRED_ACCOUNT_TYPE',
-          properties: {
-            // eslint-disable-next-line valtio/state-snapshot-rule
-            accountType: newType,
-            network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
-          }
-        });
+        switchAccountType(namespace, newType, network);
       }
     } catch (error) {
-      ModalController.setLoading(false);
       SnackController.showError('Error switching account type');
     }
   };

package/src/views/w3m-account-view/index.tsx

@@ -1,5 +1,5 @@
 import { useSnapshot } from 'valtio';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { ScrollView } from 'react-native';
 import {
   AccountPill,
@@ -25,6 +25,7 @@ import styles from './styles';
 
 export function AccountView() {
   const Theme = useTheme();
+  const [isLoading, setIsLoading] = useState(false);
   const { padding } = useCustomDimensions();
   const { activeNetwork, activeAddress } = useSnapshot(ConnectionsController.state);
   const address = CoreHelperUtil.getPlainAddress(activeAddress);
@@ -38,15 +39,17 @@ export function AccountView() {
   };
 
   useEffect(() => {
-    ConnectionsController.fetchBalance();
-    SendController.resetSend();
-  }, []);
+    async function fetchBalance() {
+      setIsLoading(true);
+      await ConnectionsController.fetchBalance();
+      setIsLoading(false);
+    }
 
-  useEffect(() => {
-    ConnectionsController.fetchBalance();
+    fetchBalance();
+    SendController.resetSend();
 
     const balanceInterval = setInterval(() => {
-      ConnectionsController.fetchBalance();
+      fetchBalance();
     }, 10000);
 
     return () => {
@@ -82,7 +85,7 @@ export function AccountView() {
           onPress={onProfilePress}
           style={styles.accountPill}
         />
-        <AccountWalletFeatures />
+        <AccountWalletFeatures isBalanceLoading={isLoading} />
       </FlexView>
     </ScrollView>
   );

package/src/views/w3m-network-switch-view/index.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable valtio/state-snapshot-rule */
 import { useSnapshot } from 'valtio';
 import { useEffect, useState } from 'react';
 import {
@@ -6,9 +5,6 @@ import {
   AssetUtil,
   ConnectionController,
   ConnectionsController,
-  ConnectorController,
-  EventsController,
-  NetworkController,
   RouterController,
   RouterUtil
 } from '@reown/appkit-core-react-native';
@@ -20,30 +16,27 @@ import {
   NetworkImage,
   Text
 } from '@reown/appkit-ui-react-native';
+import { useAppKit } from '../../AppKitContext';
 import styles from './styles';
 
 export function NetworkSwitchView() {
+  const { switchNetwork } = useAppKit();
   const { data } = useSnapshot(RouterController.state);
   const { recentWallets } = useSnapshot(ConnectionController.state);
   const { activeNetwork } = useSnapshot(ConnectionsController.state);
-  const isAuthConnected = ConnectorController.state.connectedConnector === 'AUTH';
   const [error, setError] = useState<boolean>(false);
   const [showRetry, setShowRetry] = useState<boolean>(false);
-  const network = data?.network!;
+  const network = data?.network;
   const wallet = recentWallets?.[0];
 
   const onSwitchNetwork = async () => {
     try {
-      setError(false);
-      //TODO: change to appkit switchNetwork
-      await NetworkController.switchActiveNetwork(network);
-      EventsController.sendEvent({
-        type: 'track',
-        event: 'SWITCH_NETWORK',
-        properties: {
-          network: network.id
-        }
-      });
+      if (network) {
+        setError(false);
+        const _network = ConnectionsController.state.networks.find(n => n.id === network.id);
+        if (!_network) return;
+        await switchNetwork(_network);
+      }
     } catch {
       setError(true);
       setShowRetry(true);
@@ -57,9 +50,12 @@ export function NetworkSwitchView() {
 
   useEffect(() => {
     // Go back if network is already switched
+    // eslint-disable-next-line valtio/state-snapshot-rule
     if (activeNetwork?.id === network?.id) {
       RouterUtil.navigateAfterNetworkSwitch();
     }
+
+    // eslint-disable-next-line valtio/state-snapshot-rule
   }, [activeNetwork?.id, network?.id]);
 
   const retryTemplate = () => {
@@ -95,14 +91,6 @@ export function NetworkSwitchView() {
       );
     }
 
-    if (isAuthConnected) {
-      return (
-        <Text variant="paragraph-500" style={styles.text}>
-          Switching to {network.name} network
-        </Text>
-      );
-    }
-
     return (
       <>
         <Text variant="paragraph-500" style={styles.text}>{`Approve in ${walletName}`}</Text>

package/src/views/w3m-swap-select-token-view/utils.ts

@@ -1,13 +1,17 @@
 import { SwapController, type SwapTokenWithBalance } from '@reown/appkit-core-react-native';
 
-export function filterTokens(tokens: SwapTokenWithBalance[], searchValue?: string) {
+export function filterTokens(tokens?: SwapTokenWithBalance[], searchValue?: string) {
+  if (!tokens) {
+    return [];
+  }
+
   if (!searchValue) {
     return tokens;
   }
 
   return tokens.filter(
     token =>
-      token.name.toLowerCase().includes(searchValue.toLowerCase()) ||
+      token.name?.toLowerCase().includes(searchValue.toLowerCase()) ||
       token.symbol.toLowerCase().includes(searchValue.toLowerCase())
   );
 }

package/src/views/w3m-wallet-send-preview-view/components/preview-send-details.tsx

@@ -1,5 +1,5 @@
 import { AssetUtil } from '@reown/appkit-core-react-native';
-import type { CaipNetwork } from '@reown/appkit-common-react-native';
+import type { AppKitNetwork } from '@reown/appkit-common-react-native';
 import {
   BorderRadius,
   FlexView,
@@ -14,7 +14,7 @@ import { StyleSheet, type StyleProp, type ViewStyle } from 'react-native';
 export interface PreviewSendDetailsProps {
   address?: string;
   name?: string;
-  caipNetwork?: CaipNetwork;
+  activeNetwork?: AppKitNetwork;
   networkFee?: number;
   style?: StyleProp<ViewStyle>;
 }
@@ -22,7 +22,7 @@ export interface PreviewSendDetailsProps {
 export function PreviewSendDetails({
   address,
   name,
-  caipNetwork,
+  activeNetwork,
   networkFee,
   style
 }: PreviewSendDetailsProps) {
@@ -42,7 +42,7 @@ export function PreviewSendDetails({
     truncate: 'middle'
   });
 
-  const networkImage = AssetUtil.getNetworkImage(caipNetwork?.id);
+  const networkImage = AssetUtil.getNetworkImage(activeNetwork?.id);
 
   return (
     <FlexView

package/src/views/w3m-wallet-send-preview-view/index.tsx

@@ -3,7 +3,7 @@ import { ScrollView } from 'react-native';
 import { Avatar, Button, FlexView, Icon, Image, Text, UiUtil } from '@reown/appkit-ui-react-native';
 import { NumberUtil } from '@reown/appkit-common-react-native';
 import {
-  NetworkController,
+  ConnectionsController,
   RouterController,
   SendController
 } from '@reown/appkit-core-react-native';
@@ -14,7 +14,7 @@ import { PreviewSendDetails } from './components/preview-send-details';
 
 export function WalletSendPreviewView() {
   const { padding } = useCustomDimensions();
-  const { caipNetwork } = useSnapshot(NetworkController.state);
+  const { activeNetwork } = useSnapshot(ConnectionsController.state);
   const {
     token,
     receiverAddress,
@@ -112,7 +112,7 @@ export function WalletSendPreviewView() {
           networkFee={gasPriceInUSD}
           address={receiverAddress}
           name={receiverProfileName}
-          caipNetwork={caipNetwork}
+          activeNetwork={activeNetwork}
         />
         <FlexView flexDirection="row" alignItems="center" justifyContent="center">
           <Icon name="warningCircle" size="sm" color="fg-200" style={styles.reviewIcon} />

package/src/views/w3m-wallet-send-select-token-view/index.tsx

@@ -65,7 +65,7 @@ export function WalletSendSelectTokenView() {
               amount={_token.quantity?.numeric || '0'}
               currency={_token.symbol}
               onPress={() => onTokenPress(_token)}
-              disabled={_token.contractAddress === token?.contractAddress}
+              disabled={_token.address === token?.address}
             />
           ))
         ) : (