@dynamic-labs/sdk-react-core 2.3.5 → 2.3.7

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+### [2.3.7](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.6...v2.3.7) (2024-07-26)
+
+
+### Bug Fixes
+
+* cherrypick ledger toggle works on safari ([#6429](https://github.com/dynamic-labs/DynamicAuth/issues/6429)) ([e58f687](https://github.com/dynamic-labs/DynamicAuth/commit/e58f687d569ab3ea51f6026c481d41e70bd0e7f6))
+
+### [2.3.6](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.5...v2.3.6) (2024-07-26)
+
+
+### Bug Fixes
+
+* add settings prefetch ([#6403](https://github.com/dynamic-labs/DynamicAuth/issues/6403)) ([dcf9e95](https://github.com/dynamic-labs/DynamicAuth/commit/dcf9e950943e9347ab01159772c4de18dd8abd9a)), closes [#6368](https://github.com/dynamic-labs/DynamicAuth/issues/6368)
+* don't filter out bitcoin.com when searching for bitcoin ([#6409](https://github.com/dynamic-labs/DynamicAuth/issues/6409)) ([13121f6](https://github.com/dynamic-labs/DynamicAuth/commit/13121f6b4ad4529fc9691c4504e383caeb5dd294))
+
 ### [2.3.5](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.4...v2.3.5) (2024-07-22)
 
 

package/package.cjs

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.3.5";
+var version = "2.3.7";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.0.460",
+	"@dynamic-labs/sdk-api-core": "0.0.497",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	formik: "2.2.9",

package/package.js

@@ -1,7 +1,7 @@
 'use client'
-var version = "2.3.5";
+var version = "2.3.7";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.0.460",
+	"@dynamic-labs/sdk-api-core": "0.0.497",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	formik: "2.2.9",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
     "directory": "packages/sdk-react-core"
   },
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.460",
+    "@dynamic-labs/sdk-api-core": "0.0.497",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "country-list": "2.3.0",
     "formik": "2.2.9",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.3.5",
-    "@dynamic-labs/logger": "2.3.5",
-    "@dynamic-labs/multi-wallet": "2.3.5",
-    "@dynamic-labs/rpc-provider-ethereum": "2.3.5",
-    "@dynamic-labs/rpc-provider-solana": "2.3.5",
-    "@dynamic-labs/rpc-providers": "2.3.5",
-    "@dynamic-labs/store": "2.3.5",
-    "@dynamic-labs/types": "2.3.5",
-    "@dynamic-labs/utils": "2.3.5",
-    "@dynamic-labs/viem-utils": "2.3.5",
-    "@dynamic-labs/wallet-book": "2.3.5",
-    "@dynamic-labs/wallet-connector-core": "2.3.5",
+    "@dynamic-labs/iconic": "2.3.7",
+    "@dynamic-labs/logger": "2.3.7",
+    "@dynamic-labs/multi-wallet": "2.3.7",
+    "@dynamic-labs/rpc-provider-ethereum": "2.3.7",
+    "@dynamic-labs/rpc-provider-solana": "2.3.7",
+    "@dynamic-labs/rpc-providers": "2.3.7",
+    "@dynamic-labs/store": "2.3.7",
+    "@dynamic-labs/types": "2.3.7",
+    "@dynamic-labs/utils": "2.3.7",
+    "@dynamic-labs/viem-utils": "2.3.7",
+    "@dynamic-labs/wallet-book": "2.3.7",
+    "@dynamic-labs/wallet-connector-core": "2.3.7",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/HardwareWalletToggle/HardwareWalletToggle.cjs

@@ -30,7 +30,7 @@ const HardwareWalletToggle = ({ connectors, label, copykey, }) => {
         }, "data-testid": 'hardware-wallet-toggle', icon: 
         // eslint-disable-next-line react/jsx-wrap-multilines
         jsxRuntime.jsx(Icon.Icon, { size: 'small', children: jsxRuntime.jsx(check.ReactComponent, {}) }) }));
-    return (jsxRuntime.jsx(ListTile.ListTile, { disabled: true, trailing: toggle, children: jsxRuntime.jsx("span", { copykey, children: label }) }));
+    return (jsxRuntime.jsx(ListTile.ListTile, { trailing: toggle, children: jsxRuntime.jsx("span", { copykey, children: label }) }));
 };
 
 exports.HardwareWalletToggle = HardwareWalletToggle;

package/src/lib/components/HardwareWalletToggle/HardwareWalletToggle.js

@@ -26,7 +26,7 @@ const HardwareWalletToggle = ({ connectors, label, copykey, }) => {
         }, "data-testid": 'hardware-wallet-toggle', icon: 
         // eslint-disable-next-line react/jsx-wrap-multilines
         jsx(Icon, { size: 'small', children: jsx(SvgCheck, {}) }) }));
-    return (jsx(ListTile, { disabled: true, trailing: toggle, children: jsx("span", { copykey, children: label }) }));
+    return (jsx(ListTile, { trailing: toggle, children: jsx("span", { copykey, children: label }) }));
 };
 
 export { HardwareWalletToggle };

package/src/lib/config/ApiEndpoint.cjs

@@ -1,6 +1,8 @@
 'use client'
 'use strict';
 
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+
 /* eslint-disable no-underscore-dangle */
 class ApiEndpoint {
 }
