@dynamic-labs/sdk-react-core 0.18.15 → 0.18.17

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+### [0.18.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.16...v0.18.17) (2023-09-11)
+
+
+### Bug Fixes
+
+* remove react component props from sending to sdk api v18 ([#3286](https://github.com/dynamic-labs/DynamicAuth/issues/3286)) ([af699f7](https://github.com/dynamic-labs/DynamicAuth/commit/af699f7efc42603a0ade890c622ea64ff219ee30)), closes [#3282](https://github.com/dynamic-labs/DynamicAuth/issues/3282)
+
+### [0.18.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.15...v0.18.16) (2023-09-11)
+
+
+### Bug Fixes
+
+* catch error sending sdkSettings and log warning v18 ([#3276](https://github.com/dynamic-labs/DynamicAuth/issues/3276)) ([e843e28](https://github.com/dynamic-labs/DynamicAuth/commit/e843e28c9f0e3714313b8e1ef1ae14734705a67e)), closes [#3274](https://github.com/dynamic-labs/DynamicAuth/issues/3274)
+* issue where unexpected token would occur when bundlers defined process.env ([#3283](https://github.com/dynamic-labs/DynamicAuth/issues/3283)) ([47387ea](https://github.com/dynamic-labs/DynamicAuth/commit/47387ea4c938f871f270d52163cdb37e46efdc1a))
+* seprate ls checks for dynamiccontext and wagmi settings v18 ([#3278](https://github.com/dynamic-labs/DynamicAuth/issues/3278)) ([daea94c](https://github.com/dynamic-labs/DynamicAuth/commit/daea94c92fd5a4c21f3a75f7056168090dd827ec)), closes [#3275](https://github.com/dynamic-labs/DynamicAuth/issues/3275)
+
 ### [0.18.15](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.14...v0.18.15) (2023-09-11)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.18.15";
+var version = "0.18.17";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.27",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.18.15",
+  "version": "0.18.17",
   "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.18.15",
-    "@dynamic-labs/multi-wallet": "0.18.15",
-    "@dynamic-labs/rpc-providers": "0.18.15",
-    "@dynamic-labs/types": "0.18.15",
-    "@dynamic-labs/utils": "0.18.15",
-    "@dynamic-labs/wallet-book": "0.18.15",
-    "@dynamic-labs/wallet-connector-core": "0.18.15",
+    "@dynamic-labs/logger": "0.18.17",
+    "@dynamic-labs/multi-wallet": "0.18.17",
+    "@dynamic-labs/rpc-providers": "0.18.17",
+    "@dynamic-labs/types": "0.18.17",
+    "@dynamic-labs/utils": "0.18.17",
+    "@dynamic-labs/wallet-book": "0.18.17",
+    "@dynamic-labs/wallet-connector-core": "0.18.17",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -18,7 +18,8 @@ require('ethers');
 var getAuthToken = require('../../utils/functions/getAuthToken/getAuthToken.cjs');
 
 let logoutTimer;
-let sdkSettingsTimer;
+let dynamicContextSettingsTimer;
+let wagmiSettingsTimer;
 const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt.decodeJwt(token);
@@ -69,13 +70,22 @@ const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFull
     }
     return 'wallet-list';
 };
-const setSDKSessionSettings = () => {
+const setDynamicContextSessionSettings = () => {
+    setSessionSettings(localStorage$1.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS);
+    dynamicContextSettingsTimer = setTimeout(isDynamicContextSessionSettingExpired, sdkSettingsTimeout);
+};
+const setWagmiSessionSettings = () => {
+    setSessionSettings(localStorage$1.WAGMI_LAST_SESSION_SETTINGS);
+    wagmiSettingsTimer = setTimeout(isWagmiSessionSettingExpired, sdkSettingsTimeout);
+};
+const setSessionSettings = (lsKey) => {
     const timestamp = new Date().getTime();
-    localStorage.LocalStorage.setToLS(localStorage$1.SDK_LAST_SESSION_SETTINGS, timestamp.toString());
-    sdkSettingsTimer = setTimeout(isSDKSessionSettingExpired, sdkSettingsTimeout);
+    localStorage.LocalStorage.setToLS(lsKey, timestamp.toString());
 };
-const isSDKSessionSettingExpired = () => {
-    const lastSentTime = localStorage.LocalStorage.getFromLS(localStorage$1.SDK_LAST_SESSION_SETTINGS);
+const isDynamicContextSessionSettingExpired = () => isSettingExpired(localStorage$1.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, dynamicContextSettingsTimer);
+const isWagmiSessionSettingExpired = () => isSettingExpired(localStorage$1.WAGMI_LAST_SESSION_SETTINGS, wagmiSettingsTimer);
+const isSettingExpired = (lsKey, timer) => {
+    const lastSentTime = localStorage.LocalStorage.getFromLS(lsKey);
     // should set new time
     if (!lastSentTime) {
         return true;
@@ -84,8 +94,8 @@ const isSDKSessionSettingExpired = () => {
     const currentTime = new Date().getTime();
     if (currentTime - lastSentTimestamp > sdkSettingsTimeout) {
         // Reset session-related data here
-        clearTimeout(sdkSettingsTimer);
-        localStorage.LocalStorage.removeFromLS(localStorage$1.SDK_LAST_SESSION_SETTINGS);
+        clearTimeout(timer);
+        localStorage.LocalStorage.removeFromLS(lsKey);
         return true;
     }
     return false;
@@ -94,6 +104,8 @@ const isSDKSessionSettingExpired = () => {
 exports.getInitialView = getInitialView;
 exports.initExpirationTime = initExpirationTime;
 exports.isAuthTokenExpired = isAuthTokenExpired;
-exports.isSDKSessionSettingExpired = isSDKSessionSettingExpired;
+exports.isDynamicContextSessionSettingExpired = isDynamicContextSessionSettingExpired;
+exports.isWagmiSessionSettingExpired = isWagmiSessionSettingExpired;
 exports.sdkSettingsTimeout = sdkSettingsTimeout;
-exports.setSDKSessionSettings = setSDKSessionSettings;
+exports.setDynamicContextSessionSettings = setDynamicContextSessionSettings;
+exports.setWagmiSessionSettings = setWagmiSessionSettings;

package/src/lib/context/DynamicContext/helpers.d.ts

@@ -10,5 +10,7 @@ export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBrid
     isFullyConnected: boolean;
     isMultiWalletEnabled: boolean;
 }) => ViewType;
-export declare const setSDKSessionSettings: () => void;
-export declare const isSDKSessionSettingExpired: () => boolean;
+export declare const setDynamicContextSessionSettings: () => void;
+export declare const setWagmiSessionSettings: () => void;
+export declare const isDynamicContextSessionSettingExpired: () => boolean;
+export declare const isWagmiSessionSettingExpired: () => boolean;

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

@@ -7,14 +7,15 @@ import 'react';
 import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
-import { SDK_LAST_SESSION_SETTINGS } from '../../utils/constants/localStorage.js';
+import { DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, WAGMI_LAST_SESSION_SETTINGS } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
 import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 
 let logoutTimer;
-let sdkSettingsTimer;
+let dynamicContextSettingsTimer;
+let wagmiSettingsTimer;
 const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt(token);
@@ -65,13 +66,22 @@ const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFull
     }
     return 'wallet-list';
 };
-const setSDKSessionSettings = () => {
+const setDynamicContextSessionSettings = () => {
+    setSessionSettings(DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS);
+    dynamicContextSettingsTimer = setTimeout(isDynamicContextSessionSettingExpired, sdkSettingsTimeout);
+};
+const setWagmiSessionSettings = () => {
+    setSessionSettings(WAGMI_LAST_SESSION_SETTINGS);
+    wagmiSettingsTimer = setTimeout(isWagmiSessionSettingExpired, sdkSettingsTimeout);
+};
+const setSessionSettings = (lsKey) => {
     const timestamp = new Date().getTime();
-    LocalStorage.setToLS(SDK_LAST_SESSION_SETTINGS, timestamp.toString());
-    sdkSettingsTimer = setTimeout(isSDKSessionSettingExpired, sdkSettingsTimeout);
+    LocalStorage.setToLS(lsKey, timestamp.toString());
 };
-const isSDKSessionSettingExpired = () => {
-    const lastSentTime = LocalStorage.getFromLS(SDK_LAST_SESSION_SETTINGS);
+const isDynamicContextSessionSettingExpired = () => isSettingExpired(DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, dynamicContextSettingsTimer);
+const isWagmiSessionSettingExpired = () => isSettingExpired(WAGMI_LAST_SESSION_SETTINGS, wagmiSettingsTimer);
+const isSettingExpired = (lsKey, timer) => {
+    const lastSentTime = LocalStorage.getFromLS(lsKey);
     // should set new time
     if (!lastSentTime) {
         return true;
@@ -80,11 +90,11 @@ const isSDKSessionSettingExpired = () => {
     const currentTime = new Date().getTime();
     if (currentTime - lastSentTimestamp > sdkSettingsTimeout) {
         // Reset session-related data here
-        clearTimeout(sdkSettingsTimer);
-        LocalStorage.removeFromLS(SDK_LAST_SESSION_SETTINGS);
+        clearTimeout(timer);
+        LocalStorage.removeFromLS(lsKey);
         return true;
     }
     return false;
 };
 
-export { getInitialView, initExpirationTime, isAuthTokenExpired, isSDKSessionSettingExpired, sdkSettingsTimeout, setSDKSessionSettings };
+export { getInitialView, initExpirationTime, isAuthTokenExpired, isDynamicContextSessionSettingExpired, isWagmiSessionSettingExpired, sdkSettingsTimeout, setDynamicContextSessionSettings, setWagmiSessionSettings };

package/src/lib/data/api.cjs

@@ -401,26 +401,25 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 });
 const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const isSettingsExpired = helpers.isSDKSessionSettingExpired();
-        // sent once. no need to send again
-        if (!isSettingsExpired) {
-            return;
-        }
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
-        if (dynamicContextProps || dynamicWagmiSettings) {
-            yield sdkApi().logDynamicSdkSettings({
-                environmentId,
-                sdkSettingsRequest: {
-                    dynamicContextProps,
-                    dynamicWagmiSettings,
-                },
-            });
+        if (dynamicContextProps) {
+            yield sendDynamicContextSettings(environmentId, { dynamicContextProps }, helpers.isDynamicContextSessionSettingExpired, helpers.setDynamicContextSessionSettings);
+        }
+        if (dynamicWagmiSettings) {
+            yield sendDynamicContextSettings(environmentId, { dynamicWagmiSettings }, helpers.isWagmiSessionSettingExpired, helpers.setWagmiSessionSettings);
         }
-        helpers.setSDKSessionSettings();
     }
-    catch (e) {
-        logger.logger.error(e);
+    catch (error) {
+        logger.logger.warn('Error caught when sending sdkSettings to api. Please notify Dynamic, and send the DynamicContextProvider settings you currently have configured', { error });
+    }
+});
+const sendDynamicContextSettings = (environmentId, sdkSettingsRequest, isSdkSettingExpired, setSDKSessionSettings) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // sent once. no need to send again
+    if (!isSdkSettingExpired()) {
+        return;
     }
+    yield sdkApi().logDynamicSdkSettings({ environmentId, sdkSettingsRequest });
+    setSDKSessionSettings();
 });
 const mergeUserAccounts = (userJwt, environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {

package/src/lib/data/api.js

@@ -14,7 +14,7 @@ import '../utils/constants/colors.js';
 import '../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../shared/consts/index.js';
-import { isSDKSessionSettingExpired, setSDKSessionSettings } from '../context/DynamicContext/helpers.js';
+import { isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings, isWagmiSessionSettingExpired, setWagmiSessionSettings } from '../context/DynamicContext/helpers.js';
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -397,26 +397,25 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 });
 const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const isSettingsExpired = isSDKSessionSettingExpired();
-        // sent once. no need to send again
-        if (!isSettingsExpired) {
-            return;
-        }
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
-        if (dynamicContextProps || dynamicWagmiSettings) {
-            yield sdkApi().logDynamicSdkSettings({
-                environmentId,
-                sdkSettingsRequest: {
-                    dynamicContextProps,
-                    dynamicWagmiSettings,
-                },
-            });
+        if (dynamicContextProps) {
+            yield sendDynamicContextSettings(environmentId, { dynamicContextProps }, isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings);
+        }
+        if (dynamicWagmiSettings) {
+            yield sendDynamicContextSettings(environmentId, { dynamicWagmiSettings }, isWagmiSessionSettingExpired, setWagmiSessionSettings);
         }
-        setSDKSessionSettings();
     }
-    catch (e) {
-        logger.error(e);
+    catch (error) {
+        logger.warn('Error caught when sending sdkSettings to api. Please notify Dynamic, and send the DynamicContextProvider settings you currently have configured', { error });
+    }
+});
+const sendDynamicContextSettings = (environmentId, sdkSettingsRequest, isSdkSettingExpired, setSDKSessionSettings) => __awaiter(void 0, void 0, void 0, function* () {
+    // sent once. no need to send again
+    if (!isSdkSettingExpired()) {
+        return;
     }
+    yield sdkApi().logDynamicSdkSettings({ environmentId, sdkSettingsRequest });
+    setSDKSessionSettings();
 });
 const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0, void 0, function* () {
     try {

package/src/lib/utils/constants/localStorage.cjs

@@ -16,13 +16,15 @@ const AUTH_MODE = 'dynamic_auth_mode';
 const CONNECTED_WALLET_NAME_SERVICE = 'dynamic_connected_wallet_ns';
 const IS_FULLY_CONNECTED = 'dynamic_fully_connected';
 const IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
-const SDK_LAST_SESSION_SETTINGS = 'dynamic_session_settings';
+const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = 'dynamic_context_session_settings';
+const WAGMI_LAST_SESSION_SETTINGS = 'dynamic_wagmi_session_settings';
 
 exports.AUTH_MODE = AUTH_MODE;
 exports.AUTH_TOKEN = AUTH_TOKEN;
 exports.AUTH_USER = AUTH_USER;
 exports.CONNECTED_WALLETS_INFO = CONNECTED_WALLETS_INFO;
 exports.CONNECTED_WALLET_NAME_SERVICE = CONNECTED_WALLET_NAME_SERVICE;
+exports.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS;
 exports.IS_FULLY_CONNECTED = IS_FULLY_CONNECTED;
 exports.IS_MULTI_WALLET_ENABLED = IS_MULTI_WALLET_ENABLED;
 exports.LAST_USED_WALLET = LAST_USED_WALLET;
@@ -31,5 +33,5 @@ exports.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY = NEWTOWEB3_WALLET_EXTENSION_FLAG_KE
 exports.NONCE_STORAGE_KEY = NONCE_STORAGE_KEY;
 exports.PRIMARY_WALLET_ID = PRIMARY_WALLET_ID;
 exports.PROJECT_SETTINGS_STORAGE_KEY = PROJECT_SETTINGS_STORAGE_KEY;
-exports.SDK_LAST_SESSION_SETTINGS = SDK_LAST_SESSION_SETTINGS;
+exports.WAGMI_LAST_SESSION_SETTINGS = WAGMI_LAST_SESSION_SETTINGS;
 exports.WALLET_PICKER_SEARCH_KEY = WALLET_PICKER_SEARCH_KEY;

package/src/lib/utils/constants/localStorage.d.ts

@@ -13,4 +13,5 @@ export declare const AUTH_MODE = "dynamic_auth_mode";
 export declare const CONNECTED_WALLET_NAME_SERVICE = "dynamic_connected_wallet_ns";
 export declare const IS_FULLY_CONNECTED = "dynamic_fully_connected";
 export declare const IS_MULTI_WALLET_ENABLED = "dynamic_multi_wallet_enabled";
-export declare const SDK_LAST_SESSION_SETTINGS = "dynamic_session_settings";
+export declare const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = "dynamic_context_session_settings";
+export declare const WAGMI_LAST_SESSION_SETTINGS = "dynamic_wagmi_session_settings";

package/src/lib/utils/constants/localStorage.js

@@ -12,6 +12,7 @@ const AUTH_MODE = 'dynamic_auth_mode';
 const CONNECTED_WALLET_NAME_SERVICE = 'dynamic_connected_wallet_ns';
 const IS_FULLY_CONNECTED = 'dynamic_fully_connected';
 const IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
-const SDK_LAST_SESSION_SETTINGS = 'dynamic_session_settings';
+const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = 'dynamic_context_session_settings';
+const WAGMI_LAST_SESSION_SETTINGS = 'dynamic_wagmi_session_settings';
 
-export { AUTH_MODE, AUTH_TOKEN, AUTH_USER, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, IS_FULLY_CONNECTED, IS_MULTI_WALLET_ENABLED, LAST_USED_WALLET, NETWORKS_STORAGE_KEY, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PRIMARY_WALLET_ID, PROJECT_SETTINGS_STORAGE_KEY, SDK_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };
+export { AUTH_MODE, AUTH_TOKEN, AUTH_USER, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, IS_FULLY_CONNECTED, IS_MULTI_WALLET_ENABLED, LAST_USED_WALLET, NETWORKS_STORAGE_KEY, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PRIMARY_WALLET_ID, PROJECT_SETTINGS_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };

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

@@ -44,7 +44,16 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             environmentId &&
             retries < maxRetries) {
             setLoading(true);
-            api.sendDynamicProps(environmentId, { dynamicContextProps });
+            // we ReactNode components are not being serialized properly
+            // remove them for now and deal with them later
+            // context: https://linear.app/dynamic-labs/issue/GVTY-328/[starknet]-sdk-api-is-not-serializing-react-components
+            // future work: https://linear.app/dynamic-labs/issue/GVTY-330/bug-figure-out-why-react-components-are-not
+            const updatedDynamicProps = {
+                settings: Object.assign(Object.assign({}, dynamicContextProps.settings), { customPrivacyPolicy: Boolean(dynamicContextProps.settings.customPrivacyPolicy), customTermsOfServices: Boolean(dynamicContextProps.settings.customTermsOfServices), policiesConsentInnerComponent: Boolean(dynamicContextProps.settings.policiesConsentInnerComponent) }),
+            };
+            api.sendDynamicProps(environmentId, {
+                dynamicContextProps: updatedDynamicProps,
+            });
             api.fetchProjectSettings(environmentId)
                 .then((response) => {
                 if (!response)

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

@@ -40,7 +40,16 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             environmentId &&
             retries < maxRetries) {
             setLoading(true);
-            sendDynamicProps(environmentId, { dynamicContextProps });
+            // we ReactNode components are not being serialized properly
+            // remove them for now and deal with them later
+            // context: https://linear.app/dynamic-labs/issue/GVTY-328/[starknet]-sdk-api-is-not-serializing-react-components
+            // future work: https://linear.app/dynamic-labs/issue/GVTY-330/bug-figure-out-why-react-components-are-not
+            const updatedDynamicProps = {
+                settings: Object.assign(Object.assign({}, dynamicContextProps.settings), { customPrivacyPolicy: Boolean(dynamicContextProps.settings.customPrivacyPolicy), customTermsOfServices: Boolean(dynamicContextProps.settings.customTermsOfServices), policiesConsentInnerComponent: Boolean(dynamicContextProps.settings.policiesConsentInnerComponent) }),
+            };
+            sendDynamicProps(environmentId, {
+                dynamicContextProps: updatedDynamicProps,
+            });
             fetchProjectSettings(environmentId)
                 .then((response) => {
                 if (!response)