@dynamic-labs/sdk-react-core 4.4.3 → 4.4.4

package/src/lib/widgets/DynamicWidget/components/DotsMenu/DotsMenu.cjs

@@ -16,7 +16,15 @@ require('../../../../context/ViewContext/ViewContext.cjs');
 const DotsMenu = ({ options, buttonClassName, buttonClassNameWithOpenMenu, direction = 'right', iconOverride, }) => {
     const dotsMenuRef = React.useRef(null);
     const [showMenu, setShowMenu] = React.useState(false);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(IconButton.IconButton, { ref: dotsMenuRef, onClick: () => setShowMenu(true), "data-testid": 'dotsMenu', className: showMenu ? buttonClassNameWithOpenMenu : buttonClassName, children: iconOverride ? (iconOverride) : (jsxRuntime.jsx(Icon.Icon, { children: jsxRuntime.jsx(threeDots.ReactComponent, {}) })) }), jsxRuntime.jsx(Dropdown.Dropdown, { isOpen: showMenu, onClickOutside: () => setShowMenu(false), onScroll: () => setShowMenu(false), anchorRef: dotsMenuRef, anchorOrigin: direction === 'right' ? 'bottom-left' : 'top-right', transformOrigin: direction === 'right' ? 'top-left' : 'bottom-right', children: jsxRuntime.jsx(DotsMenuDropdown.DotsMenuDropdown, { options: options, setShowMenu: setShowMenu }) })] }));
+    const handleIconClick = React.useCallback(() => {
+        // Use setTimeout here to prevent React 17 from triggering a click event
+        // when the dropdown is rendered.
+        setTimeout(() => setShowMenu(true), 0);
+    }, [setShowMenu]);
+    const handleMenuClose = React.useCallback(() => {
+        setShowMenu(false);
+    }, [setShowMenu]);
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(IconButton.IconButton, { ref: dotsMenuRef, onClick: handleIconClick, "data-testid": 'dotsMenu', className: showMenu ? buttonClassNameWithOpenMenu : buttonClassName, children: iconOverride ? (iconOverride) : (jsxRuntime.jsx(Icon.Icon, { children: jsxRuntime.jsx(threeDots.ReactComponent, {}) })) }), jsxRuntime.jsx(Dropdown.Dropdown, { isOpen: showMenu, onClickOutside: handleMenuClose, onScroll: handleMenuClose, anchorRef: dotsMenuRef, anchorOrigin: direction === 'right' ? 'bottom-left' : 'top-right', transformOrigin: direction === 'right' ? 'top-left' : 'bottom-right', children: jsxRuntime.jsx(DotsMenuDropdown.DotsMenuDropdown, { options: options, setShowMenu: setShowMenu }) })] }));
 };
 
 exports.DotsMenu = DotsMenu;

package/src/lib/widgets/DynamicWidget/components/DotsMenu/DotsMenu.js

@@ -1,6 +1,6 @@
 'use client'
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
-import { useRef, useState } from 'react';
+import { useRef, useState, useCallback } from 'react';
 import { Icon } from '../../../../components/Icon/Icon.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import { Dropdown } from '../../../../components/MenuList/Dropdown/Dropdown.js';
@@ -12,7 +12,15 @@ import '../../../../context/ViewContext/ViewContext.js';
 const DotsMenu = ({ options, buttonClassName, buttonClassNameWithOpenMenu, direction = 'right', iconOverride, }) => {
     const dotsMenuRef = useRef(null);
     const [showMenu, setShowMenu] = useState(false);
-    return (jsxs(Fragment, { children: [jsx(IconButton, { ref: dotsMenuRef, onClick: () => setShowMenu(true), "data-testid": 'dotsMenu', className: showMenu ? buttonClassNameWithOpenMenu : buttonClassName, children: iconOverride ? (iconOverride) : (jsx(Icon, { children: jsx(SvgThreeDots, {}) })) }), jsx(Dropdown, { isOpen: showMenu, onClickOutside: () => setShowMenu(false), onScroll: () => setShowMenu(false), anchorRef: dotsMenuRef, anchorOrigin: direction === 'right' ? 'bottom-left' : 'top-right', transformOrigin: direction === 'right' ? 'top-left' : 'bottom-right', children: jsx(DotsMenuDropdown, { options: options, setShowMenu: setShowMenu }) })] }));
+    const handleIconClick = useCallback(() => {
+        // Use setTimeout here to prevent React 17 from triggering a click event
+        // when the dropdown is rendered.
+        setTimeout(() => setShowMenu(true), 0);
+    }, [setShowMenu]);
+    const handleMenuClose = useCallback(() => {
+        setShowMenu(false);
+    }, [setShowMenu]);
+    return (jsxs(Fragment, { children: [jsx(IconButton, { ref: dotsMenuRef, onClick: handleIconClick, "data-testid": 'dotsMenu', className: showMenu ? buttonClassNameWithOpenMenu : buttonClassName, children: iconOverride ? (iconOverride) : (jsx(Icon, { children: jsx(SvgThreeDots, {}) })) }), jsx(Dropdown, { isOpen: showMenu, onClickOutside: handleMenuClose, onScroll: handleMenuClose, anchorRef: dotsMenuRef, anchorOrigin: direction === 'right' ? 'bottom-left' : 'top-right', transformOrigin: direction === 'right' ? 'top-left' : 'bottom-right', children: jsx(DotsMenuDropdown, { options: options, setShowMenu: setShowMenu }) })] }));
 };
 
 export { DotsMenu };

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useStartExternalWalletFunding/useStartExternalWalletFunding.cjs

