@dynamic-labs/sdk-react-core 3.0.0-alpha.19 → 3.0.0-alpha.20

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## [3.0.0-alpha.20](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.19...v3.0.0-alpha.20) (2024-07-15)
+
+
+### Bug Fixes
+
+* show/hide confirmation ui for aa session key wallets ([#6334](https://github.com/dynamic-labs/DynamicAuth/issues/6334)) ([6e17162](https://github.com/dynamic-labs/DynamicAuth/commit/6e17162e31915620b622f3ec5b4f8b7087f1728c))
+
 ## [3.0.0-alpha.19](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.18...v3.0.0-alpha.19) (2024-07-13)
 
 ## [3.0.0-alpha.18](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.17...v3.0.0-alpha.18) (2024-07-12)

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "3.0.0-alpha.19";
+var version = "3.0.0-alpha.20";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.470",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "3.0.0-alpha.19";
+var version = "3.0.0-alpha.20";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.470",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "3.0.0-alpha.19",
+  "version": "3.0.0-alpha.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,15 +17,15 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "3.0.0-alpha.19",
-    "@dynamic-labs/logger": "3.0.0-alpha.19",
-    "@dynamic-labs/multi-wallet": "3.0.0-alpha.19",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.19",
-    "@dynamic-labs/store": "3.0.0-alpha.19",
-    "@dynamic-labs/types": "3.0.0-alpha.19",
-    "@dynamic-labs/utils": "3.0.0-alpha.19",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.19",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.19",
+    "@dynamic-labs/iconic": "3.0.0-alpha.20",
+    "@dynamic-labs/logger": "3.0.0-alpha.20",
+    "@dynamic-labs/multi-wallet": "3.0.0-alpha.20",
+    "@dynamic-labs/rpc-providers": "3.0.0-alpha.20",
+    "@dynamic-labs/store": "3.0.0-alpha.20",
+    "@dynamic-labs/types": "3.0.0-alpha.20",
+    "@dynamic-labs/utils": "3.0.0-alpha.20",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.20",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.20",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/index.cjs

@@ -32,6 +32,7 @@ require('./lib/utils/constants/colors.cjs');
 require('./lib/utils/constants/values.cjs');
 var localStorage = require('./lib/shared/utils/classes/storage/localStorage.cjs');
 require('./lib/shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/wallet-connector-core');
 var useLocalStorage = require('./lib/shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 var index$1 = require('./lib/shared/utils/hooks/useOnClickOutside/index.cjs');
 require('@dynamic-labs/utils');
@@ -58,7 +59,6 @@ var stroke = require('./lib/shared/assets/stroke.cjs');
 require('./lib/shared/consts/index.cjs');
 require('../_virtual/_tslib.cjs');
 require('react-dom');
-require('@dynamic-labs/wallet-connector-core');
 require('./lib/events/dynamicEvents.cjs');
 require('./lib/config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');

package/src/index.js

@@ -28,6 +28,7 @@ import './lib/utils/constants/colors.js';
 import './lib/utils/constants/values.js';
 export { LocalStorage } from './lib/shared/utils/classes/storage/localStorage.js';
 import './lib/shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/wallet-connector-core';
 export { useLocalStorage } from './lib/shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 export { useOnClickOutside } from './lib/shared/utils/hooks/useOnClickOutside/index.js';
 import '@dynamic-labs/utils';
@@ -54,7 +55,6 @@ export { ReactComponent as ArrowIcon } from './lib/shared/assets/stroke.js';
 import './lib/shared/consts/index.js';
 import '../_virtual/_tslib.js';
 import 'react-dom';
-import '@dynamic-labs/wallet-connector-core';
 import './lib/events/dynamicEvents.js';
 import './lib/config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';

package/src/lib/components/TransactionConfirmationPageLayout/TransactionConfirmationPageLayout.cjs

@@ -6,13 +6,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var reactI18next = require('react-i18next');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var ModalHeader = require('../ModalHeader/ModalHeader.cjs');
 var IconWithSpinner = require('../IconWithSpinner/IconWithSpinner.cjs');
 var Icon = require('../Icon/Icon.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 require('react');
 var chevronLeft = require('../../shared/assets/chevron-left.cjs');
@@ -23,6 +23,7 @@ require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('../../shared/utils/classes/storage/sessionStorage.cjs');
+var usingSessionKeys = require('../../shared/utils/functions/usingSessionKeys/usingSessionKeys.cjs');
 var useEffectOnce = require('../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
 require('@dynamic-labs/utils');
 require('../../shared/consts/index.cjs');
@@ -111,7 +112,9 @@ const TransactionConfirmationPageLayout = ({ onClickClose, isLoading, onClickBac
     const { userNeedsCrossDomainPasskey } = PasskeyContext.usePasskeyContext();
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery.usePasskeyRecovery();
     const handleRecovery = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (yield shouldInitRecovery())
+        if ((yield shouldInitRecovery()) &&
+            walletConnector &&
+            !usingSessionKeys.usingSessionKey(walletConnector))
             yield initPasskeyRecoveryProcess('email', 'sendTransaction');
         onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess('callHandlerOutsideModal');
     });
@@ -123,9 +126,7 @@ const TransactionConfirmationPageLayout = ({ onClickClose, isLoading, onClickBac
     const closeButton = onClickClose && (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', onClick: onClickClose, "data-testid": 'close', disabled: isLoading, children: jsxRuntime.jsx(close.ReactComponent, {}) }));
     const backButton = onClickBack && (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', onClick: onClickBack, "data-testid": 'back-button', children: jsxRuntime.jsx(chevronLeft.ReactComponent, {}) }));
     const handleSubmitWithChecks = (e) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) ||
-            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector.getEOAConnector()))) {
+        if (walletConnector && usingSessionKeys.usingSessionKey(walletConnector)) {
             onClickSend(e);
             return;
         }

package/src/lib/components/TransactionConfirmationPageLayout/TransactionConfirmationPageLayout.js

@@ -2,13 +2,13 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
-import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ModalHeader } from '../ModalHeader/ModalHeader.js';
 import { IconWithSpinner } from '../IconWithSpinner/IconWithSpinner.js';
 import { Icon } from '../Icon/Icon.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import 'react';
 import { ReactComponent as SvgChevronLeft } from '../../shared/assets/chevron-left.js';
@@ -19,6 +19,7 @@ import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import '../../shared/utils/classes/storage/sessionStorage.js';
+import { usingSessionKey } from '../../shared/utils/functions/usingSessionKeys/usingSessionKeys.js';
 import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
 import '@dynamic-labs/utils';
 import '../../shared/consts/index.js';
@@ -107,7 +108,9 @@ const TransactionConfirmationPageLayout = ({ onClickClose, isLoading, onClickBac
     const { userNeedsCrossDomainPasskey } = usePasskeyContext();
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery();
     const handleRecovery = () => __awaiter(void 0, void 0, void 0, function* () {
-        if (yield shouldInitRecovery())
+        if ((yield shouldInitRecovery()) &&
+            walletConnector &&
+            !usingSessionKey(walletConnector))
             yield initPasskeyRecoveryProcess('email', 'sendTransaction');
         onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess('callHandlerOutsideModal');
     });
@@ -119,9 +122,7 @@ const TransactionConfirmationPageLayout = ({ onClickClose, isLoading, onClickBac
     const closeButton = onClickClose && (jsx(IconButton, { type: 'button', onClick: onClickClose, "data-testid": 'close', disabled: isLoading, children: jsx(SvgClose, {}) }));
     const backButton = onClickBack && (jsx(IconButton, { type: 'button', onClick: onClickBack, "data-testid": 'back-button', children: jsx(SvgChevronLeft, {}) }));
     const handleSubmitWithChecks = (e) => __awaiter(void 0, void 0, void 0, function* () {
-        if (isSessionKeyCompatibleWalletConnector(walletConnector) ||
-            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                isSessionKeyCompatibleWalletConnector(walletConnector.getEOAConnector()))) {
+        if (walletConnector && usingSessionKey(walletConnector)) {
             onClickSend(e);
             return;
         }

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs

@@ -8,7 +8,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
 var utils = require('@dynamic-labs/utils');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../components/Alert/Alert.cjs');
 var AnimatePresence = require('../../components/AnimatePresence/AnimatePresence.cjs');
@@ -16,6 +15,7 @@ var AppOriginTile = require('../../components/AppOriginTile/AppOriginTile.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 var close = require('../../shared/assets/close.cjs');
 var signCircle = require('../../shared/assets/sign-circle.cjs');
@@ -24,6 +24,7 @@ require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('../../shared/utils/classes/storage/sessionStorage.cjs');
+var usingSessionKeys = require('../../shared/utils/functions/usingSessionKeys/usingSessionKeys.cjs');
 var useEffectOnce = require('../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
 var usePreventPageScroll = require('../../shared/utils/hooks/usePreventPageScroll/usePreventPageScroll.cjs');
 var index = require('../../shared/consts/index.cjs');
@@ -154,16 +155,16 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, appOrigin, message,
         onReject(signMessageError || new Error('user rejected signing'));
     }, [signedMessage, onSignMessage, onReject, signMessageError]);
     const handleMessageSign = (signWithoutModal) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (yield shouldInitRecovery()) {
+        if ((yield shouldInitRecovery()) &&
+            walletConnector &&
+            !usingSessionKeys.usingSessionKey(walletConnector)) {
             yield initPasskeyRecoveryProcess('email', 'signMessage');
         }
         if (signWithoutModal === true) {
             onSignMessage('callHandlerOutsideModal');
             return;
         }
-        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) ||
-            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector.getEOAConnector()))) {
+        if (walletConnector && usingSessionKeys.usingSessionKey(walletConnector)) {
             confirm();
             return;
         }

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js

@@ -4,7 +4,6 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { useRef, useState, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { DynamicError, AccessBlockedError } from '@dynamic-labs/utils';
-import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../components/Alert/Alert.js';
 import { AnimatePresence } from '../../components/AnimatePresence/AnimatePresence.js';
@@ -12,6 +11,7 @@ import { AppOriginTile } from '../../components/AppOriginTile/AppOriginTile.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgClose } from '../../shared/assets/close.js';
 import { ReactComponent as SvgSignCircle } from '../../shared/assets/sign-circle.js';
@@ -20,6 +20,7 @@ import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import '../../shared/utils/classes/storage/sessionStorage.js';
+import { usingSessionKey } from '../../shared/utils/functions/usingSessionKeys/usingSessionKeys.js';
 import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
 import { usePreventPageScroll } from '../../shared/utils/hooks/usePreventPageScroll/usePreventPageScroll.js';
 import { authModalZIndex } from '../../shared/consts/index.js';
@@ -150,16 +151,16 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, appOrigin, message,
         onReject(signMessageError || new Error('user rejected signing'));
     }, [signedMessage, onSignMessage, onReject, signMessageError]);
     const handleMessageSign = (signWithoutModal) => __awaiter(void 0, void 0, void 0, function* () {
-        if (yield shouldInitRecovery()) {
+        if ((yield shouldInitRecovery()) &&
+            walletConnector &&
+            !usingSessionKey(walletConnector)) {
             yield initPasskeyRecoveryProcess('email', 'signMessage');
         }
         if (signWithoutModal === true) {
             onSignMessage('callHandlerOutsideModal');
             return;
         }
-        if (isSessionKeyCompatibleWalletConnector(walletConnector) ||
-            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                isSessionKeyCompatibleWalletConnector(walletConnector.getEOAConnector()))) {
+        if (walletConnector && usingSessionKey(walletConnector)) {
             confirm();
             return;
         }

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

@@ -13,3 +13,4 @@ export * from './getWalletListItemLabel';
 export * from './providerLabel';
 export * from './validatePassword';
 export * from './generateRandomPassword';
+export * from './usingSessionKeys';

package/src/lib/shared/utils/functions/usingSessionKeys/index.d.ts

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

package/src/lib/shared/utils/functions/usingSessionKeys/usingSessionKeys.cjs

@@ -0,0 +1,12 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+
+const usingSessionKey = (walletConnector) => walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) ||
+    ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
+        walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector.getEOAConnector()));
+
+exports.usingSessionKey = usingSessionKey;

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

@@ -0,0 +1,2 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const usingSessionKey: (walletConnector: WalletConnector) => boolean;

package/src/lib/shared/utils/functions/usingSessionKeys/usingSessionKeys.js

@@ -0,0 +1,8 @@
+'use client'
+import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
+
+const usingSessionKey = (walletConnector) => isSessionKeyCompatibleWalletConnector(walletConnector) ||
+    ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
+        isSessionKeyCompatibleWalletConnector(walletConnector.getEOAConnector()));
+
+export { usingSessionKey };