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

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

@@ -28,15 +28,17 @@ var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
+    const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -47,7 +49,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         if (nonce === undefined)
             throw new utils.DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs.getVerifyArgs({
-            displayTermsOfService,
+            displaySiweStatement,
             environmentId,
             fetchPublicAddressOpts,
             nonce,
@@ -90,6 +92,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     const handleError = (e, walletConnector, address, oauth) => {
         removeConnectedWalletsInfo();
+        // Ensure auth verification flag is taken down
+        setIsVerificationInProgress(false);
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof utils.WalletUsedError) {
@@ -103,9 +107,15 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
         walletConnector.endSession();
         if (e instanceof utils.ChainalysisError) {
+            setDeniedAddress(address);
             setView('chainalysis-blocked-wallet');
             return;
         }
+        if (e instanceof utils.GateBlockedError) {
+            setDeniedAddress(address);
+            setView('gate-blocked-wallet');
+            return;
+        }
         if (e instanceof utils.NoAccessError) {
             setDeniedAddress(address);
             // we need to set this value if it's magic in order to set proper icon
@@ -115,6 +125,11 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             setView('no-access');
             return;
         }
+        if (e instanceof utils.AccountExistsError) {
+            setExistentAccountData(e.errorPayload);
+            setView('account-exists');
+            return;
+        }
         if (connectedWallet && authMode === 'connect-only') {
             throw new utils.DynamicError(e.message);
         }

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

@@ -2,8 +2,8 @@ import { Dispatch, SetStateAction } from 'react';
 import { ProjectSettingsProps, VerifyProps, VerifyCallbackArgs } from '../../../shared/types';
 type UseVerifyWalletArgs = VerifyProps & ProjectSettingsProps & {
     consumeNonce: () => string | undefined;
-    displayTermsOfService: boolean;
+    displaySiweStatement: boolean;
     setIsSingleWalletAccount: Dispatch<SetStateAction<boolean>>;
 };
-export declare const useVerifyWallet: ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }: VerifyCallbackArgs) => Promise<void>;
+export declare const useVerifyWallet: ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }: VerifyCallbackArgs) => Promise<void>;
 export {};

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

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError, WalletUsedError, ChainalysisError, NoAccessError } from '@dynamic-labs/utils';
+import { DynamicError, WalletUsedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import { verifyWallet, linkWallet } from '../../../data/api.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import '@dynamic-labs/multi-wallet';
@@ -24,15 +24,17 @@ import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
+    const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -43,7 +45,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         if (nonce === undefined)
             throw new DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs({
-            displayTermsOfService,
+            displaySiweStatement,
             environmentId,
             fetchPublicAddressOpts,
             nonce,
@@ -86,6 +88,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     const handleError = (e, walletConnector, address, oauth) => {
         removeConnectedWalletsInfo();
+        // Ensure auth verification flag is taken down
+        setIsVerificationInProgress(false);
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof WalletUsedError) {
@@ -99,9 +103,15 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
         walletConnector.endSession();
         if (e instanceof ChainalysisError) {
+            setDeniedAddress(address);
             setView('chainalysis-blocked-wallet');
             return;
         }
+        if (e instanceof GateBlockedError) {
+            setDeniedAddress(address);
+            setView('gate-blocked-wallet');
+            return;
+        }
         if (e instanceof NoAccessError) {
             setDeniedAddress(address);
             // we need to set this value if it's magic in order to set proper icon
@@ -111,6 +121,11 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             setView('no-access');
             return;
         }
+        if (e instanceof AccountExistsError) {
+            setExistentAccountData(e.errorPayload);
+            setView('account-exists');
+            return;
+        }
         if (connectedWallet && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }

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

@@ -21,7 +21,7 @@ var useWalletsConnectionState = require('../useWalletsConnectionState/useWallets
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -33,7 +33,17 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
             walletOptions: availableWallets,
         });
     }, [authToken, primaryWalletId, availableWallets]);
-    const walletsBasedOnAuthMode = React.useMemo(() => (authMode === 'connect-only' ? connectedWallets : linkedWallets), [authMode, connectedWallets, linkedWallets]);
+    const walletsBasedOnAuthMode = React.useMemo(() => {
+        // Before signing the first message we are using connected wallets list
+        // This is because we want the first connected wallet to have events applied by useWalletEventListeners
+        // In connect-and-sign mode, events are only applied after the message is signed.
+        // This change ensures that events will be applied even before the signature.
+        // After signing the message user could be undefined in scenarios like OTP
+        if (authMode === 'connect-and-sign' && (user || onboardingOnlyJwt)) {
+            return linkedWallets;
+        }
+        return connectedWallets;
+    }, [authMode, connectedWallets, linkedWallets, user, onboardingOnlyJwt]);
     const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     React.useEffect(() => {

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

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { WalletOption, Wallet, MultiWalletWidgetState, AuthModeType } from '../../../shared';
+import { WalletOption, Wallet, MultiWalletWidgetState, AuthModeType, UserProfile } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 import { WalletConnector } from '../../../..';
 type Props = {
@@ -13,6 +13,8 @@ type Props = {
     wallets: WalletOption[];
     setPrimaryWalletId: (walletId: string) => void;
     primaryWalletId: string | undefined;
+    user?: UserProfile;
+    onboardingOnlyJwt?: string;
 };
 export interface UseWalletConnectors {
     computeConnectedStateForWallets: () => Promise<void>;
@@ -27,5 +29,5 @@ export interface UseWalletConnectors {
     walletConnectors: WalletConnector[];
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, }: Props) => UseWalletConnectors;
 export {};

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

@@ -17,7 +17,7 @@ import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalle
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
@@ -29,7 +29,17 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
             walletOptions: availableWallets,
         });
     }, [authToken, primaryWalletId, availableWallets]);
