@dynamic-labs/sdk-react-core 0.19.0-alpha.25 → 0.19.0-alpha.27

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

@@ -20,10 +20,11 @@ import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnab
 import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWallet } from '../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
+import { getUserWalletsFromVerifiedCredentials } from '../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, primaryWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const userHasEmbeddedWallet = () => {
         var _a;
@@ -42,9 +43,9 @@ const useEmbeddedWallet = () => {
         if (!isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled');
         }
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
-        // if user doesn't have an embedded wallet, show the passkey view to create wallet
-        if (!embeddedWalletVerifiedCredential) {
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
+        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
+        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
             internalSetShowAuthFlow(true);
             setView('passkey-intro');
             return new Promise((resolve, reject) => {
@@ -52,14 +53,19 @@ const useEmbeddedWallet = () => {
                 internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
             });
         }
-        const decodedJwt = decodeJwt(jwt);
+        internalSetShowAuthFlow(false);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
         const turnkeyWallet = findTurnkeyWallet(wallets);
+        // if user logged in with MM for example, just continue the flow
+        if (!embeddedWalletVerifiedCredential) {
+            return Promise.resolve(primaryWallet);
+        }
+        const decodedJwt = decodeJwt(jwt);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         }
-        internalSetShowAuthFlow(false);
         const passkeyWallet = {
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
             chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',

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

@@ -14,7 +14,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
-var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
@@ -42,12 +42,6 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
         }
         return overrideSettings;
     };
