@dynamic-labs/sdk-react-core 2.1.0-alpha.13 → 2.1.0-alpha.15

package/src/lib/views/WalletList/WalletListItem/WalletListItem.js

@@ -34,6 +34,7 @@ import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import 'react-i18next';
@@ -55,7 +56,6 @@ import { useWalletGroupContext } from '../../../context/WalletGroupContext/Walle
 import { ListTileAnimatedTrailing } from '../../../components/ListTileAnimatedTrailing/ListTileAnimatedTrailing.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../context/LoadingContext/LoadingContext.js';
 import { Icon } from '../../../components/Icon/Icon.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/IconButton/IconButton.js';

package/src/lib/views/WalletList/hooks/useTabState.cjs

@@ -35,6 +35,7 @@ require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('react-i18next');
@@ -63,7 +64,6 @@ require('../WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');

package/src/lib/views/WalletList/hooks/useTabState.js

@@ -31,6 +31,7 @@ import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import 'react-i18next';
@@ -59,7 +60,6 @@ import '../WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';

package/src/lib/views/WalletLockedView/WalletLockedView.cjs

@@ -38,6 +38,7 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -57,7 +58,6 @@ require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidge
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
 var Divider = require('../../components/Divider/Divider.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');

package/src/lib/views/WalletLockedView/WalletLockedView.js

