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

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, isBridgeFlow } = useInternalDynamicContext();
+    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, } = useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = useQrCodeContext();
     const { mockedSDK } = useMockContext();
     const { helpHeaderData } = getDynamicLayoutData({ view });
@@ -30,23 +30,29 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'verify-email' &&
         view !== 'network-not-supported' &&
         view !== 'wallet-locked-view' &&
+        view !== 'gate-blocked-wallet' &&
         view !== 'email-wallet-otp-verification-view' &&
         view !== 'bridge-welcome' &&
-        view !== 'bridge-summary';
+        view !== 'bridge-summary' &&
+        view !== 'bridge-next-wallet-connection';
     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');
+            view === 'pending-signature-without-back-button' ||
+            view === 'bridge-next-wallet-connection' ||
+            view === 'bridge-summary');
     const showToSFooter = Boolean(!isUserLinkingWallet(user, view, mockedSDK) &&
         (view === 'wallet-list' ||
             view === 'wallet-connect-mobile-wallets-list' ||
             // Don't show empty footer on login-with-email-or-wallet-full-wallet-list
             (view === 'login-with-email-or-wallet' &&
-                termsOfServiceUrl &&
-                privacyPolicyUrl) ||
+                (termsOfServiceUrl ||
+                    privacyPolicyUrl ||
+                    customPrivacyPolicy ||
+                    customTermsOfServices)) ||
             view === 'login-with-email-or-wallet-full-wallet-list'));
     const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
         view !== 'login-with-email-verification';
@@ -57,7 +63,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'login-with-email-verification' ||
         view === 'login-with-email-or-wallet-full-wallet-list' ||
         view === 'wallet-group' ||