-    const walletsBasedOnAuthMode = useMemo(() => (authMode === 'connect-only' ? connectedWallets : linkedWallets), [authMode, connectedWallets, linkedWallets]);
+    const walletsBasedOnAuthMode = useMemo(() => {
+        // Before signing the first message we are using connected wallets list
+        // This is because we want the first connected wallet to have events applied by useWalletEventListeners
+        // In connect-and-sign mode, events are only applied after the message is signed.
+        // This change ensures that events will be applied even before the signature.
+        // After signing the message user could be undefined in scenarios like OTP
+        if (authMode === 'connect-and-sign' && (user || onboardingOnlyJwt)) {
+            return linkedWallets;
+        }
+        return connectedWallets;
+    }, [authMode, connectedWallets, linkedWallets, user, onboardingOnlyJwt]);
     const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     useEffect(() => {

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

@@ -18,7 +18,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
     React.useEffect(() => {
@@ -95,6 +95,10 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             onAccountChange: (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 const [newAddress] = accounts;
                 const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+                if (authMode === 'connect-only') {
+                    refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+                    return;
+                }
                 if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
                     setMultiWalletWidgetState('idle');
                 }
@@ -115,7 +119,6 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                         yield computeConnectedStateForWallets();
                         return;
                     }
-                    connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
                 }
                 else {
                     logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
@@ -124,32 +127,54 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 yield computeConnectedStateForWallets();
             }),
             onChainChange: (chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                setNetwork(parseInt(chain));
+                if (!primaryWallet) {
+                    return;
+                }
+                refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+                // https://linear.app/dynamic-labs/issue/QNTM-84/breaking-change-rename-network-to-primarywalletnetwork
+                if (primaryWallet.chain === 'starknet') {
+                    setNetwork(chain);
+                }
+                else {
+                    setNetwork(parseInt(chain));
+                }
             }),
             onDisconnect: handleLogOut,
         });
     }, [
+        authMode,
         primaryWallet,
         setMultiWalletWidgetState,
         multiWallet,
         user,
         computeConnectedStateForWallets,
         handleLogOut,
-        connectWalletByAddressAndChain,
         multiWalletWidgetState,
         secondaryWallets,
         setSelectedWalletConnector,
         handleAccountChangeWhenAwaitingAccountSwitch,
         setPrimaryWalletId,
+        refreshConnectedWallet,
     ]);
     const addSecondaryWalletEventListeners = React.useCallback((seen) => {
         const secondaryListeners = {
             onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                if (authMode === 'connect-only' && secondaryWallets.length) {
+                    refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+                    return;
+                }
                 if (multiWalletWidgetState === 'awaiting_account_switch') {
                     handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
                 }
                 yield computeConnectedStateForWallets();
             }),
+            onChainChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                // We should pass the proper walletId here
+                if (!secondaryWallets.length) {
+                    return;
+                }
+                refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+            }),
             onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 yield computeConnectedStateForWallets();
             }),