-    React.useEffect(() => {
-        const [connectedWalletData] = localStorage$1.LocalStorage.getFromLS(localStorage.CONNECTED_WALLETS_INFO) || [];
-        if (!authToken && !connectedWalletData) {
-            removeLsSettings();
-        }
-    }, [authToken, removeLsSettings]);
     React.useEffect(() => {
         if (!lsSettingsExists &&
             !isLoading &&

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

@@ -8,9 +8,9 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import { PROJECT_SETTINGS_STORAGE_KEY, CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
+import { PROJECT_SETTINGS_STORAGE_KEY } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
-import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
@@ -38,12 +38,6 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
         }
         return overrideSettings;
     };
-    useEffect(() => {
-        const [connectedWalletData] = LocalStorage.getFromLS(CONNECTED_WALLETS_INFO) || [];
-        if (!authToken && !connectedWalletData) {
-            removeLsSettings();
-        }
-    }, [authToken, removeLsSettings]);
     useEffect(() => {
         if (!lsSettingsExists &&
             !isLoading &&

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

@@ -20,15 +20,11 @@ require('../../../shared/consts/index.cjs');
 var primaryWalletIdValidator = require('../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
 require('@dynamic-labs/multi-wallet');
 
-const usePrimaryWalletId = (internalEvents) => {
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
+const usePrimaryWalletId = () => {
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
     const setPrimaryWalletId = React.useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearPrimaryWalletId = React.useCallback(() => {
-        clearPrimaryWalletIdStorage();
-        internalEvents.emit('clearPrimaryWallet');
-    }, [clearPrimaryWalletIdStorage, internalEvents]);
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -1,5 +1,4 @@
-import { InternalEventEmitter } from '../../../context/DynamicContext/internalEvents';
-export declare const usePrimaryWalletId: (internalEvents: InternalEventEmitter) => {
+export declare const usePrimaryWalletId: () => {
     clearPrimaryWalletId: () => void;
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;

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

@@ -16,15 +16,11 @@ import '../../../shared/consts/index.js';
 import { primaryWalletIdValidator } from '../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
 import '@dynamic-labs/multi-wallet';
 
-const usePrimaryWalletId = (internalEvents) => {
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
+const usePrimaryWalletId = () => {
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearPrimaryWalletId = useCallback(() => {
-        clearPrimaryWalletIdStorage();
-        internalEvents.emit('clearPrimaryWallet');
-    }, [clearPrimaryWalletIdStorage, internalEvents]);
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -192,10 +192,6 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         const handleAuthWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             var _e, _f;
             const message = event.data;
-            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
-            if (isAuthorizationMessage) {
-                logger.logger.debug('Message received', { data: message });
-            }
             const apiProvider = getProviderByType.getProviderByType((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _e !== void 0 ? _e : [], provider);
             if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
                 return;
@@ -213,6 +209,18 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                     return;
                 }
             }
+            if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
+                logger.logger.debug('Origin check message received. Sending response now.', {
+                    data: message,
+                    expectedOrigin,
+                });
+                authWindow.postMessage('origin_check_response', expectedOrigin);
+                return;
+            }
+            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
+            if (isAuthorizationMessage) {
+                logger.logger.debug('Message received', { data: message });
+            }
             const isExpectedOrigin = event.origin === expectedOrigin;
             const isValidMessage = isAuthorizationMessage &&
                 (message === null || message === void 0 ? void 0 : message.provider) === provider &&
@@ -234,7 +242,9 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             // check that the state we receive from message is the same state we calculated earlier
             // this could be an attack
-            if (state !== authState) {
+            // this state check is used only by providers with an open window opener reference (eg, not twitter)
+            if (!providersWithoutWindowOpenerRefence.includes(provider) &&
+                state !== authState) {
                 handleError(types.SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: Invalid random state`);
                 return;
             }

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

@@ -188,10 +188,6 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
             var _e, _f;
             const message = event.data;
-            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
-            if (isAuthorizationMessage) {
-                logger.debug('Message received', { data: message });
-            }
             const apiProvider = getProviderByType((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _e !== void 0 ? _e : [], provider);
             if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
                 return;
@@ -209,6 +205,18 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                     return;
                 }
             }
+            if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
+                logger.debug('Origin check message received. Sending response now.', {
+                    data: message,
+                    expectedOrigin,
+                });
+                authWindow.postMessage('origin_check_response', expectedOrigin);
+                return;
+            }
+            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
+            if (isAuthorizationMessage) {
+                logger.debug('Message received', { data: message });
+            }
             const isExpectedOrigin = event.origin === expectedOrigin;
             const isValidMessage = isAuthorizationMessage &&
                 (message === null || message === void 0 ? void 0 : message.provider) === provider &&
@@ -230,7 +238,9 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             // check that the state we receive from message is the same state we calculated earlier
             // this could be an attack
-            if (state !== authState) {
+            // this state check is used only by providers with an open window opener reference (eg, not twitter)
+            if (!providersWithoutWindowOpenerRefence.includes(provider) &&
+                state !== authState) {
                 handleError(SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: Invalid random state`);
                 return;
             }

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, user, onboardingOnlyJwt, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -60,7 +60,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         computeConnectedStateForWallets();
     }, [primaryWalletId, computeConnectedStateForWallets]);
     const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = React.useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
+    const getSecondaryWallets = React.useCallback(() => canHaveMultipleWalletsConnected
+        ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
+        : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {

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

@@ -15,6 +15,7 @@ type Props = {
     primaryWalletId: string | undefined;
     user?: UserProfile;
     onboardingOnlyJwt?: string;
+    canHaveMultipleWalletsConnected?: boolean;
 };
 export interface UseWalletConnectors {
     computeConnectedStateForWallets: () => Promise<void>;
@@ -29,5 +30,5 @@ export interface UseWalletConnectors {
     walletConnectors: WalletConnector[];
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: 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, user, onboardingOnlyJwt, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
@@ -56,7 +56,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         computeConnectedStateForWallets();
     }, [primaryWalletId, computeConnectedStateForWallets]);
     const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
+    const getSecondaryWallets = useCallback(() => canHaveMultipleWalletsConnected
+        ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
+        : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {

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

@@ -17,7 +17,6 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
 var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
-var sortAccountsByPrimaryWallet = require('./utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.cjs');
 
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
@@ -25,7 +24,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     React.useEffect(() => {
         const fetchNetwork = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             try {
-                if (!primaryWallet)
+                if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector))
                     return;
                 const network = yield primaryWallet.connector.getNetwork();
                 setNetwork(network);
@@ -39,7 +38,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             }
         });
         fetchNetwork();
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);
+    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -65,11 +64,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // change the api here
         if (!primaryWallet)
             return;
-        // Sorts the accounts so that the primary wallet is always first
-        // when multiWallet is disabled to ensure we find the primary address
-        const [newAddress] = multiWallet
-            ? accounts
-            : sortAccountsByPrimaryWallet.sortAccountsByPrimaryWallet(accounts, primaryWallet);
+        const [newAddress] = accounts;
         const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
         if (authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);

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

@@ -13,7 +13,6 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
 import { useWalletConnectorEvent } from '../useWalletConnectorEvent/useWalletConnectorEvent.js';
-import { sortAccountsByPrimaryWallet } from './utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.js';
 
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
@@ -21,7 +20,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     useEffect(() => {
         const fetchNetwork = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
-                if (!primaryWallet)
+                if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector))
                     return;
                 const network = yield primaryWallet.connector.getNetwork();
                 setNetwork(network);
@@ -35,7 +34,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             }
         });
         fetchNetwork();
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);
+    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -61,11 +60,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // change the api here
         if (!primaryWallet)
             return;
-        // Sorts the accounts so that the primary wallet is always first
-        // when multiWallet is disabled to ensure we find the primary address
-        const [newAddress] = multiWallet
-            ? accounts
-            : sortAccountsByPrimaryWallet(accounts, primaryWallet);
+        const [newAddress] = accounts;
         const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
         if (authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);

package/src/lib/utils/types/ClassStyleProps.d.ts

@@ -0,0 +1,5 @@
+import { CSSProperties } from 'react';
+export type ClassStyleProps = {
+    className?: string;
+    style?: CSSProperties;
+};

package/src/lib/utils/types/index.d.ts

@@ -0,0 +1 @@
+export * from './ClassStyleProps';

package/src/lib/views/LoginView/LoginView.cjs

@@ -59,7 +59,7 @@ const LoginView = () => {
             default:
                 return null;
         }
-    }), [logingViewSections, isLoading, setView]);
+    }), [logingViewSections, isLoading, numOfWallets, setView]);
     if (showWalletList) {
         return jsxRuntime.jsx(WalletList.WalletList, {});
     }