-        view === 'pending-connect';
+        view === 'pending-connect' ||
+        view === 'account-exists';
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {
         isWalletListTypeView,

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

@@ -21,6 +21,7 @@ require('../../../shared/consts/index.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
 

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

@@ -17,6 +17,7 @@ import '../../../shared/consts/index.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 

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

@@ -23,13 +23,54 @@ 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, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
-    const [connectedWallet, setConnectedWallet] = React.useState(null);
+    const [connectedWallets, setConnectedWallets] = React.useState([]);
+    // The function to update and define the connectedWallets list.
+    // It uses walletConnector to get the current wallet address and network
+    // The address and network in the runtime are updated by the event listeners
+    // The event listeners are updating `connectedWallets` list.
+    // It should be called on the first render and when connectedWalletsInfo updates
+    const updateConnectedWalletsList = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const walletConnectors = wallets.map((wallet) => wallet.walletConnector);
+        if (!walletConnectors.length) {
+            return;
+        }
+        const nextConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            const walletConnector = walletConnectorCore.getWalletConnectorByName(walletConnectors, storedConnectedWalletInfo.walletConnectorKey);
+            if (!walletConnector) {
+                walletConnectorCore.logger.error('Could not find walletConnector: ' +
+                    storedConnectedWalletInfo.walletConnectorKey);
+                return Promise.resolve(null);
+            }
+            const [walletAddress] = yield walletConnector.getConnectedAccounts();
+            const walletNetwork = yield walletConnector.getNetwork();
+            const walletChain = walletConnector.connectedChain;
+            const walletObject = {
+                address: 
+                // We use `storedConnectedWalletInfo.lastWalletAddress` as a workaround to Braavos issue
+                // Braavos during initialization returns an empty string as a wallet address
+                walletAddress ||
+                    storedConnectedWalletInfo.lastWalletAddress ||
+                    '',
+                chain: walletChain || '',
+                connected: true,
+                connector: walletConnector,
+                id: storedConnectedWalletInfo.id,
+                network: walletNetwork,
+            };
+            return Promise.resolve(walletObject);
+        })))).filter((wallet) => Boolean(wallet));
+        setConnectedWallets(nextConnectedWallets);
+    }), [connectedWalletsInfo, wallets]);
+    // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
+    React.useEffect(() => {
+        updateConnectedWalletsList();
+    }, [updateConnectedWalletsList]);
     const getNextIdAvailable = React.useCallback((currentWallets) => {
         const existingIds = currentWallets.map(({ id }) => id);
         const sortedIds = existingIds
-            .map((id) => Number(id.replace('connect-only-wallet-', '')))
+            .map((id) => Number(id.replace('connect-wallet-', '')))
             .sort((a, b) => a - b);
         for (let i = 0; i < sortedIds.length; i++) {
             if (sortedIds[i] !== i) {
@@ -38,81 +79,57 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         }
         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;
+    const updateConnectedWalletById = React.useCallback((walletId, walletObject) => {
+        const clonedConnectedWalletsList = [...connectedWallets];
+        const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
+        if (connectedWalletIndex > -1) {
+            clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), walletObject);
+            setConnectedWallets(clonedConnectedWalletsList);
         }
-        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,
-            connected: true,
-            connector: walletConnector,
-            id: 'connect-only-wallet',
+    }, [connectedWallets]);
+    const connectedWallet = connectedWallets[0] || null;
+    // Keeps connected wallet data inside localStorage
+    const applyConnectedWalletToStore = ({ walletId, walletAddress, walletConnectorKey, walletChain, provider, }) => {
+        const nextConnectedWalletsInfo = [...connectedWalletsInfo];
+        nextConnectedWalletsInfo.push({
+            id: walletId,
+            lastWalletAddress: walletAddress,
+            provider,
+            walletChain,
+            walletConnectorKey,
         });
-        setConnectedWalletsInfo((currentWallets) => {
-            const exists = currentWallets.some((currentWallet) => currentWallet.walletPublicKey === address);
-            if (exists) {
-                return currentWallets;
-            }
-            return [
-                ...currentWallets,
-                {
-                    chain,
-                    id: `connect-only-wallet-${getNextIdAvailable(currentWallets)}`,
-                    name: walletConnector.name,
-                    provider: getWalletProvider.getWalletProvider(walletConnector),
-                    walletPublicKey: address,
-                },
-            ];
-        });
-    }, [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)) {
-                yield walletConnector.connect();
-            }
-            const connectedAccounts = yield walletConnector.getConnectedAccounts();
-            const result = connectedAccounts.filter((account) => walletConnectorCore.isSameAddress(account, address, chain));
-            if (result.length > 0) {
-                walletConnector.connect();
-                setConnectedStates(walletConnector, address, chain);
-            }
-            else {
-                setConnectedWallet(null);
-            }
-        }
-        else {
-            setConnectedWallet(null);
+        setConnectedWalletsInfo(nextConnectedWalletsInfo);
+        return Promise.resolve();
+    };
+    // Updates connected wallet (network and address) and verifies connected wallet connection
+    const refreshConnectedWallet = (walletId, walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(walletConnector)) {
+            yield walletConnector.connect();
         }
-    }), [setConnectedStates, wallets]);
-    React.useEffect(() => {
-        const shouldUpdateConnectedWalletsState = authMode === 'connect-only' && connectedWalletsInfo.length;
-        if (shouldUpdateConnectedWalletsState) {
-            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }) => {
-                if (chain) {
-                    connectWalletByAddressAndChain(name, walletPublicKey, chain);
-                }
+        const currentWalletConnectorAddress = yield walletConnector.fetchPublicAddress();
+        if (onBeforeConnectSuccessConfirmation) {
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: currentWalletConnectorAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
             });
+            if (!shouldProceedWithConnection) {
+                walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                unlinkConnectedWallet(walletId);
+                setShowAuthFlow(false);
+                return;
+            }
         }
-    }, [
-        authMode,
-        connectWalletByAddressAndChain,
-        connectedWallets.length,
-        connectedWalletsInfo,
-    ]);
+        if (!currentWalletConnectorAddress) {
+            walletConnectorCore.logger.error('Could not refresh the wallet. The wallet address is not available');
+            return;
+        }
+        const currentWalletConnectoNetwork = yield walletConnector.getNetwork();
+        updateConnectedWalletById(walletId, {
+            address: currentWalletConnectorAddress,
+            network: currentWalletConnectoNetwork,
+        });
+    });
     const shouldSkipCreatingVisit = React.useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
         connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
     const connectWallet = (walletConnector, fetchPublicAddressOpts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -122,28 +139,51 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             error.code = 'missing-public-address';
             throw error;
         }
