@dynamic-labs/sdk-react-core 4.3.0 → 4.3.2

package/src/lib/utils/functions/getWalletUniqueId/getWalletUniqueId.cjs

@@ -0,0 +1,13 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Generates a unique id for a wallet, based on the address,
+ * connector key, and chain.
+ * This is used to identify a wallet no matter if it's connected only or linked.
+ */
+const getWalletUniqueId = ({ address, connectorKey, chain, }) => `${connectorKey}-${address}-${chain}`;
+
+exports.getWalletUniqueId = getWalletUniqueId;

package/src/lib/utils/functions/getWalletUniqueId/getWalletUniqueId.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Generates a unique id for a wallet, based on the address,
+ * connector key, and chain.
+ * This is used to identify a wallet no matter if it's connected only or linked.
+ */
+export declare const getWalletUniqueId: ({ address, connectorKey, chain, }: {
+    address: string;
+    connectorKey: string;
+    chain: string;
+}) => string;

package/src/lib/utils/functions/getWalletUniqueId/getWalletUniqueId.js

@@ -0,0 +1,9 @@
+'use client'
+/**
+ * Generates a unique id for a wallet, based on the address,
+ * connector key, and chain.
+ * This is used to identify a wallet no matter if it's connected only or linked.
+ */
+const getWalletUniqueId = ({ address, connectorKey, chain, }) => `${connectorKey}-${address}-${chain}`;
+
+export { getWalletUniqueId };

package/src/lib/utils/functions/getWalletUniqueId/index.d.ts

@@ -0,0 +1 @@
+export { getWalletUniqueId } from './getWalletUniqueId';

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

@@ -82,3 +82,4 @@ export * from './fiatUtils';
 export * from './isAuthenticatedWithAWallet';
 export * from './networksAndChains';
 export * from './updatePrimaryWalletId';
