@dynamic-labs/sdk-react-core 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+### [2.2.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.0...v2.2.1) (2024-06-17)
+
+
+### Bug Fixes
+
+* improve handling of bitcoin connected accounts ([#6049](https://github.com/dynamic-labs/DynamicAuth/issues/6049)) ([08cb8ba](https://github.com/dynamic-labs/DynamicAuth/commit/08cb8bae2b1521367234cbe2bb55a8c3766df3c1))
+* improve wagmi hooks with embedded wallets ([#6044](https://github.com/dynamic-labs/DynamicAuth/issues/6044)) ([#6052](https://github.com/dynamic-labs/DynamicAuth/issues/6052)) ([28654e8](https://github.com/dynamic-labs/DynamicAuth/commit/28654e8a45b25c4fc3bb3abfa89b453808a55053))
+
 ## [2.2.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.5...v2.2.0) (2024-06-16)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.2.0";
+var version = "2.2.1";
 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.2.0";
+var version = "2.2.1";
 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.2.0",
+  "version": "2.2.1",
   "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.2.0",
-    "@dynamic-labs/logger": "2.2.0",
-    "@dynamic-labs/multi-wallet": "2.2.0",
-    "@dynamic-labs/rpc-provider-ethereum": "2.2.0",
-    "@dynamic-labs/rpc-provider-solana": "2.2.0",
-    "@dynamic-labs/rpc-providers": "2.2.0",
-    "@dynamic-labs/store": "2.2.0",
-    "@dynamic-labs/types": "2.2.0",
-    "@dynamic-labs/utils": "2.2.0",
-    "@dynamic-labs/viem-utils": "2.2.0",
-    "@dynamic-labs/wallet-book": "2.2.0",
-    "@dynamic-labs/wallet-connector-core": "2.2.0",
+    "@dynamic-labs/iconic": "2.2.1",
+    "@dynamic-labs/logger": "2.2.1",
+    "@dynamic-labs/multi-wallet": "2.2.1",
+    "@dynamic-labs/rpc-provider-ethereum": "2.2.1",
+    "@dynamic-labs/rpc-provider-solana": "2.2.1",
+    "@dynamic-labs/rpc-providers": "2.2.1",
+    "@dynamic-labs/store": "2.2.1",
+    "@dynamic-labs/types": "2.2.1",
+    "@dynamic-labs/utils": "2.2.1",
+    "@dynamic-labs/viem-utils": "2.2.1",
+    "@dynamic-labs/wallet-book": "2.2.1",
+    "@dynamic-labs/wallet-connector-core": "2.2.1",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -272,7 +272,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, lo
     const { selectedWalletConnector, setSelectedWalletConnectorKey } = useSelectedWalletConnector.useSelectedWalletConnector({ walletConnectorOptions });
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = React.useState(null);
-    useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(user, walletConnectorOptions);
+    useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(user !== null && user !== void 0 ? user : unauthenticatedUser, walletConnectorOptions);
     useSetWalletConnectorFetchers.useSetWalletConnectorFetchers(walletConnectorOptions, environmentId);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors.useWalletConnectors({
         authMode,

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

@@ -268,7 +268,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     const { selectedWalletConnector, setSelectedWalletConnectorKey } = useSelectedWalletConnector({ walletConnectorOptions });
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = useState(null);
-    useSetWalletConnectorVerifiedCredentials(user, walletConnectorOptions);
+    useSetWalletConnectorVerifiedCredentials(user !== null && user !== void 0 ? user : unauthenticatedUser, walletConnectorOptions);
     useSetWalletConnectorFetchers(walletConnectorOptions, environmentId);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors({
         authMode,

package/src/lib/shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.d.ts

@@ -1,2 +0,0 @@
-import { UserProfile } from '@dynamic-labs/types';
-export declare const isUserLinkingWallet: (user: UserProfile | undefined, view: string, isMockedSDK: boolean) => boolean;

package/src/lib/utils/functions/isPhoneNumberProviderEnabled/index.d.ts

@@ -1 +0,0 @@
-export * from './isPhoneNumberProviderEnabled';

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

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -53,11 +53,6 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const numberOfLinkedWallets = verifiedCredentials.filter((account) => account.walletName === ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.key) || '')).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfLinkedWallets === 1) {
-            if (wallet && walletConnectorCore.isBitcoinConnector(wallet.connector)) {
-                // to avoid the infinite wallet popup issue experienced with the ME wallet
-                // we only want to clear the cached connected accounts when we unlink, but not on logout
-                yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.clearConnectedAccounts());
-            }
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
         removedWalletsIds.current.push(walletId);

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

@@ -1,11 +1,11 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { isBitcoinConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -49,11 +49,6 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const numberOfLinkedWallets = verifiedCredentials.filter((account) => account.walletName === ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.key) || '')).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfLinkedWallets === 1) {
-            if (wallet && isBitcoinConnector(wallet.connector)) {
-                // to avoid the infinite wallet popup issue experienced with the ME wallet
-                // we only want to clear the cached connected accounts when we unlink, but not on logout
-                yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.clearConnectedAccounts());
-            }
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
         removedWalletsIds.current.push(walletId);

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

@@ -83,7 +83,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 const sleepToShowSuccessMessage = () => utils.sleep(1500);
 const useUserAuth = ({ authMethod, }) => {
-    const { handleLogOut, setShowAuthFlow, setCallback, setMultiWalletWidgetState, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleLogOut, setShowAuthFlow, setCallback, setMultiWalletWidgetState, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
     const { view, setView, goToInitialView } = ViewContext.useViewContext();
     const { setLoading } = LoadingContext.useLoadingContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
@@ -110,6 +110,9 @@ const useUserAuth = ({ authMethod, }) => {
                 verifiedUser = verifyResponse;
             }
             onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(verifiedUser);
+            walletConnectorOptions.forEach((walletOption) => {
+                walletOption.walletConnector.setVerifiedCredentials(verifiedUser.verifiedCredentials);
+            });
             if ((_b = verifiedUser.scope) === null || _b === void 0 ? void 0 : _b.includes('requiresAdditionalAuth')) {
                 const devices = yield mfa.getUserMfaDevices({ environmentId });
                 if (devices.length === 0) {

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

@@ -79,7 +79,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 const sleepToShowSuccessMessage = () => sleep(1500);
 const useUserAuth = ({ authMethod, }) => {
-    const { handleLogOut, setShowAuthFlow, setCallback, setMultiWalletWidgetState, environmentId, } = useInternalDynamicContext();
+    const { handleLogOut, setShowAuthFlow, setCallback, setMultiWalletWidgetState, environmentId, walletConnectorOptions, } = useInternalDynamicContext();
     const { view, setView, goToInitialView } = useViewContext();
     const { setLoading } = useLoadingContext();
     const { setErrorMessage, setError } = useErrorContext();
@@ -106,6 +106,9 @@ const useUserAuth = ({ authMethod, }) => {
                 verifiedUser = verifyResponse;
             }
             onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(verifiedUser);
+            walletConnectorOptions.forEach((walletOption) => {
+                walletOption.walletConnector.setVerifiedCredentials(verifiedUser.verifiedCredentials);
+            });
             if ((_b = verifiedUser.scope) === null || _b === void 0 ? void 0 : _b.includes('requiresAdditionalAuth')) {
                 const devices = yield getUserMfaDevices({ environmentId });
                 if (devices.length === 0) {

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

@@ -102,7 +102,7 @@ require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 const SECONDS_TO_RETRY = 15;
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
-    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, unauthenticatedUser, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, unauthenticatedUser, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { error, setError, setErrorMessage } = ErrorContext.useErrorContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
@@ -177,14 +177,16 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                 if (!embeddedWalletVerifiedCredential) {
                     throw new Error('Could not find an embedded wallet');
                 }
+                const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((option) => option.key === embeddedWalletVerifiedCredential.walletName);
+                if (!(walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector)) {
+                    throw new Error('Could not find connector for embedded wallet');
+                }
                 const wallet = {
                     address: embeddedWalletVerifiedCredential.address,
                     authenticated: false,
                     chain: embeddedWalletVerifiedCredential.chain,
                     connected: true,
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    connector: undefined,
+                    connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 };
@@ -210,6 +212,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setShowAuthFlow,
         setView,
         user,
+        walletConnectorOptions,
     ]);
     const handleEmailVerification = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);

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

@@ -98,7 +98,7 @@ import '../../context/IpConfigurationContext/IpConfigurationContext.js';
 const SECONDS_TO_RETRY = 15;
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
-    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, unauthenticatedUser, } = useInternalDynamicContext();
+    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, unauthenticatedUser, walletConnectorOptions, } = useInternalDynamicContext();
     const { setView, goToInitialView } = useViewContext();
     const { error, setError, setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
@@ -173,14 +173,16 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                 if (!embeddedWalletVerifiedCredential) {
                     throw new Error('Could not find an embedded wallet');
                 }
+                const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((option) => option.key === embeddedWalletVerifiedCredential.walletName);
+                if (!(walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector)) {
+                    throw new Error('Could not find connector for embedded wallet');
+                }
                 const wallet = {
                     address: embeddedWalletVerifiedCredential.address,
                     authenticated: false,
                     chain: embeddedWalletVerifiedCredential.chain,
                     connected: true,
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    connector: undefined,
+                    connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 };
@@ -206,6 +208,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setShowAuthFlow,
         setView,
         user,
+        walletConnectorOptions,
     ]);
     const handleEmailVerification = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);