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

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

@@ -8,7 +8,7 @@ var loadingAndLifecycle = require('../../../../store/state/loadingAndLifecycle.c
 var logger = require('../../../logger.cjs');
 var index = require('../../functions/lastAuthenticatedAccount/index.cjs');
 
-const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, enableInstrumentation, appName, environmentId, }) => {
+const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWalletId, primaryWallet, user, isLoadingUserFromCookie, walletBook, enableInstrumentation, appName, environmentId, }) => {
     var _a, _b;
     // Once we declare the SDK as loaded, we do not ever want to flip back to false
     const hasLoaded = React.useRef(false);
@@ -18,18 +18,11 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
         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 +33,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 +41,32 @@ 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 = !Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length;
+    const isProjectSettingsLoading = !projectSettings;
+    const isUserLoading = isLoadingUserFromCookie;
+    const shouldHavePrimaryWallet = primaryWalletId ||
+        (user && ((_b = index.lastAuthenticatedAccount(user)) === null || _b === void 0 ? void 0 : _b.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,
+        isPrimaryWalletLoading,
+        isProjectSettingsLoading,
+        isUserLoading,
+        isValidatingSession,
+        isWalletBookLoading,
+    });
+    if (!isWalletBookLoading &&
+        !isProjectSettingsLoading &&
+        !isUserLoading &&
         !isPrimaryWalletLoading &&
         !isConnectOnlyWalletsLoading &&
-        sessionValidation)
+        !isValidatingSession) {
         finishLoading();
+    }
     return hasLoaded.current;
 };
 

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

@@ -8,12 +8,14 @@ type Props = {
     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;
 };
-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, }: Props) => boolean;
 export {};

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

@@ -4,7 +4,7 @@ import { useLoadingAndLifecycle } from '../../../../store/state/loadingAndLifecy
 import { logger } from '../../../logger.js';
 import { lastAuthenticatedAccount } from '../../functions/lastAuthenticatedAccount/index.js';
 
-const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWallet, user, walletBook, enableInstrumentation, appName, environmentId, }) => {
+const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSettings, primaryWalletId, primaryWallet, user, isLoadingUserFromCookie, walletBook, enableInstrumentation, appName, environmentId, }) => {
     var _a, _b;
     // Once we declare the SDK as loaded, we do not ever want to flip back to false
     const hasLoaded = useRef(false);
@@ -14,18 +14,11 @@ const useGlobalLoading = ({ authMode, connectedInfo, connectedWallets, projectSe
         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 +29,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 +37,32 @@ 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 = !Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length;
+    const isProjectSettingsLoading = !projectSettings;
+    const isUserLoading = isLoadingUserFromCookie;
+    const shouldHavePrimaryWallet = primaryWalletId ||
+        (user && ((_b = lastAuthenticatedAccount(user)) === null || _b === void 0 ? void 0 : _b.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,
+        isPrimaryWalletLoading,
+        isProjectSettingsLoading,
+        isUserLoading,
+        isValidatingSession,
+        isWalletBookLoading,
+    });
+    if (!isWalletBookLoading &&
+        !isProjectSettingsLoading &&
+        !isUserLoading &&
         !isPrimaryWalletLoading &&
         !isConnectOnlyWalletsLoading &&
-        sessionValidation)
+        !isValidatingSession) {
         finishLoading();
+    }
     return hasLoaded.current;
 };
 

package/src/lib/store/state/projectSettings/projectSettings.cjs

@@ -69,11 +69,11 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');

package/src/lib/store/state/projectSettings/projectSettings.js

@@ -65,11 +65,11 @@ import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';