@dynamic-labs/sdk-react-core 4.0.0-alpha.5 → 4.0.0-alpha.51

package/src/lib/shared/assets/work-suitcase.js

@@ -3,9 +3,9 @@ import * as React from 'react';
 
 var _path;
 var _excluded = ["title", "titleId"];
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) { ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } } return n; }, _extends.apply(null, arguments); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) { o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) { if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } } return t; }
 var SvgWorkSuitcase = function SvgWorkSuitcase(_ref) {
   var title = _ref.title,
     titleId = _ref.titleId,

package/src/lib/shared/types/dynamicEventsCallbacks.d.ts

@@ -1,6 +1,5 @@
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
-import { OtpDestination, PhoneData, UserProfile } from '@dynamic-labs/types';
-import { AuthEventPayload } from '../../events/auth';
+import { AuthEventPayload, OtpDestination, PhoneData, UserProfile } from '@dynamic-labs/types';
 import { Wallet } from './wallets';
 export type DynamicEventsCallbacks = {
     onSignedMessage?: (params: {

package/src/lib/shared/types/dynamicHandlers.d.ts

@@ -12,6 +12,9 @@ export type UserOnboardingFieldResponse = {
     value: string;
     isCustom: boolean;
 };
+/**
+ * Handlers supported by dynamic. They always return a promise
+ */
 export type DynamicHandlers = {
     handleAuthenticatedUser?: (params: {
         user: UserProfile;

package/src/lib/shared/types/embeddedWallets.d.ts

@@ -3,4 +3,4 @@ export type EmbeddedWalletSessionSettings = {
     userId: string;
     createdAt: number;
 };
-export type EmbeddedWalletCurrentAction = 'signMessage' | 'sendTransaction' | 'helpSession' | 'reveal';
+export type EmbeddedWalletCurrentAction = 'signMessage' | 'sendTransaction' | 'helpSession' | 'signTransaction' | 'reveal';

package/src/lib/shared/types/wallets.d.ts

@@ -1,3 +1,4 @@
+import { ReactElement } from 'react';
 import { OauthProviderRequest, PasswordSourceTypeEnum, WalletAdditionalAddress, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import type { InternalWalletConnector, Wallet } from '@dynamic-labs/wallet-connector-core';
 export type { Wallet } from '@dynamic-labs/wallet-connector-core';
@@ -21,6 +22,17 @@ export interface WalletOption {
 export type WalletGroupOption = WalletOption & {
     groupedWallets: WalletOption[];
 };
+export type WalletGroup = {
+    key: string;
+    name: string;
+    brand?: {
+        primaryColor?: string;
+        icon?: string;
+    };
+};
+export type WalletGroups = {
+    [key: string]: WalletGroup;
+};
 export type WalletProvider = `${WalletProviderEnum}`;
 export interface VerifyWallet {
     captchaToken?: string;
@@ -54,3 +66,12 @@ export type ChainToWalletMap = {
         solana?: string;
     };
 };
+export type WalletsFilter = (options: WalletOption[]) => WalletOption[];
+export type WalletListViewTabItem = {
+    label: {
+        text?: string;
+        icon?: string | ReactElement;
+    };
+    walletsFilter?: WalletsFilter;
+    recommendedWallets?: RecommendedWallet[];
+};

package/src/lib/shared/utils/functions/chain/getChainIcon.cjs

@@ -14,6 +14,7 @@ const chainIconMap = {
     algorand: iconic.AlgorandIcon,
     bitcoin: iconic.BitcoinIcon,
     cosmos: iconic.CosmosIcon,
+    eclipse: iconic.EclipseIcon,
     evm: iconic.EthereumIcon,
     flow: iconic.FlowIcon,
     solana: iconic.SolanaIcon,

package/src/lib/shared/utils/functions/chain/getChainIcon.js

@@ -1,5 +1,5 @@
 'use client'
-import { AlgorandIcon, BitcoinIcon, CosmosIcon, EthereumIcon, FlowIcon, SolanaIcon, StarknetIcon } from '@dynamic-labs/iconic';
+import { AlgorandIcon, BitcoinIcon, CosmosIcon, EclipseIcon, EthereumIcon, FlowIcon, SolanaIcon, StarknetIcon } from '@dynamic-labs/iconic';
 import { getChainInfo } from '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
@@ -10,6 +10,7 @@ const chainIconMap = {
     algorand: AlgorandIcon,
     bitcoin: BitcoinIcon,
     cosmos: CosmosIcon,
+    eclipse: EclipseIcon,
     evm: EthereumIcon,
     flow: FlowIcon,
     solana: SolanaIcon,

package/src/lib/shared/utils/functions/createWalletGroupFromWalletOption/createWalletGroupFromWalletOption.cjs

@@ -0,0 +1,22 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+
+const createWalletGroupFromWalletOption = (walletOption) => {
+    const { metadata } = walletOption.walletConnector;
+    const { name } = metadata;
+    const key = utils.sanitizeName(name);
+    return {
+        brand: {
+            icon: metadata.icon,
+            primaryColor: metadata.brandColor,
+        },
+        key,
+        name,
+    };
+};
+
+exports.createWalletGroupFromWalletOption = createWalletGroupFromWalletOption;

package/src/lib/shared/utils/functions/createWalletGroupFromWalletOption/createWalletGroupFromWalletOption.d.ts

@@ -0,0 +1,9 @@
+import { WalletOption } from '../../../types';
+export declare const createWalletGroupFromWalletOption: (walletOption: WalletOption) => {
+    brand: {
+        icon: string;
+        primaryColor: `#${string}` | undefined;
+    };
+    key: string;
+    name: string;
+};

package/src/lib/shared/utils/functions/createWalletGroupFromWalletOption/createWalletGroupFromWalletOption.js

@@ -0,0 +1,18 @@
+'use client'
+import { sanitizeName } from '@dynamic-labs/utils';
+
+const createWalletGroupFromWalletOption = (walletOption) => {
+    const { metadata } = walletOption.walletConnector;
+    const { name } = metadata;
+    const key = sanitizeName(name);
+    return {
+        brand: {
+            icon: metadata.icon,
+            primaryColor: metadata.brandColor,
+        },
+        key,
+        name,
+    };
+};
+
+export { createWalletGroupFromWalletOption };

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

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

package/src/lib/shared/utils/functions/getInitialUrl/getInitialUrl.cjs

@@ -0,0 +1,16 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var isSSR = require('../isSSR/isSSR.cjs');
+
+let initialUrl;
+(() => {
+    if (!isSSR.isSSR()) {
+        initialUrl = new URL(window.location.href);
+    }
+})();
+const getInitialUrl = () => initialUrl;
+
+exports.getInitialUrl = getInitialUrl;

package/src/lib/shared/utils/functions/getInitialUrl/getInitialUrl.d.ts

@@ -0,0 +1 @@
+export declare const getInitialUrl: () => URL | null;

package/src/lib/shared/utils/functions/getInitialUrl/getInitialUrl.js

@@ -0,0 +1,12 @@
+'use client'
+import { isSSR } from '../isSSR/isSSR.js';
+
+let initialUrl;
+(() => {
+    if (!isSSR()) {
+        initialUrl = new URL(window.location.href);
+    }
+})();
+const getInitialUrl = () => initialUrl;
+
+export { getInitialUrl };

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

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

package/src/lib/shared/utils/functions/providerLabel/providerLabel.cjs

@@ -10,6 +10,9 @@ const providerLabel = (provider) => {
     if (!provider) {
         return undefined;
     }
+    if (provider === sdkApiCore.SocialSignInProviderEnum.Twitter) {
+        return 'X';
+    }
     if (provider === sdkApiCore.SocialSignInProviderEnum.Coinbasesocial) {
         return 'Coinbase';
     }

package/src/lib/shared/utils/functions/providerLabel/providerLabel.js

@@ -6,6 +6,9 @@ const providerLabel = (provider) => {
     if (!provider) {
         return undefined;
     }
+    if (provider === SocialSignInProviderEnum.Twitter) {
+        return 'X';
+    }
     if (provider === SocialSignInProviderEnum.Coinbasesocial) {
         return 'Coinbase';
     }

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

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

package/src/lib/shared/utils/functions/shouldFetchNonce/shouldFetchNonce.cjs

@@ -0,0 +1,10 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+
+const shouldFetchNonce = ({ authMode }) => authMode === 'connect-and-sign' || utils.isMobile();
+
+exports.shouldFetchNonce = shouldFetchNonce;

package/src/lib/shared/utils/functions/shouldFetchNonce/shouldFetchNonce.d.ts

@@ -0,0 +1,6 @@
+import { AuthModeType } from '../../../types';
+type ShouldFetchNonceProps = {
+    authMode: AuthModeType;
+};
+export declare const shouldFetchNonce: ({ authMode }: ShouldFetchNonceProps) => boolean;
+export {};

package/src/lib/shared/utils/functions/shouldFetchNonce/shouldFetchNonce.js

@@ -0,0 +1,6 @@
+'use client'
+import { isMobile } from '@dynamic-labs/utils';
+
+const shouldFetchNonce = ({ authMode }) => authMode === 'connect-and-sign' || isMobile();
+
+export { shouldFetchNonce };

package/src/lib/shared/utils/functions/wallet/createWallet.cjs

@@ -5,18 +5,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var walletBook = require('@dynamic-labs/wallet-book');
 
-const createWallet = (walletBook$1, wallet) => {
+const createWallet = (walletBook$1, walletConnector) => {
     var _a;
-    const walletBookWallet = walletBook.findWalletBookWallet(walletBook$1, wallet.key);
+    const walletBookWallet = walletBook.findWalletBookWallet(walletBook$1, walletConnector.key);
     return {
-        chainGroup: walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.chainGroup,
-        group: (walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.chainGroup) || (walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.walletGroup),
+        chainGroup: walletConnector.metadata.groupKey,
+        group: walletConnector.metadata.groupKey,
         injectedConfig: walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.injectedConfig,
-        isInstalledOnBrowser: (_a = wallet.isInstalledOnBrowser()) !== null && _a !== void 0 ? _a : false,
-        key: wallet.key,
-        name: wallet.name,
-        walletConnector: wallet,
-        walletGroup: walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.walletGroup,
+        isInstalledOnBrowser: (_a = walletConnector.isInstalledOnBrowser()) !== null && _a !== void 0 ? _a : false,
+        key: walletConnector.key,
+        name: walletConnector.name,
+        walletConnector: walletConnector,
+        walletGroup: walletConnector.metadata.groupKey,
     };
 };
 

package/src/lib/shared/utils/functions/wallet/createWallet.d.ts

@@ -1,4 +1,4 @@
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import type { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletOption } from '../../../types';
-export declare const createWallet: (walletBook: WalletBookSchema, wallet: InternalWalletConnector) => WalletOption;
+export declare const createWallet: (walletBook: WalletBookSchema, walletConnector: InternalWalletConnector) => WalletOption;

package/src/lib/shared/utils/functions/wallet/createWallet.js

@@ -1,18 +1,18 @@
 'use client'
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 
-const createWallet = (walletBook, wallet) => {
+const createWallet = (walletBook, walletConnector) => {
     var _a;
-    const walletBookWallet = findWalletBookWallet(walletBook, wallet.key);
+    const walletBookWallet = findWalletBookWallet(walletBook, walletConnector.key);
     return {
-        chainGroup: walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.chainGroup,
-        group: (walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.chainGroup) || (walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.walletGroup),
+        chainGroup: walletConnector.metadata.groupKey,
+        group: walletConnector.metadata.groupKey,
         injectedConfig: walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.injectedConfig,
-        isInstalledOnBrowser: (_a = wallet.isInstalledOnBrowser()) !== null && _a !== void 0 ? _a : false,
-        key: wallet.key,
-        name: wallet.name,
-        walletConnector: wallet,
-        walletGroup: walletBookWallet === null || walletBookWallet === void 0 ? void 0 : walletBookWallet.walletGroup,
+        isInstalledOnBrowser: (_a = walletConnector.isInstalledOnBrowser()) !== null && _a !== void 0 ? _a : false,
+        key: walletConnector.key,
+        name: walletConnector.name,
+        walletConnector: walletConnector,
+        walletGroup: walletConnector.metadata.groupKey,
     };
 };
 

package/src/lib/shared/utils/hooks/useGlobalLoading/useGlobalLoading.cjs

@@ -4,32 +4,30 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
+var walletBook = require('@dynamic-labs/wallet-book');
 var loadingAndLifecycle = require('../../../../store/state/loadingAndLifecycle.cjs');
 var logger = require('../../../logger.cjs');
 var index = require('../../functions/lastAuthenticatedAccount/index.cjs');
+var shouldFetchNonce = require('../../functions/shouldFetchNonce/shouldFetchNonce.cjs');
 
-const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, enableInstrumentation, appName, environmentId, }) => {
-    var _a, _b;
+const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWalletId, primaryWallet, user, isLoadingUserFromCookie, walletBook: walletBook$1, enableInstrumentation, appName, environmentId, nonce, }) => {
+    var _a;
     // Once we declare the SDK as loaded, we do not ever want to flip back to false
     const hasLoaded = React.useRef(false);
     const loadingStart = React.useRef(new Date().getTime());
     const { sessionValidation } = loadingAndLifecycle.useLoadingAndLifecycle();
+    const isFetchingNonce = React.useMemo(() => shouldFetchNonce.shouldFetchNonce({
+        authMode,
+    }) && !nonce, [authMode, nonce]);
     const finishLoading = () => {
         if (hasLoaded.current)
             return;
         hasLoaded.current = true;
-        logger.logger.logVerboseTroubleshootingMessage('SDK finished loading', {
-            appName,
+        logger.logger.debug('[useGlobalLoading] SDK finished loading', {
             authMode,
-            connectedInfo,
-            connectedWallets,
             enableInstrumentation,
-            environmentId,
             primaryWallet,
-            projectSettings,
-            sessionValidation,
             user,
-            walletBook,
         });
         // Calculate how long loading took and emit log
         if (enableInstrumentation) {
@@ -40,7 +38,7 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
                 appName,
                 environmentId,
                 key: 'sdkHasLoaded',
-                primaryWalletId: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
+                primaryWalletId,
                 time: loadingTime,
                 userId: user === null || user === void 0 ? void 0 : user.userId,
             });
@@ -48,19 +46,34 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
     };
     if (hasLoaded.current)
         return true;
-    const hasWalletBookLoaded = Boolean(Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length);
-    const isPrimaryWalletLoading = user &&
-        ((_b = index.lastAuthenticatedAccount(user)) === null || _b === void 0 ? void 0 : _b.format) === 'blockchain' &&
-        !primaryWallet;
+    const isWalletBookLoading = !walletBook.isWalletBookPopulated(walletBook$1);
+    const isProjectSettingsLoading = !projectSettings;
+    const isUserLoading = isLoadingUserFromCookie;
+    const shouldHavePrimaryWallet = primaryWalletId ||
+        (user && ((_a = index.lastAuthenticatedAccount(user)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain');
+    const isPrimaryWalletLoading = Boolean(shouldHavePrimaryWallet && !primaryWallet);
     const isConnectOnlyWalletsLoading = authMode === 'connect-only' &&
         connectedInfo &&
         connectedWallets.length === 0;
-    if (hasWalletBookLoaded &&
-        Boolean(projectSettings) &&
+    const isValidatingSession = !sessionValidation;
+    logger.logger.logVerboseTroubleshootingMessage('[useGlobalLoading] SDK loading', {
+        isConnectOnlyWalletsLoading,
+        isFetchingNonce,
+        isPrimaryWalletLoading,
+        isProjectSettingsLoading,
+        isUserLoading,
+        isValidatingSession,
+        isWalletBookLoading,
+    });
+    if (!isWalletBookLoading &&
+        !isProjectSettingsLoading &&
+        !isUserLoading &&
         !isPrimaryWalletLoading &&
         !isConnectOnlyWalletsLoading &&
-        sessionValidation)
+        !isValidatingSession &&
+        !isFetchingNonce) {
         finishLoading();
+    }
     return hasLoaded.current;
 };
 

package/src/lib/shared/utils/hooks/useGlobalLoading/useGlobalLoading.d.ts

@@ -2,18 +2,21 @@ import { ProjectSettings } from '@dynamic-labs/sdk-api-core';
 import { UserProfile } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { ConnectedWalletConnectorType } from '../../../../utils/hooks/useConnectWallet/useConnectWallet';
-import { Wallet } from '../../../types';
+import { AuthModeType, Wallet } from '../../../types';
 type Props = {
-    authMode: string;
+    authMode: AuthModeType;
     connectedInfo: ConnectedWalletConnectorType | null;
     connectedWallets: Wallet[];
     primaryWallet: Wallet | null;
+    primaryWalletId: string | undefined;
     projectSettings: ProjectSettings | undefined;
+    isLoadingUserFromCookie: boolean;
     user: UserProfile | undefined;
     walletBook: WalletBookSchema;
     enableInstrumentation: boolean;
     appName: string;
     environmentId: string;
+    nonce: string | undefined;
 };
-export declare const useGlobalLoading: ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, enableInstrumentation, appName, environmentId, }: Props) => boolean;
+export declare const useGlobalLoading: ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWalletId, primaryWallet, user, isLoadingUserFromCookie, walletBook, enableInstrumentation, appName, environmentId, nonce, }: Props) => boolean;
 export {};

package/src/lib/shared/utils/hooks/useGlobalLoading/useGlobalLoading.js

@@ -1,31 +1,29 @@
 'use client'
-import { useRef } from 'react';
+import { useRef, useMemo } from 'react';
+import { isWalletBookPopulated } from '@dynamic-labs/wallet-book';
 import { useLoadingAndLifecycle } from '../../../../store/state/loadingAndLifecycle.js';
 import { logger } from '../../../logger.js';
 import { lastAuthenticatedAccount } from '../../functions/lastAuthenticatedAccount/index.js';
+import { shouldFetchNonce } from '../../functions/shouldFetchNonce/shouldFetchNonce.js';
 
-const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, enableInstrumentation, appName, environmentId, }) => {
-    var _a, _b;
+const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWalletId, primaryWallet, user, isLoadingUserFromCookie, walletBook, enableInstrumentation, appName, environmentId, nonce, }) => {
+    var _a;
     // Once we declare the SDK as loaded, we do not ever want to flip back to false
     const hasLoaded = useRef(false);
     const loadingStart = useRef(new Date().getTime());
     const { sessionValidation } = useLoadingAndLifecycle();
+    const isFetchingNonce = useMemo(() => shouldFetchNonce({
+        authMode,
+    }) && !nonce, [authMode, nonce]);
     const finishLoading = () => {
         if (hasLoaded.current)
             return;
         hasLoaded.current = true;
-        logger.logVerboseTroubleshootingMessage('SDK finished loading', {
-            appName,
+        logger.debug('[useGlobalLoading] SDK finished loading', {
             authMode,
-            connectedInfo,
-            connectedWallets,
             enableInstrumentation,
-            environmentId,
             primaryWallet,
-            projectSettings,
-            sessionValidation,
             user,
-            walletBook,
         });
         // Calculate how long loading took and emit log
         if (enableInstrumentation) {
@@ -36,7 +34,7 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
                 appName,
                 environmentId,
                 key: 'sdkHasLoaded',
-                primaryWalletId: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
+                primaryWalletId,
                 time: loadingTime,
                 userId: user === null || user === void 0 ? void 0 : user.userId,
             });
@@ -44,19 +42,34 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
     };
     if (hasLoaded.current)
         return true;
-    const hasWalletBookLoaded = Boolean(Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length);
-    const isPrimaryWalletLoading = user &&
-        ((_b = lastAuthenticatedAccount(user)) === null || _b === void 0 ? void 0 : _b.format) === 'blockchain' &&
-        !primaryWallet;
+    const isWalletBookLoading = !isWalletBookPopulated(walletBook);
+    const isProjectSettingsLoading = !projectSettings;
+    const isUserLoading = isLoadingUserFromCookie;
+    const shouldHavePrimaryWallet = primaryWalletId ||
+        (user && ((_a = lastAuthenticatedAccount(user)) === null || _a === void 0 ? void 0 : _a.format) === 'blockchain');
+    const isPrimaryWalletLoading = Boolean(shouldHavePrimaryWallet && !primaryWallet);
     const isConnectOnlyWalletsLoading = authMode === 'connect-only' &&
         connectedInfo &&
         connectedWallets.length === 0;
-    if (hasWalletBookLoaded &&
-        Boolean(projectSettings) &&
+    const isValidatingSession = !sessionValidation;
+    logger.logVerboseTroubleshootingMessage('[useGlobalLoading] SDK loading', {
+        isConnectOnlyWalletsLoading,
+        isFetchingNonce,
+        isPrimaryWalletLoading,
+        isProjectSettingsLoading,
+        isUserLoading,
+        isValidatingSession,
+        isWalletBookLoading,
+    });
+    if (!isWalletBookLoading &&
+        !isProjectSettingsLoading &&
+        !isUserLoading &&
         !isPrimaryWalletLoading &&
         !isConnectOnlyWalletsLoading &&
-        sessionValidation)
+        !isValidatingSession &&
+        !isFetchingNonce) {
         finishLoading();
+    }
     return hasLoaded.current;
 };
 

package/src/lib/store/internalImplementation/store.cjs

@@ -23,19 +23,21 @@ const removeStoreInstance = () => {
     // @ts-ignore
     store = undefined;
 };
-const initializeStore = ({ storageSuffix, environmentId, }) => {
+const initializeStore = (props) => {
+    var _a;
     if (store) {
         return;
     }
-    const persistName = storageSuffix
-        ? `${localStorage$1.STORE_STORAGE_KEY}_${storageSuffix}`
+    const { localStorageSuffix } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
+    const persistName = localStorageSuffix
+        ? `${localStorage$1.STORE_STORAGE_KEY}_${localStorageSuffix}`
         : localStorage$1.STORE_STORAGE_KEY;
     store = syncLegacyStorage.syncLegacyStorage(store$1.persist({
         name: persistName,
         partialize: stateConfig.transformStateForLocalStorage,
         storage: getStorage(),
         // Map each entry to its initialValue
-        store: store$1.createStore(() => stateConfig.createInitialStates({ environmentId, storageSuffix })),
+        store: store$1.createStore(() => stateConfig.createInitialStates(props)),
     }));
     clearExpiredData.clearExpiredData(store);
 };

package/src/lib/store/internalImplementation/store.d.ts

@@ -1,5 +1,6 @@
 import { StoreApi } from '@dynamic-labs/store';
-import { SdkStore, SdkStoreProps } from '../types';
+import { DynamicContextProps } from '../../context/DynamicContext/types';
+import { SdkStore } from '../types';
 export declare const getStore: () => StoreApi<SdkStore>;
 export declare const removeStoreInstance: () => void;
-export declare const initializeStore: ({ storageSuffix, environmentId, }: SdkStoreProps) => void;
+export declare const initializeStore: (props: DynamicContextProps) => void;

package/src/lib/store/internalImplementation/store.js

@@ -19,19 +19,21 @@ const removeStoreInstance = () => {
     // @ts-ignore
     store = undefined;
 };
-const initializeStore = ({ storageSuffix, environmentId, }) => {
+const initializeStore = (props) => {
+    var _a;
     if (store) {
         return;
     }
-    const persistName = storageSuffix
-        ? `${STORE_STORAGE_KEY}_${storageSuffix}`
+    const { localStorageSuffix } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
+    const persistName = localStorageSuffix
+        ? `${STORE_STORAGE_KEY}_${localStorageSuffix}`
         : STORE_STORAGE_KEY;
     store = syncLegacyStorage(persist({
         name: persistName,
         partialize: transformStateForLocalStorage,
         storage: getStorage(),
         // Map each entry to its initialValue
-        store: createStore(() => createInitialStates({ environmentId, storageSuffix })),
+        store: createStore(() => createInitialStates(props)),
     }));
     clearExpiredData(store);
 };

package/src/lib/store/internalImplementation/utils/syncLegacyStorage/syncLegacyStorage.cjs

@@ -9,7 +9,7 @@ const AUTH_USER = 'dynamic_authenticated_user';
 const syncLegacyStorage = (store) => {
     const legacyUser = utils.StorageService.getItem(AUTH_USER);
     if (Boolean(legacyUser) && !store.getState().user) {
-        store.setState({ user: legacyUser });
+        store.setState({ user: legacyUser !== null && legacyUser !== void 0 ? legacyUser : undefined });
         utils.StorageService.removeItem(AUTH_USER);
     }
     return store;

package/src/lib/store/internalImplementation/utils/syncLegacyStorage/syncLegacyStorage.js

@@ -5,7 +5,7 @@ const AUTH_USER = 'dynamic_authenticated_user';
 const syncLegacyStorage = (store) => {
     const legacyUser = StorageService.getItem(AUTH_USER);
     if (Boolean(legacyUser) && !store.getState().user) {
-        store.setState({ user: legacyUser });
+        store.setState({ user: legacyUser !== null && legacyUser !== void 0 ? legacyUser : undefined });
         StorageService.removeItem(AUTH_USER);
     }
     return store;