close drawer when sub item menu clicked

shapeshift · May 6, 2024 · 213fd70 · 213fd70
1 parent daac3b4
commit 213fd70
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/components/Layout/Header/NavBar/Native/NativeMenu.tsx b/src/components/Layout/Header/NavBar/Native/NativeMenu.tsx
@@ -1,30 +1,33 @@
 import { ChevronRightIcon, EditIcon } from '@chakra-ui/icons'
 import { Button, MenuDivider, MenuItem } from '@chakra-ui/react'
-import { useCallback } from 'react'
+import React, { useCallback } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { Text } from 'components/Text'
 import { useFeatureFlag } from 'hooks/useFeatureFlag/useFeatureFlag'
 import { useModal } from 'hooks/useModal/useModal'
 
 const chevronRightIcon = <ChevronRightIcon />
 const editIcon = <EditIcon />
+type NativeMenuProps = {
+  onClose?: () => void
+}
 
-export const NativeMenu = () => {
+export const NativeMenu: React.FC<NativeMenuProps> = ({ onClose }) => {
   const translate = useTranslate()
   const isAccountManagementEnabled = useFeatureFlag('AccountManagement')
 
   const backupNativePassphrase = useModal('backupNativePassphrase')
   const accountManagementPopover = useModal('manageAccounts')
 
-  const handleBackupMenuItemClick = useCallback(
-    () => backupNativePassphrase.open({}),
-    [backupNativePassphrase],
-  )
+  const handleBackupMenuItemClick = useCallback(() => {
+    onClose && onClose()
+    backupNativePassphrase.open({})
+  }, [backupNativePassphrase, onClose])
 
-  const handleManageAccountsMenuItemClick = useCallback(
-    () => accountManagementPopover.open({}),
-    [accountManagementPopover],
-  )
+  const handleManageAccountsMenuItemClick = useCallback(() => {
+    onClose && onClose()
+    accountManagementPopover.open({})
+  }, [accountManagementPopover, onClose])
 
   return (
     <>

diff --git a/src/components/Layout/Header/NavBar/UserMenu.tsx b/src/components/Layout/Header/NavBar/UserMenu.tsx
@@ -49,6 +49,7 @@ const NoWallet = ({ onClick }: { onClick: () => void }) => {
 export type WalletConnectedProps = {
   onDisconnect: () => void
   onSwitchProvider: () => void
+  onClose?: () => void
 } & Pick<InitialState, 'walletInfo' | 'isConnected' | 'connectedType'>
 
 export const WalletConnected = (props: WalletConnectedProps) => {
@@ -60,6 +61,7 @@ export const WalletConnected = (props: WalletConnectedProps) => {
         onDisconnect={props.onDisconnect}
         onSwitchProvider={props.onSwitchProvider}
         connectedType={props.connectedType}
+        onClose={props.onClose}
       />
     </MemoryRouter>
   )
@@ -191,6 +193,7 @@ export const UserMenu: React.FC<{ onClick?: () => void }> = memo(({ onClick }) =
                 onDisconnect={disconnect}
                 onSwitchProvider={handleConnect}
                 connectedType={connectedType}
+                onClose={onClick}
               />
             ) : (
               <NoWallet onClick={handleConnect} />

diff --git a/src/components/Layout/Header/NavBar/WalletConnectedMenu.tsx b/src/components/Layout/Header/NavBar/WalletConnectedMenu.tsx
@@ -27,6 +27,7 @@ const ConnectedMenu = memo(
     walletInfo,
     onDisconnect,
     onSwitchProvider,
+    onClose,
   }: WalletConnectedProps & {
     connectedWalletMenuRoutes: boolean
   }) => {
@@ -74,7 +75,7 @@ const ConnectedMenu = memo(
               {translate('connectWallet.menu.connecting')}
             </MenuItem>
           )}
-          {ConnectMenuComponent && <ConnectMenuComponent />}
+          {ConnectMenuComponent && <ConnectMenuComponent onClose={onClose} />}
           <MenuDivider />
           <MenuItem icon={repeatIcon} onClick={onSwitchProvider}>
             {translate('connectWallet.menu.switchWallet')}
@@ -94,6 +95,7 @@ export const WalletConnectedMenu = ({
   walletInfo,
   isConnected,
   connectedType,
+  onClose,
 }: WalletConnectedProps) => {
   const location = useLocation()
 
@@ -128,6 +130,7 @@ export const WalletConnectedMenu = ({
               walletInfo={walletInfo}
               onDisconnect={onDisconnect}
               onSwitchProvider={onSwitchProvider}
+              onClose={onClose}
             />
           </SubMenuContainer>
         </Route>