@dynamic-labs/sdk-react-core 2.1.2 → 2.1.4

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 wallet with unknown connector');
+            throw new Error("Cannot switch to this wallet, as it doesn't have an initialized wallet connector on this platform (desktop/mobile)");
         }
         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/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -37,6 +37,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
+        var _a;
         const wallet = findWallet.findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -68,6 +69,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connected: false,
                 connector: wallet.walletConnector,
                 id: account.id,
+                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             };
         }
         return null;

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

@@ -33,6 +33,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
+        var _a;
         const wallet = findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -64,6 +65,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connected: false,
                 connector: wallet.walletConnector,
                 id: account.id,
+                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             };
         }
         return null;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var values = require('../../../../constants/values.cjs');
 
 const findWallet = (account, walletOptions) => {
+    var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
         const chain = account.chain
@@ -14,7 +15,9 @@ const findWallet = (account, walletOptions) => {
         return walletOptions.find((wallet) => walletKey === wallet.key &&
             wallet.walletConnector.connectedChain === chain);
     }
-    return walletOptions.find((wallet) => walletKey === wallet.key);
+    // 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'));
 };
 
 exports.findWallet = findWallet;

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

@@ -2,6 +2,7 @@
 import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 
 const findWallet = (account, walletOptions) => {
+    var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
         const chain = account.chain
@@ -10,7 +11,9 @@ const findWallet = (account, walletOptions) => {
         return walletOptions.find((wallet) => walletKey === wallet.key &&
             wallet.walletConnector.connectedChain === chain);
     }
-    return walletOptions.find((wallet) => walletKey === wallet.key);
+    // 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'));
 };
 
 export { findWallet };

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

@@ -105,7 +105,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             return false;
         }
         return true;
-    }, [confirmationStateRef]);
+    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
     const signMessage = React.useCallback(({ message, handler }) => {
         if (!shouldConfirmAction()) {
             return handler();

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

@@ -101,7 +101,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
             return false;
         }
         return true;
-    }, [confirmationStateRef]);
+    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
     const signMessage = useCallback(({ message, handler }) => {
         if (!shouldConfirmAction()) {
             return handler();

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -137,7 +137,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     });
     const { verifyOtp } = useOtpVerificationRequest.useOtpVerificationRequest();
     const completeSignInFlow = React.useCallback((updateUserProfileResponse) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _e, _f, _g, _h, _j, _k;
         if (updateUserProfileResponse.nextView === 'verified-and-transferred') {
             setShowTransferMessage === null || setShowTransferMessage === void 0 ? void 0 : setShowTransferMessage(true);
         }
@@ -186,6 +186,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     // @ts-ignore
                     connector: undefined,
                     id: embeddedWalletVerifiedCredential.id,
+                    key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -133,7 +133,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     });
     const { verifyOtp } = useOtpVerificationRequest();
     const completeSignInFlow = useCallback((updateUserProfileResponse) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _e, _f, _g, _h, _j, _k;
         if (updateUserProfileResponse.nextView === 'verified-and-transferred') {
             setShowTransferMessage === null || setShowTransferMessage === void 0 ? void 0 : setShowTransferMessage(true);
         }
@@ -182,6 +182,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     // @ts-ignore
                     connector: undefined,
                     id: embeddedWalletVerifiedCredential.id,
+                    key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.cjs

@@ -33,7 +33,7 @@ require('@dynamic-labs/store');
 require('../../../../../locale/locale.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../../context/WalletContext/WalletContext.cjs');
@@ -84,22 +84,22 @@ var useInternalDynamicContext = require('../../../../../context/DynamicContext/u
 
 const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllWallets, }) => {
     const { t } = reactI18next.useTranslation();
-    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, connectedWallets, linkedWallets, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const userWallets = UserWalletsContext.useUserWallets();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { numberOfWallets, walletsList } = walletListBuilder.walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: walletConnectorOptions,
         isWalletConnectList: false,
         lastUsedWalletKey: localStorage.LocalStorage.getFromLS(localStorage$1.LAST_USED_WALLET),
-        linkedWallets,
         loginWithEmail: true,
         multiWallet,
         numberOfWalletsToShow: previewWalletsNumber,
         recommendedWallets,
         searchFilter: undefined,
         signWithEmailWalletName,
+        userWallets,
         walletBook: walletBook$1,
         walletsFilter,
     });

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.js

