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

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-connecting-qrcode/index.tsx

@@ -3,7 +3,6 @@ import { useSnapshot } from 'valtio';
 import {
   AssetUtil,
   ConnectionController,
-  ConnectorController,
   EventsController,
   OptionsController,
   SnackController
@@ -11,6 +10,7 @@ import {
 import { FlexView, Link, QrCode, Text, Spacing } from '@reown/appkit-ui-react-native';
 import { useCustomDimensions } from '../../hooks/useCustomDimensions';
 import styles from './styles';
+import { PresetsUtil } from '@reown/appkit-common-react-native';
 
 export function ConnectingQrCode() {
   const { wcUri } = useSnapshot(ConnectionController.state);
@@ -37,9 +37,8 @@ export function ConnectingQrCode() {
       }
     });
 
-    const connectors = ConnectorController.state.connectors;
-    const connector = connectors.find(c => c.type === 'WALLET_CONNECT');
-    const url = AssetUtil.getConnectorImage(connector);
+    //TODO: check this
+    const url = AssetUtil.getConnectorImage(PresetsUtil.ConnectorImageIds['WALLET_CONNECT']);
     ConnectionController.setConnectedWalletImageUrl(url);
   };
 

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

@@ -48,9 +48,6 @@ export function Header() {
       SwapPreview: 'Review swap',
       Transactions: 'Activity',
       UnsupportedChain: 'Switch network',
-      UpdateEmailPrimaryOtp: 'Confirm current email',
-      UpdateEmailSecondaryOtp: 'Confirm new email',
-      UpdateEmailWallet: 'Edit email',
       UpgradeEmailWallet: 'Upgrade wallet',
       WalletCompatibleNetworks: 'Compatible networks',
       WalletReceive: 'Receive',

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

@@ -16,6 +16,7 @@ import {
   OnRampController,
   ConnectionsController
 } from '@reown/appkit-core-react-native';
+import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common-react-native';
 import {
   Avatar,
   Button,
@@ -34,6 +35,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 +52,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 +67,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 +76,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');
     }
   };
@@ -158,11 +145,21 @@ export function AccountDefaultView() {
     RouterController.push('UpgradeEmailWallet');
   };
 
