@dynamic-labs/sdk-react-core 0.18.0-RC.16 → 0.18.0-RC.18

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

@@ -7,6 +7,18 @@ import { isEmailVerificationRequired } from '../../functions/authenication/isEma
 import { useEmailVerificationContext } from '../../../context/EmailVerificationContext/EmailVerificationContext.js';
 import { useEmailVerificationRequest } from '../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
 
 // User Fields Schema without captchaToken and policiesConsent properties
 const userFieldsSchema = object().shape({
@@ -29,11 +41,14 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
     const { verifyEmail: verifyEmailFn } = useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     const updateUser = useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
         const updateUserProfileResponse = yield updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, validatedUserFields);
+        // check if decoded JWT still somehow has missing fields, we can't proceed if it does
+        const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
+        const userProfileHasMissingFields = ((_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : []).length > 0;
         const _isEmailVerificationRequired = isEmailVerificationRequired(updateUserProfileResponse);
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
@@ -41,11 +56,12 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
             return {
                 isEmailVerificationRequired: _isEmailVerificationRequired,
                 updateUserProfileResponse,
+                userProfileHasMissingFields,
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
-        setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
@@ -56,6 +72,7 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
         return {
             isEmailVerificationRequired: _isEmailVerificationRequired,
             updateUserProfileResponse,
+            userProfileHasMissingFields,
             verifyEmailFn: scopedVerifyEmailFn,
         };
     }), [

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

@@ -36,7 +36,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
     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, ongoingVerifications, } = 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.
@@ -90,6 +90,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     const handleError = (e, walletConnector, address, oauth) => {
         removeConnectedWalletsInfo();
+        // Ensure auth verification flag is taken down
+        ongoingVerifications.setAuthVerification(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) {

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

@@ -32,7 +32,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
     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, ongoingVerifications, } = 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.
@@ -86,6 +86,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     const handleError = (e, walletConnector, address, oauth) => {
         removeConnectedWalletsInfo();
+        // Ensure auth verification flag is taken down
+        ongoingVerifications.setAuthVerification(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) {

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, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -33,7 +33,16 @@ 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.
+        if (authMode === 'connect-and-sign' && user) {
+            return linkedWallets;
+        }
+        return connectedWallets;
+    }, [authMode, connectedWallets, linkedWallets, user]);
     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,7 @@ type Props = {
     wallets: WalletOption[];
     setPrimaryWalletId: (walletId: string) => void;
     primaryWalletId: string | undefined;
+    user?: UserProfile;
 };
 export interface UseWalletConnectors {
     computeConnectedStateForWallets: () => Promise<void>;
@@ -27,5 +28,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, }: 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, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
@@ -29,7 +29,16 @@ 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.
+        if (authMode === 'connect-and-sign' && user) {
+            return linkedWallets;
+        }
+        return connectedWallets;
+    }, [authMode, connectedWallets, linkedWallets, user]);
     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, authMode, }) => {
+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(() => {
@@ -96,7 +96,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 const [newAddress] = accounts;
                 const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
                 if (authMode === 'connect-only') {
-                    connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
+                    refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
                     return;
                 }
                 if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
@@ -119,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.`);
@@ -128,6 +127,11 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 yield computeConnectedStateForWallets();
             }),
             onChainChange: (chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                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);
                 }
@@ -145,19 +149,18 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         user,
         computeConnectedStateForWallets,
         handleLogOut,
-        connectWalletByAddressAndChain,
         multiWalletWidgetState,
         secondaryWallets,
         setSelectedWalletConnector,
         handleAccountChangeWhenAwaitingAccountSwitch,
         setPrimaryWalletId,
+        refreshConnectedWallet,
     ]);
     const addSecondaryWalletEventListeners = React.useCallback((seen) => {
         const secondaryListeners = {
-            onAccountChange: (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 if (authMode === 'connect-only' && secondaryWallets.length) {
-                    const [newAddress] = accounts;
-                    connectWalletByAddressAndChain(secondaryWallets[0].connector.name, newAddress, secondaryWallets[0].chain);
+                    refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
                     return;
                 }
                 if (multiWalletWidgetState === 'awaiting_account_switch') {
@@ -165,6 +168,13 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 }
                 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();
             }),
@@ -183,12 +193,12 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     }, [
         authMode,
         computeConnectedStateForWallets,
-        connectWalletByAddressAndChain,
         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 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;
@@ -18,8 +17,9 @@ export type UseWalletEventListenersArgs = {
     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, authMode, }: 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, authMode, }) => {
+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(() => {
@@ -92,7 +92,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 const [newAddress] = accounts;
                 const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
                 if (authMode === 'connect-only') {
-                    connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
+                    refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
                     return;
                 }
                 if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
@@ -115,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.`);
@@ -124,6 +123,11 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 yield computeConnectedStateForWallets();
             }),
             onChainChange: (chain) => __awaiter(void 0, void 0, void 0, function* () {
+                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);
                 }