@@ -34,6 +34,7 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
@@ -53,7 +54,6 @@ import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidget
 import 'react-focus-lock';
 import { iconRatio, IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
 import { Divider } from '../../components/Divider/Divider.js';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';

package/src/lib/views/WalletRedirectView/WalletRedirectView.cjs

@@ -38,6 +38,7 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -56,7 +57,6 @@ require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');

package/src/lib/views/WalletRedirectView/WalletRedirectView.js

@@ -34,6 +34,7 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
@@ -52,7 +53,6 @@ import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';

package/src/lib/views/WalletSignSpinnerView/WalletSignSpinnerView.cjs

@@ -37,6 +37,7 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -68,7 +69,6 @@ require('../WalletList/WalletList.cjs');
 require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');

package/src/lib/views/WalletSignSpinnerView/WalletSignSpinnerView.js

@@ -33,6 +33,7 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
@@ -64,7 +65,6 @@ import '../WalletList/WalletList.js';
 import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';

package/src/lib/views/WalletUsedView/WalletUsedView.cjs

@@ -7,9 +7,9 @@ var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
+var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
 require('../../events/dynamicEvents.cjs');
-require('@dynamic-labs/utils');
 require('../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../shared/logger.cjs');
@@ -17,33 +17,31 @@ require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 var shortenWalletAddress = require('../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.cjs');
+var localStorage$1 = require('../../utils/constants/localStorage.cjs');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
-require('../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs');
 require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-var getVerifyArgs = require('../../utils/functions/getVerifyArgs/getVerifyArgs.cjs');
 require('viem');
 require('viem/chains');
 require('../../config/ApiEndpoint.cjs');
 require('../../locale/locale.cjs');
-var wallets = require('../../data/api/wallets/wallets.cjs');
-var updateJWTAndCreateUserProfile = require('../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
-var UserWalletsContext = require('../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../context/UserWalletsContext/UserWalletsContext.cjs');
 var getSiweStatement = require('../../utils/functions/getSiweStatement/getSiweStatement.cjs');
-var getWalletProvider = require('../../utils/functions/getWalletProvider/getWalletProvider.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+var LoadingContext = require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -61,7 +59,6 @@ require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-var LoadingContext = require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -83,6 +80,7 @@ require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+var useTransferWallet = require('../../utils/hooks/useTransferWallet/useTransferWallet.cjs');
 
 const WalletUsedView = () => {
     const [isChecked, setIsChecked] = React.useState(false);
@@ -90,8 +88,7 @@ const WalletUsedView = () => {
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
-    const { environmentId, displaySiweStatement, authToken, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
+    const { authToken, setShowAuthFlow, appName, siweStatement, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext.useInternalDynamicContext();
     const { data: walletAddress } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const accounts = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getConnectedAccounts());
         return accounts === null || accounts === void 0 ? void 0 : accounts[0];
@@ -99,25 +96,7 @@ const WalletUsedView = () => {
         deps: [walletConnector],
     });
     const shortenedWalletAddress = shortenWalletAddress.shortenWalletAddress(walletAddress);
-    const updatePrimaryWalletId = (walletConnector, user) => {
-        const newWalletKey = walletConnector.key;
-        if (user.lastVerifiedCredentialId) {
-            if (!primaryWallet) {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-                return;
-            }
-            const currentPrimaryWalletKey = primaryWallet.connector.key;
-            if (newWalletKey === currentPrimaryWalletKey) {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-            }
-            // if both wallets are flow wallets, set the last verified wallet as primary
-            // this is a limitation of flow as all wallets use the same flow connector
-            if (primaryWallet.connector.connectedChain === 'FLOW' &&
-                walletConnector.connectedChain === 'FLOW') {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-            }
-        }
-    };
+    const completeWalletTransfer = useTransferWallet.useTransferWallet();
     const handleWalletTransfer = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!walletConnector || !authToken)
             return;
@@ -137,26 +116,27 @@ const WalletUsedView = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
-            const verifyArgs = yield getVerifyArgs.getVerifyArgs({
-                displaySiweStatement,
-                environmentId,
+            // We need to set to LS when about to transfer phantom wallet on mobile
+            // because the deeplink interrupts this code execution and then redirects back on a new tab.
+            // This resets all state (except for LS obviously). When we receive the phantom signature in this new tab,
+            // we can't tell whether it's supposed to be used to sign a message, verify a wallet sign in/link,
+            // or conclude the transfer, which is why we need this LS variable: it will indicate whether it
+            // is a signature, authentication or transfer.
+            // Check method handleUserResponse in file useResponseHandlers, case 'signMessage'.
+            if (walletConnector.key === 'phantom' && utils.isMobile()) {
+                localStorage.LocalStorage.setToLS(localStorage$1.PHANTOM_SIGNATURE_STATE, {
+                    loseOriginalAccountOnTransfer: isChecked,
+                    submittedAtTimestamp: new Date().toString(),
+                    verificationType: 'awaiting_transfer',
+                });
+            }
+            yield completeWalletTransfer({
                 nonce,
+                overrideSiweStatement: siweStatementToUse,
                 publicWalletAddress: connectionResult.address,
-                siweStatement: siweStatementToUse,
                 skipEmptyAccountCheck: isChecked,
                 walletConnector,
-                walletProvider,
             });
-            const response = yield wallets.transferWallet(environmentId, verifyArgs, authToken);
-            const userProfile = updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
-            updatePrimaryWalletId(walletConnector, userProfile);
-            setUser(userProfile);
-            const walletId = userProfile.lastVerifiedCredentialId;
-            if (walletId) {
-                addedWalletsIds.current.push(walletId);
-            }
-            setShowAuthFlow(false);
         }
         catch (error) {
             logger.logger.error(error);

package/src/lib/views/WalletUsedView/WalletUsedView.js

@@ -3,9 +3,9 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { isMobile } from '@dynamic-labs/utils';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
 import '../../events/dynamicEvents.js';
-import '@dynamic-labs/utils';
 import '../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../shared/logger.js';
@@ -13,33 +13,31 @@ import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import { shortenWalletAddress } from '../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
+import { PHANTOM_SIGNATURE_STATE } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
-import '../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
 import '../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { getVerifyArgs } from '../../utils/functions/getVerifyArgs/getVerifyArgs.js';
 import 'viem';
 import 'viem/chains';
 import '../../config/ApiEndpoint.js';
 import '../../locale/locale.js';
-import { transferWallet } from '../../data/api/wallets/wallets.js';
-import { updateJWTAndCreateUserProfile } from '../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
-import { useInternalUserWallets } from '../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../context/UserWalletsContext/UserWalletsContext.js';
 import { getSiweStatement } from '../../utils/functions/getSiweStatement/getSiweStatement.js';
-import { getWalletProvider } from '../../utils/functions/getWalletProvider/getWalletProvider.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import { useLoadingContext } from '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
@@ -57,7 +55,6 @@ import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import { useLoadingContext } from '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
@@ -79,6 +76,7 @@ import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import { useTransferWallet } from '../../utils/hooks/useTransferWallet/useTransferWallet.js';
 
 const WalletUsedView = () => {
     const [isChecked, setIsChecked] = useState(false);
@@ -86,8 +84,7 @@ const WalletUsedView = () => {
     const { setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
     const { setView, goToInitialView } = useViewContext();
-    const { environmentId, displaySiweStatement, authToken, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext();
-    const { addedWalletsIds } = useInternalUserWallets();
+    const { authToken, setShowAuthFlow, appName, siweStatement, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext();
     const { data: walletAddress } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
         const accounts = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getConnectedAccounts());
         return accounts === null || accounts === void 0 ? void 0 : accounts[0];
@@ -95,25 +92,7 @@ const WalletUsedView = () => {
         deps: [walletConnector],
     });
     const shortenedWalletAddress = shortenWalletAddress(walletAddress);
-    const updatePrimaryWalletId = (walletConnector, user) => {
-        const newWalletKey = walletConnector.key;
-        if (user.lastVerifiedCredentialId) {
-            if (!primaryWallet) {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-                return;
-            }
-            const currentPrimaryWalletKey = primaryWallet.connector.key;
-            if (newWalletKey === currentPrimaryWalletKey) {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-            }
-            // if both wallets are flow wallets, set the last verified wallet as primary
-            // this is a limitation of flow as all wallets use the same flow connector
-            if (primaryWallet.connector.connectedChain === 'FLOW' &&
-                walletConnector.connectedChain === 'FLOW') {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-            }
-        }
-    };
+    const completeWalletTransfer = useTransferWallet();
     const handleWalletTransfer = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!walletConnector || !authToken)
             return;
@@ -133,26 +112,27 @@ const WalletUsedView = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const walletProvider = getWalletProvider(walletConnector);
-            const verifyArgs = yield getVerifyArgs({
-                displaySiweStatement,
-                environmentId,
+            // We need to set to LS when about to transfer phantom wallet on mobile
+            // because the deeplink interrupts this code execution and then redirects back on a new tab.
+            // This resets all state (except for LS obviously). When we receive the phantom signature in this new tab,
+            // we can't tell whether it's supposed to be used to sign a message, verify a wallet sign in/link,
+            // or conclude the transfer, which is why we need this LS variable: it will indicate whether it
+            // is a signature, authentication or transfer.
+            // Check method handleUserResponse in file useResponseHandlers, case 'signMessage'.
+            if (walletConnector.key === 'phantom' && isMobile()) {
+                LocalStorage.setToLS(PHANTOM_SIGNATURE_STATE, {
+                    loseOriginalAccountOnTransfer: isChecked,
+                    submittedAtTimestamp: new Date().toString(),
+                    verificationType: 'awaiting_transfer',
+                });
+            }
+            yield completeWalletTransfer({
                 nonce,
+                overrideSiweStatement: siweStatementToUse,
                 publicWalletAddress: connectionResult.address,
-                siweStatement: siweStatementToUse,
                 skipEmptyAccountCheck: isChecked,
                 walletConnector,
-                walletProvider,
             });
-            const response = yield transferWallet(environmentId, verifyArgs, authToken);
-            const userProfile = updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
-            updatePrimaryWalletId(walletConnector, userProfile);
-            setUser(userProfile);
-            const walletId = userProfile.lastVerifiedCredentialId;
-            if (walletId) {
-                addedWalletsIds.current.push(walletId);
-            }
-            setShowAuthFlow(false);
         }
         catch (error) {
             logger.error(error);

package/src/lib/views/viewToComponentMap.cjs

@@ -68,6 +68,7 @@ require('react-dom');
 require('../context/WalletContext/WalletContext.cjs');
 require('../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../context/MockContext/MockContext.cjs');
 require('../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -84,7 +85,6 @@ require('../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../context/LoadingContext/LoadingContext.cjs');
 require('../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../components/IconButton/IconButton.cjs');
 require('../components/MenuList/Dropdown/Dropdown.cjs');
@@ -115,6 +115,7 @@ var WalletLockedView = require('./WalletLockedView/WalletLockedView.cjs');
 var WalletRedirectView = require('./WalletRedirectView/WalletRedirectView.cjs');
 var WalletSignSpinnerView = require('./WalletSignSpinnerView/WalletSignSpinnerView.cjs');
 var WalletUsedView = require('./WalletUsedView/WalletUsedView.cjs');
+var MfaVerificationView = require('./MfaVerificationView/MfaVerificationView.cjs');
 var PasskeyNewDomainDetectedView = require('./Passkey/PasskeyNewDomainDetectedView/PasskeyNewDomainDetectedView.cjs');
 
 const viewToComponentMap = {
@@ -143,6 +144,7 @@ const viewToComponentMap = {
     'merge-user-accounts-with-same-email': MergeUserAccountsWithSameEmailView.MergeUserAccountsWithSameEmailView,
     'mfa-choose-device': MfaChooseDeviceView.MfaChooseDeviceView,
     'mfa-secure-device': MfaSecureDeviceView.MfaSecureDeviceView,
+    'mfa-verification': MfaVerificationView.MfaVerificationView,
     'multi-wallet-wallet-list': WalletList.WalletList,
     'network-not-supported': NetworkNotSupported.NetworkNotSupported,
     'network-not-supported-manual': NetworkNotSupportedSwitchManual.NetworkNotSupportedSwitchManual,

package/src/lib/views/viewToComponentMap.d.ts

@@ -28,6 +28,7 @@ export declare const viewToComponentMap: {
     'merge-user-accounts-with-same-email': import("react").FC<import("./MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView").MergeUserAccountsWithSameEmailViewProps>;
     'mfa-choose-device': () => JSX.Element;
     'mfa-secure-device': ({ type }: import("./MfaSecureDeviceView").MfaSecureDeviceViewProps) => JSX.Element;
+    'mfa-verification': ({ type }: import("./MfaVerificationView").MfaVerificationViewProps) => JSX.Element;
     'multi-wallet-wallet-list': ({ isWalletConnectList, }: import("./WalletList").WalletListProps) => JSX.Element;
     'network-not-supported': () => JSX.Element | null;
     'network-not-supported-manual': import("react").FC;

package/src/lib/views/viewToComponentMap.js

@@ -64,6 +64,7 @@ import 'react-dom';
 import '../context/WalletContext/WalletContext.js';
 import '../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../context/MockContext/MockContext.js';
 import '../context/FieldsStateContext/FieldsStateContext.js';
@@ -80,7 +81,6 @@ import '../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../context/WalletGroupContext/WalletGroupContext.js';
 import '../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../context/LoadingContext/LoadingContext.js';
 import '../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../components/IconButton/IconButton.js';
 import '../components/MenuList/Dropdown/Dropdown.js';
@@ -111,6 +111,7 @@ import { WalletLockedView } from './WalletLockedView/WalletLockedView.js';
 import { WalletRedirectView } from './WalletRedirectView/WalletRedirectView.js';
 import { WalletSignSpinnerView } from './WalletSignSpinnerView/WalletSignSpinnerView.js';
 import { WalletUsedView } from './WalletUsedView/WalletUsedView.js';
+import { MfaVerificationView } from './MfaVerificationView/MfaVerificationView.js';
 import { PasskeyNewDomainDetectedView } from './Passkey/PasskeyNewDomainDetectedView/PasskeyNewDomainDetectedView.js';
 
 const viewToComponentMap = {
@@ -139,6 +140,7 @@ const viewToComponentMap = {
     'merge-user-accounts-with-same-email': MergeUserAccountsWithSameEmailView,
     'mfa-choose-device': MfaChooseDeviceView,
     'mfa-secure-device': MfaSecureDeviceView,
+    'mfa-verification': MfaVerificationView,
     'multi-wallet-wallet-list': WalletList,
     'network-not-supported': NetworkNotSupported,
     'network-not-supported-manual': NetworkNotSupportedSwitchManual,

package/src/lib/widgets/DynamicBridgeWidget/DynamicBridgeWidget.cjs

@@ -40,6 +40,7 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -56,7 +57,6 @@ require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');

package/src/lib/widgets/DynamicBridgeWidget/DynamicBridgeWidget.js

@@ -36,6 +36,7 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
@@ -52,7 +53,6 @@ import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeUserProfile/DynamicBridgeUserProfile.cjs

@@ -41,6 +41,7 @@ require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useKYCFlag = require('../../../../utils/hooks/useKYCFlag/useKYCFlag.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
 require('react-i18next');
@@ -58,7 +59,6 @@ require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeUserProfile/DynamicBridgeUserProfile.js

@@ -37,6 +37,7 @@ import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useKYCFlag } from '../../../../utils/hooks/useKYCFlag/useKYCFlag.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
 import 'react-i18next';
@@ -54,7 +55,6 @@ import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCard/DynamicBridgeWalletCard.cjs

@@ -37,6 +37,7 @@ require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -54,7 +55,6 @@ require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCard/DynamicBridgeWalletCard.js

@@ -33,6 +33,7 @@ import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
 import '../../../../context/FieldsStateContext/FieldsStateContext.js';
@@ -50,7 +51,6 @@ import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';