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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-account-activity/index.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,SAAS,EAAE,KAAK,SAAS,EAAkB,MAAM,cAAc,CAAC;AAwBhG,UAAU,KAAK;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,2CA+J/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-account-activity/index.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,SAAS,EAAE,KAAK,SAAS,EAAkB,MAAM,cAAc,CAAC;AAuBhG,UAAU,KAAK;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,2CA+J/C"}

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;AAiBtB,UAAU,KAAK;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,2CAgE7C"}
+{"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"}

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":"AAmBA,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,qBAAqB,4CAiIpC"}
+{"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-header/index.tsx"],"names":[],"mappings":"AAYA,wBAAgB,MAAM,mDAkHrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/partials/w3m-header/index.tsx"],"names":[],"mappings":"AAYA,wBAAgB,MAAM,mDAiHrB"}

package/lib/typescript/views/w3m-account-default-view/components/auth-buttons.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-buttons.d.ts","sourceRoot":"","sources":["../../../../../src/views/w3m-account-default-view/components/auth-buttons.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAG1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAExE,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,WAAW,CAAC,EAC1B,cAAc,EACd,OAAO,EACP,cAAc,EACd,IAAI,EACJ,KAAK,EACN,EAAE,gBAAgB,2CA+BlB"}
+{"version":3,"file":"auth-buttons.d.ts","sourceRoot":"","sources":["../../../../../src/views/w3m-account-default-view/components/auth-buttons.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAG1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAExE,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,wBAAgB,WAAW,CAAC,EAC1B,cAAc,EACd,OAAO,EACP,cAAc,EACd,IAAI,EACJ,KAAK,EACN,EAAE,gBAAgB,2CAoBlB"}

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

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":"AA2BA,wBAAgB,WAAW,4CA8E1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-view/index.tsx"],"names":[],"mappings":"AAyBA,wBAAgB,WAAW,4CA+D1B"}

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

@@ -21,11 +21,6 @@ declare const _default: {
         marginBottom: number;
         marginHorizontal: number;
     };
-    promoPill: {
-        marginTop: number;
-        marginBottom: number;
-        alignSelf: "center";
-    };
 };
 export default _default;
 //# sourceMappingURL=styles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-view/styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBA4BG"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-account-view/styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBAuBG"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-connecting-siwe-view/index.tsx"],"names":[],"mappings":"AA0BA,wBAAgB,kBAAkB,4CAoHjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-connecting-siwe-view/index.tsx"],"names":[],"mappings":"AAyBA,wBAAgB,kBAAkB,4CA0GjC"}

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":"AAqBA,wBAAgB,QAAQ,4CA+LvB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-swap-view/index.tsx"],"names":[],"mappings":"AAoBA,wBAAgB,QAAQ,4CA+LvB"}

package/lib/typescript/views/w3m-wallet-compatible-networks-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-compatible-networks-view/index.tsx"],"names":[],"mappings":"AAYA,wBAAgB,wBAAwB,4CAmCvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-compatible-networks-view/index.tsx"],"names":[],"mappings":"AAOA,wBAAgB,wBAAwB,4CAsCvC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-receive-view/index.tsx"],"names":[],"mappings":"AAsBA,wBAAgB,iBAAiB,wDA8DhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-receive-view/index.tsx"],"names":[],"mappings":"AAuBA,wBAAgB,iBAAiB,wDAmEhC"}

package/lib/typescript/views/w3m-wallet-send-select-token-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-select-token-view/index.tsx"],"names":[],"mappings":"AAiBA,wBAAgB,yBAAyB,4CAiExC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-select-token-view/index.tsx"],"names":[],"mappings":"AAgBA,wBAAgB,yBAAyB,4CAgExC"}

package/package.json

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

package/src/AppKit.ts