@@ -29,7 +29,7 @@ import '@dynamic-labs/store';
 import '../../../../../locale/locale.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useUserWallets } from '../../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../../context/WalletContext/WalletContext.js';
@@ -80,22 +80,22 @@ import { useInternalDynamicContext } from '../../../../../context/DynamicContext
 
 const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllWallets, }) => {
     const { t } = useTranslation();
-    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, connectedWallets, linkedWallets, recommendedWallets, } = useInternalDynamicContext();
+    const { walletConnectorOptions, projectSettings, walletsFilter, signWithEmailWalletName, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const userWallets = useUserWallets();
     const { walletBook } = useWalletBookContext();
     const { numberOfWallets, walletsList } = walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: walletConnectorOptions,
         isWalletConnectList: false,
         lastUsedWalletKey: LocalStorage.getFromLS(LAST_USED_WALLET),
-        linkedWallets,
         loginWithEmail: true,
         multiWallet,
         numberOfWalletsToShow: previewWalletsNumber,
         recommendedWallets,
         searchFilter: undefined,
         signWithEmailWalletName,
+        userWallets,
         walletBook,
         walletsFilter,
     });

package/src/lib/views/WalletList/WalletList.cjs

@@ -37,7 +37,7 @@ require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
@@ -95,7 +95,8 @@ var getEffectiveRecommendedWallets = require('./utils/getEffectiveRecommendedWal
 localStorage.LocalStorage.setToLS(localStorage$1.WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, linkedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const userWallets = UserWalletsContext.useUserWallets();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState.useTabState();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { error } = ErrorContext.useErrorContext();
@@ -109,18 +110,17 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     const effectiveRecommendedWallets = getEffectiveRecommendedWallets.getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
     const { numberOfWallets, walletsList } = walletListBuilder.walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: filteredBridgeChains || walletConnectorOptions,
         isWalletConnectList,
         lastUsedWalletKey: localStorage.LocalStorage.getFromLS(localStorage$1.LAST_USED_WALLET),
-        linkedWallets,
         multiWallet,
         numberOfWalletsToShow: defaultNumberOfWalletsToShow,
         recommendedWallets: effectiveRecommendedWallets,
         searchFilter: filterValue,
         showMoreWalletsWithFilter: true,
         signWithEmailWalletName,
+        userWallets,
         walletBook: walletBook$1,
         walletsFilter: getEffectiveWalletFilter.getEffectiveWalletFilter(selectedTabSettings, walletsFilter),
     });

package/src/lib/views/WalletList/WalletList.js

@@ -33,7 +33,7 @@ import '@dynamic-labs/store';
 import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../context/UserWalletsContext/UserWalletsContext.js';
+import { useUserWallets } from '../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
@@ -91,7 +91,8 @@ import { getEffectiveRecommendedWallets } from './utils/getEffectiveRecommendedW
 LocalStorage.setToLS(WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, linkedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const userWallets = useUserWallets();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState();
     const { walletBook } = useWalletBookContext();
     const { error } = useErrorContext();
@@ -105,18 +106,17 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     const effectiveRecommendedWallets = getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
     const { numberOfWallets, walletsList } = walletListBuilder({
         authMode,
-        connectedWallets,
         groupWallets: true,
         inputList: filteredBridgeChains || walletConnectorOptions,
         isWalletConnectList,
         lastUsedWalletKey: LocalStorage.getFromLS(LAST_USED_WALLET),
-        linkedWallets,
         multiWallet,
         numberOfWalletsToShow: defaultNumberOfWalletsToShow,
         recommendedWallets: effectiveRecommendedWallets,
         searchFilter: filterValue,
         showMoreWalletsWithFilter: true,
         signWithEmailWalletName,
+        userWallets,
         walletBook,
         walletsFilter: getEffectiveWalletFilter(selectedTabSettings, walletsFilter),
     });