-        const chain = walletConnector.connectedChain || '';
-        // 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)}`);
+        if (onBeforeConnectSuccessConfirmation) {
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: publicWalletAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
+            });
+            if (!shouldProceedWithConnection) {
+                walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                setShowAuthFlow(false);
+                return;
+            }
+        }
+        const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        if (!primaryWalletId) {
+            setPrimaryWalletId(walletId);
+        }
+        const walletChain = walletConnector.connectedChain;
+        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.name);
+        if (isWalletStored) {
+            yield updateConnectedWalletsList();
+        }
+        else {
+            applyConnectedWalletToStore({
+                provider: getWalletProvider.getWalletProvider(walletConnector),
+                walletAddress: publicWalletAddress,
+                walletChain,
+                walletConnectorKey: walletConnector.name,
+                walletId,
+            });
         }
-        setConnectedStates(walletConnector, publicWalletAddress, chain);
         if (shouldSkipCreatingVisit) {
-            return publicWalletAddress;
+            return Promise.resolve(publicWalletAddress);
         }
         // send information to backend to kick off background jobs
         // so verify/sign on the next step could go by more quickly
         // this is async work, but DO NOT AWAIT
         api.createVisit({
             authMode,
-            chain,
+            chain: walletChain || '',
             environmentId,
             publicWalletAddress,
             walletName: walletConnector.name,
             walletProvider: getWalletProvider.getWalletProvider(walletConnector),
         });
-        return publicWalletAddress;
+        return Promise.resolve(publicWalletAddress);
     });
     const unlinkConnectedWallet = (walletId) => {
         const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
@@ -151,15 +191,16 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             clearPrimaryWalletId();
         }
         setConnectedWalletsInfo(filteredWallets);
+        onUnlink === null || onUnlink === void 0 ? void 0 : onUnlink(walletId, filteredWallets);
     };
     const getConnectedWalletById = React.useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,
-        connectWalletByAddressAndChain,
         connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
         getConnectedWalletById,
+        refreshConnectedWallet,
         removeConnectedWalletsInfo,
         unlinkConnectedWallet,
     };

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

