@dynamic-labs/sdk-react-core 0.18.0-RC.8 → 0.18.0-RC.9

package/src/lib/utils/hooks/useAuthLayoutChecks/useAuthLayoutChecks.js

@@ -7,7 +7,7 @@ import { getDynamicLayoutData } from '../../functions/getDynamicLayoutData/getDy
 
 const useAuthLayoutChecks = (walletConnector) => {
     const { view } = useViewContext();
-    const { user, privacyPolicyUrl, termsOfServiceUrl } = useInternalDynamicContext();
+    const { user, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow } = useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = useQrCodeContext();
     const { mockedSDK } = useMockContext();
     const { helpHeaderData } = getDynamicLayoutData({ view });
@@ -30,7 +30,16 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'verify-email' &&
         view !== 'network-not-supported' &&
         view !== 'wallet-locked-view' &&
-        view !== 'email-wallet-otp-verification-view';
+        view !== 'email-wallet-otp-verification-view' &&
+        view !== 'bridge-welcome' &&
+        view !== 'bridge-summary';
+    const showConnectedWalletProgress = isBridgeFlow &&
+        (view === 'wallet-list' ||
+            view === 'qr-code' ||
+            view === 'wallet-connect-mobile-wallets-list' ||
+            view === 'pending-connect' ||
+            view === 'pending-signature' ||
+            view === 'pending-signature-without-back-button');
     const showToSFooter = Boolean(!isUserLinkingWallet(user, view, mockedSDK) &&
         (view === 'wallet-list' ||
             view === 'wallet-connect-mobile-wallets-list' ||
@@ -54,6 +63,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         isWalletListTypeView,
         showBackButton,
         showCloseButton,
+        showConnectedWalletProgress,
         showHeader,
         showHelpContent,
         showQrCodePreHeader,

package/src/lib/utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.cjs

@@ -4,6 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = React.useCallback(() => {
@@ -12,7 +23,7 @@ const useClearWalletConnectSessions = ({ connectors }) => {
         if (connectors.length === 0)
             return;
         const names = new Set(connectors.map((connector) => walletConnectorCore.normalizeWalletName(connector.name)));
-        for (const key of Object.keys(localStorage)) {
+        for (const key of localStorage$1.LocalStorage.getKeys()) {
             if (key.startsWith('walletconnect') &&
                 !names.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
@@ -22,8 +33,10 @@ const useClearWalletConnectSessions = ({ connectors }) => {
     const clearAllWalletConnectSessions = () => {
         if (typeof window === 'undefined')
             return;
-        for (const key of Object.keys(localStorage)) {
-            if (key.startsWith('walletconnect')) {
+        for (const key of localStorage$1.LocalStorage.getKeys()) {
+            if (key.startsWith('walletconnect') ||
+                key.startsWith('walletlink') ||
+                key.startsWith('wc@2')) {
                 localStorage.removeItem(key);
             }
         }

package/src/lib/utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.js

@@ -1,5 +1,16 @@
 import { useCallback } from 'react';
 import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = useCallback(() => {
@@ -8,7 +19,7 @@ const useClearWalletConnectSessions = ({ connectors }) => {
         if (connectors.length === 0)
             return;
         const names = new Set(connectors.map((connector) => normalizeWalletName(connector.name)));
-        for (const key of Object.keys(localStorage)) {
+        for (const key of LocalStorage.getKeys()) {
             if (key.startsWith('walletconnect') &&
                 !names.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
@@ -18,8 +29,10 @@ const useClearWalletConnectSessions = ({ connectors }) => {
     const clearAllWalletConnectSessions = () => {
         if (typeof window === 'undefined')
             return;
-        for (const key of Object.keys(localStorage)) {
-            if (key.startsWith('walletconnect')) {
+        for (const key of LocalStorage.getKeys()) {
+            if (key.startsWith('walletconnect') ||
+                key.startsWith('walletlink') ||
+                key.startsWith('wc@2')) {
                 localStorage.removeItem(key);
             }
         }

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.cjs

@@ -23,11 +23,37 @@ var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, user, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
     const [connectedWallet, setConnectedWallet] = React.useState(null);
-    const [connectedWallets, setConnectedWallets] = React.useState([]);
-    const setConnectedStates = React.useCallback((walletConnector, address, chain, id) => {
+    const getNextIdAvailable = React.useCallback((currentWallets) => {
+        const existingIds = currentWallets.map(({ id }) => id);
+        const sortedIds = existingIds
+            .map((id) => Number(id.replace('connect-only-wallet-', '')))
+            .sort((a, b) => a - b);
+        for (let i = 0; i < sortedIds.length; i++) {
+            if (sortedIds[i] !== i) {
+                return i;
+            }
+        }
+        return sortedIds.length;
+    }, []);
+    const connectedWallets = React.useMemo(() => connectedWalletsInfo
+        .map((connectedWallet) => {
+        const walletConnector = walletConnectorCore.getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), connectedWallet.name);
+        if (!walletConnector) {
+            return null;
+        }
+        return {
+            address: connectedWallet.walletPublicKey,
+            chain: connectedWallet.chain,
+            connected: true,
+            connector: walletConnector,
+            id: connectedWallet.id,
+        };
+    })
+        .filter((wc) => wc !== null), [connectedWalletsInfo, wallets]);
+    const setConnectedStates = React.useCallback((walletConnector, address, chain) => {
         setConnectedWallet({
             address,
             chain,
@@ -35,29 +61,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             connector: walletConnector,
             id: 'connect-only-wallet',
         });
-        setConnectedWallets((currentWallets) => {
-            const exists = currentWallets.some((currentWallet) => walletConnectorCore.isSameAddress(currentWallet.address, address, chain));
-            // when we connect first wallet, it should be set as a primary wallet
-            const shouldSetPrimaryWalletId = authMode === 'connect-only' &&
-                currentWallets.length === 0 &&
-                !primaryWalletId;
-            if (shouldSetPrimaryWalletId) {
-                setPrimaryWalletId(`connect-only-wallet-${0}`);
-            }
-            if (exists) {
-                return currentWallets;
-            }
-            return [
-                ...currentWallets,
-                {
-                    address,
-                    chain,
-                    connected: true,
-                    connector: walletConnector,
-                    id: `connect-only-wallet-${id}`,
-                },
-            ];
-        });
         setConnectedWalletsInfo((currentWallets) => {
             const exists = currentWallets.some((currentWallet) => currentWallet.walletPublicKey === address);
             if (exists) {
@@ -67,25 +70,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 ...currentWallets,
                 {
                     chain,
-                    id: `connect-only-wallet-${id}`,
+                    id: `connect-only-wallet-${getNextIdAvailable(currentWallets)}`,
                     name: walletConnector.name,
                     provider: getWalletProvider.getWalletProvider(walletConnector),
                     walletPublicKey: address,
                 },
             ];
         });
-    }, [authMode, primaryWalletId, setConnectedWalletsInfo, setPrimaryWalletId]);
-    React.useEffect(() => {
-        const found = connectedWalletsInfo.find((connectedWalletInfo) => connectedWalletInfo.id !== primaryWalletId);
-        // when primaryWalletId is defined, but it does not exist in
-        // connectedWalletInfo that means we're out of sync and we want to remove all connected wallets data
-        if (primaryWalletId && !found && !user) {
-            removeConnectedWalletsInfo();
-            setConnectedWallets([]);
-            clearPrimaryWalletId();
-        }
-    }, []);
-    const connectWalletByAddressAndChain = React.useCallback((name, address, chain, id) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }, [getNextIdAvailable, setConnectedWalletsInfo]);
+    const connectWalletByAddressAndChain = React.useCallback((name, address, chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletConnector = walletConnectorCore.getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
         if (walletConnector) {
             if (shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(walletConnector)) {
@@ -95,7 +88,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             const result = connectedAccounts.filter((account) => walletConnectorCore.isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
-                setConnectedStates(walletConnector, address, chain, id);
+                setConnectedStates(walletConnector, address, chain);
             }
             else {
                 setConnectedWallet(null);
@@ -106,13 +99,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         }
     }), [setConnectedStates, wallets]);
     React.useEffect(() => {
-        const shouldUpdateConnectedWalletsState = authMode === 'connect-only' &&
-            connectedWalletsInfo.length &&
-            !connectedWallets.length;
+        const shouldUpdateConnectedWalletsState = authMode === 'connect-only' && connectedWalletsInfo.length;
         if (shouldUpdateConnectedWalletsState) {
-            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }, id) => {
+            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }) => {
                 if (chain) {
-                    connectWalletByAddressAndChain(name, walletPublicKey, chain, id);
+                    connectWalletByAddressAndChain(name, walletPublicKey, chain);
                 }
             });
         }
@@ -132,7 +123,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             throw error;
         }
         const chain = walletConnector.connectedChain || '';
-        setConnectedStates(walletConnector, publicWalletAddress, chain, connectedWalletsInfo.length);
+        // when we connect first wallet, it should be set as a primary wallet
+        const shouldSetPrimaryWalletId = authMode === 'connect-only' && !primaryWalletId;
+        if (shouldSetPrimaryWalletId) {
+            setPrimaryWalletId(`connect-only-wallet-${getNextIdAvailable(connectedWalletsInfo)}`);
+        }
+        setConnectedStates(walletConnector, publicWalletAddress, chain);
         if (shouldSkipCreatingVisit) {
             return publicWalletAddress;
         }
@@ -149,15 +145,23 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         });
         return publicWalletAddress;
     });
+    const unlinkConnectedWallet = (walletId) => {
+        const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
+        if (walletId === primaryWalletId) {
+            clearPrimaryWalletId();
+        }
+        setConnectedWalletsInfo(filteredWallets);
+    };
+    const getConnectedWalletById = React.useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,
         connectWalletByAddressAndChain,
         connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
+        getConnectedWalletById,
         removeConnectedWalletsInfo,
-        setConnectedWallet,
-        setConnectedWallets,
+        unlinkConnectedWallet,
     };
 };
 

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { AuthModeType, UserProfile, Wallet, WalletOption } from '../../../shared';
+import { AuthModeType, Wallet, WalletOption } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     chain: Chain | undefined;
     name: string;
@@ -16,16 +15,15 @@ type Props = {
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;
     wallets: WalletOption[];
-    user: UserProfile | undefined;
 };
-export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, user, }: Props) => {
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, }: Props) => {
     connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string>;
-    connectWalletByAddressAndChain: (name: string, address: string, chain: Chain, id?: number) => Promise<void>;
+    connectWalletByAddressAndChain: (name: string, address: string, chain: Chain) => Promise<void>;
     connectedWallet: Wallet | null;
-    connectedWallets: [] | Wallet[];
+    connectedWallets: Wallet[];
     connectedWalletsInfo: [] | ConnectedWalletConnectorType[];
+    getConnectedWalletById: (walletId: string) => Wallet | undefined;
     removeConnectedWalletsInfo: () => void;
-    setConnectedWallet: import("react").Dispatch<import("react").SetStateAction<Wallet | null>>;
-    setConnectedWallets: import("react").Dispatch<import("react").SetStateAction<[] | Wallet[]>>;
+    unlinkConnectedWallet: (walletId: string) => void;
 };
 export {};

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.js

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect, useMemo } from 'react';
-import { isSameAddress, getWalletConnectorByName } from '@dynamic-labs/wallet-connector-core';
+import { useState, useCallback, useMemo, useEffect } from 'react';
+import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -19,11 +19,37 @@ import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, user, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
     const [connectedWallet, setConnectedWallet] = useState(null);
-    const [connectedWallets, setConnectedWallets] = useState([]);
-    const setConnectedStates = useCallback((walletConnector, address, chain, id) => {
+    const getNextIdAvailable = useCallback((currentWallets) => {
+        const existingIds = currentWallets.map(({ id }) => id);
+        const sortedIds = existingIds
+            .map((id) => Number(id.replace('connect-only-wallet-', '')))
+            .sort((a, b) => a - b);
+        for (let i = 0; i < sortedIds.length; i++) {
+            if (sortedIds[i] !== i) {
+                return i;
+            }
+        }
+        return sortedIds.length;
+    }, []);
+    const connectedWallets = useMemo(() => connectedWalletsInfo
+        .map((connectedWallet) => {
+        const walletConnector = getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), connectedWallet.name);
+        if (!walletConnector) {
+            return null;
+        }
+        return {
+            address: connectedWallet.walletPublicKey,
+            chain: connectedWallet.chain,
+            connected: true,
+            connector: walletConnector,
+            id: connectedWallet.id,
+        };
+    })
+        .filter((wc) => wc !== null), [connectedWalletsInfo, wallets]);
+    const setConnectedStates = useCallback((walletConnector, address, chain) => {
         setConnectedWallet({
             address,
             chain,
@@ -31,29 +57,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             connector: walletConnector,
             id: 'connect-only-wallet',
         });
-        setConnectedWallets((currentWallets) => {
-            const exists = currentWallets.some((currentWallet) => isSameAddress(currentWallet.address, address, chain));
-            // when we connect first wallet, it should be set as a primary wallet
-            const shouldSetPrimaryWalletId = authMode === 'connect-only' &&
-                currentWallets.length === 0 &&
-                !primaryWalletId;
-            if (shouldSetPrimaryWalletId) {
-                setPrimaryWalletId(`connect-only-wallet-${0}`);
-            }
-            if (exists) {
-                return currentWallets;
-            }
-            return [
-                ...currentWallets,
-                {
-                    address,
-                    chain,
-                    connected: true,
-                    connector: walletConnector,
-                    id: `connect-only-wallet-${id}`,
-                },
-            ];
-        });
         setConnectedWalletsInfo((currentWallets) => {
             const exists = currentWallets.some((currentWallet) => currentWallet.walletPublicKey === address);
             if (exists) {
@@ -63,25 +66,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 ...currentWallets,
                 {
                     chain,
-                    id: `connect-only-wallet-${id}`,
+                    id: `connect-only-wallet-${getNextIdAvailable(currentWallets)}`,
                     name: walletConnector.name,
                     provider: getWalletProvider(walletConnector),
                     walletPublicKey: address,
                 },
             ];
         });
-    }, [authMode, primaryWalletId, setConnectedWalletsInfo, setPrimaryWalletId]);
-    useEffect(() => {
-        const found = connectedWalletsInfo.find((connectedWalletInfo) => connectedWalletInfo.id !== primaryWalletId);
-        // when primaryWalletId is defined, but it does not exist in
-        // connectedWalletInfo that means we're out of sync and we want to remove all connected wallets data
-        if (primaryWalletId && !found && !user) {
-            removeConnectedWalletsInfo();
-            setConnectedWallets([]);
-            clearPrimaryWalletId();
-        }
-    }, []);
-    const connectWalletByAddressAndChain = useCallback((name, address, chain, id) => __awaiter(void 0, void 0, void 0, function* () {
+    }, [getNextIdAvailable, setConnectedWalletsInfo]);
+    const connectWalletByAddressAndChain = useCallback((name, address, chain) => __awaiter(void 0, void 0, void 0, function* () {
         const walletConnector = getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
         if (walletConnector) {
             if (shouldManuallyReconnectOnRefresh(walletConnector)) {
@@ -91,7 +84,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             const result = connectedAccounts.filter((account) => isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
-                setConnectedStates(walletConnector, address, chain, id);
+                setConnectedStates(walletConnector, address, chain);
             }
             else {
                 setConnectedWallet(null);
@@ -102,13 +95,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         }
     }), [setConnectedStates, wallets]);
     useEffect(() => {
-        const shouldUpdateConnectedWalletsState = authMode === 'connect-only' &&
-            connectedWalletsInfo.length &&
-            !connectedWallets.length;
+        const shouldUpdateConnectedWalletsState = authMode === 'connect-only' && connectedWalletsInfo.length;
         if (shouldUpdateConnectedWalletsState) {
-            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }, id) => {
+            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }) => {
                 if (chain) {
-                    connectWalletByAddressAndChain(name, walletPublicKey, chain, id);
+                    connectWalletByAddressAndChain(name, walletPublicKey, chain);
                 }
             });
         }
@@ -128,7 +119,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             throw error;
         }
         const chain = walletConnector.connectedChain || '';
-        setConnectedStates(walletConnector, publicWalletAddress, chain, connectedWalletsInfo.length);
+        // when we connect first wallet, it should be set as a primary wallet
+        const shouldSetPrimaryWalletId = authMode === 'connect-only' && !primaryWalletId;
+        if (shouldSetPrimaryWalletId) {
+            setPrimaryWalletId(`connect-only-wallet-${getNextIdAvailable(connectedWalletsInfo)}`);
+        }
+        setConnectedStates(walletConnector, publicWalletAddress, chain);
         if (shouldSkipCreatingVisit) {
             return publicWalletAddress;
         }
@@ -145,15 +141,23 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         });
         return publicWalletAddress;
     });
+    const unlinkConnectedWallet = (walletId) => {
+        const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
+        if (walletId === primaryWalletId) {
+            clearPrimaryWalletId();
+        }
+        setConnectedWalletsInfo(filteredWallets);
+    };
+    const getConnectedWalletById = useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,
         connectWalletByAddressAndChain,
         connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
+        getConnectedWalletById,
         removeConnectedWalletsInfo,
-        setConnectedWallet,
-        setConnectedWallets,
+        unlinkConnectedWallet,
     };
 };
 

package/src/lib/utils/hooks/useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs

@@ -31,9 +31,9 @@ const useCreateUserProfileByJWTCallback = () => {
             goToInitialView();
             return;
         }
+        index.storeAuthToken(jwt);
         const userProfile = createUserProfile.createUserProfile(decodedJWT);
         setUser(userProfile);
-        index.storeAuthToken(jwt);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     return { createUserProfileByJWT };

package/src/lib/utils/hooks/useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js

@@ -27,9 +27,9 @@ const useCreateUserProfileByJWTCallback = () => {
             goToInitialView();
             return;
         }
+        storeAuthToken(jwt);
         const userProfile = createUserProfile(decodedJWT);
         setUser(userProfile);
-        storeAuthToken(jwt);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     return { createUserProfileByJWT };

package/src/lib/utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.cjs

@@ -17,17 +17,13 @@ require('ethers');
 var index = require('../../../shared/consts/index.cjs');
 
 const useFetchWalletsForChainsMap = (propsWalletsChainsMap) => {
-    const walletsForChainsMap = index.defaultWalletsForChains;
-    // Update default map only if is setup
-    React.useEffect(() => {
-        if (propsWalletsChainsMap) {
-            Object.assign(walletsForChainsMap, {
-                primary_chain: propsWalletsChainsMap.primary_chain,
-                wallets: Object.assign(Object.assign({}, index.defaultWalletsForChains.wallets), (Boolean(propsWalletsChainsMap.wallets) &&
-                    propsWalletsChainsMap.wallets)),
-            });
+    const walletsForChainsMap = React.useMemo(() => {
+        if (!propsWalletsChainsMap) {
+            return index.defaultWalletsForChains;
         }
-    }, []);
+        return Object.assign(Object.assign({}, index.defaultWalletsForChains), { primary_chain: propsWalletsChainsMap.primary_chain, wallets: Object.assign(Object.assign({}, index.defaultWalletsForChains.wallets), (Boolean(propsWalletsChainsMap.wallets) &&
+                propsWalletsChainsMap.wallets)) });
+    }, [propsWalletsChainsMap]);
     return { walletsForChainsMap };
 };
 

package/src/lib/utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.js

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useMemo } from 'react';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -13,17 +13,13 @@ import 'ethers';
 import { defaultWalletsForChains } from '../../../shared/consts/index.js';
 
 const useFetchWalletsForChainsMap = (propsWalletsChainsMap) => {
-    const walletsForChainsMap = defaultWalletsForChains;
-    // Update default map only if is setup
-    useEffect(() => {
-        if (propsWalletsChainsMap) {
-            Object.assign(walletsForChainsMap, {
-                primary_chain: propsWalletsChainsMap.primary_chain,
-                wallets: Object.assign(Object.assign({}, defaultWalletsForChains.wallets), (Boolean(propsWalletsChainsMap.wallets) &&
-                    propsWalletsChainsMap.wallets)),
-            });
+    const walletsForChainsMap = useMemo(() => {
+        if (!propsWalletsChainsMap) {
+            return defaultWalletsForChains;
         }
-    }, []);
+        return Object.assign(Object.assign({}, defaultWalletsForChains), { primary_chain: propsWalletsChainsMap.primary_chain, wallets: Object.assign(Object.assign({}, defaultWalletsForChains.wallets), (Boolean(propsWalletsChainsMap.wallets) &&
+                propsWalletsChainsMap.wallets)) });
+    }, [propsWalletsChainsMap]);
     return { walletsForChainsMap };
 };
 

package/src/lib/utils/hooks/useHandleWalletsToConnect/useHandleWalletsToConnect.cjs

@@ -6,10 +6,11 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setConnectedUser, isUserConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
+            setConnectedUser(true);
             setShowAuthFlow(false);
             return;
         }
@@ -24,8 +25,17 @@ const useHandleWalletsToConnect = () => {
             return;
         }
         setWalletsToConnectByChain(restOfTheWallets);
-        if (restOfTheWallets.length === 0) {
-            setShowAuthFlow(false);
+        const allWalletsConnected = restOfTheWallets.length === 0;
+        if (allWalletsConnected) {
+            if (!isUserConnected) {
+                setConnectedUser(true);
+                setView('bridge-summary');
+            }
+            else {
+                setShowAuthFlow(false);
+                goToInitialView();
+            }
+            return;
         }
         setView('wallet-list');
     };

package/src/lib/utils/hooks/useHandleWalletsToConnect/useHandleWalletsToConnect.js

@@ -2,10 +2,11 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setConnectedUser, isUserConnected, } = useInternalDynamicContext();
+    const { setView, goToInitialView } = useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
+            setConnectedUser(true);
             setShowAuthFlow(false);
             return;
         }
@@ -20,8 +21,17 @@ const useHandleWalletsToConnect = () => {
             return;
         }
         setWalletsToConnectByChain(restOfTheWallets);
-        if (restOfTheWallets.length === 0) {
-            setShowAuthFlow(false);
+        const allWalletsConnected = restOfTheWallets.length === 0;
+        if (allWalletsConnected) {
+            if (!isUserConnected) {
+                setConnectedUser(true);
+                setView('bridge-summary');
+            }
+            else {
+                setShowAuthFlow(false);
+                goToInitialView();
+            }
+            return;
         }
         setView('wallet-list');
     };

package/src/lib/utils/hooks/usePromise/usePromise.cjs

@@ -5,7 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 
-const usePromise = (fetcher, deps = []) => {
+const usePromise = (fetcher, deps = [], options = {
+    enabled: true,
+}) => {
     const [state, setState] = React.useState({
         active: false,
     });
@@ -35,7 +37,9 @@ const usePromise = (fetcher, deps = []) => {
         }
     }), [setState, fetcher]);
     React.useEffect(() => {
-        fetch();
+        if (options.enabled) {
+            fetch();
+        }
     }, deps);
     return Object.assign(Object.assign({}, state), { isLoading: state.active });
 };