@dynamic-labs/sdk-react-core 2.1.3 → 2.1.5

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

@@ -82,7 +82,8 @@ const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWallets
         if (walletConnectorCore.isEmbeddedConnector(wallet.walletConnector)) {
             return;
         }
-        else if (wallet.key === 'unknown') {
+        else if (wallet.key === 'unknown' ||
+            !wallet.walletConnector.isAvailable) {
             return;
         }
         else if (isRecommendedWallet) {

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

@@ -78,7 +78,8 @@ const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWallets
         if (isEmbeddedConnector(wallet.walletConnector)) {
             return;
         }
-        else if (wallet.key === 'unknown') {
+        else if (wallet.key === 'unknown' ||
+            !wallet.walletConnector.isAvailable) {
             return;
         }
         else if (isRecommendedWallet) {

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

@@ -14,9 +14,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -100,7 +101,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
@@ -139,9 +140,10 @@ const useEmbeddedWallet = () => {
     });
     const shouldAutoCreateEmbeddedWallet = React.useCallback(() => {
         var _a, _b;
+        const hasPrimaryWallet = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
@@ -153,7 +155,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -10,9 +10,10 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -96,7 +97,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext();
+    const { user, projectSettings } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
@@ -135,9 +136,10 @@ const useEmbeddedWallet = () => {
     });
     const shouldAutoCreateEmbeddedWallet = useCallback(() => {
         var _a, _b;
+        const hasPrimaryWallet = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
@@ -149,7 +151,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -112,7 +112,7 @@ const useSwitchWallet = () => {
             throw new Error(`Wallet with id ${walletId} not found`);
         }
         if (((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown') {
-            throw new Error("Cannot switch to this wallet, as it doesn't have an initialized wallet connector on this platform (desktop/mobile)");
+            throw new Error("Cannot make this wallet active, since this wallet doesn't have a compatible connector on this device.");
         }
         const { connector } = wallet;
         const email = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((verifiedCredential) => verifiedCredential.format === 'email')) === null || _b === void 0 ? void 0 : _b.email;

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

@@ -108,7 +108,7 @@ const useSwitchWallet = () => {
             throw new Error(`Wallet with id ${walletId} not found`);
         }
         if (((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown') {
-            throw new Error("Cannot switch to this wallet, as it doesn't have an initialized wallet connector on this platform (desktop/mobile)");
+            throw new Error("Cannot make this wallet active, since this wallet doesn't have a compatible connector on this device.");
         }
         const { connector } = wallet;
         const email = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((verifiedCredential) => verifiedCredential.format === 'email')) === null || _b === void 0 ? void 0 : _b.email;

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/findWallet.cjs

@@ -17,7 +17,7 @@ const findWallet = (account, walletOptions) => {
     }
     // if we cannot find the correct connector for the wallet, we default to the unknown
     // this way the wallet will appear in user wallets, but will not be able to be interacted with
-    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'unknown'));
+    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'fallbackconnector'));
 };
 
 exports.findWallet = findWallet;

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/findWallet.js

@@ -13,7 +13,7 @@ const findWallet = (account, walletOptions) => {
     }
     // if we cannot find the correct connector for the wallet, we default to the unknown
     // this way the wallet will appear in user wallets, but will not be able to be interacted with
-    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'unknown'));
+    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'fallbackconnector'));
 };
 
 export { findWallet };

package/src/lib/widgets/DynamicWidget/components/Wallet/Wallet.cjs

@@ -88,7 +88,7 @@ require('../../views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const Wallet = ({ wallet, ens }) => {
-    var _a;
+    var _a, _b;
     const { connector, address } = wallet;
     const switchWallet = useSwitchWallet.useSwitchWallet();
     const { setSelectedWalletWithAction, projectSettings, authMode } = useInternalDynamicContext.useInternalDynamicContext();
@@ -97,7 +97,7 @@ const Wallet = ({ wallet, ens }) => {
         {
             Icon: jsxRuntime.jsx(switchHorizontal.ReactComponent, {}),
             callback: () => switchWallet(wallet.id),
-            hide: ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown',
+            hide: ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown' || !((_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.isAvailable),
             text: 'Select wallet',
         },
     ];

package/src/lib/widgets/DynamicWidget/components/Wallet/Wallet.js

@@ -84,7 +84,7 @@ import '../../views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const Wallet = ({ wallet, ens }) => {
-    var _a;
+    var _a, _b;
     const { connector, address } = wallet;
     const switchWallet = useSwitchWallet();
     const { setSelectedWalletWithAction, projectSettings, authMode } = useInternalDynamicContext();
@@ -93,7 +93,7 @@ const Wallet = ({ wallet, ens }) => {
         {
             Icon: jsx(SvgSwitchHorizontal, {}),
             callback: () => switchWallet(wallet.id),
-            hide: ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown',
+            hide: ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown' || !((_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.isAvailable),
             text: 'Select wallet',
         },
     ];