+export * from './getWalletUniqueId';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -43,6 +43,7 @@ require('../../../functions/compareChains/compareChains.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/WalletContext/WalletContext.cjs');
@@ -79,7 +80,6 @@ require('../../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
@@ -98,7 +98,7 @@ require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
-    const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { setView, goToInitialView, replaceView } = ViewContext.useViewContext();
     const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { authMode, connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -112,7 +112,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const handleWalletVerify = (walletConnector, publicWalletAddress, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
             walletConnectorCore.isBloctoConnector(walletConnector)) {
-            setView('pending-signature');
+            replaceView('pending-signature');
         }
         else {
             walletUiUtils.disabledConfirmationOnce();

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -39,6 +39,7 @@ import '../../../functions/compareChains/compareChains.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/WalletContext/WalletContext.js';
@@ -75,7 +76,6 @@ import '../../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -94,7 +94,7 @@ import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
-    const { setView, goToInitialView } = useViewContext();
+    const { setView, goToInitialView, replaceView } = useViewContext();
     const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage } = useErrorContext();
     const { authMode, connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, } = useInternalDynamicContext();
@@ -108,7 +108,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const handleWalletVerify = (walletConnector, publicWalletAddress, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         if (!isEmailWalletConnector(walletConnector) ||
             isBloctoConnector(walletConnector)) {
-            setView('pending-signature');
+            replaceView('pending-signature');
         }
         else {
             walletUiUtils.disabledConfirmationOnce();

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -43,6 +43,7 @@ require('../../../functions/compareChains/compareChains.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/WalletContext/WalletContext.cjs');
@@ -79,7 +80,6 @@ require('../../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -39,6 +39,7 @@ import '../../../functions/compareChains/compareChains.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/WalletContext/WalletContext.js';
@@ -75,7 +76,6 @@ import '../../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

package/src/lib/utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.cjs

@@ -44,6 +44,7 @@ require('../../../functions/compareChains/compareChains.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useHandleVerificationRequired = require('../../useHandleVerificationRequired/useHandleVerificationRequired.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -78,7 +79,6 @@ require('../../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

package/src/lib/utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.js

@@ -40,6 +40,7 @@ import '../../../functions/compareChains/compareChains.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useHandleVerificationRequired } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
 import '@dynamic-labs/types';
+import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -74,7 +75,6 @@ import '../../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -37,6 +37,7 @@ require('../../../functions/compareChains/compareChains.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/WalletContext/WalletContext.cjs');
@@ -73,7 +74,6 @@ require('../../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js

@@ -33,6 +33,7 @@ import '../../../functions/compareChains/compareChains.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/WalletContext/WalletContext.js';
@@ -69,7 +70,6 @@ import '../../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -42,6 +42,7 @@ require('../../../functions/compareChains/compareChains.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -75,7 +76,6 @@ require('../../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -38,6 +38,7 @@ import '../../../functions/compareChains/compareChains.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -71,7 +72,6 @@ import '../../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

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

@@ -39,6 +39,7 @@ require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -74,7 +75,6 @@ var useDynamicLayoutData = require('../useDynamicLayoutData/useDynamicLayoutData
 var index = require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
@@ -205,34 +205,12 @@ const useAuthLayoutChecks = () => {
         view.type !== 'mfa-display-backup-codes' &&
         view.type !== 'mfa-recovery' &&
         view.type !== 'deposit-view';
-    const showBackButton = view.type === 'pending-signature' ||
-        view.type === 'no-qr-not-installed' ||
-        view.type === 'wallet-connect-mobile-wallets-list' ||
-        view.type === 'login-with-email-verification' ||
-        view.type === 'login-with-sms-verification' ||
-        view.type === 'login-with-email-or-wallet-full-wallet-list' ||
-        view.type === 'wallet-group' ||
-        view.type === 'select-wallet-in-wallet-group' ||
-        view.type === 'select-hardware-wallet' ||
-        view.type === 'pending-connect' ||
-        view.type === 'mobile-wallet-redirect-view' ||
-        view.type === 'account-exists' ||
-        view.type === 'passkey-intro' ||
-        view.type === 'qr-code' ||
-        view.type === 'farcaster-connect-view' ||
-        view.type === 'mfa-verification' ||
-        view.type === 'mfa-secure-device-help' ||
-        view.type === 'merge-user-accounts-conflicts' ||
-        view.type === 'mfa-recovery' ||
-        view.type === 'deposit-view' ||
-        (view.type === 'merge-user-accounts-with-same-email' && !user);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,
         shouldHideDynamicFooterSeparator,
-        showBackButton,
         showCloseButton,
         showConnectedWalletProgress,
         showDefaultFooter,

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

@@ -2,7 +2,6 @@ export declare const useAuthLayoutChecks: () => {
     displayBorderBelowHeader: boolean;
     isWalletListTypeView: boolean;
     shouldHideDynamicFooterSeparator: boolean;
-    showBackButton: boolean;
     showCloseButton: boolean;
     showConnectedWalletProgress: boolean;
     showDefaultFooter: boolean;

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

@@ -35,6 +35,7 @@ import '../../functions/compareChains/compareChains.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -70,7 +71,6 @@ import { useDynamicLayoutData } from '../useDynamicLayoutData/useDynamicLayoutDa
 import { useFooterAnimationContext } from '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -201,34 +201,12 @@ const useAuthLayoutChecks = () => {
         view.type !== 'mfa-display-backup-codes' &&
         view.type !== 'mfa-recovery' &&
         view.type !== 'deposit-view';
-    const showBackButton = view.type === 'pending-signature' ||
-        view.type === 'no-qr-not-installed' ||
-        view.type === 'wallet-connect-mobile-wallets-list' ||
-        view.type === 'login-with-email-verification' ||
-        view.type === 'login-with-sms-verification' ||
-        view.type === 'login-with-email-or-wallet-full-wallet-list' ||
-        view.type === 'wallet-group' ||
-        view.type === 'select-wallet-in-wallet-group' ||
-        view.type === 'select-hardware-wallet' ||
-        view.type === 'pending-connect' ||
-        view.type === 'mobile-wallet-redirect-view' ||
-        view.type === 'account-exists' ||
-        view.type === 'passkey-intro' ||
-        view.type === 'qr-code' ||
-        view.type === 'farcaster-connect-view' ||
-        view.type === 'mfa-verification' ||
-        view.type === 'mfa-secure-device-help' ||
-        view.type === 'merge-user-accounts-conflicts' ||
-        view.type === 'mfa-recovery' ||
-        view.type === 'deposit-view' ||
-        (view.type === 'merge-user-accounts-with-same-email' && !user);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,
         shouldHideDynamicFooterSeparator,
-        showBackButton,
         showCloseButton,
         showConnectedWalletProgress,
         showDefaultFooter,

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

@@ -40,6 +40,7 @@ require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -73,7 +74,6 @@ require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

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

@@ -36,6 +36,7 @@ import '../../functions/compareChains/compareChains.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -69,7 +70,6 @@ import '../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

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

@@ -12,8 +12,8 @@ var UserWalletsContext = require('../../../context/UserWalletsContext/UserWallet
 require('../../../config/ApiEndpoint.cjs');
 require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
-var localStorage = require('../../constants/localStorage.cjs');
 require('../../../shared/logger.cjs');
+var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('react-international-phone');
 require('@dynamic-labs/iconic');
@@ -27,6 +27,7 @@ require('../../../store/state/nonce/nonce.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
+var getWalletUniqueId = require('../../functions/getWalletUniqueId/getWalletUniqueId.cjs');
 require('../../../store/state/user/user.cjs');
 var session = require('../../../data/api/session/session.cjs');
 require('../../../locale/locale.cjs');
@@ -117,18 +118,6 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         updateConnectedWalletsList();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [connectedWalletsInfo, walletConnectorOptions]);
-    const getNextIdAvailable = React.useCallback((currentWallets) => {
-        const existingIds = currentWallets.map(({ id }) => id);
-        const sortedIds = existingIds
-            .map((id) => Number(id.replace('connect-wallet-', '')))
-            .sort((a, b) => a - b);
-        for (let i = 0; i < sortedIds.length; i++) {
-            if (sortedIds[i] !== i) {
-                return i;
-            }
-        }
-        return sortedIds.length;
-    }, []);
     const updateConnectedWalletById = React.useCallback((walletId, walletObject) => {
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
@@ -225,7 +214,11 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         // https://linear.app/dynamic-labs/issue/QNTM-784/rework-the-way-we-compute-wallet-ids
         if (!isConnectOnly.isConnectOnly(user, authMode))
             return { address: walletAddress, id: '' };
-        const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        const walletId = getWalletUniqueId.getWalletUniqueId({
+            address: walletAddress,
+            chain: walletConnector.connectedChain,
+            connectorKey: walletConnector.key,
+        });
         if (!primaryWalletId$1) {
             updatePrimaryWalletId.updatePrimaryWalletId(walletId);
         }

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

@@ -8,8 +8,8 @@ import { useInternalUserWallets } from '../../../context/UserWalletsContext/User
 import '../../../config/ApiEndpoint.js';
 import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
-import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../../shared/logger.js';
+import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import 'react-international-phone';
 import '@dynamic-labs/iconic';
@@ -23,6 +23,7 @@ import '../../../store/state/nonce/nonce.js';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
+import { getWalletUniqueId } from '../../functions/getWalletUniqueId/getWalletUniqueId.js';
 import '../../../store/state/user/user.js';
 import { createVisit } from '../../../data/api/session/session.js';
 import '../../../locale/locale.js';
@@ -113,18 +114,6 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         updateConnectedWalletsList();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [connectedWalletsInfo, walletConnectorOptions]);
-    const getNextIdAvailable = useCallback((currentWallets) => {
-        const existingIds = currentWallets.map(({ id }) => id);
-        const sortedIds = existingIds
-            .map((id) => Number(id.replace('connect-wallet-', '')))
-            .sort((a, b) => a - b);
-        for (let i = 0; i < sortedIds.length; i++) {
-            if (sortedIds[i] !== i) {
-                return i;
-            }
-        }
-        return sortedIds.length;
-    }, []);
     const updateConnectedWalletById = useCallback((walletId, walletObject) => {
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
@@ -221,7 +210,11 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         // https://linear.app/dynamic-labs/issue/QNTM-784/rework-the-way-we-compute-wallet-ids
         if (!isConnectOnly(user, authMode))
             return { address: walletAddress, id: '' };
-        const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        const walletId = getWalletUniqueId({
+            address: walletAddress,
+            chain: walletConnector.connectedChain,
+            connectorKey: walletConnector.key,
+        });
         if (!primaryWalletId) {
             updatePrimaryWalletId(walletId);
         }

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

@@ -43,6 +43,7 @@ require('../../../context/ThemeContext/ThemeContext.cjs');
 var useIsLoggedIn = require('../useIsLoggedIn/useIsLoggedIn.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -76,7 +77,6 @@ require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

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

@@ -39,6 +39,7 @@ import '../../../context/ThemeContext/ThemeContext.js';
 import { useIsLoggedIn } from '../useIsLoggedIn/useIsLoggedIn.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -72,7 +73,6 @@ import '../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

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

@@ -44,9 +44,10 @@ require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../../functions/compareChains/compareChains.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
@@ -79,7 +80,6 @@ require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');

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

@@ -40,9 +40,10 @@ import '../../../context/ThemeContext/ThemeContext.js';
 import '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
-import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
@@ -75,7 +76,6 @@ import '../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../context/ConnectWithOtpContext/constants.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';

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

@@ -41,6 +41,7 @@ require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -73,7 +74,6 @@ require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
@@ -152,6 +152,10 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
                 copykey: 'dyn_embedded_delete.title',
                 heading: t('dyn_embedded_delete.title'),
             },
+            'embedded-wallet-exists': {
+                copykey: 'dyn_wallet_link.already_exists.title',
+                heading: t('dyn_wallet_link.already_exists.title'),
+            },
             'external-funding-wallet-list': {
                 copykey: 'dyn_receive_external_wallet_funds.wallet_list.title',
                 heading: t('dyn_receive_external_wallet_funds.wallet_list.title'),