package/src/lib/views/LoginView/LoginView.js

@@ -55,7 +55,7 @@ const LoginView = () => {
             default:
                 return null;
         }
-    }), [logingViewSections, isLoading, setView]);
+    }), [logingViewSections, isLoading, numOfWallets, setView]);
     if (showWalletList) {
         return jsx(WalletList, {});
     }

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.cjs

@@ -53,6 +53,7 @@ require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUse
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('formik');
 require('yup');
+var Button = require('../../../../components/Button/Button.cjs');
 var IconButton = require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
@@ -63,7 +64,7 @@ var useEmailProvider = require('../../../../utils/hooks/useEmailProvider/useEmai
 
 const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError, currentEmail, }) => {
-    var _a;
+    var _a, _b, _c;
     const { t } = reactI18next.useTranslation();
     const { environmentId, wallets, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
@@ -122,7 +123,11 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         }
     });
     // social sign in currently coupled to email... might be better to decouple
-    return (jsxRuntime.jsx("form", { className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e), children: jsxRuntime.jsx(Input.Input, { id: 'email_field', value: emailInput, onChange: handleEmailOnChangeEvent, label: 'Enter your email', error: invalidEmail, message: invalidEmail && t('dyn_login.helper.email_form.invalid_email'), suffix: emailInputSuffixIcon, disabled: isLoading }) }));
+    return (jsxRuntime.jsxs("form", { className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e), children: [jsxRuntime.jsx(Input.Input, { id: 'email_field', value: emailInput, onChange: handleEmailOnChangeEvent, label: 'Enter your email', error: invalidEmail, message: invalidEmail && t('dyn_login.helper.email_form.invalid_email'), suffix: ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput)
+                    ? emailInputSuffixIcon
+                    : null, disabled: isLoading }), !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.emailSubmitButtonInsideInput) && (jsxRuntime.jsx(Button.Button, { dataTestId: 'email_submit_button', buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'brand-primary', buttonPadding: 'large', expanded: true, typographyProps: {
+                    color: 'inherit',
+                }, children: "Continue" }))] }));
 };
 
 exports.EMAIL_REGEX = EMAIL_REGEX;

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
@@ -49,6 +49,7 @@ import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import 'formik';
 import 'yup';
