@dynamic-labs/sdk-react-core 2.1.0-alpha.2 → 2.1.0-alpha.20

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.js

@@ -16,34 +16,35 @@ import '../../../../utils/constants/values.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../config/ApiEndpoint.js';
-import { completePasskeyRecovery as completePasskeyRecovery$1, updatePasskeyRecoveryEmail, initEmbeddedWalletSession as initEmbeddedWalletSession$1 } from '../../../../data/api/embeddedWallets/embeddedWallets.js';
-import '../../../../locale/locale.js';
-import { refreshUserJwt } from '../../../../data/api/user/user.js';
+import { createUserProfileFromSdkUser } from '../../../../utils/functions/createUserProfile/createUserProfile.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
+import { USER_NOT_LOGGED_IN } from '../../../../utils/constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { removeElementById } from '../../../../utils/functions/removeElementById/removeElementById.js';
 import 'viem';
 import 'viem/chains';
+import { completePasskeyRecovery as completePasskeyRecovery$1, updatePasskeyRecoveryEmail, initEmbeddedWalletSession as initEmbeddedWalletSession$1 } from '../../../../data/api/embeddedWallets/embeddedWallets.js';
+import '../../../../locale/locale.js';
+import { refreshUserJwt } from '../../../../data/api/user/user.js';
 import { iframeElementId } from '../../PasskeyRecovery/constants.js';
 
