@dynamic-labs/sdk-react-core 2.3.2 → 2.3.4

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [2.3.4](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.3...v2.3.4) (2024-07-19)
+
+
+### Bug Fixes
+
+* not able to switch to secondary wallet ([#6373](https://github.com/dynamic-labs/DynamicAuth/issues/6373)) ([#6378](https://github.com/dynamic-labs/DynamicAuth/issues/6378)) ([7c4f220](https://github.com/dynamic-labs/DynamicAuth/commit/7c4f2200cc66da1889b5de03a6823a96043825da))
+
+### [2.3.3](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.2...v2.3.3) (2024-07-18)
+
+
+### Bug Fixes
+
+* add project setting prefetch ([#6368](https://github.com/dynamic-labs/DynamicAuth/issues/6368)) ([4f3009e](https://github.com/dynamic-labs/DynamicAuth/commit/4f3009ec1fbe110be73bd7b775cfb040592a8b2a))
+
 ### [2.3.2](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.1...v2.3.2) (2024-07-16)
 
 ### [2.3.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.1-alpha.0...v2.3.1) (2024-07-13)

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.3.2";
+var version = "2.3.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "2.3.2";
+var version = "2.3.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.3.2",
-    "@dynamic-labs/logger": "2.3.2",
-    "@dynamic-labs/multi-wallet": "2.3.2",
-    "@dynamic-labs/rpc-provider-ethereum": "2.3.2",
-    "@dynamic-labs/rpc-provider-solana": "2.3.2",
-    "@dynamic-labs/rpc-providers": "2.3.2",
-    "@dynamic-labs/store": "2.3.2",
-    "@dynamic-labs/types": "2.3.2",
-    "@dynamic-labs/utils": "2.3.2",
-    "@dynamic-labs/viem-utils": "2.3.2",
-    "@dynamic-labs/wallet-book": "2.3.2",
-    "@dynamic-labs/wallet-connector-core": "2.3.2",
+    "@dynamic-labs/iconic": "2.3.4",
+    "@dynamic-labs/logger": "2.3.4",
+    "@dynamic-labs/multi-wallet": "2.3.4",
+    "@dynamic-labs/rpc-provider-ethereum": "2.3.4",
+    "@dynamic-labs/rpc-provider-solana": "2.3.4",
+    "@dynamic-labs/rpc-providers": "2.3.4",
+    "@dynamic-labs/store": "2.3.4",
+    "@dynamic-labs/types": "2.3.4",
+    "@dynamic-labs/utils": "2.3.4",
+    "@dynamic-labs/viem-utils": "2.3.4",
+    "@dynamic-labs/wallet-book": "2.3.4",
+    "@dynamic-labs/wallet-connector-core": "2.3.4",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -25,6 +25,7 @@ var values = require('../../utils/constants/values.cjs');
 var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs');
 var useGlobalLoading = require('../../shared/utils/hooks/useGlobalLoading/useGlobalLoading.cjs');
 var useLocalStorage = require('../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
+var usePrefetch = require('../../shared/utils/hooks/usePrefetch/usePrefetch.cjs');
 require('../../shared/consts/index.cjs');
 var CaptchaContext = require('../CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
@@ -34,6 +35,7 @@ var getMinAuthToken = require('../../utils/functions/getMinAuthToken/getMinAuthT
 require('react-international-phone');
 require('viem');
 require('viem/chains');
+var version = require('../../../version.cjs');
 var ApiEndpoint = require('../../config/ApiEndpoint.cjs');
 var userActions = require('../../store/actions/userActions/userActions.cjs');
 var settings = require('../../data/api/settings/settings.cjs');
@@ -674,31 +676,24 @@ const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, lo
         walletUiUtils,
         walletsFilter,
     ]);
-    React.useEffect(() => {
-        const addPrefetch = (attr) => {
-            if (!document.head.querySelector(`#${attr.id}`)) {
-                const element = document.createElement('link');
-                element.setAttribute('id', attr.id);
-                element.setAttribute('rel', 'prefetch');
-                element.setAttribute('href', attr.href);
-                element.setAttribute('as', attr.as);
-                element.setAttribute('type', attr.type);
-                document.head.insertAdjacentElement('beforeend', element);
-            }
-        };
-        addPrefetch({
-            as: 'image',
-            href: iconic.getIconicSpriteUrl(),
-            id: 'sprite',
-            type: 'image/svg+xml',
-        });
-        addPrefetch({
-            as: 'fetch',
-            href: walletBook.getWalletBookCdnUrl(),
-            id: 'wallet-book',
-            type: 'application/json',
-        });
-    }, []);
+    usePrefetch.usePrefetch({
+        as: 'image',
+        href: iconic.getIconicSpriteUrl(),
+        id: 'sprite',
+        type: 'image/svg+xml',
+    });
+    usePrefetch.usePrefetch({
+        as: 'fetch',
+        href: walletBook.getWalletBookCdnUrl(),
+        id: 'wallet-book',
+        type: 'application/json',
+    });
+    usePrefetch.usePrefetch({
+        as: 'fetch',
+        href: `${ApiEndpoint.getBaseUrl()}/sdk/${environmentId}/settings?sdkVersion=${encodeURIComponent(`WalletKit/${version.VERSION}`)}`,
+        id: `project-settings-${environmentId}`,
+        type: 'application/json',
+    });
     // DYN-1140 - Opens Widget when multiWalletWidgetState changes
     React.useEffect(() => {
         // If statement to secure SingleWallet widget

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -21,6 +21,7 @@ import { DEFAULT_NUMBER_OF_WALLETS_TO_SHOW } from '../../utils/constants/values.
 import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
 import { useGlobalLoading } from '../../shared/utils/hooks/useGlobalLoading/useGlobalLoading.js';
 import { useLocalStorage } from '../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import { usePrefetch } from '../../shared/utils/hooks/usePrefetch/usePrefetch.js';
 import '../../shared/consts/index.js';
 import { CaptchaContextProvider } from '../CaptchaContext/CaptchaContext.js';
 import { ErrorContextProvider } from '../ErrorContext/ErrorContext.js';
@@ -30,6 +31,7 @@ import { getMinAuthToken } from '../../utils/functions/getMinAuthToken/getMinAut
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
+import { VERSION } from '../../../version.js';
 import ApiEndpoint from '../../config/ApiEndpoint.js';
 import { setUser } from '../../store/actions/userActions/userActions.js';
 import { sendDynamicProps } from '../../data/api/settings/settings.js';
@@ -670,31 +672,24 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, enable
         walletUiUtils,
         walletsFilter,
     ]);
-    useEffect(() => {
-        const addPrefetch = (attr) => {
-            if (!document.head.querySelector(`#${attr.id}`)) {
-                const element = document.createElement('link');
-                element.setAttribute('id', attr.id);
-                element.setAttribute('rel', 'prefetch');
-                element.setAttribute('href', attr.href);
-                element.setAttribute('as', attr.as);
-                element.setAttribute('type', attr.type);
-                document.head.insertAdjacentElement('beforeend', element);
-            }
-        };
-        addPrefetch({
-            as: 'image',
-            href: getIconicSpriteUrl(),
-            id: 'sprite',
-            type: 'image/svg+xml',
-        });
-        addPrefetch({
-            as: 'fetch',
-            href: getWalletBookCdnUrl(),
-            id: 'wallet-book',
-            type: 'application/json',
-        });
-    }, []);
+    usePrefetch({
+        as: 'image',
+        href: getIconicSpriteUrl(),
+        id: 'sprite',
+        type: 'image/svg+xml',
+    });
+    usePrefetch({
+        as: 'fetch',
+        href: getWalletBookCdnUrl(),
+        id: 'wallet-book',
+        type: 'application/json',
+    });
+    usePrefetch({
+        as: 'fetch',
+        href: `${ApiEndpoint.getBaseUrl()}/sdk/${environmentId}/settings?sdkVersion=${encodeURIComponent(`WalletKit/${VERSION}`)}`,
+        id: `project-settings-${environmentId}`,
+        type: 'application/json',
+    });
     // DYN-1140 - Opens Widget when multiWalletWidgetState changes
     useEffect(() => {
         // If statement to secure SingleWallet widget

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

@@ -5,4 +5,5 @@ export { useLocalStorage } from './useLocalStorage';
 export { useMediaQuery } from './useMediaQuery';
 export { useOnClickOutside } from './useOnClickOutside';
 export { usePreventPageScroll } from './usePreventPageScroll';
-export * from './useThrottle';
+export { useThrottle } from './useThrottle';
+export { usePrefetch } from './usePrefetch';

package/src/lib/shared/utils/hooks/usePrefetch/index.d.ts

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

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

@@ -0,0 +1,51 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('@dynamic-labs/sdk-api-core');
+require('../../../logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+var isSSR = require('../../functions/isSSR/isSSR.cjs');
+require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
+require('../../classes/storage/localStorage.cjs');
+
+/**
+ * Prefetches a resource
+ * Adds a link element to the head of the document with the provided attributes
+ * when the element is not already present
+ * @param {PrefetchProps} prefetchProps
+ * @returns {void}
+ *
+ * @example
+ * usePrefetch({
+ *  href: 'https://example.com/image.jpg',
+ *  as: 'image',
+ *  type: 'image/jpeg',
+ *  id: 'image-prefetch',
+ * });
+ */
+const usePrefetch = ({ as, href, id, type }) => {
+    // Do not run on server side
+    if (isSSR.isSSR())
+        return;
+    const predefinedElement = document.head.querySelector(`#${id}`);
+    // Do not add the element if it already exists
+    if (predefinedElement)
+        return;
+    const element = document.createElement('link');
+    element.setAttribute('id', id);
+    element.setAttribute('rel', 'prefetch');
+    element.setAttribute('href', href);
+    element.setAttribute('as', as);
+    element.setAttribute('type', type);
+    document.head.insertAdjacentElement('beforeend', element);
+};
+
+exports.usePrefetch = usePrefetch;

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

@@ -0,0 +1,23 @@
+type PrefetchProps = {
+    href: string;
+    as: string;
+    type: string;
+    id: string;
+};
+/**
+ * Prefetches a resource
+ * Adds a link element to the head of the document with the provided attributes
+ * when the element is not already present
+ * @param {PrefetchProps} prefetchProps
+ * @returns {void}
+ *
+ * @example
+ * usePrefetch({
+ *  href: 'https://example.com/image.jpg',
+ *  as: 'image',
+ *  type: 'image/jpeg',
+ *  id: 'image-prefetch',
+ * });
+ */
+export declare const usePrefetch: ({ as, href, id, type }: PrefetchProps) => void;
+export {};

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

@@ -0,0 +1,47 @@
+'use client'
+import '@dynamic-labs/sdk-api-core';
+import '../../../logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import { isSSR } from '../../functions/isSSR/isSSR.js';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import '../../classes/storage/localStorage.js';
+
+/**
+ * Prefetches a resource
+ * Adds a link element to the head of the document with the provided attributes
+ * when the element is not already present
+ * @param {PrefetchProps} prefetchProps
+ * @returns {void}
+ *
+ * @example
+ * usePrefetch({
+ *  href: 'https://example.com/image.jpg',
+ *  as: 'image',
+ *  type: 'image/jpeg',
+ *  id: 'image-prefetch',
+ * });
+ */
+const usePrefetch = ({ as, href, id, type }) => {
+    // Do not run on server side
+    if (isSSR())
+        return;
+    const predefinedElement = document.head.querySelector(`#${id}`);
+    // Do not add the element if it already exists
+    if (predefinedElement)
+        return;
+    const element = document.createElement('link');
+    element.setAttribute('id', id);
+    element.setAttribute('rel', 'prefetch');
+    element.setAttribute('href', href);
+    element.setAttribute('as', as);
+    element.setAttribute('type', type);
+    document.head.insertAdjacentElement('beforeend', element);
+};
+
+export { usePrefetch };

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

@@ -82,7 +82,7 @@ require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/Passke
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, selectedWalletWithAction, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
@@ -104,7 +104,11 @@ const useSyncPrimaryWallet = (canSync = true) => {
             connectedWalletWithSameProvider,
             multiWallet,
         });
-        if (multiWallet && connectedWalletWithSameProvider) {
+        // If user was explicitly trying to switch to this new wallet, let it be
+        const wasExplicitWalletChange = (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) === primaryWallet.address;
+        if (multiWallet &&
+            connectedWalletWithSameProvider &&
+            !wasExplicitWalletChange) {
             setPrimaryWallet(connectedWalletWithSameProvider.id);
             return;
         }
@@ -119,6 +123,7 @@ const useSyncPrimaryWallet = (canSync = true) => {
         primaryWallet,
         secondaryWallets,
         multiWallet,
+        selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address,
         setSelectedWalletWithAction,
         setMultiWalletWidgetState,
         connectWallet,

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

@@ -78,7 +78,7 @@ import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/Passkey
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, selectedWalletWithAction, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
@@ -100,7 +100,11 @@ const useSyncPrimaryWallet = (canSync = true) => {
             connectedWalletWithSameProvider,
             multiWallet,
         });
-        if (multiWallet && connectedWalletWithSameProvider) {
+        // If user was explicitly trying to switch to this new wallet, let it be
+        const wasExplicitWalletChange = (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) === primaryWallet.address;
+        if (multiWallet &&
+            connectedWalletWithSameProvider &&
+            !wasExplicitWalletChange) {
             setPrimaryWallet(connectedWalletWithSameProvider.id);
             return;
         }
@@ -115,6 +119,7 @@ const useSyncPrimaryWallet = (canSync = true) => {
         primaryWallet,
         secondaryWallets,
         multiWallet,
+        selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address,
         setSelectedWalletWithAction,
         setMultiWalletWidgetState,
         connectWallet,

package/src/lib/widgets/DynamicWidget/index.d.ts

@@ -0,0 +1,3 @@
+export { DynamicWidget } from './DynamicWidget';
+export { ShadowedDynamicNav as DynamicNav } from './components/DynamicNav/DynamicNav';
+export { ShadowedDynamicUserProfile as DynamicUserProfile } from './components/DynamicUserProfile';