+import { Button } from '../../../../components/Button/Button.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/Popper/Popper/Popper.js';
@@ -59,7 +60,7 @@ import { useEmailProvider } from '../../../../utils/hooks/useEmailProvider/useEm
 
 const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError, currentEmail, }) => {
-    var _a;
+    var _a, _b, _c;
     const { t } = useTranslation();
     const { environmentId, wallets, projectSettings } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
@@ -118,7 +119,11 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         }
     });
     // social sign in currently coupled to email... might be better to decouple
-    return (jsx("form", { className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e), children: jsx(Input, { id: 'email_field', value: emailInput, onChange: handleEmailOnChangeEvent, label: 'Enter your email', error: invalidEmail, message: invalidEmail && t('dyn_login.helper.email_form.invalid_email'), suffix: emailInputSuffixIcon, disabled: isLoading }) }));
+    return (jsxs("form", { className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e), children: [jsx(Input, { id: 'email_field', value: emailInput, onChange: handleEmailOnChangeEvent, label: 'Enter your email', error: invalidEmail, message: invalidEmail && t('dyn_login.helper.email_form.invalid_email'), suffix: ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput)
+                    ? emailInputSuffixIcon
+                    : null, disabled: isLoading }), !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.emailSubmitButtonInsideInput) && (jsx(Button, { dataTestId: 'email_submit_button', buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'brand-primary', buttonPadding: 'large', expanded: true, typographyProps: {
+                    color: 'inherit',
+                }, children: "Continue" }))] }));
 };
 
 export { EMAIL_REGEX, LoginEmailForm };

package/src/lib/views/LoginView/sections/SocialSignInSection/MagicSocialSignIn/MagicSocialSignIn.cjs

@@ -16,7 +16,7 @@ require('../../../../../utils/constants/colors.cjs');
 require('../../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../../../shared/consts/index.cjs');
-var useInternalDynamicContext = require('../../../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('../../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
@@ -61,15 +61,13 @@ var SocialSignIn = require('../../../../../components/SocialSignIn/SocialSignIn.
 var SocialRedirectContext = require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 
 const MagicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLayout, }) => {
-    const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext.useInternalDynamicContext();
     const { socialProvider, setSocialProvider, socialWalletConnector, enabledSocialProviders, } = SocialRedirectContext.useSocialRedirectContext();
-    const socialProviders = socialProvidersFilter(enabledSocialProviders);
     const { mutate: onClickProvider, isLoading } = useMutation.useMutation((provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setSocialProvider(provider);
         yield (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.endSession());
         return socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.connect(provider);
     }));
-    return (jsxRuntime.jsx(SocialSignIn.SocialSignIn, { onSelectProvider: onClickProvider, providers: socialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
+    return (jsxRuntime.jsx(SocialSignIn.SocialSignIn, { onSelectProvider: onClickProvider, providers: enabledSocialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
 };
 
 exports.MagicSocialSignIn = MagicSocialSignIn;

package/src/lib/views/LoginView/sections/SocialSignInSection/MagicSocialSignIn/MagicSocialSignIn.js

@@ -12,7 +12,7 @@ import '../../../../../utils/constants/colors.js';
 import '../../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../../../shared/consts/index.js';
-import { useInternalDynamicContext } from '../../../../../context/DynamicContext/useInternalDynamicContext.js';
+import '../../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
@@ -57,15 +57,13 @@ import { SocialSignIn } from '../../../../../components/SocialSignIn/SocialSignI
 import { useSocialRedirectContext } from '../../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 
 const MagicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLayout, }) => {
-    const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext();
     const { socialProvider, setSocialProvider, socialWalletConnector, enabledSocialProviders, } = useSocialRedirectContext();
-    const socialProviders = socialProvidersFilter(enabledSocialProviders);
     const { mutate: onClickProvider, isLoading } = useMutation((provider) => __awaiter(void 0, void 0, void 0, function* () {
         setSocialProvider(provider);
         yield (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.endSession());
         return socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.connect(provider);
     }));
-    return (jsx(SocialSignIn, { onSelectProvider: onClickProvider, providers: socialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
+    return (jsx(SocialSignIn, { onSelectProvider: onClickProvider, providers: enabledSocialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
 };
 
 export { MagicSocialSignIn };