@reown/appkit-react-native 0.0.0-feat-multichain-20250520183003 → 0.0.0-feat-multichain-20250604171123

package/lib/typescript/utils/UiUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UiUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/UiUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,QAAQ,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,MAAM;;;2BAQT,mBAAmB,iBACX,uBAAuB;sCAM1B;QAAE,MAAM,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,kBACzB,QAAQ;CAa3B,CAAC"}
+{"version":3,"file":"UiUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/UiUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,QAAQ,EACd,MAAM,iCAAiC,CAAC;AAEzC,eAAO,MAAM,MAAM;;;;sCAcJ;QAAE,MAAM,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,kBACzB,QAAQ;CAa3B,CAAC"}

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":"AAuCA,wBAAgB,kBAAkB,4CAuSjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-default-view/index.tsx"],"names":[],"mappings":"AAuCA,wBAAgB,kBAAkB,4CAySjC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-preview-view/index.tsx"],"names":[],"mappings":"AAmBA,wBAAgB,eAAe,4CA6H9B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-preview-view/index.tsx"],"names":[],"mappings":"AAmBA,wBAAgB,eAAe,4CAgI9B"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-view/index.tsx"],"names":[],"mappings":"AAoBA,wBAAgB,QAAQ,4CA4LvB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-view/index.tsx"],"names":[],"mappings":"AAqBA,wBAAgB,QAAQ,4CA+LvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-react-native",
-  "version": "0.0.0-feat-multichain-20250520183003",
+  "version": "0.0.0-feat-multichain-20250604171123",
   "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-multichain-20250520183003",
-    "@reown/appkit-core-react-native": "0.0.0-feat-multichain-20250520183003",
-    "@reown/appkit-siwe-react-native": "0.0.0-feat-multichain-20250520183003",
-    "@reown/appkit-ui-react-native": "0.0.0-feat-multichain-20250520183003",
+    "@reown/appkit-common-react-native": "0.0.0-feat-multichain-20250604171123",
+    "@reown/appkit-core-react-native": "0.0.0-feat-multichain-20250604171123",
+    "@reown/appkit-siwe-react-native": "0.0.0-feat-multichain-20250604171123",
+    "@reown/appkit-ui-react-native": "0.0.0-feat-multichain-20250604171123",
     "@walletconnect/universal-provider": "2.20.2",
     "valtio": "^1.13.2"
   },

package/src/AppKit.ts