-const initEmbeddedWalletSession = (_a) => __awaiter(void 0, [_a], void 0, function* ({ authenticatorType, authToken, iframeContainer, iframeElementId, environmentId, userEmail, wallet, sessionExpiration, }) {
+const initEmbeddedWalletSession = (_a) => __awaiter(void 0, [_a], void 0, function* ({ authenticatorType, iframeContainer, iframeElementId, environmentId, user, wallet, sessionExpiration, }) {
     var _b;
-    if (!authToken) {
-        throw new DynamicError('Auth token is not defined');
+    if (!user) {
+        throw new DynamicError(USER_NOT_LOGGED_IN);
     }
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyRecoveryHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getAuthenticatorHandler();
     if (authenticatorType === 'passkey' &&
         turnkeyRecoveryHandler.isSessionActive()) {
         return addNewPasskeyAuthenticator({
-            authToken,
             environmentId,
-            userEmail,
+            user,
             wallet,
         });
     }
@@ -55,7 +56,6 @@ const initEmbeddedWalletSession = (_a) => __awaiter(void 0, [_a], void 0, functi
         authenticatorType,
         environmentId,
         publicKey,
-        userJwt: authToken,
         walletId: wallet.id,
     });
     turnkeyRecoveryHandler.recoveryUserId =
@@ -72,7 +72,7 @@ const passkeyRecoveryBundleValidation = (_c) => __awaiter(void 0, [_c], void 0,
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const decodedJwt = decodeJwt(authToken);
     if (!decodedJwt) {
@@ -96,7 +96,7 @@ const resentRecoveryEmail = (_h) => __awaiter(void 0, [_h], void 0, function* ({
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const publicKey = (_j = wallet.connector) === null || _j === void 0 ? void 0 : _j.getAuthenticatorHandler().publicKey;
     if (!publicKey) {
@@ -106,116 +106,91 @@ const resentRecoveryEmail = (_h) => __awaiter(void 0, [_h], void 0, function* ({
         authenticatorType,
         environmentId,
         publicKey,
-        userJwt: authToken,
         walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
     });
 });
-const completePasskeyRecovery = (_k) => __awaiter(void 0, [_k], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
-    var _l, _m, _o;
-    if (!authToken) {
-        throw new DynamicError('User must be logged in');
-    }
-    let decodedJwt = decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new DynamicError('User must be logged in with a valid token');
-    }
-    if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
-        !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
-        !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
-    }
-    const connector = wallet.connector;
-    connector.setEmail(userEmail);
-    const organizationId = (_o = (_m = (_l = decodedJwt.verifiedCredentials) === null || _l === void 0 ? void 0 : _l.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _m === void 0 ? void 0 : _m.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
-    if (!organizationId) {
-        throw new DynamicError('Invalid token!');
-    }
-    const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
-    const { attestation, challenge } = yield connector.getWebAuthnAttestation();
-    // calls turnkey recovery api
-    yield turnkeyRecoveryHandler.completeRecovery({
-        attestation,
-        challenge,
-        organizationId,
-    });
-    // calls readcost recovery api
-    const passkeyRecoveryResponse = yield completePasskeyRecovery$1({
-        attestation: attestation,
-        challenge,
+const completePasskeyRecovery = (_k) => __awaiter(void 0, [_k], void 0, function* ({ authToken, user, environmentId, wallet, }) {
+    const { passkeyRecoveryResponse, connector } = yield recoverTurnkeyWallet({
+        addPasskeyAuthenticator: false,
         environmentId,
-        userJwt: authToken,
-        walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+        user,
+        wallet,
     });
-    const { jwt } = passkeyRecoveryResponse;
-    decodedJwt = decodeJwt(jwt);
-    if (decodedJwt === undefined) {
-        throw new DynamicError('Invalid token!');
-    }
-    const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
-    if (!embeddedWalletVerifiedCredential) {
-        throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
-    }
-    connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
     // clear iframeStamper and its reference
     connector.getAuthenticatorHandler().clear();
     // deletes iframe container after usage
     removeElementById(iframeElementId);
     return {
-        decodedJwt,
         passkeyRecoveryResponse,
     };
 });
-const addNewPasskeyAuthenticator = (_p) => __awaiter(void 0, [_p], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
-    var _q, _r, _s;
-    if (!authToken) {
-        throw new DynamicError('User must be logged in');
-    }
-    let decodedJwt = decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new DynamicError('User must be logged in with a valid token');
+const addNewPasskeyAuthenticator = (_l) => __awaiter(void 0, [_l], void 0, function* ({ user, environmentId, wallet, }) {
+    const { passkeyRecoveryResponse, updatedUserProfile } = yield recoverTurnkeyWallet({
+        addPasskeyAuthenticator: true,
+        environmentId,
+        user,
+        wallet,
+    });
+    return {
+        passkeyRecoveryResponse,
+        user: updatedUserProfile,
+    };
+});
+const recoverTurnkeyWallet = (_m) => __awaiter(void 0, [_m], void 0, function* ({ wallet, user, environmentId, addPasskeyAuthenticator, }) {
+    var _o, _p, _q;
+    if (!user) {
+        throw new DynamicError(USER_NOT_LOGGED_IN);
     }
-    if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
-        !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
-        !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+    if (!wallet ||
+        !wallet.connector ||
+        !wallet.id ||
+        !isPasskeyWalletConnector(wallet.connector)) {
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
-    connector.setEmail(userEmail);
-    const organizationId = (_s = (_r = (_q = decodedJwt.verifiedCredentials) === null || _q === void 0 ? void 0 : _q.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _r === void 0 ? void 0 : _r.walletProperties) === null || _s === void 0 ? void 0 : _s.turnkeySubOrganizationId;
-    if (!organizationId) {
-        throw new DynamicError('Invalid token!');
+    connector.setEmail(user.email);
+    const turnkeySubOrganizationId = (_q = (_p = (_o = user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
+    if (!turnkeySubOrganizationId) {
+        throw new DynamicError('The authentication token is invalid - turnkeySubOrganizationId is missing');
     }
     const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
     const { attestation, challenge } = yield connector.getWebAuthnAttestation();
-    // calls turnkey create authenticator api
-    yield turnkeyRecoveryHandler.addPasskeyAuthenticator({
-        attestation,
-        challenge,
-        organizationId,
-    });
-    // calls readcost api to add new authenticator
+    if (addPasskeyAuthenticator) {
+        yield turnkeyRecoveryHandler.addPasskeyAuthenticator({
+            attestation,
+            challenge,
+            turnkeySubOrganizationId,
+        });
+    }
+    else {
+        yield turnkeyRecoveryHandler.completeRecovery({
+            attestation,
+            challenge,
+            turnkeySubOrganizationId,
+        });
+    }
+    // calls readcost recovery api
     const passkeyRecoveryResponse = yield completePasskeyRecovery$1({
         attestation: attestation,
         challenge,
         environmentId,
-        userJwt: authToken,
-        walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+        walletId: wallet.id,
     });
-    const { jwt } = passkeyRecoveryResponse;
-    decodedJwt = decodeJwt(jwt);
-    if (decodedJwt === undefined) {
-        throw new DynamicError('Invalid token!');
+    const { user: updatedUser } = passkeyRecoveryResponse;
+    if (!updatedUser) {
+        throw new DynamicError('No user returned from passkey recovery');
     }
+    const updatedUserProfile = createUserProfileFromSdkUser(updatedUser);
     const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(updatedUserProfile, [chain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
-    connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+    connector.setVerifiedCredentials(updatedUserProfile.verifiedCredentials);
     return {
-        decodedJwt,
+        connector,
         passkeyRecoveryResponse,
+        updatedUserProfile,
     };
 });
 const canRestoreEmbeddedWalletSession = (sessionExpirationTime) => {
@@ -236,22 +211,18 @@ const canRestoreEmbeddedWalletSession = (sessionExpirationTime) => {
     }
     return true;
 };
-const restoreEmbeddedWalletSession = (_t) => __awaiter(void 0, [_t], void 0, function* ({ authToken, iframeContainer, iframeElementId, wallet, sessionExpiration, }) {
-    var _u, _v, _w, _x;
-    if (!authToken) {
-        throw new DynamicError('Auth token is not defined');
-    }
-    const decodedJwt = decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new DynamicError('User must be logged in with a valid token');
+const restoreEmbeddedWalletSession = (_r) => __awaiter(void 0, [_r], void 0, function* ({ user, iframeContainer, iframeElementId, wallet, sessionExpiration, }) {
+    var _s, _t, _u, _v;
+    if (!user) {
+        throw new DynamicError(USER_NOT_LOGGED_IN);
     }
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const sessionSettings = LocalStorage.getFromLS(EMBEDDED_WALLET_SESSION_SETTINGS);
-    const turnkeyRecoveryHandler = (_u = wallet.connector) === null || _u === void 0 ? void 0 : _u.getAuthenticatorHandler();
+    const turnkeyRecoveryHandler = (_s = wallet.connector) === null || _s === void 0 ? void 0 : _s.getAuthenticatorHandler();
     if (!sessionSettings || Boolean(turnkeyRecoveryHandler.recoveryUserId)) {
         return false;
     }
@@ -260,12 +231,12 @@ const restoreEmbeddedWalletSession = (_t) => __awaiter(void 0, [_t], void 0, fun
         throw new DynamicError('Could not open embedded wallet connection communication');
     }
     turnkeyRecoveryHandler.recoveryUserId = sessionSettings.userId;
-    const organizationId = (_x = (_w = (_v = decodedJwt.verifiedCredentials) === null || _v === void 0 ? void 0 : _v.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _w === void 0 ? void 0 : _w.walletProperties) === null || _x === void 0 ? void 0 : _x.turnkeySubOrganizationId;
+    const organizationId = (_v = (_u = (_t = user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
     yield turnkeyRecoveryHandler.verifyRecoveryCode(sessionSettings.emailCode, organizationId);
     return true;
 });
-const addEmailRecovery = (_y) => __awaiter(void 0, [_y], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
-    var _z, _0;
+const addEmailRecovery = (_w) => __awaiter(void 0, [_w], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
+    var _x, _y;
     if (!authToken) {
         throw new DynamicError('User must be logged in');
     }
@@ -277,11 +248,11 @@ const addEmailRecovery = (_y) => __awaiter(void 0, [_y], void 0, function* ({ au
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
-    const { turnkeySubOrganizationId, turnkeyUserId } = (_0 = (_z = decodedJwt.verifiedCredentials) === null || _z === void 0 ? void 0 : _z.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _0 === void 0 ? void 0 : _0.walletProperties;
+    const { turnkeySubOrganizationId, turnkeyUserId } = (_y = (_x = decodedJwt.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _y === void 0 ? void 0 : _y.walletProperties;
     if (!turnkeySubOrganizationId || !turnkeyUserId) {
-        throw new DynamicError('Invalid token!');
+        throw new DynamicError('The authentication token is invalid - turnkeySubOrganizationId or turnkeyUserID is missing');
     }
     const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
     const { signedRequest } = (yield turnkeyRecoveryHandler.addEmailRecovery({
@@ -292,10 +263,9 @@ const addEmailRecovery = (_y) => __awaiter(void 0, [_y], void 0, function* ({ au
     yield updatePasskeyRecoveryEmail({
         environmentId,
         updateRecoveryEmailRequest: { turnkeySignedRequest: signedRequest },
-        userJwt: authToken,
     });
     wallet.connector.setEmail(userEmail);
-    return refreshUserJwt({ environmentId }, authToken);
+    return refreshUserJwt({ environmentId });
 });
 
 export { addEmailRecovery, addNewPasskeyAuthenticator, canRestoreEmbeddedWalletSession, completePasskeyRecovery, initEmbeddedWalletSession, passkeyRecoveryBundleValidation, resentRecoveryEmail, restoreEmbeddedWalletSession };

package/src/lib/views/PendingConnectView/PendingConnectView.cjs

@@ -38,11 +38,15 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
@@ -56,11 +60,11 @@ require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Alert/Alert.cjs');
 require('../../components/Input/Input.cjs');

package/src/lib/views/PendingConnectView/PendingConnectView.js

@@ -34,11 +34,15 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
@@ -52,11 +56,11 @@ import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { iconRatio, IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';
 import '../../components/Input/Input.js';

package/src/lib/views/PendingSignatureView/PendingSignatureView.cjs

@@ -42,11 +42,15 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
@@ -60,11 +64,11 @@ require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Alert/Alert.cjs');

package/src/lib/views/PendingSignatureView/PendingSignatureView.js

@@ -38,11 +38,15 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
@@ -56,11 +60,11 @@ import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { IconWithSpinner, iconRatio } from '../../components/IconWithSpinner/IconWithSpinner.js';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';

package/src/lib/views/QrCodeView/QrCodeView.cjs

@@ -36,13 +36,17 @@ require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('react-i18next');
-require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../components/Alert/Alert.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../components/IconButton/IconButton.cjs');
@@ -61,11 +65,11 @@ require('react-focus-lock');
 require('qrcode');
 var QrCodeWrapper = require('../../components/QrCodeWrapper/QrCodeWrapper.cjs');
 require('formik');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../WalletList/WalletList.cjs');
 require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');

package/src/lib/views/QrCodeView/QrCodeView.js

@@ -32,13 +32,17 @@ import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import 'react-i18next';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../components/Alert/Alert.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../components/IconButton/IconButton.js';
@@ -57,11 +61,11 @@ import 'react-focus-lock';
 import 'qrcode';
 import { QrCodeWrapper } from '../../components/QrCodeWrapper/QrCodeWrapper.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../WalletList/WalletList.js';
 import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';

package/src/lib/views/SelectHardwareWalletView/SelectHardwareWalletView.cjs

@@ -36,11 +36,15 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
@@ -54,12 +58,13 @@ require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var Divider = require('../../components/Divider/Divider.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 var Icon = require('../../components/Icon/Icon.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Alert/Alert.cjs');
 require('../../components/Input/Input.cjs');
@@ -75,7 +80,6 @@ require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
-var WalletGroupItem = require('../WalletGroupView/components/WalletGroupItem/WalletGroupItem.cjs');
 var HardwareWalletToggle = require('../../components/HardwareWalletToggle/HardwareWalletToggle.cjs');
 
 const SelectHardwareWalletView = ({ wallet, onSelectWallet, }) => {
@@ -84,7 +88,7 @@ const SelectHardwareWalletView = ({ wallet, onSelectWallet, }) => {
     const chainName = (_a = walletConnectorCore.getChainInfo(wallet.walletConnector.connectedChain)) === null || _a === void 0 ? void 0 : _a.displayName;
     return (jsxRuntime.jsx("div", { className: 'select-hardware-wallet-view', children: jsxRuntime.jsxs("div", { className: 'select-hardware-wallet-view__container', children: [jsxRuntime.jsx(Icon.Icon, { className: 'select-hardware-wallet-view__icon', children: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: wallet.key }) }), jsxRuntime.jsx(Typography.Typography, { className: 'select-hardware-wallet-view__text', as: 'p', color: 'secondary', variant: 'body_normal', copykey: 'dyn_select_hardware_wallet.description', children: t('dyn_select_hardware_wallet.description') }), walletConnectorCore.isHardwareWalletConnector(wallet.walletConnector) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { connectors: [wallet.walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label', {
                                 chainName,
-                            }) }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx(WalletGroupItem.WalletGroupItem, { wallet: wallet, onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet) })] }) }));
+                            }) }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'primary', onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet), copykey: 'dyn_select_hardware_wallet.button', dataTestId: 'select-hardware-wallet-connect-button', children: t('dyn_select_hardware_wallet.button') })] }) }));
 };
 
 exports.SelectHardwareWalletView = SelectHardwareWalletView;

package/src/lib/views/SelectHardwareWalletView/SelectHardwareWalletView.js

@@ -32,11 +32,15 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
@@ -50,12 +54,13 @@ import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { Divider } from '../../components/Divider/Divider.js';
-import '../../context/LoadingContext/LoadingContext.js';
 import { Icon } from '../../components/Icon/Icon.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
+import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';
 import '../../components/Input/Input.js';
@@ -71,7 +76,6 @@ import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
-import { WalletGroupItem } from '../WalletGroupView/components/WalletGroupItem/WalletGroupItem.js';
 import { HardwareWalletToggle } from '../../components/HardwareWalletToggle/HardwareWalletToggle.js';
 
 const SelectHardwareWalletView = ({ wallet, onSelectWallet, }) => {
@@ -80,7 +84,7 @@ const SelectHardwareWalletView = ({ wallet, onSelectWallet, }) => {
     const chainName = (_a = getChainInfo(wallet.walletConnector.connectedChain)) === null || _a === void 0 ? void 0 : _a.displayName;
     return (jsx("div", { className: 'select-hardware-wallet-view', children: jsxs("div", { className: 'select-hardware-wallet-view__container', children: [jsx(Icon, { className: 'select-hardware-wallet-view__icon', children: jsx(WalletIcon, { walletKey: wallet.key }) }), jsx(Typography, { className: 'select-hardware-wallet-view__text', as: 'p', color: 'secondary', variant: 'body_normal', copykey: 'dyn_select_hardware_wallet.description', children: t('dyn_select_hardware_wallet.description') }), isHardwareWalletConnector(wallet.walletConnector) && (jsxs(Fragment, { children: [jsx(HardwareWalletToggle, { connectors: [wallet.walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label', {
                                 chainName,
-                            }) }), jsx(Divider, {})] })), jsx(WalletGroupItem, { wallet: wallet, onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet) })] }) }));
+                            }) }), jsx(Divider, {})] })), jsx(TypographyButton, { buttonVariant: 'primary', onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet), copykey: 'dyn_select_hardware_wallet.button', dataTestId: 'select-hardware-wallet-connect-button', children: t('dyn_select_hardware_wallet.button') })] }) }));
 };
 
 export { SelectHardwareWalletView };