@@ -166,12 +191,14 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             wallet.connector.setupEventListeners(secondaryListeners);
         }
     }, [
+        authMode,
         computeConnectedStateForWallets,
         selectedWalletConnector,
         selectedWalletWithAction,
         handleAccountChangeWhenAwaitingAccountSwitch,
         multiWalletWidgetState,
         secondaryWallets,
+        refreshConnectedWallet,
     ]);
     return {
         loadingNetwork,

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

@@ -1,10 +1,9 @@
 /// <reference types="react" />
-import type { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { MultiWalletWidgetState, UserProfile, Wallet, WalletWithAction } from '../../../shared';
+import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { AuthModeType, MultiWalletWidgetState, UserProfile, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 export type UseWalletEventListenersArgs = {
     computeConnectedStateForWallets(): Promise<void>;
-    connectWalletByAddressAndChain: (name: string, address: string, chain: Chain) => Promise<void>;
     handleLogOut(): Promise<void>;
     multiWallet: boolean;
     multiWalletWidgetState: MultiWalletWidgetState;
@@ -17,8 +16,10 @@ export type UseWalletEventListenersArgs = {
     setSelectedWalletConnector(connector: WalletConnector | null): void;
     setSelectedWalletWithAction(walletWithAction: WalletWithAction | null): void;
     user: UserProfile | undefined;
+    authMode: AuthModeType;
+    refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector) => Promise<void>;
 };
-export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
+export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
     network: string | number | undefined;
     setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;

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

@@ -14,7 +14,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
     const [network, setNetwork] = useState(undefined);
     useEffect(() => {
@@ -91,6 +91,10 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             onAccountChange: (accounts) => __awaiter(void 0, void 0, void 0, function* () {
                 const [newAddress] = accounts;
                 const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+                if (authMode === 'connect-only') {
+                    refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+                    return;
+                }
                 if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
                     setMultiWalletWidgetState('idle');
                 }
@@ -111,7 +115,6 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                         yield computeConnectedStateForWallets();
                         return;
                     }
-                    connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
                 }
                 else {
                     logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
@@ -120,32 +123,54 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 yield computeConnectedStateForWallets();
             }),
             onChainChange: (chain) => __awaiter(void 0, void 0, void 0, function* () {
-                setNetwork(parseInt(chain));
+                if (!primaryWallet) {
+                    return;
+                }
+                refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+                // https://linear.app/dynamic-labs/issue/QNTM-84/breaking-change-rename-network-to-primarywalletnetwork
+                if (primaryWallet.chain === 'starknet') {
+                    setNetwork(chain);
+                }
+                else {
+                    setNetwork(parseInt(chain));
+                }
             }),
             onDisconnect: handleLogOut,
         });
     }, [
+        authMode,
         primaryWallet,
         setMultiWalletWidgetState,
         multiWallet,
         user,
         computeConnectedStateForWallets,
         handleLogOut,
-        connectWalletByAddressAndChain,
         multiWalletWidgetState,
         secondaryWallets,
         setSelectedWalletConnector,
         handleAccountChangeWhenAwaitingAccountSwitch,
         setPrimaryWalletId,
+        refreshConnectedWallet,
     ]);
     const addSecondaryWalletEventListeners = useCallback((seen) => {
         const secondaryListeners = {
             onAccountChange: () => __awaiter(void 0, void 0, void 0, function* () {
+                if (authMode === 'connect-only' && secondaryWallets.length) {
+                    refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+                    return;
+                }
                 if (multiWalletWidgetState === 'awaiting_account_switch') {
                     handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
                 }
                 yield computeConnectedStateForWallets();
             }),
+            onChainChange: () => __awaiter(void 0, void 0, void 0, function* () {
+                // We should pass the proper walletId here
+                if (!secondaryWallets.length) {
+                    return;
+                }
+                refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+            }),
             onDisconnect: () => __awaiter(void 0, void 0, void 0, function* () {
                 yield computeConnectedStateForWallets();
             }),
@@ -162,12 +187,14 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             wallet.connector.setupEventListeners(secondaryListeners);
         }
     }, [
+        authMode,
         computeConnectedStateForWallets,
         selectedWalletConnector,
         selectedWalletWithAction,
         handleAccountChangeWhenAwaitingAccountSwitch,
         multiWalletWidgetState,
         secondaryWallets,
+        refreshConnectedWallet,
     ]);
     return {
         loadingNetwork,

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

@@ -4,9 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var MockContext = require('../../../context/MockContext/MockContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
+var MockContext = require('../../../context/MockContext/MockContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
@@ -21,14 +21,15 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
+var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
-var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, connectedWallets, setIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { setError } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
@@ -79,7 +80,7 @@ const useWalletItemActions = () => {
     });
     const handleAlreadyConnectedWallet = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const connectedAccounts = yield walletConnector.getConnectedAccounts();
-        const activeAccountAlreadyLinked = connectedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+        const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
         if (activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
         }
@@ -111,8 +112,8 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
-        setIsVerifying(false);
-        if (isSelectedWalletAlreadyConnected.isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
+        setLegacyIsVerifying(false);
+        if (isSelectedWalletAlreadyConnected.isSelectedWalletAlreadyConnected(linkedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected
             handleAlreadyConnectedWallet(walletConnector);

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

@@ -1,8 +1,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { isMobile } from '@dynamic-labs/utils';
-import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
@@ -17,14 +17,15 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
+import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';
-import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, connectedWallets, setIsVerifying, } = useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext();
     const { mockedSDK } = useMockContext();
     const { setError } = useErrorContext();
     const { setView } = useViewContext();
@@ -75,7 +76,7 @@ const useWalletItemActions = () => {
     });
     const handleAlreadyConnectedWallet = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         const connectedAccounts = yield walletConnector.getConnectedAccounts();
-        const activeAccountAlreadyLinked = connectedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+        const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
         if (activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
         }
@@ -107,8 +108,8 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
-        setIsVerifying(false);
-        if (isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
+        setLegacyIsVerifying(false);
+        if (isSelectedWalletAlreadyConnected(linkedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected
             handleAlreadyConnectedWallet(walletConnector);

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

@@ -32,6 +32,7 @@ require('@dynamic-labs/rpc-providers');
 require('../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -42,6 +43,8 @@ require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
     const confirmationStateRef = React.useRef('enabled');

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

@@ -28,6 +28,7 @@ import '@dynamic-labs/rpc-providers';
 import '../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';
 import '../../../context/MockContext/MockContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -38,6 +39,8 @@ import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
     const confirmationStateRef = useRef('enabled');