@@ -10,7 +10,8 @@ import {
   StorageUtil,
   type OptionsControllerState,
   ThemeController,
-  ConnectionController
+  ConnectionController,
+  type Features
 } from '@reown/appkit-core-react-native';
 
 import type {
@@ -26,7 +27,8 @@ import type {
   ThemeMode,
   WalletInfo,
   Network,
-  ChainNamespace
+  ChainNamespace,
+  ConnectOptions
 } from '@reown/appkit-common-react-native';
 
 import { WalletConnectConnector } from './connectors/WalletConnectConnector';
@@ -53,7 +55,7 @@ interface AppKitConfig {
   themeVariables?: ThemeVariables;
   siweConfig?: AppKitSIWEClient;
   defaultNetwork?: Network;
-  // features?: Features;
+  features?: Features;
   // chainImages?: Record<number, string>; //TODO: rename to networkImages
 }
 
@@ -102,18 +104,17 @@ export class AppKit {
   /**
    * Handles the full connection flow for a given connector type.
    * @param type - The type of connector to use.
-   * @param requestedNamespaces - Optional specific namespaces to request.
+   * @param options - Optional connection options.
    */
-  async connect(type: New_ConnectorType, requestedNamespaces?: ProposalNamespaces): Promise<void> {
+  async connect(type: New_ConnectorType, options?: ConnectOptions): Promise<void> {
     try {
+      const { namespaces, defaultChain, universalLink } = options ?? {};
       const connector = await this.createConnector(type);
-      const defaultChain = this.defaultNetwork
-        ? NetworkUtil.getDefaultChainId(this.defaultNetwork)
-        : undefined;
 
       const approvedNamespaces = await connector.connect({
-        namespaces: requestedNamespaces ?? this.namespaces,
-        defaultChain
+        namespaces: namespaces ?? this.namespaces,
+        defaultChain,
+        universalLink
       });
 
       const walletInfo = connector.getWalletInfo();
@@ -166,10 +167,12 @@ export class AppKit {
         return;
       }
 
-      const connection = ConnectionsController.state.connections[activeNamespace];
+      const connection = ConnectionsController.state.connections.get(
+        activeNamespace as ChainNamespace
+      );
       const connectorType = connection?.adapter?.connector?.type;
 
-      await ConnectionsController.disconnect(activeNamespace, isInternal);
+      await ConnectionsController.disconnect(activeNamespace as ChainNamespace, isInternal);
 
       if (connectorType) {
         await StorageUtil.removeConnectedConnectors(connectorType);
@@ -203,7 +206,9 @@ export class AppKit {
     const activeNamespace = namespace ?? ConnectionsController.state.activeNamespace;
     if (!activeNamespace) return null;
 
-    const connection = ConnectionsController.state.connections[activeNamespace];
+    const connection = ConnectionsController.state.connections.get(
+      activeNamespace as ChainNamespace
+    );
     if (!connection || !connection.adapter || !connection.adapter.connector) return null;
 
     return connection.adapter.connector.getProvider() as T;
@@ -227,7 +232,7 @@ export class AppKit {
       }
     });
 
-    ConnectionsController.setActiveChain(
+    ConnectionsController.setActiveNetwork(
       adapter.getSupportedNamespace(),
       `${adapter.getSupportedNamespace()}:${network.id}` as CaipNetworkId
     );
@@ -327,28 +332,36 @@ export class AppKit {
   }
 
   private getAdapterByNamespace(namespace: ChainNamespace): BlockchainAdapter | null {
-    const namespaceConnection = ConnectionsController.state.connections[namespace];
+    const namespaceConnection = ConnectionsController.state.connections.get(namespace);
+    if (namespaceConnection) {
+      return namespaceConnection.adapter;
+    }
 
-    return namespaceConnection?.adapter ?? null;
+    return null;
   }
 
   private async syncAccounts(adapters: BlockchainAdapter[]) {
-    // Get account balances
-    adapters.map(adapter => {
+    adapters.forEach(async adapter => {
       const namespace = adapter.getSupportedNamespace();
-      const connection = ConnectionsController.state.connections[namespace];
-
-      if (!connection) return;
-
-      const network = this.networks.find(
-        n => n.id?.toString() === connection?.activeChain?.split(':')[1]
-      );
-
-      const address =
-        adapter.getAccounts()?.find(a => a.startsWith(connection?.activeChain)) ??
-        adapter.getAccounts()?.[0];
-
-      adapter.getBalance({ address, network, tokens: this.config.tokens });
+      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 address = accounts.find(
+            a => a.split(':')[1] === connection.caipNetwork?.split(':')[1]
+          );
+
+          if (address) {
+            adapter.getBalance({ address, network, tokens: this.config.tokens });
+          }
+        }
+      }
     });
   }
 
@@ -364,14 +377,14 @@ export class AppKit {
 
       const accounts = namespaceDetails.accounts ?? [];
       const chains = namespaceDetails.chains ?? [];
-      const activeChain = adapter?.connector?.getChainId(namespace);
+      const caipNetwork = adapter?.connector?.getChainId(namespace);
 
       ConnectionsController.storeConnection({
         namespace,
         adapter,
         accounts,
         chains,
-        activeChain,
+        caipNetwork,
         wallet
       });
     });
@@ -387,15 +400,17 @@ export class AppKit {
   }
 
   private subscribeToAdapterEvents(adapter: BlockchainAdapter): void {
-    adapter.on('accountsChanged', ({ accounts, namespace }) => {
+    adapter.on('accountsChanged', ({ accounts }) => {
+      const namespace = adapter.getSupportedNamespace();
       //eslint-disable-next-line no-console
       console.log('accountsChanged', accounts, namespace);
       //TODO: check this
     });
 
-    adapter.on('chainChanged', ({ chainId, namespace }) => {
+    adapter.on('chainChanged', ({ chainId }) => {
+      const namespace = adapter.getSupportedNamespace();
       const chain = `${namespace}:${chainId}` as CaipNetworkId;
-      ConnectionsController.setActiveChain(namespace, chain);
+      ConnectionsController.setActiveNetwork(namespace, chain);
 
       const network = this.networks.find(n => n.id?.toString() === chainId);
       if (network) {
@@ -406,18 +421,19 @@ export class AppKit {
       }
     });
 
-    adapter.on('disconnect', ({ namespace }) => {
-      // console.log('AppKit disconnect namespace', namespace);
+    adapter.on('disconnect', () => {
+      const namespace = adapter.getSupportedNamespace();
       this.disconnect(namespace, false);
     });
 
-    adapter.on('balanceChanged', ({ namespace, address, balance }) => {
+    adapter.on('balanceChanged', ({ address, balance }) => {
+      const namespace = adapter.getSupportedNamespace();
       ConnectionsController.updateBalance(namespace, address, balance);
     });
   }
 
   private async initControllers(options: AppKitConfig) {
-    await this.initAsyncValues();
+    await this.initAsyncValues(options);
 
     OptionsController.setProjectId(options.projectId);
     OptionsController.setMetadata(options.metadata);
@@ -428,7 +444,7 @@ export class AppKit {
     OptionsController.setCustomWallets(options.customWallets);
     OptionsController.setEnableAnalytics(options.enableAnalytics);
     OptionsController.setDebug(options.debug);
-    // OptionsController.setFeatures(options.features);
+    OptionsController.setFeatures(options.features);
 
     ThemeController.setThemeMode(options.themeMode);
     ThemeController.setThemeVariables(options.themeVariables);
@@ -454,7 +470,7 @@ export class AppKit {
     // }
   }
 
-  private async initAsyncValues() {
+  private async initActiveNamespace() {
     const activeNamespace = await StorageUtil.getActiveNamespace();
     if (activeNamespace) {
       ConnectionsController.setActiveNamespace(activeNamespace);
@@ -462,6 +478,35 @@ export class AppKit {
       ConnectionsController.setActiveNamespace(this.defaultNetwork?.chainNamespace);
     }
   }
+
+  private async initRecentWallets(options: AppKitConfig) {
+    const wallets = await StorageUtil.getRecentWallets();
+    const connectedWalletImage = await StorageUtil.getConnectedWalletImageUrl();
+
+    const filteredWallets = wallets.filter(wallet => {
+      const { includeWalletIds, excludeWalletIds } = options;
+      if (includeWalletIds) {
+        return includeWalletIds.includes(wallet.id);
+      }
+      if (excludeWalletIds) {
+        return !excludeWalletIds.includes(wallet.id);
+      }
+
+      return true;
+    });
+
+    ConnectionController.setRecentWallets(filteredWallets);
+
+    if (connectedWalletImage) {
+      ConnectionController.setConnectedWalletImageUrl(connectedWalletImage);
+    }
+  }
+
+  private async initAsyncValues(options: AppKitConfig) {
+    await this.initActiveNamespace();
+    await this.initRecentWallets(options);
+    //disable coinbase if connector is not set
+  }
 }
 
 export function createAppKit(config: AppKitConfig): AppKit {

package/src/client.ts

@@ -343,7 +343,6 @@ export class AppKitScaffold {
 
   private async initRecentWallets(options: ScaffoldOptions) {
     const wallets = await StorageUtil.getRecentWallets();
-    const connectedWalletImage = await StorageUtil.getConnectedWalletImageUrl();
 
     const filteredWallets = wallets.filter(wallet => {
       const { includeWalletIds, excludeWalletIds } = options;
@@ -358,10 +357,6 @@ export class AppKitScaffold {
     });
 
     ConnectionController.setRecentWallets(filteredWallets);
-
-    if (connectedWalletImage) {
-      ConnectionController.setConnectedWalletImageUrl(connectedWalletImage);
-    }
   }
 
   private async initConnectedConnector() {

package/src/connectors/WalletConnectConnector.ts

@@ -4,11 +4,11 @@ import {
   WalletConnector,
   type AppKitNetwork,
   type Namespaces,
-  type ProposalNamespaces,
   type Provider,
   type WalletInfo,
   type ChainNamespace,
-  type CaipNetworkId
+  type CaipNetworkId,
+  type ConnectOptions
 } from '@reown/appkit-common-react-native';
 
 export class WalletConnectConnector extends WalletConnector {
@@ -69,7 +69,7 @@ export class WalletConnectConnector extends WalletConnector {
     return this.provider.disconnect();
   }
 
-  override async connect(opts: { namespaces: ProposalNamespaces; defaultChain?: CaipNetworkId }) {
+  override async connect(opts: ConnectOptions) {
     function onUri(uri: string) {
       ConnectionController.setWcUri(uri);
     }

package/src/hooks/useAccount.ts

@@ -11,11 +11,11 @@ export function useAccount() {
     connections
   } = useSnapshot(ConnectionsController.state);
 
-  const connection = activeNamespace ? connections[activeNamespace] : undefined;
+  const connection = activeNamespace ? connections.get(activeNamespace) : undefined;
 
   return {
     address: address?.split(':')[2],
     isConnected: !!address,
-    chainId: connection?.activeChain
+    chainId: connection?.caipNetwork
   };
 }

package/src/hooks/useProvider.ts

@@ -7,12 +7,14 @@ interface ProviderResult {
   providerType?: ChainNamespace;
 }
 
-export function useProvider(namespace?: string): ProviderResult {
+export function useProvider(namespace?: ChainNamespace): ProviderResult {
   const { connections, activeNamespace } = useSnapshot(ConnectionsController.state);
 
-  if (!namespace || !activeNamespace) return { provider: undefined, providerType: undefined };
+  const targetNamespace = namespace ?? activeNamespace;
 
-  const connection = connections[namespace ?? activeNamespace];
+  if (!targetNamespace) return { provider: undefined, providerType: undefined };
+
+  const connection = connections.get(targetNamespace);
 
   if (!connection) return { provider: undefined, providerType: undefined };
 

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

@@ -15,6 +15,7 @@ import {
   AccountController,
   AssetUtil,
   ConnectionsController,
+  ConstantsUtil,
   EventsController,
   OptionsController,
   TransactionsController
@@ -32,9 +33,11 @@ export function AccountActivity({ style }: Props) {
   const [refreshing, setRefreshing] = useState(false);
   const [initialLoad, setInitialLoad] = useState(true);
   const { loading, transactions, next } = useSnapshot(TransactionsController.state);
-  const { activeNetwork, activeNamespace } = useSnapshot(ConnectionsController.state);
+  const { activeNetwork } = useSnapshot(ConnectionsController.state);
   const networkImage = AssetUtil.getNetworkImage(activeNetwork?.id);
-  const isSupported = activeNamespace && ['eip155', 'solana'].includes(activeNamespace);
+  const isSupported =
+    activeNetwork?.caipNetworkId &&
+    ConstantsUtil.ACTIVITY_SUPPORTED_CHAINS.includes(activeNetwork.caipNetworkId);
 
   const handleLoadMore = () => {
     const address = ConnectionsController.state.activeAddress?.split(':')[2];

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

@@ -3,10 +3,10 @@ import { useSnapshot } from 'valtio';
 import { Balance, FlexView, IconLink, Tabs } from '@reown/appkit-ui-react-native';
 import {
   AccountController,
+  ConnectionsController,
   ConstantsUtil,
   CoreHelperUtil,
   EventsController,
-  NetworkController,
   OnRampController,
   OptionsController,
   RouterController,
@@ -25,8 +25,12 @@ export function AccountWalletFeatures() {
   const [activeTab, setActiveTab] = useState(0);
   const { tokenBalance } = useSnapshot(AccountController.state);
   const { features, isOnRampEnabled } = useSnapshot(OptionsController.state);
+  const { activeNetwork } = useSnapshot(ConnectionsController.state);
   const balance = CoreHelperUtil.calculateAndFormatBalance(tokenBalance as BalanceType[]);
-  const isSwapsEnabled = features?.swaps;
+  const isSwapsEnabled =
+    features?.swaps &&
+    activeNetwork?.caipNetworkId &&
+    ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(activeNetwork.caipNetworkId);
 
   const onTabChange = (index: number) => {
     setActiveTab(index);
@@ -46,23 +50,16 @@ export function AccountWalletFeatures() {
   };
 
   const onSwapPress = () => {
-    if (
-      NetworkController.state.caipNetwork?.id &&
-      !ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(`${NetworkController.state.caipNetwork.id}`)
-    ) {
-      RouterController.push('UnsupportedChain');
-    } else {
-      SwapController.resetState();
-      EventsController.sendEvent({
-        type: 'track',
-        event: 'OPEN_SWAP',
-        properties: {
-          network: NetworkController.state.caipNetwork?.id || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
-        }
-      });
-      RouterController.push('Swap');
-    }
+    SwapController.resetState();
+    EventsController.sendEvent({
+      type: 'track',
+      event: 'OPEN_SWAP',
+      properties: {
+        network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
+        isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+      }
+    });
+    RouterController.push('Swap');
   };
 
   const onSendPress = () => {
@@ -70,7 +67,7 @@ export function AccountWalletFeatures() {
       type: 'track',
       event: 'OPEN_SEND',
       properties: {
-        network: NetworkController.state.caipNetwork?.id || '',
+        network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
         isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
       }
     });

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

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

package/src/partials/w3m-swap-details/index.tsx

@@ -1,6 +1,10 @@
 import { useSnapshot } from 'valtio';
 import { useState } from 'react';
-import { ConstantsUtil, NetworkController, SwapController } from '@reown/appkit-core-react-native';
+import {
+  ConnectionsController,
+  ConstantsUtil,
+  SwapController
+} from '@reown/appkit-core-react-native';
 import {
   FlexView,
   Text,
@@ -80,7 +84,7 @@ export function SwapDetails({ initialOpen, canClose }: SwapDetailsProps) {
     setModalData(
       getModalData('networkCost', {
         networkSymbol: SwapController.state.networkTokenSymbol,
-        networkName: NetworkController.state.caipNetwork?.name
+        networkName: ConnectionsController.state.activeNetwork?.name
       })
     );
   };

package/src/partials/w3m-swap-input/index.tsx

@@ -128,7 +128,7 @@ export function SwapInput({
             >
               <Text variant="small-400" color="fg-200" numberOfLines={1}>
                 {isMarketValueGreaterThanZero
-                  ? `~$${UiUtil.formatNumberToLocalString(marketValue, 2)}`
+                  ? `~$${UiUtil.formatNumberToLocalString(marketValue, 6)}`
                   : ''}
               </Text>
               {showMax && (

package/src/utils/UiUtil.ts

@@ -4,24 +4,18 @@ import {
   StorageUtil,
   type WcWallet
 } from '@reown/appkit-core-react-native';
-import {
-  LayoutAnimation,
-  type LayoutAnimationProperty,
-  type LayoutAnimationType
-} from 'react-native';
 
 export const UiUtil = {
   TOTAL_VISIBLE_WALLETS: 4,
 
   createViewTransition: () => {
-    LayoutAnimation.configureNext(LayoutAnimation.create(200, 'easeInEaseOut', 'opacity'));
+    //TODO: replace this with reanimated
+    // LayoutAnimation.configureNext(LayoutAnimation.create(200, 'easeInEaseOut', 'opacity'));
   },
 
-  animateChange: (
-    type: LayoutAnimationType = 'linear',
-    creationProp: LayoutAnimationProperty = 'scaleX'
-  ) => {
-    LayoutAnimation.configureNext(LayoutAnimation.create(150, type, creationProp));
+  animateChange: () => {
+    //TODO: replace this with reanimated
+    // LayoutAnimation.configureNext(LayoutAnimation.create(150, type, creationProp));
   },
 
   storeConnectedWallet: async (

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

@@ -59,7 +59,16 @@ export function AccountDefaultView() {
   const showExplorer = Object.keys(activeNetwork?.blockExplorers ?? {}).length > 0 && !isAuth;
   const showBack = history.length > 1;
   const showSwitchAccountType = isAuth && NetworkController.checkIfSmartAccountEnabled();
-  const showActivity = !isAuth && activeNamespace && ['eip155', 'solana'].includes(activeNamespace);
+  const showActivity =
+    !isAuth &&
+    activeNamespace &&
+    activeNetwork?.caipNetworkId &&
+    ConstantsUtil.ACTIVITY_SUPPORTED_CHAINS.includes(activeNetwork.caipNetworkId);
+  const showSwaps =
+    !isAuth &&
+    features?.swaps &&
+    activeNetwork?.caipNetworkId &&
+    ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(activeNetwork.caipNetworkId);
   const { padding } = useCustomDimensions();
   const { disconnect } = useAppKit();
 
@@ -82,7 +91,7 @@ export function AccountDefaultView() {
           event: 'SET_PREFERRED_ACCOUNT_TYPE',
           properties: {
             accountType,
-            network: NetworkController.state.caipNetwork?.id || ''
+            network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
           }
         });
       }
@@ -124,23 +133,16 @@ export function AccountDefaultView() {
   };
 
   const onSwapPress = () => {
-    if (
-      NetworkController.state.caipNetwork?.id &&
-      !ConstantsUtil.SWAP_SUPPORTED_NETWORKS.includes(`${NetworkController.state.caipNetwork.id}`)
-    ) {
-      RouterController.push('UnsupportedChain');
-    } else {
-      SwapController.resetState();
-      EventsController.sendEvent({
-        type: 'track',
-        event: 'OPEN_SWAP',
-        properties: {
-          network: NetworkController.state.caipNetwork?.id || '',
-          isSmartAccount: false
-        }
-      });
-      RouterController.push('Swap');
-    }
+    SwapController.resetState();
+    EventsController.sendEvent({
+      type: 'track',
+      event: 'OPEN_SWAP',
+      properties: {
+        network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
+        isSmartAccount: false
+      }
+    });
+    RouterController.push('Swap');
   };
 
   const onBuyPress = () => {
@@ -276,7 +278,7 @@ export function AccountDefaultView() {
                 <Text color="fg-100">Buy crypto</Text>
               </ListItem>
             )}
-            {!isAuth && features?.swaps && (
+            {showSwaps && (
               <ListItem
                 chevron
                 icon="recycleHorizontal"

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

@@ -31,6 +31,7 @@ export function ConnectView() {
   const { padding } = useCustomDimensions();
   const { keyboardShown, keyboardHeight } = useKeyboard();
 
+  //TODO: check this
   // const isWalletConnectEnabled = connectors.some(c => c.type === 'WALLET_CONNECT');
   const isWalletConnectEnabled = true;
   const isAuthEnabled = connectors.some(c => c.type === 'AUTH');

package/src/views/w3m-swap-preview-view/index.tsx

@@ -86,11 +86,14 @@ export function SwapPreviewView() {
               Send
             </Text>
             <Text variant="paragraph-400" color="fg-100">
-              ${UiUtil.formatNumberToLocalString(sourceTokenMarketValue, 2)}
+              ${UiUtil.formatNumberToLocalString(sourceTokenMarketValue, 6)}
             </Text>
           </FlexView>
           <TokenButton
-            text={` ${sourceTokenAmount} ${sourceToken?.symbol}`}
+            text={` ${UiUtil.formatNumberToLocalString(
+              sourceTokenAmount,
+              8
+            )} ${sourceToken?.symbol}`}
             imageUrl={sourceToken?.logoUri}
             inverse
             disabled
@@ -103,7 +106,7 @@ export function SwapPreviewView() {
               Receive
             </Text>
             <Text variant="paragraph-400" color="fg-100">
-              ${UiUtil.formatNumberToLocalString(toTokenMarketValue, 2)}
+              ${UiUtil.formatNumberToLocalString(toTokenMarketValue, 6)}
             </Text>
           </FlexView>
           <TokenButton