@@ -1,11 +1,12 @@
+import { Dispatch, SetStateAction } from 'react';
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { AuthModeType, Wallet, WalletOption } from '../../../shared';
+import { AuthModeType, OnBeforeConnectSuccessConfirmation, Wallet, WalletOption } from '../../../shared';
 export type ConnectedWalletConnectorType = {
-    chain: Chain | undefined;
-    name: string;
-    provider: string;
-    walletPublicKey: string;
     id: string;
+    walletChain?: Chain;
+    walletConnectorKey: string;
+    provider: string;
+    lastWalletAddress?: string;
 };
 type Props = {
     authMode: AuthModeType;
@@ -15,14 +16,17 @@ type Props = {
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;
     wallets: WalletOption[];
+    onUnlink?: (walletId: string, connectedWalletsInfo: ConnectedWalletConnectorType[]) => void;
+    onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
+    setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
 };
-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) => Promise<void>;
-    connectedWallet: Wallet | null;
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }: Props) => {
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string | undefined>;
+    connectedWallet: Wallet;
     connectedWallets: Wallet[];
-    connectedWalletsInfo: [] | ConnectedWalletConnectorType[];
+    connectedWalletsInfo: ConnectedWalletConnectorType[] | [];
     getConnectedWalletById: (walletId: string) => Wallet | undefined;
+    refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector) => Promise<void>;
     removeConnectedWalletsInfo: () => void;
     unlinkConnectedWallet: (walletId: string) => void;
 };

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

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useMemo, useEffect } from 'react';
-import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { useState, useCallback, useEffect, useMemo } from 'react';
+import { getWalletConnectorByName, logger } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -19,13 +19,54 @@ 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, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
-    const [connectedWallet, setConnectedWallet] = useState(null);
+    const [connectedWallets, setConnectedWallets] = useState([]);
+    // The function to update and define the connectedWallets list.
+    // It uses walletConnector to get the current wallet address and network
+    // The address and network in the runtime are updated by the event listeners
+    // The event listeners are updating `connectedWallets` list.
+    // It should be called on the first render and when connectedWalletsInfo updates
+    const updateConnectedWalletsList = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        const walletConnectors = wallets.map((wallet) => wallet.walletConnector);
+        if (!walletConnectors.length) {
+            return;
+        }
+        const nextConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => __awaiter(void 0, void 0, void 0, function* () {
+            const walletConnector = getWalletConnectorByName(walletConnectors, storedConnectedWalletInfo.walletConnectorKey);
+            if (!walletConnector) {
+                logger.error('Could not find walletConnector: ' +
+                    storedConnectedWalletInfo.walletConnectorKey);
+                return Promise.resolve(null);
+            }
+            const [walletAddress] = yield walletConnector.getConnectedAccounts();
+            const walletNetwork = yield walletConnector.getNetwork();
+            const walletChain = walletConnector.connectedChain;
+            const walletObject = {
+                address: 
+                // We use `storedConnectedWalletInfo.lastWalletAddress` as a workaround to Braavos issue
+                // Braavos during initialization returns an empty string as a wallet address
+                walletAddress ||
+                    storedConnectedWalletInfo.lastWalletAddress ||
+                    '',
+                chain: walletChain || '',
+                connected: true,
+                connector: walletConnector,
+                id: storedConnectedWalletInfo.id,
+                network: walletNetwork,
+            };
+            return Promise.resolve(walletObject);
+        })))).filter((wallet) => Boolean(wallet));
+        setConnectedWallets(nextConnectedWallets);
+    }), [connectedWalletsInfo, wallets]);
+    // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
+    useEffect(() => {
+        updateConnectedWalletsList();
+    }, [updateConnectedWalletsList]);
     const getNextIdAvailable = useCallback((currentWallets) => {
         const existingIds = currentWallets.map(({ id }) => id);
         const sortedIds = existingIds
-            .map((id) => Number(id.replace('connect-only-wallet-', '')))
+            .map((id) => Number(id.replace('connect-wallet-', '')))
             .sort((a, b) => a - b);
         for (let i = 0; i < sortedIds.length; i++) {
             if (sortedIds[i] !== i) {
@@ -34,81 +75,57 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         }
         return sortedIds.length;
     }, []);
-    const connectedWallets = useMemo(() => connectedWalletsInfo
-        .map((connectedWallet) => {
-        const walletConnector = getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), connectedWallet.name);
-        if (!walletConnector) {
-            return null;
+    const updateConnectedWalletById = useCallback((walletId, walletObject) => {
+        const clonedConnectedWalletsList = [...connectedWallets];
+        const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
+        if (connectedWalletIndex > -1) {
+            clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), walletObject);
+            setConnectedWallets(clonedConnectedWalletsList);
         }
-        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,
-            connected: true,
-            connector: walletConnector,
-            id: 'connect-only-wallet',
+    }, [connectedWallets]);
+    const connectedWallet = connectedWallets[0] || null;
+    // Keeps connected wallet data inside localStorage
+    const applyConnectedWalletToStore = ({ walletId, walletAddress, walletConnectorKey, walletChain, provider, }) => {
+        const nextConnectedWalletsInfo = [...connectedWalletsInfo];
+        nextConnectedWalletsInfo.push({
+            id: walletId,
+            lastWalletAddress: walletAddress,
+            provider,
+            walletChain,
+            walletConnectorKey,
         });
-        setConnectedWalletsInfo((currentWallets) => {
-            const exists = currentWallets.some((currentWallet) => currentWallet.walletPublicKey === address);
-            if (exists) {
-                return currentWallets;
-            }
-            return [
-                ...currentWallets,
-                {
-                    chain,
-                    id: `connect-only-wallet-${getNextIdAvailable(currentWallets)}`,
-                    name: walletConnector.name,
-                    provider: getWalletProvider(walletConnector),
-                    walletPublicKey: address,
-                },
-            ];
-        });
-    }, [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)) {
-                yield walletConnector.connect();
-            }
-            const connectedAccounts = yield walletConnector.getConnectedAccounts();
-            const result = connectedAccounts.filter((account) => isSameAddress(account, address, chain));
-            if (result.length > 0) {
-                walletConnector.connect();
-                setConnectedStates(walletConnector, address, chain);
-            }
-            else {
-                setConnectedWallet(null);
-            }
-        }
-        else {
-            setConnectedWallet(null);
+        setConnectedWalletsInfo(nextConnectedWalletsInfo);
+        return Promise.resolve();
+    };
+    // Updates connected wallet (network and address) and verifies connected wallet connection
+    const refreshConnectedWallet = (walletId, walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
+        if (shouldManuallyReconnectOnRefresh(walletConnector)) {
+            yield walletConnector.connect();
         }
-    }), [setConnectedStates, wallets]);
-    useEffect(() => {
-        const shouldUpdateConnectedWalletsState = authMode === 'connect-only' && connectedWalletsInfo.length;
-        if (shouldUpdateConnectedWalletsState) {
-            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }) => {
-                if (chain) {
-                    connectWalletByAddressAndChain(name, walletPublicKey, chain);
-                }
+        const currentWalletConnectorAddress = yield walletConnector.fetchPublicAddress();
+        if (onBeforeConnectSuccessConfirmation) {
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: currentWalletConnectorAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
             });
+            if (!shouldProceedWithConnection) {
+                logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                unlinkConnectedWallet(walletId);
+                setShowAuthFlow(false);
+                return;
+            }
         }