@@ -154,7 +154,10 @@ export class AppKit {
       //TODO: Replace this
       AccountController.setIsConnected(true);
 
-      if (ConnectionsController.state.activeNamespace === 'eip155') {
+      if (
+        OptionsController.state.isSiweEnabled &&
+        ConnectionsController.state.activeNamespace === 'eip155'
+      ) {
         this.handleSiweChange();
       } else {
         ModalController.close();
@@ -411,20 +414,23 @@ export class AppKit {
     adapters.forEach(async adapter => {
       const namespace = adapter.getSupportedNamespace();
       const namespaceDetails = approvedNamespaces[namespace];
-      if (!namespaceDetails) return; // Should not happen if filtering is correct
+      if (!namespaceDetails) return;
 
       const accounts = namespaceDetails.accounts ?? [];
       const chains = namespaceDetails.chains ?? [];
       const caipNetwork = adapter?.connector?.getChainId(namespace);
+      const namespaceProperties = {
+        ...properties,
+        smartAccounts: properties?.smartAccounts?.filter(account => account.startsWith(namespace))
+      };
 
       ConnectionsController.setConnection({
-        namespace,
-        adapter,
         accounts,
-        chains,
-        caipNetwork,
-        wallet,
-        properties
+        adapter,
+        caipNetwork: caipNetwork ?? chains[0]!,
+        namespace,
+        properties: namespaceProperties,
+        wallet
       });
     });
 
@@ -473,6 +479,7 @@ export class AppKit {
       this.disconnect(namespace, false);
     });
 
+    //TODO: Add types to this events
     adapter.on('balanceChanged', ({ address, balance }) => {
       const namespace = adapter.getSupportedNamespace();
       ConnectionsController.updateBalance(namespace, address, balance);

package/src/connectors/WalletConnectConnector.ts

@@ -50,6 +50,15 @@ export class WalletConnectConnector extends WalletConnector {
       this.namespaces = provider.session.namespaces as Namespaces;
     }
 
+    if (provider.session?.sessionProperties) {
+      this.properties = {
+        ...provider.session.sessionProperties,
+        smartAccounts: provider.session.sessionProperties['smartAccounts']
+          ? JSON.parse(provider.session.sessionProperties['smartAccounts'])
+          : []
+      };
+    }
+
     if (provider.session?.peer?.metadata) {
       const metadata = provider.session?.peer.metadata;
       if (metadata) {
@@ -82,10 +91,6 @@ export class WalletConnectConnector extends WalletConnector {
     return this.provider as IUniversalProvider;
   }
 
-  override disconnect(): Promise<void> {
-    return this.getProvider().disconnect();
-  }
-
   override async connect(opts: ConnectOptions) {
     const { siweConfig, namespaces, defaultChain, universalLink } = opts;
     function onUri(uri: string) {
@@ -179,7 +184,12 @@ export class WalletConnectConnector extends WalletConnector {
     }
 
     if (session?.sessionProperties) {
-      this.properties = session.sessionProperties;
+      this.properties = {
+        ...session.sessionProperties,
+        smartAccounts: session.sessionProperties['smartAccounts']
+          ? JSON.parse(session.sessionProperties['smartAccounts'])
+          : []
+      };
     }
 
     this.namespaces = session?.namespaces as Namespaces;

package/src/modal/w3m-router/index.tsx

@@ -28,7 +28,6 @@ import { UpdateEmailWalletView } from '../../views/w3m-update-email-wallet-view'
 import { UpdateEmailPrimaryOtpView } from '../../views/w3m-update-email-primary-otp-view';
 import { UpdateEmailSecondaryOtpView } from '../../views/w3m-update-email-secondary-otp-view';
 import { UpgradeEmailWalletView } from '../../views/w3m-upgrade-email-wallet-view';
-import { UpgradeToSmartAccountView } from '../../views/w3m-upgrade-to-smart-account-view';
 import { WalletCompatibleNetworks } from '../../views/w3m-wallet-compatible-networks-view';
 import { WalletReceiveView } from '../../views/w3m-wallet-receive-view';
 import { WalletSendView } from '../../views/w3m-wallet-send-view';
@@ -99,8 +98,6 @@ export function AppKitRouter() {
         return UpdateEmailWalletView;
       case 'UpgradeEmailWallet':
         return UpgradeEmailWalletView;
-      case 'UpgradeToSmartAccount':
-        return UpgradeToSmartAccountView;
       case 'WalletCompatibleNetworks':
         return WalletCompatibleNetworks;
       case 'WalletReceive':

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

@@ -12,7 +12,6 @@ import {
 } from '@reown/appkit-ui-react-native';
 import { type Transaction, type TransactionImage } from '@reown/appkit-common-react-native';
 import {
-  AccountController,
   AssetUtil,
   ConnectionsController,
   ConstantsUtil,
@@ -40,7 +39,7 @@ export function AccountActivity({ style }: Props) {
     ConstantsUtil.ACTIVITY_SUPPORTED_CHAINS.includes(activeNetwork.caipNetworkId);
 
   const handleLoadMore = () => {
-    const address = ConnectionsController.state.activeAddress?.split(':')[2];
+    const address = ConnectionsController.state.activeAddress;
     TransactionsController.fetchTransactions(address);
     EventsController.sendEvent({
       type: 'track',
@@ -49,14 +48,14 @@ export function AccountActivity({ style }: Props) {
         address,
         projectId: OptionsController.state.projectId,
         cursor: TransactionsController.state.next,
-        isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+        isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
       }
     });
   };
 
   const onRefresh = useCallback(async () => {
     setRefreshing(true);
-    const address = ConnectionsController.state.activeAddress?.split(':')[2];
+    const address = ConnectionsController.state.activeAddress;
     await TransactionsController.fetchTransactions(address, true);
     setRefreshing(false);
   }, []);
@@ -67,7 +66,7 @@ export function AccountActivity({ style }: Props) {
 
   useEffect(() => {
     if (!TransactionsController.state.transactions.length) {
-      const address = ConnectionsController.state.activeAddress?.split(':')[2];
+      const address = ConnectionsController.state.activeAddress;
       TransactionsController.fetchTransactions(address, true);
     }
     // Set initial load to false after first fetch

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

@@ -8,7 +8,6 @@ import {
 } from 'react-native';
 import { useSnapshot } from 'valtio';
 import {
-  AccountController,
   AssetUtil,
   ConnectionsController,
   RouterController
@@ -29,13 +28,15 @@ interface Props {
 export function AccountTokens({ style }: Props) {
   const Theme = useTheme();
   const [refreshing, setRefreshing] = useState(false);
-  const { tokenBalance } = useSnapshot(AccountController.state);
-  const { activeNetwork } = useSnapshot(ConnectionsController.state);
+  const { activeNetwork, balances } = useSnapshot(ConnectionsController.state);
   const networkImage = AssetUtil.getNetworkImage(activeNetwork?.id);
 
+  // Show all tokens that come from the API
+  const filteredBalances = balances?.filter(balance => balance.quantity);
+
   const onRefresh = useCallback(async () => {
     setRefreshing(true);
-    AccountController.fetchTokenBalance();
+    await ConnectionsController.fetchBalance();
     setRefreshing(false);
   }, []);
 
@@ -43,7 +44,7 @@ export function AccountTokens({ style }: Props) {
     RouterController.push('WalletReceive');
   };
 
-  if (!tokenBalance?.length) {
+  if (!filteredBalances?.length) {
     return (
       <ListItem
         icon="arrowBottomCircle"
@@ -76,14 +77,14 @@ export function AccountTokens({ style }: Props) {
         />
       }
     >
-      {tokenBalance.map(token => (
+      {filteredBalances.map(token => (
         <ListToken
-          key={token.name}
-          name={token.name}
+          key={token.symbol}
+          name={token.name || 'Unknown'}
           imageSrc={token.iconUrl}
           networkSrc={networkImage}
           value={token.value}
-          amount={token.quantity.numeric}
+          amount={token.quantity?.numeric}
           currency={token.symbol}
           pressable={false}
         />

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

@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { useSnapshot } from 'valtio';
 import { Balance, FlexView, IconLink, Tabs } from '@reown/appkit-ui-react-native';
 import {
-  AccountController,
   ConnectionsController,
   ConstantsUtil,
   CoreHelperUtil,
@@ -23,10 +22,11 @@ export interface AccountWalletFeaturesProps {
 
 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 { activeNetwork, balances } = useSnapshot(ConnectionsController.state);
+  const balance = CoreHelperUtil.calculateAndFormatBalance(balances as BalanceType[]);
+  const network = ConnectionsController.state.activeNetwork?.caipNetworkId || '';
+  const isSmartAccount = ConnectionsController.state.accountType === 'smartAccount';
   const isSwapsEnabled =
     features?.swaps &&
     activeNetwork?.caipNetworkId &&
@@ -43,9 +43,7 @@ export function AccountWalletFeatures() {
     EventsController.sendEvent({
       type: 'track',
       event: 'CLICK_TRANSACTIONS',
-      properties: {
-        isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
-      }
+      properties: { isSmartAccount }
     });
   };
 
@@ -54,10 +52,7 @@ export function AccountWalletFeatures() {
     EventsController.sendEvent({
       type: 'track',
       event: 'OPEN_SWAP',
-      properties: {
-        network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
-        isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
-      }
+      properties: { network, isSmartAccount }
     });
     RouterController.push('Swap');
   };
@@ -66,10 +61,7 @@ export function AccountWalletFeatures() {
     EventsController.sendEvent({
       type: 'track',
       event: 'OPEN_SEND',
-      properties: {
-        network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
-        isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
-      }
+      properties: { network, isSmartAccount }
     });
     RouterController.push('WalletSend');
   };

package/src/partials/w3m-header/index.tsx

@@ -52,7 +52,6 @@ export function Header() {
       UpdateEmailSecondaryOtp: 'Confirm new email',
       UpdateEmailWallet: 'Edit email',
       UpgradeEmailWallet: 'Upgrade wallet',
-      UpgradeToSmartAccount: undefined,
       WalletCompatibleNetworks: 'Compatible networks',
       WalletReceive: 'Receive',
       WalletSend: 'Send',

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

@@ -27,7 +27,7 @@ export function SendInputToken({
   const [inputValue, setInputValue] = useState<string | undefined>(sendTokenAmount?.toString());
   const sendValue = getSendValue(token, sendTokenAmount);
   const maxAmount = getMaxAmount(token);
-  const maxError = token && sendTokenAmount && sendTokenAmount > Number(token.quantity.numeric);
+  const maxError = token && sendTokenAmount && sendTokenAmount > Number(token?.quantity?.numeric);
 
   const onInputChange = (value: string) => {
     const formattedValue = value.replace(/,/g, '.');
@@ -39,11 +39,11 @@ export function SendInputToken({
   };
 
   const onMaxPress = () => {
-    if (token && gasPrice) {
+    if (token?.quantity && gasPrice) {
       const isNetworkToken =
-        token.address === undefined ||
+        token.contractAddress === undefined ||
         Object.values(ConstantsUtil.NATIVE_TOKEN_ADDRESS).some(
-          nativeAddress => token?.address?.split(':')[2] === nativeAddress
+          nativeAddress => token?.contractAddress?.split(':')[2] === nativeAddress
         );
 
       const numericGas = NumberUtil.bigNumber(gasPrice).shiftedBy(-token.quantity.decimals);

package/src/partials/w3m-send-input-token/utils.ts

@@ -2,7 +2,7 @@ import { type Balance, NumberUtil } from '@reown/appkit-common-react-native';
 import { UiUtil } from '@reown/appkit-ui-react-native';
 
 export function getSendValue(token?: Balance, sendTokenAmount?: number) {
-  if (token && sendTokenAmount) {
+  if (token?.price && sendTokenAmount) {
     const price = token.price;
     const totalValue = price * sendTokenAmount;
 
@@ -13,7 +13,7 @@ export function getSendValue(token?: Balance, sendTokenAmount?: number) {
 }
 
 export function getMaxAmount(token?: Balance) {
-  if (token) {
+  if (token?.quantity) {
     return NumberUtil.roundNumber(Number(token.quantity.numeric), 6, 5);
   }
 

package/src/views/w3m-account-default-view/components/auth-buttons.tsx

@@ -1,6 +1,6 @@
 import { StyleSheet, type StyleProp, type ViewStyle } from 'react-native';
 import { UpgradeWalletButton } from './upgrade-wallet-button';
-import { ListItem, ListSocial, Spacing, Text } from '@reown/appkit-ui-react-native';
+import { ListSocial, Spacing, Text } from '@reown/appkit-ui-react-native';
 import type { SocialProvider } from '@reown/appkit-common-react-native';
 
 export interface AuthButtonsProps {
@@ -21,30 +21,19 @@ export function AuthButtons({
   return (
     <>
       <UpgradeWalletButton onPress={onUpgradePress} style={styles.upgradeButton} />
-      {socialProvider ? (
+      {socialProvider && (
         <ListSocial
           logo={socialProvider}
           logoHeight={32}
           logoWidth={32}
           style={[styles.socialContainer, style]}
+          onPress={onPress}
+          chevron={socialProvider === 'email'}
         >
           <Text color="fg-100" numberOfLines={1} ellipsizeMode="tail" style={styles.socialText}>
             {text}
           </Text>
         </ListSocial>
-      ) : (
-        <ListItem
-          icon="email"
-          onPress={onPress}
-          chevron
-          testID="button-email"
-          iconColor="fg-100"
-          style={style}
-        >
-          <Text color="fg-100" numberOfLines={1} ellipsizeMode="tail">
-            {text}
-          </Text>
-        </ListItem>
       )}
     </>
   );

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

@@ -5,16 +5,12 @@ import {
   AccountController,
   ApiController,
   AssetUtil,
-  ConnectionController,
-  ConnectorController,
   CoreHelperUtil,
   EventsController,
   ModalController,
-  NetworkController,
   OptionsController,
   RouterController,
   SnackController,
-  type AppKitFrameProvider,
   ConstantsUtil,
   SwapController,
   OnRampController,
@@ -38,27 +34,27 @@ import { AuthButtons } from './components/auth-buttons';
 import styles from './styles';
 
 export function AccountDefaultView() {
-  const { profileName, profileImage, preferredAccountType } = useSnapshot(AccountController.state);
+  const { profileName, profileImage } = useSnapshot(AccountController.state);
   const { loading } = useSnapshot(ModalController.state);
   const {
     activeAddress: address,
     activeBalance: balance,
     activeNetwork,
-    activeNamespace
+    activeNamespace,
+    connection,
+    accountType
   } = useSnapshot(ConnectionsController.state);
   const account = address?.split(':')[2];
   const [disconnecting, setDisconnecting] = useState(false);
-  const { connectedConnector } = useSnapshot(ConnectorController.state);
-  const { connectedSocialProvider } = useSnapshot(ConnectionController.state);
   const { features, isOnRampEnabled } = useSnapshot(OptionsController.state);
   const { history } = useSnapshot(RouterController.state);
   const networkImage = AssetUtil.getNetworkImage(activeNetwork?.id);
   const showCopy = OptionsController.isClipboardAvailable();
-  const isAuth = connectedConnector === 'AUTH';
+  const isAuth = connection?.properties?.email || connection?.properties?.username;
   const showBalance = balance && !isAuth;
   const showExplorer = Object.keys(activeNetwork?.blockExplorers ?? {}).length > 0 && !isAuth;
   const showBack = history.length > 1;
-  const showSwitchAccountType = isAuth && NetworkController.checkIfSmartAccountEnabled();
+  const showSwitchAccountType = isAuth;
   const showActivity =
     !isAuth &&
     activeNamespace &&
@@ -80,17 +76,20 @@ export function AccountDefaultView() {
 
   const onSwitchAccountType = async () => {
     try {
-      if (isAuth) {
-        ModalController.setLoading(true);
-        const accountType =
-          AccountController.state.preferredAccountType === 'eoa' ? 'smartAccount' : 'eoa';
-        const provider = ConnectorController.getAuthConnector()?.provider as AppKitFrameProvider;
-        await provider?.setPreferredAccount(accountType);
+      if (isAuth && ConnectionsController.state.activeNamespace) {
+        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: {
-            accountType,
+            // eslint-disable-next-line valtio/state-snapshot-rule
+            accountType: newType,
             network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
           }
         });
@@ -101,20 +100,6 @@ export function AccountDefaultView() {
     }
   };
 
-  const getUserEmail = () => {
-    const provider = ConnectorController.getAuthConnector()?.provider as AppKitFrameProvider;
-    if (!provider) return '';
-
-    return provider.getEmail();
-  };
-
-  const getUsername = () => {
-    const provider = ConnectorController.getAuthConnector()?.provider as AppKitFrameProvider;
-    if (!provider) return '';
-
-    return provider.getUsername();
-  };
-
   const onExplorerPress = () => {
     if (showExplorer && ConnectionsController.state.activeNetwork?.blockExplorers?.default?.url) {
       Linking.openURL(ConnectionsController.state.activeNetwork?.blockExplorers?.default?.url);
@@ -174,8 +159,10 @@ export function AccountDefaultView() {
   };
 
   const onEmailPress = () => {
-    if (ConnectionController.state.connectedSocialProvider) return;
-    RouterController.push('UpdateEmailWallet', { email: getUserEmail() });
+    const email = ConnectionsController.state.connection?.properties?.email;
+    const provider = ConnectionsController.state.connection?.properties?.provider;
+    if (provider !== 'email' || !email) return;
+    RouterController.push('UpdateEmailWallet', { email });
   };
 
   return (
@@ -239,11 +226,11 @@ export function AccountDefaultView() {
             {isAuth && (
               <AuthButtons
                 onUpgradePress={onUpgradePress}
-                socialProvider={connectedSocialProvider}
+                socialProvider={connection?.properties?.provider}
                 onPress={onEmailPress}
                 style={styles.actionButton}
                 text={UiUtil.getTruncateString({
-                  string: getUsername() || getUserEmail() || '',
+                  string: connection?.properties?.username || connection?.properties?.email || '',
                   charsStart: 30,
                   charsEnd: 0,
                   truncate: 'end'
@@ -316,7 +303,7 @@ export function AccountDefaultView() {
                 loading={loading}
               >
                 <Text color="fg-100">{`Switch to your ${
-                  preferredAccountType === 'eoa' ? 'smart account' : 'EOA'
+                  accountType === 'eoa' ? 'smart account' : 'EOA'
                 }`}</Text>
               </ListItem>
             )}