@dynamic-labs/sdk-react-core 0.18.100-viem.0 → 0.18.100-viem.1

package/src/lib/views/WalletLockedView/WalletLockedView.js

@@ -1,9 +1,10 @@
+import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
+import { useEffect } from 'react';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
-import 'react';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
-import '../../shared/logger.js';
+import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import '../../context/ViewContext/ViewContext.js';
@@ -47,15 +48,30 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 
 const iconSize = 64;
 const WalletLockedView = () => {
-    const { handleLogOut, primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
+    const { handleLogOut, primaryWallet, setShowAuthFlow, appName, authToken } = useInternalDynamicContext();
+    useEffect(() => {
+        // when there is no valid session, we want to log user out
+        if (!authToken) {
+            handleLogOut();
+        }
+    }, [authToken, handleLogOut]);
     if (!primaryWallet) {
         return null;
     }
+    const handleConnectWallet = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield primaryWallet.connector.connect();
+            setShowAuthFlow(false);
+        }
+        catch (_a) {
+            logger.info('could not connect wallet');
+        }
+    });
     const icon = (jsx(WalletIcon, { walletName: primaryWallet.connector.name, style: {
             height: pixelToRem(iconSize * iconRatio),
             width: pixelToRem(iconSize * iconRatio),
         } }));