-    }, [
-        authMode,
-        connectWalletByAddressAndChain,
-        connectedWallets.length,
-        connectedWalletsInfo,
-    ]);
+        if (!currentWalletConnectorAddress) {
+            logger.error('Could not refresh the wallet. The wallet address is not available');
+            return;
+        }
+        const currentWalletConnectoNetwork = yield walletConnector.getNetwork();
+        updateConnectedWalletById(walletId, {
+            address: currentWalletConnectorAddress,
+            network: currentWalletConnectoNetwork,
+        });
+    });
     const shouldSkipCreatingVisit = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
         connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
     const connectWallet = (walletConnector, fetchPublicAddressOpts) => __awaiter(void 0, void 0, void 0, function* () {
@@ -118,28 +135,51 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             error.code = 'missing-public-address';
             throw error;
         }
-        const chain = walletConnector.connectedChain || '';
-        // 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)}`);
+        if (onBeforeConnectSuccessConfirmation) {
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: publicWalletAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
+            });
+            if (!shouldProceedWithConnection) {
+                logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                setShowAuthFlow(false);
+                return;
+            }
+        }
+        const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        if (!primaryWalletId) {
+            setPrimaryWalletId(walletId);
+        }
+        const walletChain = walletConnector.connectedChain;
+        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.name);
+        if (isWalletStored) {
+            yield updateConnectedWalletsList();
+        }
+        else {
+            applyConnectedWalletToStore({
+                provider: getWalletProvider(walletConnector),
+                walletAddress: publicWalletAddress,
+                walletChain,
+                walletConnectorKey: walletConnector.name,
+                walletId,
+            });
         }
-        setConnectedStates(walletConnector, publicWalletAddress, chain);
         if (shouldSkipCreatingVisit) {
-            return publicWalletAddress;
+            return Promise.resolve(publicWalletAddress);
         }
         // send information to backend to kick off background jobs
         // so verify/sign on the next step could go by more quickly
         // this is async work, but DO NOT AWAIT
         createVisit({
             authMode,
-            chain,
+            chain: walletChain || '',
             environmentId,
             publicWalletAddress,
             walletName: walletConnector.name,
             walletProvider: getWalletProvider(walletConnector),
         });
-        return publicWalletAddress;
+        return Promise.resolve(publicWalletAddress);
     });
     const unlinkConnectedWallet = (walletId) => {
         const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
@@ -147,15 +187,16 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             clearPrimaryWalletId();
         }
         setConnectedWalletsInfo(filteredWallets);
+        onUnlink === null || onUnlink === void 0 ? void 0 : onUnlink(walletId, filteredWallets);
     };
     const getConnectedWalletById = useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,
-        connectWalletByAddressAndChain,
         connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
         getConnectedWalletById,
+        refreshConnectedWallet,
         removeConnectedWalletsInfo,
         unlinkConnectedWallet,
     };