-  const onEmailPress = () => {
+  const onEmailPress = async () => {
     const email = ConnectionsController.state.connection?.properties?.email;
     const provider = ConnectionsController.state.connection?.properties?.provider;
     if (provider !== 'email' || !email) return;
-    RouterController.push('UpdateEmailWallet', { email });
+
+    const sessionTopic = ConnectionsController.state.connection?.properties?.sessionTopic;
+
+    if (!sessionTopic) {
+      throw new Error('Session topic not found');
+    }
+
+    const link = `${CommonConstantsUtil.WEB_WALLET_URL}/emailUpdate/${sessionTopic}`;
+    await CoreHelperUtil.openLink(link);
+
+    // Subscribe to email update event
   };
 
   return (

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-all-wallets-view/index.tsx

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import {
   ConnectionController,
-  ConnectorController,
   EventsController,
   RouterController,
   type WcWallet
@@ -25,12 +24,13 @@ export function AllWalletsView() {
   const { debouncedCallback: onInputChange } = useDebounceCallback({ callback: setSearchQuery });
 
   const onWalletPress = (wallet: WcWallet) => {
-    const connector = ConnectorController.state.connectors.find(c => c.explorerId === wallet.id);
-    if (connector) {
-      RouterController.push('ConnectingExternal', { connector, wallet });
-    } else {
-      RouterController.push('ConnectingWalletConnect', { wallet });
-    }
+    //TODO: check this
+    // const connector = ConnectorController.state.connectors.find(c => c.explorerId === wallet.id);
+    // if (connector) {
+    //   RouterController.push('ConnectingExternal', { connector, wallet });
+    // } else {
+    RouterController.push('ConnectingWalletConnect', { wallet });
+    // }
 
     EventsController.sendEvent({
       type: 'track',

package/src/views/w3m-connect-view/components/connectors-list.tsx

@@ -1,45 +1,47 @@
-import { useSnapshot } from 'valtio';
-import type { StyleProp, ViewStyle } from 'react-native';
-import {
-  ConnectorController,
-  AssetUtil,
-  RouterController,
-  ApiController
-} from '@reown/appkit-core-react-native';
+// import { useSnapshot } from 'valtio';
+// import type { StyleProp, ViewStyle } from 'react-native';
+// import {
+//   ConnectorController,
+//   AssetUtil,
+//   RouterController,
+//   ApiController
+// } from '@reown/appkit-core-react-native';
 
-import { ListWallet } from '@reown/appkit-ui-react-native';
-import type { ConnectorType } from '@reown/appkit-common-react-native';
+// import { ListWallet } from '@reown/appkit-ui-react-native';
+// import type { ConnectorType } from '@reown/appkit-common-react-native';
 
-interface Props {
-  itemStyle: StyleProp<ViewStyle>;
-  isWalletConnectEnabled: boolean;
-}
+// interface Props {
+//   itemStyle: StyleProp<ViewStyle>;
+//   isWalletConnectEnabled: boolean;
+// }
 
-export function ConnectorList({ itemStyle, isWalletConnectEnabled }: Props) {
-  const { connectors } = useSnapshot(ConnectorController.state);
-  const excludeConnectors: ConnectorType[] = ['WALLET_CONNECT', 'AUTH'];
-  const imageHeaders = ApiController._getApiHeaders();
+// TODO: check this for coinbase
+export function ConnectorList(/*{ itemStyle, isWalletConnectEnabled }: Props*/) {
+  // const { connectors } = useSnapshot(ConnectorController.state);
+  // const excludeConnectors: ConnectorType[] = ['WALLET_CONNECT', 'AUTH'];
+  // const imageHeaders = ApiController._getApiHeaders();
 
-  if (isWalletConnectEnabled) {
-    // use wallet from api list
-    excludeConnectors.push('COINBASE');
-  }
+  // if (isWalletConnectEnabled) {
+  //   // use wallet from api list
+  //   excludeConnectors.push('COINBASE');
+  // }
 
-  return connectors.map(connector => {
-    if (excludeConnectors.includes(connector.type)) {
-      return null;
-    }
+  // return connectors.map(connector => {
+  //   if (excludeConnectors.includes(connector.type)) {
+  //     return null;
+  //   }
 
-    return (
-      <ListWallet
-        key={connector.type}
-        imageSrc={AssetUtil.getConnectorImage(connector)}
-        imageHeaders={imageHeaders}
-        name={connector.name || 'Unknown'}
-        onPress={() => RouterController.push('ConnectingExternal', { connector })}
-        style={itemStyle}
-        installed={connector.installed}
-      />
-    );
-  });
+  //   return (
+  //     <ListWallet
+  //       key={connector.type}
+  //       imageSrc={AssetUtil.getConnectorImage(connector)}
+  //       imageHeaders={imageHeaders}
+  //       name={connector.name || 'Unknown'}
+  //       onPress={() => RouterController.push('ConnectingExternal', { connector })}
+  //       style={itemStyle}
+  //       installed={connector.installed}
+  //     />
+  //   );
+  // });
+  return null;
 }

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

@@ -2,7 +2,6 @@ import { useSnapshot } from 'valtio';
 import { ScrollView, View } from 'react-native';
 import {
   ApiController,
-  ConnectorController,
   EventUtil,
   EventsController,
   OptionsController,
@@ -12,7 +11,6 @@ import {
 import { FlexView, Icon, ListItem, Separator, Text } from '@reown/appkit-ui-react-native';
 import { useCustomDimensions } from '../../hooks/useCustomDimensions';
 import { Placeholder } from '../../partials/w3m-placeholder';
-import { ConnectorList } from './components/connectors-list';
 import { CustomWalletList } from './components/custom-wallet-list';
 import { AllWalletsButton } from './components/all-wallets-button';
 import { AllWalletList } from './components/all-wallet-list';
@@ -21,16 +19,13 @@ import { SocialLoginList } from './components/social-login-list';
 import styles from './styles';
 
 export function ConnectView() {
-  const connectors = ConnectorController.state.connectors;
-  // const { authLoading } = useSnapshot(ConnectorController.state);
   const { prefetchError } = useSnapshot(ApiController.state);
   const { features } = useSnapshot(OptionsController.state);
   const { padding } = useCustomDimensions();
 
-  //TODO: check this
-  // const isWalletConnectEnabled = connectors.some(c => c.type === 'WALLET_CONNECT');
+  //TODO: check this with Coinbase
   const isWalletConnectEnabled = true;
-  const isCoinbaseEnabled = connectors.some(c => c.type === 'COINBASE');
+  const isCoinbaseEnabled = false;
   const isSocialEnabled = features?.socials && features?.socials.length > 0;
   const showConnectWalletsButton =
     isWalletConnectEnabled && isSocialEnabled && !features?.showWallets;
@@ -39,19 +34,19 @@ export function ConnectView() {
   const showList = !showConnectWalletsButton && !showLoadingError;
 
   const onWalletPress = (wallet: WcWallet, isInstalled?: boolean) => {
-    const connector = connectors.find(c => c.explorerId === wallet.id);
-    if (connector) {
-      RouterController.push('ConnectingExternal', { connector, wallet });
-    } else {
-      RouterController.push('ConnectingWalletConnect', { wallet });
-    }
+    // const connector = connectors.find(c => c.explorerId === wallet.id);
+    // if (connector) {
+    //   RouterController.push('ConnectingExternal', { connector, wallet });
+    // } else {
+    RouterController.push('ConnectingWalletConnect', { wallet });
+    // }
 
     const platform = EventUtil.getWalletPlatform(wallet, isInstalled);
     EventsController.sendEvent({
       type: 'track',
       event: 'SELECT_WALLET',
       properties: {
-        name: wallet.name ?? connector?.name ?? 'Unknown',
+        name: wallet.name ?? 'Unknown',
         platform,
         explorer_id: wallet.id
       }
@@ -108,10 +103,6 @@ export function ConnectView() {
                 onWalletPress={onWalletPress}
                 isWalletConnectEnabled={isWalletConnectEnabled}
               />
-              <ConnectorList
-                itemStyle={styles.item}
-                isWalletConnectEnabled={isWalletConnectEnabled}
-              />
               <AllWalletsButton
                 itemStyle={styles.item}
                 onPress={onViewAllPress}

package/src/views/w3m-connecting-external-view/index.tsx

@@ -3,11 +3,8 @@ import { ScrollView } from 'react-native';
 import {
   RouterController,
   ApiController,
-  AssetUtil,
-  ConnectionController,
   ModalController,
   EventsController,
-  StorageUtil,
   type WcWallet
 } from '@reown/appkit-core-react-native';
 import {
@@ -22,6 +19,7 @@ import { useCustomDimensions } from '../../hooks/useCustomDimensions';
 import { ConnectingBody, getMessage, type BodyErrorType } from '../../partials/w3m-connecting-body';
 import styles from './styles';
 
+//TODO: check if this view is needed with Coinbase
 export function ConnectingExternalView() {
   const { data } = RouterController.state;
   const connector = data?.connector;
@@ -35,25 +33,27 @@ export function ConnectingExternalView() {
   };
 
   const storeConnectedWallet = useCallback(
+    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async (wallet?: WcWallet) => {
-      if (wallet) {
-        const recentWallets = await StorageUtil.addRecentWallet(wallet);
-        if (recentWallets) {
-          ConnectionController.setRecentWallets(recentWallets);
-        }
-      }
-      if (connector) {
-        const url = AssetUtil.getConnectorImage(connector);
-        ConnectionController.setConnectedWalletImageUrl(url);
-      }
+      // if (wallet) {
+      //   const recentWallets = await StorageUtil.addRecentWallet(wallet);
+      //   if (recentWallets) {
+      //     ConnectionController.setRecentWallets(recentWallets);
+      //   }
+      // }
+      // if (connector) {
+      //   const url = AssetUtil.getConnectorImage(connector);
+      //   ConnectionController.setConnectedWalletImageUrl(url);
+      // }
     },
-    [connector]
+    []
   );
 
   const onConnect = useCallback(async () => {
     try {
       if (connector) {
-        await ConnectionController.connectExternal(connector);
+        // await ConnectionController.connectExternal(connector);
         storeConnectedWallet(data?.wallet);
         ModalController.close();
         EventsController.sendEvent({
@@ -97,7 +97,7 @@ export function ConnectingExternalView() {
         <LoadingThumbnail paused={!!errorType}>
           <WalletImage
             size="xl"
-            imageSrc={AssetUtil.getConnectorImage(connector)}
+            // imageSrc={AssetUtil.getConnectorImage(connector)}
             imageHeaders={ApiController._getApiHeaders()}
           />
           {errorType && (

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-onramp-transaction-view/index.tsx

@@ -2,7 +2,7 @@ import { useSnapshot } from 'valtio';
 import { useEffect } from 'react';
 import {
   AccountController,
-  ConnectorController,
+  ConnectionsController,
   OnRampController,
   RouterController
 } from '@reown/appkit-core-react-native';
@@ -15,7 +15,7 @@ export function OnRampTransactionView() {
   const { data } = useSnapshot(RouterController.state);
 
   const onClose = () => {
-    const isAuth = ConnectorController.state.connectedConnector === 'AUTH';
+    const isAuth = !!ConnectionsController.state.connection?.properties?.provider;
     RouterController.replace(isAuth ? 'Account' : 'AccountDefault');
   };