@@ -141,19 +145,18 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         user,
         computeConnectedStateForWallets,
         handleLogOut,
-        connectWalletByAddressAndChain,
         multiWalletWidgetState,
         secondaryWallets,
         setSelectedWalletConnector,
         handleAccountChangeWhenAwaitingAccountSwitch,
         setPrimaryWalletId,
+        refreshConnectedWallet,
     ]);
     const addSecondaryWalletEventListeners = useCallback((seen) => {
         const secondaryListeners = {
-            onAccountChange: (accounts) => __awaiter(void 0, void 0, void 0, function* () {
+            onAccountChange: () => __awaiter(void 0, void 0, void 0, function* () {
                 if (authMode === 'connect-only' && secondaryWallets.length) {
-                    const [newAddress] = accounts;
-                    connectWalletByAddressAndChain(secondaryWallets[0].connector.name, newAddress, secondaryWallets[0].chain);
+                    refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
                     return;
                 }
                 if (multiWalletWidgetState === 'awaiting_account_switch') {
@@ -161,6 +164,13 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                 }
                 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();
             }),
@@ -179,12 +189,12 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     }, [
         authMode,
         computeConnectedStateForWallets,
-        connectWalletByAddressAndChain,
         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,14 @@ 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');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
-var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, ongoingVerifications, } = useInternalDynamicContext.useInternalDynamicContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { setError } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
@@ -111,7 +111,7 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
-        setIsVerifying(false);
+        ongoingVerifications.setConnectAndSignVerification(false);
         if (isSelectedWalletAlreadyConnected.isSelectedWalletAlreadyConnected(linkedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected

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,14 @@ 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 { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';
-import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setIsVerifying, } = useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, ongoingVerifications, } = useInternalDynamicContext();
     const { mockedSDK } = useMockContext();
     const { setError } = useErrorContext();
     const { setView } = useViewContext();
@@ -107,7 +107,7 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
-        setIsVerifying(false);
+        ongoingVerifications.setConnectAndSignVerification(false);
         if (isSelectedWalletAlreadyConnected(linkedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected

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

@@ -43,6 +43,7 @@ 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

@@ -39,6 +39,7 @@ 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');

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -34,8 +34,8 @@ var useVerifyWallet = require('../../utils/hooks/useVerifyWallet/useVerifyWallet
 require('../../components/IconButton/IconButton.cjs');
 var PoweredByDynamic = require('../../components/PoweredByDynamic/PoweredByDynamic.cjs');
 require('../../components/Alert/Alert.cjs');
-require('../../context/MockContext/MockContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
+require('../../context/MockContext/MockContext.cjs');
 var CaptchaContext = require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
@@ -43,6 +43,7 @@ require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
 require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var Captcha = require('../../components/Captcha/Captcha.cjs');
 
 const CaptchaVerifyUser = () => {

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -30,8 +30,8 @@ import { useVerifyWallet } from '../../utils/hooks/useVerifyWallet/useVerifyWall
 import '../../components/IconButton/IconButton.js';
 import { PoweredByDynamic } from '../../components/PoweredByDynamic/PoweredByDynamic.js';
 import '../../components/Alert/Alert.js';
-import '../../context/MockContext/MockContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
+import '../../context/MockContext/MockContext.js';
 import { useCaptchaContext } from '../../context/CaptchaContext/CaptchaContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 import '../../components/Popper/Popper/Popper.js';
@@ -39,6 +39,7 @@ import '../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
 import '../../components/InlineWidget/InlineWidget.js';
+import '../../components/MenuList/Dropdown/Dropdown.js';
 import { Captcha } from '../../components/Captcha/Captcha.js';
 
 const CaptchaVerifyUser = () => {

package/src/lib/views/CollectUserDataView/CollectUserDataView.cjs

@@ -44,6 +44,7 @@ require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
 require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var NetworkPicker = require('../../components/NetworkPicker/NetworkPicker.cjs');
 var UserAddress = require('../../components/UserAddress/UserAddress.cjs');
 var useFetchNameService = require('../../widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.cjs');

package/src/lib/views/CollectUserDataView/CollectUserDataView.js

@@ -40,6 +40,7 @@ import '../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
 import '../../components/InlineWidget/InlineWidget.js';
+import '../../components/MenuList/Dropdown/Dropdown.js';
 import { NetworkPicker } from '../../components/NetworkPicker/NetworkPicker.js';
 import { UserAddress } from '../../components/UserAddress/UserAddress.js';
 import { useFetchNameService } from '../../widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.js';

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.cjs

@@ -42,18 +42,25 @@ require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('yup');
 require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 var index = require('../UserDataFields/index.cjs');
 var useUserDataForm = require('../../../utils/hooks/useUserDataForm/useUserDataForm.cjs');
 
 const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
     const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { setView, view } = ViewContext.useViewContext();
     const decodedJwt = decodeJwt.decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequest.useUserUpdateRequestInternal({
         validationSchemaStripUnknown: false,
     });
     const onSubmit = React.useCallback((formValues) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { isEmailVerificationRequired } = yield updateUser(formValues);
+        const { isEmailVerificationRequired, userProfileHasMissingFields } = yield updateUser(formValues);
+        if (userProfileHasMissingFields) {
+            // make sure we capture the fields that are required and still missing!
+            // do not change the view, just use the current one
+            setView(view);
+            return;
+        }
         if (isEmailVerificationRequired) {
             setView('verify-email');
             return;

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.js

@@ -38,18 +38,25 @@ import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'yup';
 import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
 import { UserDataFields } from '../UserDataFields/index.js';
 import { useUserDataForm } from '../../../utils/hooks/useUserDataForm/useUserDataForm.js';
 
 const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
     const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { setView, view } = useViewContext();
     const decodedJwt = decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequestInternal({
         validationSchemaStripUnknown: false,
     });
     const onSubmit = useCallback((formValues) => __awaiter(void 0, void 0, void 0, function* () {
-        const { isEmailVerificationRequired } = yield updateUser(formValues);
+        const { isEmailVerificationRequired, userProfileHasMissingFields } = yield updateUser(formValues);
+        if (userProfileHasMissingFields) {
+            // make sure we capture the fields that are required and still missing!
+            // do not change the view, just use the current one
+            setView(view);
+            return;
+        }
         if (isEmailVerificationRequired) {
             setView('verify-email');
             return;

package/src/lib/views/CollectUserDataView/UserDataFields/index.cjs

@@ -44,6 +44,7 @@ require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('yup');
 require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 var fieldsConfig = require('../fieldsConfig.cjs');
 var getDisplayErrorMessage = require('./utils/getDisplayErrorMessage/getDisplayErrorMessage.cjs');
 

package/src/lib/views/CollectUserDataView/UserDataFields/index.js

@@ -40,6 +40,7 @@ import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'yup';
 import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
 import { fieldsConfig } from '../fieldsConfig.js';
 import { getDisplayErrorMessage } from './utils/getDisplayErrorMessage/getDisplayErrorMessage.js';