@@ -5,33 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var UserWalletsContext = require('../../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var projectSettings = require('../../../../../../store/state/projectSettings/projectSettings.cjs');
-var walletOptions = require('../../../../../../store/state/walletOptions/walletOptions.cjs');
 var useFunding = require('../../../../../../utils/hooks/useFunding/useFunding.cjs');
 var DynamicWidgetContext = require('../../../../context/DynamicWidgetContext.cjs');
 
 const useStartExternalWalletFunding = () => {
     var _a, _b;
-    const userWallets = UserWalletsContext.useUserWallets();
     const settings = projectSettings.useProjectSettings();
     const { connectWalletForFunding } = useFunding.useFunding();
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     return React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _c, _d;
-        const hasWalletConnectWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
-        // WC does not allow multiple sessions, so we have 2 cases here:
-        // 1. The user has a linked WalletConnect wallet.
-        //    In this case, we should not do anything, and our logic will prevent other WCs from being
-        //    selected for funding.
-        // 2. The user does not have a WalletConnect wallet linked.
-        //    In this case, we should reset the WC session — this is because they might have just
-        //    previously connected another WC wallet for funding and that session could still be active.
-        if (!hasWalletConnectWallet) {
-            const walletOption = walletOptions.getWalletConnectorOptions().find(({ walletConnector }) => walletConnector.isWalletConnect);
-            yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
-            yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
-        }
         try {
             const externalWallet = yield connectWalletForFunding();
             const minAmount = (_d = (_c = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _c === void 0 ? void 0 : _c.externalWallets) === null || _d === void 0 ? void 0 : _d.minAmount;
@@ -57,7 +41,6 @@ const useStartExternalWalletFunding = () => {
         connectWalletForFunding,
         setDynamicWidgetView,
         (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _a === void 0 ? void 0 : _a.externalWallets) === null || _b === void 0 ? void 0 : _b.minAmount,
-        userWallets,
     ]);
 };
 

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useStartExternalWalletFunding/useStartExternalWalletFunding.js

@@ -1,33 +1,17 @@
 'use client'
 import { __awaiter } from '../../../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { useUserWallets } from '../../../../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useProjectSettings } from '../../../../../../store/state/projectSettings/projectSettings.js';
-import { getWalletConnectorOptions } from '../../../../../../store/state/walletOptions/walletOptions.js';
 import { useFunding } from '../../../../../../utils/hooks/useFunding/useFunding.js';
 import { useWidgetContext } from '../../../../context/DynamicWidgetContext.js';
 
 const useStartExternalWalletFunding = () => {
     var _a, _b;
-    const userWallets = useUserWallets();
     const settings = useProjectSettings();
     const { connectWalletForFunding } = useFunding();
     const { setDynamicWidgetView } = useWidgetContext();
     return useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _c, _d;
-        const hasWalletConnectWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
-        // WC does not allow multiple sessions, so we have 2 cases here:
-        // 1. The user has a linked WalletConnect wallet.
-        //    In this case, we should not do anything, and our logic will prevent other WCs from being
-        //    selected for funding.
-        // 2. The user does not have a WalletConnect wallet linked.
-        //    In this case, we should reset the WC session — this is because they might have just
-        //    previously connected another WC wallet for funding and that session could still be active.
-        if (!hasWalletConnectWallet) {
-            const walletOption = getWalletConnectorOptions().find(({ walletConnector }) => walletConnector.isWalletConnect);
-            yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
-            yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
-        }
         try {
             const externalWallet = yield connectWalletForFunding();
             const minAmount = (_d = (_c = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _c === void 0 ? void 0 : _c.externalWallets) === null || _d === void 0 ? void 0 : _d.minAmount;
@@ -53,7 +37,6 @@ const useStartExternalWalletFunding = () => {
         connectWalletForFunding,
         setDynamicWidgetView,
         (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _a === void 0 ? void 0 : _a.externalWallets) === null || _b === void 0 ? void 0 : _b.minAmount,
-        userWallets,
     ]);
 };