@dynamic-labs/sdk-react-core 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+### [1.3.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.3.0...v1.3.1) (2024-03-08)
+
+
+### Bug Fixes
+
+* pass account and chain to walletClient ([#4865](https://github.com/dynamic-labs/DynamicAuth/issues/4865)) ([#4905](https://github.com/dynamic-labs/DynamicAuth/issues/4905)) ([0f4e79f](https://github.com/dynamic-labs/DynamicAuth/commit/0f4e79ff36f8a3ef63c59bb9f80429cdefbe7307))
+* update btckit network conversion for signpsbt to use correct network ([#4882](https://github.com/dynamic-labs/DynamicAuth/issues/4882)) ([3c14f55](https://github.com/dynamic-labs/DynamicAuth/commit/3c14f55f6e37718a095752d0e04bfbac45fee75c))
+* better auth state handling when logged in with disabled wallets ([#4862](https://github.com/dynamic-labs/DynamicAuth/issues/4862)) ([8cc2a1c](https://github.com/dynamic-labs/DynamicAuth/commit/8cc2a1c4f31cf6acb61d814a3410c5e77da21c50))
+
 ## [1.3.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.2.0...v1.3.0) (2024-03-05)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.3.0";
+var version = "1.3.1";
 var dependencies = {
 	"@dynamic-labs/sdk-api": "0.0.363",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,4 +1,4 @@
-var version = "1.3.0";
+var version = "1.3.1";
 var dependencies = {
 	"@dynamic-labs/sdk-api": "0.0.363",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,16 +16,16 @@
     "react-focus-lock": "2.9.2",
     "react-i18next": "^13.2.0",
     "yup": "0.32.11",
-    "@dynamic-labs/ethereum": "1.3.0",
-    "@dynamic-labs/iconic": "1.3.0",
-    "@dynamic-labs/logger": "1.3.0",
-    "@dynamic-labs/multi-wallet": "1.3.0",
-    "@dynamic-labs/rpc-providers": "1.3.0",
-    "@dynamic-labs/types": "1.3.0",
-    "@dynamic-labs/utils": "1.3.0",
-    "@dynamic-labs/viem-utils": "1.3.0",
-    "@dynamic-labs/wallet-book": "1.3.0",
-    "@dynamic-labs/wallet-connector-core": "1.3.0",
+    "@dynamic-labs/ethereum": "1.3.1",
+    "@dynamic-labs/iconic": "1.3.1",
+    "@dynamic-labs/logger": "1.3.1",
+    "@dynamic-labs/multi-wallet": "1.3.1",
+    "@dynamic-labs/rpc-providers": "1.3.1",
+    "@dynamic-labs/types": "1.3.1",
+    "@dynamic-labs/utils": "1.3.1",
+    "@dynamic-labs/viem-utils": "1.3.1",
+    "@dynamic-labs/wallet-book": "1.3.1",
+    "@dynamic-labs/wallet-connector-core": "1.3.1",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -93,8 +93,6 @@ const useHandleLogout = (params) => {
             // do not await this async call - just fire and forget
             api.revokeSession({ environmentId: p.environmentId, sessionId: p.user.sessionId }, jwt);
         }
-        yield Promise.all(p.walletConnectors.map((connector) => connector.endSession()));
-        yield Promise.all(p.connectedWallets.map((connectedWallet) => connectedWallet.connector.endSession()));
         // Necessary when user logs out in user data collection view
         // Dont require flag to be set though
         if (p.isVerificationInProgress)
@@ -118,6 +116,8 @@ const useHandleLogout = (params) => {
         p.removeConnectedNameService();
         dynamicEvents.dynamicEvents.emit('logout');
         p.removeUser();
+        yield Promise.all(p.walletConnectors.map((connector) => connector.endSession()));
+        yield Promise.all(p.connectedWallets.map((connectedWallet) => connectedWallet.connector.endSession()));
     }), []);
     /** Allows triggering a logout from anywhere in the code */
     useDynamicEvents.useInternalDynamicEvents('triggerLogout', () => logout());

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

@@ -89,8 +89,6 @@ const useHandleLogout = (params) => {
             // do not await this async call - just fire and forget
             revokeSession({ environmentId: p.environmentId, sessionId: p.user.sessionId }, jwt);
         }
-        yield Promise.all(p.walletConnectors.map((connector) => connector.endSession()));
-        yield Promise.all(p.connectedWallets.map((connectedWallet) => connectedWallet.connector.endSession()));
         // Necessary when user logs out in user data collection view
         // Dont require flag to be set though
         if (p.isVerificationInProgress)
@@ -114,6 +112,8 @@ const useHandleLogout = (params) => {
         p.removeConnectedNameService();
         dynamicEvents.emit('logout');
         p.removeUser();
+        yield Promise.all(p.walletConnectors.map((connector) => connector.endSession()));
+        yield Promise.all(p.connectedWallets.map((connectedWallet) => connectedWallet.connector.endSession()));
     }), []);
     /** Allows triggering a logout from anywhere in the code */
     useInternalDynamicEvents('triggerLogout', () => logout());

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

@@ -105,9 +105,13 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         if (!authToken || (user.isAuthenticatedWithAWallet && !primaryWallet)) {
             return;
         }
-        const updatedQueue = [...callbackQueue];
-        handleNextCallback(updatedQueue.shift(), authToken, user);
-        setCallbackQueue(updatedQueue);
+        handleNextCallback(callbackQueue[0], authToken, user);
+        setCallbackQueue((prev) => {
+            const [resolvedCallback, ...updatedQueue] = prev;
+            logger.logger.debug('Resolved callback: ', resolvedCallback.callback);
+            logger.logger.debug('Callbacks in queue: ', updatedQueue.map((c) => c.callback));
+            return updatedQueue;
+        });
     }, [callbackQueue, handleNextCallback, primaryWallet, user]);
     const setCallback = (callback, params) => {
         setCallbackQueue((prev) => [...prev, { callback, params }]);

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

@@ -101,9 +101,13 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         if (!authToken || (user.isAuthenticatedWithAWallet && !primaryWallet)) {
             return;
         }
-        const updatedQueue = [...callbackQueue];
-        handleNextCallback(updatedQueue.shift(), authToken, user);
-        setCallbackQueue(updatedQueue);
+        handleNextCallback(callbackQueue[0], authToken, user);
+        setCallbackQueue((prev) => {
+            const [resolvedCallback, ...updatedQueue] = prev;
+            logger.debug('Resolved callback: ', resolvedCallback.callback);
+            logger.debug('Callbacks in queue: ', updatedQueue.map((c) => c.callback));
+            return updatedQueue;
+        });
     }, [callbackQueue, handleNextCallback, primaryWallet, user]);
     const setCallback = (callback, params) => {
         setCallbackQueue((prev) => [...prev, { callback, params }]);

package/src/lib/context/PhantomRedirectContext/PhantomRedirectContext.cjs

@@ -96,7 +96,12 @@ const PhantomRedirectContextProvider = ({ children, }) => {
             handleUserResponse();
             return;
         }
-    }, [handleConnectResponse, handleUserResponse, phantomRedirectConnector]);
+    }, [
+        handleConnectResponse,
+        handleUserResponse,
+        phantomRedirectConnector,
+        sdkHasLoaded,
+    ]);
     return (jsxRuntime.jsx(PhantomRedirectContext.Provider, { value: {
             phantomRedirectConnector,
         }, children: children }));