-    return (jsxs("div", { "data-testid": 'wallet-locked-view', children: [jsx(ErrorContainer, { withIcon: false, className: 'wallet-locked-view__error-container', children: "We cannot connect to your wallet" }), jsxs("div", { className: 'wallet-locked-view__content', children: [jsx(IconWithSpinner, { Icon: icon, iconSize: iconSize, className: 'wallet-locked-view__icon', isSpinning: true }), jsx(Typography, { variant: 'title', color: 'primary', weight: 'medium', className: 'wallet-locked-view__title', children: "Unlock your Wallet extension" }), jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: "Your wallet extension is locked. To continue, open your extension and unlock your wallet." }), jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', className: 'wallet-locked-view__button-header', children: "Once unlocked, click here" }), jsx(Button, { buttonRounded: 'default', onClick: () => setShowAuthFlow(false), buttonClassName: 'wallet-locked-view__button', children: "I unlocked the wallet" }), jsx(Divider, { text: 'Or' }), jsx(TextButton, { className: 'wallet-locked-view__log-out', onClick: handleLogOut, children: "Log out" })] })] }));
+    return (jsxs("div", { "data-testid": 'wallet-locked-view', children: [jsx(ErrorContainer, { withIcon: false, variant: 'success', className: 'wallet-locked-view__error-container', children: "Connect your wallet to continue" }), jsxs("div", { className: 'wallet-locked-view__content', children: [jsx(IconWithSpinner, { Icon: icon, iconSize: iconSize, className: 'wallet-locked-view__icon', isSpinning: true }), jsx(Typography, { variant: 'title', color: 'primary', weight: 'medium', className: 'wallet-locked-view__title', children: "Welcome back." }), jsxs(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: ["We couldn't connect to your wallet. Click connect to retry the connection ", appName, "."] }), jsx(Button, { buttonRounded: 'default', onClick: () => handleConnectWallet(), buttonClassName: 'wallet-locked-view__button', children: "Connect wallet" }), jsx(Divider, { text: 'Or' }), jsx(TextButton, { className: 'wallet-locked-view__log-out', onClick: handleLogOut, children: "Log out" })] })] }));
 };
 
 export { WalletLockedView };

package/src/lib/views/viewToComponentMap.cjs

@@ -29,6 +29,7 @@ var BridgeWelcomeView = require('./BridgeWelcomeView/BridgeWelcomeView.cjs');
 var BridgeSummaryView = require('./BridgeSummaryView/BridgeSummaryView.cjs');
 var BridgeNextWalletConnectionView = require('./BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs');
 var AccountExistsView = require('./AccountExistsView/AccountExistsView.cjs');
+var MergeUserAccountsView = require('./MergeUserAccountsView/MergeUserAccountsView.cjs');
 
 const viewToComponentMap = {
     'account-exists': jsxRuntime.jsx(AccountExistsView.AccountExistsView, {}),
@@ -44,6 +45,7 @@ const viewToComponentMap = {
     'login-with-email-or-wallet': jsxRuntime.jsx(LoginWithEmailView.LoginWithEmailView, {}),
     'login-with-email-or-wallet-full-wallet-list': jsxRuntime.jsx(WalletList.WalletList, {}),
     'login-with-email-verification': jsxRuntime.jsx(EmailVerification.EmailVerification, {}),
+    'merge-user-accounts': jsxRuntime.jsx(MergeUserAccountsView.MergeUserAccountsView, {}),
     'network-not-supported': jsxRuntime.jsx(NetworkNotSupported.NetworkNotSupported, {}),
     'network-not-supported-manual': jsxRuntime.jsx(NetworkNotSupportedSwitchManual.NetworkNotSupportedSwitchManual, {}),
     'no-access': jsxRuntime.jsx(NoAccess.NoAccess, {}),

package/src/lib/views/viewToComponentMap.js

@@ -25,6 +25,7 @@ import { BridgeWelcomeView } from './BridgeWelcomeView/BridgeWelcomeView.js';
 import { BridgeSummaryView } from './BridgeSummaryView/BridgeSummaryView.js';
 import { BridgeNextWalletConnectionView } from './BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.js';
 import { AccountExistsView } from './AccountExistsView/AccountExistsView.js';
+import { MergeUserAccountsView } from './MergeUserAccountsView/MergeUserAccountsView.js';
 
 const viewToComponentMap = {
     'account-exists': jsx(AccountExistsView, {}),
@@ -40,6 +41,7 @@ const viewToComponentMap = {
     'login-with-email-or-wallet': jsx(LoginWithEmailView, {}),
     'login-with-email-or-wallet-full-wallet-list': jsx(WalletList, {}),
     'login-with-email-verification': jsx(EmailVerification, {}),
+    'merge-user-accounts': jsx(MergeUserAccountsView, {}),
     'network-not-supported': jsx(NetworkNotSupported, {}),
     'network-not-supported-manual': jsx(NetworkNotSupportedSwitchManual, {}),
     'no-access': jsx(NoAccess, {}),

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/index.d.ts

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

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/useTransactionData.cjs

@@ -1,104 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../../../_virtual/_tslib.cjs');
-var React = require('react');
-var viem = require('viem');
-require('@dynamic-labs/utils');
-require('@dynamic-labs/sdk-api');
-require('../../../../config/ApiEndpoint.cjs');
-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');
-require('../../../../utils/constants/colors.cjs');
-require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../../shared/consts/index.cjs');
-require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/rpc-providers');
-require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
-require('../../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('react-dom');
-require('../../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../../context/ThemeContext/ThemeContext.cjs');
-require('react-focus-lock');
-require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
-require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
-require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../../components/IconButton/IconButton.cjs');
-require('../../../../components/Alert/Alert.cjs');
-require('../../../../components/Popper/Popper/Popper.cjs');
-require('../../../../components/Popper/PopperContext/PopperContext.cjs');
-require('formik');
-require('yup');
-require('../../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../../context/MockContext/MockContext.cjs');
-require('../../../../context/CaptchaContext/CaptchaContext.cjs');
-var usePromise = require('../../../../utils/hooks/usePromise/usePromise.cjs');
-require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
-
-const useTransactionData = ({ transaction, }) => {
-    const { primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
-    const { data: transactionValue, isLoading: isEffectiveValueLoading } = usePromise.usePromise(() => {
-        const { value } = transaction;
-        if (value === undefined)
-            return undefined;
-        if (viem.isHex(value)) {
-            return viem.fromHex(value, 'bigint');
-        }
-        return value;
-    });
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const publicClient = yield (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.getRpcProvider());
-        if (!publicClient)
-            return;
-        const { from } = transaction, transactionWithNoOrigin = _tslib.__rest(transaction, ["from"]);
-        return publicClient.estimateGas(Object.assign({ account: from }, transactionWithNoOrigin));
-    }));
-    const { data: gasPrice, isLoading: isFeeDataLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const publicClient = yield (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.getRpcProvider());
-        if (!publicClient)
-            return;
-        return publicClient.getGasPrice();
-    }));
-    const isGasPriceLoading = isEstimatedGasLoading || isFeeDataLoading;
-    const gasEstimate = React.useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
-    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise.usePromise(() => transaction.to);
-    const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise.usePromise(() => transaction.from);
-    const total = React.useMemo(() => {
-        if (gasEstimate !== undefined && transactionValue !== undefined) {
-            return gasEstimate + transactionValue;
-        }
-        return transactionValue || gasEstimate;
-    }, [gasEstimate, transactionValue]);
-    const isLoading = React.useMemo(() => isEffectiveValueLoading ||
-        isGasPriceLoading ||
-        isTransactionToAddressLoading ||
-        isTransactionFromAddressLoading, [
-        isEffectiveValueLoading,
-        isGasPriceLoading,
-        isTransactionToAddressLoading,
-        isTransactionFromAddressLoading,
-    ]);
-    return {
-        gasEstimate,
-        isEffectiveValueLoading,
-        isGasPriceLoading,
-        isLoading,
-        isTransactionFromAddressLoading,
-        isTransactionToAddressLoading,
-        total,
-        transactionFromAddress,
-        transactionToAddress,
-        transactionValue,
-    };
-};
-
-exports.useTransactionData = useTransactionData;

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/useTransactionData.d.ts

@@ -1,17 +0,0 @@
-import { TransactionRequest } from 'viem';
-type TransactionDataHookProps = {
-    transaction: TransactionRequest;
-};
-export declare const useTransactionData: ({ transaction, }: TransactionDataHookProps) => {
-    gasEstimate: bigint | undefined;
-    isEffectiveValueLoading: boolean;
-    isGasPriceLoading: boolean;
-    isLoading: boolean;
-    isTransactionFromAddressLoading: boolean;
-    isTransactionToAddressLoading: boolean;
-    total: bigint | undefined;
-    transactionFromAddress: `0x${string}` | undefined;
-    transactionToAddress: `0x${string}` | undefined;
-    transactionValue: bigint | undefined;
-};
-export {};

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionData/useTransactionData.js

@@ -1,100 +0,0 @@
-import { __awaiter, __rest } from '../../../../../../_virtual/_tslib.js';
-import { useMemo } from 'react';
-import { isHex, fromHex } from 'viem';
-import '@dynamic-labs/utils';
-import '@dynamic-labs/sdk-api';
-import '../../../../config/ApiEndpoint.js';
-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';
-import '../../../../utils/constants/colors.js';
-import '../../../../shared/utils/classes/storage/localStorage.js';
-import '../../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/rpc-providers';
-import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
-import '../../../../context/ErrorContext/ErrorContext.js';
-import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import 'react-dom';
-import '../../../../components/ShadowDOM/ShadowDOM.js';
-import '../../../../context/ThemeContext/ThemeContext.js';
-import 'react-focus-lock';
-import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
-import '../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
-import '../../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../../components/IconButton/IconButton.js';
-import '../../../../components/Alert/Alert.js';
-import '../../../../components/Popper/Popper/Popper.js';
-import '../../../../components/Popper/PopperContext/PopperContext.js';
-import 'formik';
-import 'yup';
-import '../../../../components/InlineWidget/InlineWidget.js';
-import '../../../../components/MenuList/Dropdown/Dropdown.js';
-import '../../../../context/MockContext/MockContext.js';
-import '../../../../context/CaptchaContext/CaptchaContext.js';
-import { usePromise } from '../../../../utils/hooks/usePromise/usePromise.js';
-import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
-
-const useTransactionData = ({ transaction, }) => {
-    const { primaryWallet } = useInternalDynamicContext();
-    const { data: transactionValue, isLoading: isEffectiveValueLoading } = usePromise(() => {
-        const { value } = transaction;
-        if (value === undefined)
-            return undefined;
-        if (isHex(value)) {
-            return fromHex(value, 'bigint');
-        }
-        return value;
-    });
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        const publicClient = yield (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.getRpcProvider());
-        if (!publicClient)
-            return;
-        const { from } = transaction, transactionWithNoOrigin = __rest(transaction, ["from"]);
-        return publicClient.estimateGas(Object.assign({ account: from }, transactionWithNoOrigin));
-    }));
-    const { data: gasPrice, isLoading: isFeeDataLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        const publicClient = yield (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.getRpcProvider());
-        if (!publicClient)
-            return;
-        return publicClient.getGasPrice();
-    }));
-    const isGasPriceLoading = isEstimatedGasLoading || isFeeDataLoading;
-    const gasEstimate = useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
-    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise(() => transaction.to);
-    const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise(() => transaction.from);
-    const total = useMemo(() => {
-        if (gasEstimate !== undefined && transactionValue !== undefined) {
-            return gasEstimate + transactionValue;
-        }
-        return transactionValue || gasEstimate;
-    }, [gasEstimate, transactionValue]);
-    const isLoading = useMemo(() => isEffectiveValueLoading ||
-        isGasPriceLoading ||
-        isTransactionToAddressLoading ||
-        isTransactionFromAddressLoading, [
-        isEffectiveValueLoading,
-        isGasPriceLoading,
-        isTransactionToAddressLoading,
-        isTransactionFromAddressLoading,
-    ]);
-    return {
-        gasEstimate,
-        isEffectiveValueLoading,
-        isGasPriceLoading,
-        isLoading,
-        isTransactionFromAddressLoading,
-        isTransactionToAddressLoading,
-        total,
-        transactionFromAddress,
-        transactionToAddress,
-        transactionValue,
-    };
-};
-
-export { useTransactionData };