@dynamic-labs/sdk-react-core 0.17.32 → 0.17.34

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+### [0.17.34](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.33...v0.17.34) (2023-08-14)
+
+
+### Bug Fixes
+
+* fix the captcha step with embedded wallets ([#2967](https://github.com/dynamic-labs/DynamicAuth/issues/2967)) ([#2984](https://github.com/dynamic-labs/DynamicAuth/issues/2984)) ([637effe](https://github.com/dynamic-labs/DynamicAuth/commit/637effe5e7c1f19d378924a3aad3f0a02b03bd8e))
+
+### [0.17.33](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.32...v0.17.33) (2023-08-11)
+
+
+### Bug Fixes
+
+* **networks:** merge custom network after API networks ([04d4158](https://github.com/dynamic-labs/DynamicAuth/commit/04d41584f71d384eb59b3327b106219de5b10719))
+* **QNTM-249:** broken email update when user is authenticated ([#2934](https://github.com/dynamic-labs/DynamicAuth/issues/2934)) ([b8c4149](https://github.com/dynamic-labs/DynamicAuth/commit/b8c4149fbc8d17f599ac4ddf9ed8d578ecc96e8b))
+
 ### [0.17.32](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.31...v0.17.32) (2023-08-09)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.17.32";
+var version = "0.17.34";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.17.32";
+var version = "0.17.34";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.17.32",
+  "version": "0.17.34",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,13 +16,13 @@
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.17.32",
-    "@dynamic-labs/multi-wallet": "0.17.32",
-    "@dynamic-labs/rpc-providers": "0.17.32",
-    "@dynamic-labs/types": "0.17.32",
-    "@dynamic-labs/utils": "0.17.32",
-    "@dynamic-labs/wallet-book": "0.17.32",
-    "@dynamic-labs/wallet-connector-core": "0.17.32"
+    "@dynamic-labs/logger": "0.17.34",
+    "@dynamic-labs/multi-wallet": "0.17.34",
+    "@dynamic-labs/rpc-providers": "0.17.34",
+    "@dynamic-labs/types": "0.17.34",
+    "@dynamic-labs/utils": "0.17.34",
+    "@dynamic-labs/wallet-book": "0.17.34",
+    "@dynamic-labs/wallet-connector-core": "0.17.34"
   },
   "devDependencies": {
     "semver": "7.3.8"

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

@@ -19,6 +19,7 @@ require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var validators = require('../../../context/DynamicContext/validators.cjs');
+var mergeCustomerEvmNetworksWithServerNetworks = require('./utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.cjs');
 
 const MAX_RETRIES = 2;
 const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries = MAX_RETRIES, }) => {
@@ -113,13 +114,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks:
                     serverNetworks.length &&
                     customerEvmNetworks !== undefined &&
                     customerEvmNetworks.length) {
-                    mergedEvmNetworks = customerEvmNetworks.slice();
-                    serverNetworks.forEach((network) => {
-                        const existingNetwork = mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.find((item) => item.chainId === network.chainId);
-                        if (!existingNetwork) {
-                            mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.push(network);
-                        }
-                    });
+                    mergedEvmNetworks = mergeCustomerEvmNetworksWithServerNetworks.mergeCustomerEvmNetworksWithServerNetworks(customerEvmNetworks, serverNetworks);
                 }
                 setLsNetworks({
                     configurations: {

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

@@ -15,6 +15,7 @@ import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
+import { mergeCustomerEvmNetworksWithServerNetworks } from './utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.js';
 
 const MAX_RETRIES = 2;
 const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries = MAX_RETRIES, }) => {
@@ -109,13 +110,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks:
                     serverNetworks.length &&
                     customerEvmNetworks !== undefined &&
                     customerEvmNetworks.length) {
-                    mergedEvmNetworks = customerEvmNetworks.slice();
-                    serverNetworks.forEach((network) => {
-                        const existingNetwork = mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.find((item) => item.chainId === network.chainId);
-                        if (!existingNetwork) {
-                            mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.push(network);
-                        }
-                    });
+                    mergedEvmNetworks = mergeCustomerEvmNetworksWithServerNetworks(customerEvmNetworks, serverNetworks);
                 }
                 setLsNetworks({
                     configurations: {

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/index.d.ts

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

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/mergeCustomerEvmNetworksWithServerNetworks/index.d.ts

@@ -0,0 +1 @@
+export { mergeCustomerEvmNetworksWithServerNetworks } from './mergeCustomerEvmNetworksWithServerNetworks';

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.cjs

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const mergeCustomerEvmNetworksWithServerNetworks = (customerEvmNetworks, serverNetworks) => {
+    const evmNetworks = [...customerEvmNetworks];
+    serverNetworks.forEach((network) => {
+        const existingNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((item) => item.chainId === network.chainId);
+        if (!existingNetwork) {
+            evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.unshift(network);
+        }
+    });
+    return evmNetworks;
+};
+
+exports.mergeCustomerEvmNetworksWithServerNetworks = mergeCustomerEvmNetworksWithServerNetworks;

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.d.ts

@@ -0,0 +1,2 @@
+import { GenericNetwork } from '@dynamic-labs/types';
+export declare const mergeCustomerEvmNetworksWithServerNetworks: (customerEvmNetworks: GenericNetwork[], serverNetworks: GenericNetwork[]) => GenericNetwork[];

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.js

@@ -0,0 +1,12 @@
+const mergeCustomerEvmNetworksWithServerNetworks = (customerEvmNetworks, serverNetworks) => {
+    const evmNetworks = [...customerEvmNetworks];
+    serverNetworks.forEach((network) => {
+        const existingNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((item) => item.chainId === network.chainId);
+        if (!existingNetwork) {
+            evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.unshift(network);
+        }
+    });
+    return evmNetworks;
+};
+
+export { mergeCustomerEvmNetworksWithServerNetworks };

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -5,12 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var iconic = require('@dynamic-labs/iconic');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
 require('../../config/LSSuffix.cjs');
-require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
@@ -45,7 +45,7 @@ require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var Captcha = require('../../components/Captcha/Captcha.cjs');
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, disableWalletConfirmationOnce, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { setCaptchaToken } = CaptchaContext.useCaptchaContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -63,7 +63,12 @@ const CaptchaVerifyUser = () => {
         if (!publicWalletAddress) {
             return;
         }
-        setView('pending-signature');
+        if (!walletConnectorCore.isEmbeddedConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            disableWalletConfirmationOnce();
+        }
         if (requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector)) {
             setCaptchaToken(captchaToken);
             return;

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -1,12 +1,12 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { CaptchaWaveIcon } from '@dynamic-labs/iconic';
+import { isEmbeddedConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
 import '../../config/LSSuffix.js';
-import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
@@ -41,7 +41,7 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 import { Captcha } from '../../components/Captcha/Captcha.js';
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext();
+    const { consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, disableWalletConfirmationOnce, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { setCaptchaToken } = useCaptchaContext();
     const verifyWallet = useVerifyWallet({
@@ -59,7 +59,12 @@ const CaptchaVerifyUser = () => {
         if (!publicWalletAddress) {
             return;
         }
-        setView('pending-signature');
+        if (!isEmbeddedConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            disableWalletConfirmationOnce();
+        }
         if (requiresTwoStepAuthentication(walletConnector)) {
             setCaptchaToken(captchaToken);
             return;

package/src/lib/views/EmailUpdate/EmailUpdate.cjs

@@ -52,18 +52,21 @@ const EmailUpdate = () => {
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { email, setEmail, setVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
-    const { environmentId, handleLogOut, onboardingOnlyJwt } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, handleLogOut, onboardingOnlyJwt, authToken } = useInternalDynamicContext.useInternalDynamicContext();
     const handleBackClick = () => {
         setView('verify-email');
         setError(undefined);
     };
+    // If user tries to update an email for logged user there is already an authToken and onboardingOnlyJwt is undefined
+    // If user tries to update the email in the authFlow, authToken is undefined and onboardingOnlyJwt is defined
+    const jwtToken = authToken || onboardingOnlyJwt;
     const handleEmailUpdate = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {
             if (!updatedEmail) {
                 return;
             }
             setLoading(true);
-            const { emailVerification } = yield api.updateUserProfileFields(onboardingOnlyJwt, environmentId, { email: updatedEmail });
+            const { emailVerification } = yield api.updateUserProfileFields(jwtToken, environmentId, { email: updatedEmail });
             if (!emailVerification) {
                 yield handleLogOut();
                 goToInitialView();

package/src/lib/views/EmailUpdate/EmailUpdate.js

@@ -48,18 +48,21 @@ const EmailUpdate = () => {
     const { loading, setLoading } = useLoadingContext();
     const { setView, goToInitialView } = useViewContext();
     const { email, setEmail, setVerificationUUID } = useEmailVerificationContext();
-    const { environmentId, handleLogOut, onboardingOnlyJwt } = useInternalDynamicContext();
+    const { environmentId, handleLogOut, onboardingOnlyJwt, authToken } = useInternalDynamicContext();
     const handleBackClick = () => {
         setView('verify-email');
         setError(undefined);
     };
+    // If user tries to update an email for logged user there is already an authToken and onboardingOnlyJwt is undefined
+    // If user tries to update the email in the authFlow, authToken is undefined and onboardingOnlyJwt is defined
+    const jwtToken = authToken || onboardingOnlyJwt;
     const handleEmailUpdate = () => __awaiter(void 0, void 0, void 0, function* () {
         try {
             if (!updatedEmail) {
                 return;
             }
             setLoading(true);
-            const { emailVerification } = yield updateUserProfileFields(onboardingOnlyJwt, environmentId, { email: updatedEmail });
+            const { emailVerification } = yield updateUserProfileFields(jwtToken, environmentId, { email: updatedEmail });
             if (!emailVerification) {
                 yield handleLogOut();
                 goToInitialView();