package/src/lib/context/PhantomRedirectContext/PhantomRedirectContext.js

@@ -92,7 +92,12 @@ const PhantomRedirectContextProvider = ({ children, }) => {
             handleUserResponse();
             return;
         }
-    }, [handleConnectResponse, handleUserResponse, phantomRedirectConnector]);
+    }, [
+        handleConnectResponse,
+        handleUserResponse,
+        phantomRedirectConnector,
+        sdkHasLoaded,
+    ]);
     return (jsx(PhantomRedirectContext.Provider, { value: {
             phantomRedirectConnector,
         }, children: children }));

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

@@ -79,7 +79,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const startPregeneratedWalletCreationFlow = React.useCallback((jwt, decodedJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -171,12 +171,7 @@ const useTurnkey = () => {
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
-            // user logged in through an email linked to a third party wallet
-            // at this point primary wallet is still undefined and we need to set it
-            if (!primaryWallet) {
-                setPrimaryWalletId(userWaletsCredentials[0].id);
-            }
-            return Promise.resolve(primaryWallet);
+            throw new Error('Primary wallet is not an embedded wallet');
         }
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
@@ -186,8 +181,6 @@ const useTurnkey = () => {
         returnEmbeddedWallet,
         startEmbeddedWalletCreationFlow,
         startPregeneratedWalletCreationFlow,
-        primaryWallet,
-        setPrimaryWalletId,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -75,7 +75,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, primaryWallet, environmentId, } = useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const startPregeneratedWalletCreationFlow = useCallback((jwt, decodedJwt) => __awaiter(void 0, void 0, void 0, function* () {
@@ -167,12 +167,7 @@ const useTurnkey = () => {
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
-            // user logged in through an email linked to a third party wallet
-            // at this point primary wallet is still undefined and we need to set it
-            if (!primaryWallet) {
-                setPrimaryWalletId(userWaletsCredentials[0].id);
-            }
-            return Promise.resolve(primaryWallet);
+            throw new Error('Primary wallet is not an embedded wallet');
         }
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
@@ -182,8 +177,6 @@ const useTurnkey = () => {
         returnEmbeddedWallet,
         startEmbeddedWalletCreationFlow,
         startPregeneratedWalletCreationFlow,
-        primaryWallet,
-        setPrimaryWalletId,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -73,20 +73,25 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useIsLoggedIn = () => {
-    var _a, _b;
+    var _a, _b, _c;
     const { user, primaryWallet, authMode, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     // a user is set even when on connect-only mode if signing in with social,
     // but it won't have a primaryWallet in this case
     const isLoggedIn = Boolean(user) || (authMode === 'connect-only' && Boolean(primaryWallet));
+    const userWaletsCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
+    const hasEmbeddedWalletVerifiedCredential = Boolean(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
+    const isTurnkeyPregen = isTurnkeyProviderEnabled &&
+        ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) &&
+        !(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup);
+    const shouldHaveTurnkeyWallet = isTurnkeyPregen &&
+        // if user doesn't have a branded wallet only
+        (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) || hasEmbeddedWalletVerifiedCredential);
     // if turnkey is enabled we need to check if the user that is logged/connected
     // has a primaryWallet to not show the widget without secure
-    if (isTurnkeyProviderEnabled &&
-        ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-        !(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup)) {
+    if (shouldHaveTurnkeyWallet) {
         return Boolean(primaryWallet && isLoggedIn);
     }
-    // return isLoggedIn;
     return isLoggedIn;
 };
 

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

@@ -69,20 +69,25 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useIsLoggedIn = () => {
-    var _a, _b;
+    var _a, _b, _c;
     const { user, primaryWallet, authMode, projectSettings } = useInternalDynamicContext();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     // a user is set even when on connect-only mode if signing in with social,
     // but it won't have a primaryWallet in this case
     const isLoggedIn = Boolean(user) || (authMode === 'connect-only' && Boolean(primaryWallet));
+    const userWaletsCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
+    const hasEmbeddedWalletVerifiedCredential = Boolean(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
+    const isTurnkeyPregen = isTurnkeyProviderEnabled &&
+        ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) &&
+        !(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup);
+    const shouldHaveTurnkeyWallet = isTurnkeyPregen &&
+        // if user doesn't have a branded wallet only
+        (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) || hasEmbeddedWalletVerifiedCredential);
     // if turnkey is enabled we need to check if the user that is logged/connected
     // has a primaryWallet to not show the widget without secure
-    if (isTurnkeyProviderEnabled &&
-        ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-        !(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup)) {
+    if (shouldHaveTurnkeyWallet) {
         return Boolean(primaryWallet && isLoggedIn);
     }
-    // return isLoggedIn;
     return isLoggedIn;
 };
 

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

@@ -4,12 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -155,9 +155,11 @@ const useWalletItemActions = () => {
     };
     const handleWalletItemClick = (wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { walletConnector, isInstalledOnBrowser } = wallet;
+        const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
+            walletConnectorCore.isPhantomRedirectConnector(walletConnector);
         if (mockedSDK)
             return;
-        if (walletConnector.connectedChain === 'FLOW') {
+        if (shouldEndWalletConnectorSession) {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);

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

@@ -1,11 +1,11 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { isMobile } from '@dynamic-labs/utils';
+import { isPhantomRedirectConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -151,9 +151,11 @@ const useWalletItemActions = () => {
     };
     const handleWalletItemClick = (wallet) => __awaiter(void 0, void 0, void 0, function* () {
         const { walletConnector, isInstalledOnBrowser } = wallet;
+        const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
+            isPhantomRedirectConnector(walletConnector);
         if (mockedSDK)
             return;
-        if (walletConnector.connectedChain === 'FLOW') {
+        if (shouldEndWalletConnectorSession) {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);