@@ -12,9 +14,24 @@ ApiEndpoint.getBaseUrl = () => {
 };
 ApiEndpoint.setBaseUrl = (baseUrlInput) => {
     if (!ApiEndpoint.__defined__) {
-        ApiEndpoint.__baseUrl__ = baseUrlInput;
+        if (!baseUrlInput) {
+            /**
+             * If the baseUrl is not provided, use the default baseUrl from the sdk-api package
+             */
+            ApiEndpoint.__baseUrl__ = new sdkApiCore.Configuration().basePath;
+        }
+        else {
+            ApiEndpoint.__baseUrl__ = baseUrlInput;
+        }
         ApiEndpoint.__defined__ = true;
     }
+    else if (!baseUrlInput && ApiEndpoint.__defined__) {
+        /**
+         * If for some reason (usually in local development), the setBaseUrl is called multiple times with undefined
+         * And we already have it defined, let's just assume it's a no-op
+         */
+        return;
+    }
     else if (ApiEndpoint.__baseUrl__ !== baseUrlInput) {
         throw new Error(`ApiEndpoint baseUrl is already set to ${ApiEndpoint.__baseUrl__}, cannot change it to ${baseUrlInput}`);
     }

package/src/lib/config/ApiEndpoint.js

@@ -1,4 +1,6 @@
 'use client'
+import { Configuration } from '@dynamic-labs/sdk-api-core';
+
 /* eslint-disable no-underscore-dangle */
 class ApiEndpoint {
 }
@@ -10,9 +12,24 @@ ApiEndpoint.getBaseUrl = () => {
 };
 ApiEndpoint.setBaseUrl = (baseUrlInput) => {
     if (!ApiEndpoint.__defined__) {
-        ApiEndpoint.__baseUrl__ = baseUrlInput;
+        if (!baseUrlInput) {
+            /**
+             * If the baseUrl is not provided, use the default baseUrl from the sdk-api package
+             */
+            ApiEndpoint.__baseUrl__ = new Configuration().basePath;
+        }
+        else {
+            ApiEndpoint.__baseUrl__ = baseUrlInput;
+        }
         ApiEndpoint.__defined__ = true;
     }
+    else if (!baseUrlInput && ApiEndpoint.__defined__) {
+        /**
+         * If for some reason (usually in local development), the setBaseUrl is called multiple times with undefined
+         * And we already have it defined, let's just assume it's a no-op
+         */
+        return;
+    }
     else if (ApiEndpoint.__baseUrl__ !== baseUrlInput) {
         throw new Error(`ApiEndpoint baseUrl is already set to ${ApiEndpoint.__baseUrl__}, cannot change it to ${baseUrlInput}`);
     }

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/data/api/settings/settings.cjs

@@ -20,11 +20,15 @@ require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
 var helpers = require('../../../context/DynamicContext/helpers/helpers.cjs');
+var version = require('../../../../version.cjs');
 
 const fetchProjectSettings = (environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
         const res = yield api.sdkApi().getEnvironmentSettings({
             environmentId,
+            sdkVersion: `WalletKit/${version.VERSION}`,
+        }, {
+            credentials: 'omit',
         });
         return res;
     }

package/src/lib/data/api/settings/settings.js

@@ -16,11 +16,15 @@ import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
 import { isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings, isWagmiSessionSettingExpired, setWagmiSessionSettings } from '../../../context/DynamicContext/helpers/helpers.js';
+import { VERSION } from '../../../../version.js';
 
 const fetchProjectSettings = (environmentId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const res = yield sdkApi().getEnvironmentSettings({
             environmentId,
+            sdkVersion: `WalletKit/${VERSION}`,
+        }, {
+            credentials: 'omit',
         });
         return res;
     }

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/functions/walletListBuilder/walletListBuilder.cjs

@@ -134,7 +134,7 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
-const KEEP_WALLETS_NAME_LIST = ['wallet connect'];
+const KEEP_WALLETS_NAME_LIST = ['wallet connect', 'bitcoin.com wallet'];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
     const cleanName = (name) => {

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

@@ -130,7 +130,7 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
-const KEEP_WALLETS_NAME_LIST = ['wallet connect'];
+const KEEP_WALLETS_NAME_LIST = ['wallet connect', 'bitcoin.com wallet'];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
     const cleanName = (name) => {

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

@@ -176,9 +176,9 @@ const useSocialAccounts = ({ sessionTimeout } = {
         }
         const { id, oauthAccountId, oauthAccountPhotos, oauthDisplayName, oauthEmails, oauthProvider, oauthUsername, publicIdentifier, } = verifiedCredential;
         return {
-            accountId: oauthAccountId,
+            accountId: oauthAccountId !== null && oauthAccountId !== void 0 ? oauthAccountId : undefined,
             avatar: oauthAccountPhotos === null || oauthAccountPhotos === void 0 ? void 0 : oauthAccountPhotos[0],
-            displayName: oauthDisplayName,
+            displayName: oauthDisplayName !== null && oauthDisplayName !== void 0 ? oauthDisplayName : undefined,
             email: oauthEmails === null || oauthEmails === void 0 ? void 0 : oauthEmails[0],
             id,
             provider: oauthProvider,

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

@@ -172,9 +172,9 @@ const useSocialAccounts = ({ sessionTimeout } = {
         }
         const { id, oauthAccountId, oauthAccountPhotos, oauthDisplayName, oauthEmails, oauthProvider, oauthUsername, publicIdentifier, } = verifiedCredential;
         return {
-            accountId: oauthAccountId,
+            accountId: oauthAccountId !== null && oauthAccountId !== void 0 ? oauthAccountId : undefined,
             avatar: oauthAccountPhotos === null || oauthAccountPhotos === void 0 ? void 0 : oauthAccountPhotos[0],
-            displayName: oauthDisplayName,
+            displayName: oauthDisplayName !== null && oauthDisplayName !== void 0 ? oauthDisplayName : undefined,
             email: oauthEmails === null || oauthEmails === void 0 ? void 0 : oauthEmails[0],
             id,
             provider: oauthProvider,