Merge pull request #178 from chain4travel/suite

fix propagation wallet switcher (#177)
chain4travel · Dec 21, 2023 · 622f16a · 622f16a
2 parents 821a9b2 + 425d1ae
commit 622f16a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/Navbar/Account.tsx b/src/components/Navbar/Account.tsx
@@ -68,7 +68,7 @@ export default function Account({ handleCloseSidebar }: LoginIconProps) {
                         <Icon path={mdiCog} size={0.8} />
                         <Typography variant="body1">Settings</Typography>
                     </MenuItem>
-                    {auth && <AliasPicker />}
+                    {auth && <AliasPicker handleKeyDown={handleKeyDown} />}
                     <MenuItem>
                         <LoadAccountMenu type="kyc" />
                     </MenuItem>
@@ -84,6 +84,7 @@ export default function Account({ handleCloseSidebar }: LoginIconProps) {
                                 top: '5px',
                                 width: '50px',
                                 left: 'calc(100% - 55px)',
+                                zIndex: '1',
                             }}
                             label="beta"
                         />
@@ -158,6 +159,7 @@ export default function Account({ handleCloseSidebar }: LoginIconProps) {
                                         top: '5px',
                                         width: '50px',
                                         left: 'calc(100% - 55px)',
+                                        zIndex: '1',
                                     }}
                                     label="beta"
                                 />
@@ -181,7 +183,7 @@ export default function Account({ handleCloseSidebar }: LoginIconProps) {
                                 <Icon path={mdiCog} size={1} />
                                 <Typography variant="body2">Settings</Typography>
                             </MenuItem>
-                            <AliasPicker />
+                            <AliasPicker handleKeyDown={handleKeyDown} />
                             <MenuItem>
                                 <ThemeSwitcher />
                             </MenuItem>

diff --git a/src/components/Navbar/AliasPicker.tsx b/src/components/Navbar/AliasPicker.tsx
@@ -18,7 +18,7 @@ import DialogAnimate from '../Animate/DialogAnimate'
 import LoadMyKeysComponent from './LoadMyKeysComponent'
 import LoadSaveKeysComponent from './LoadSaveKeysComponent'
 
-const AliasPicker = () => {
+const AliasPicker = ({ handleKeyDown }: { handleKeyDown: (e: any) => void }) => {
     const [open, setOpen] = useState(false)
     const [load, setLoad] = useState(false)
     const handleOpenModal = () => {
@@ -39,6 +39,9 @@ const AliasPicker = () => {
     if (!load) return <></>
     return (
         <MenuItem
+            onKeyDown={e => {
+                handleKeyDown(e)
+            }}
             sx={{ display: 'flex', alignItems: 'center', justifyContent: 'start', gap: '8px' }}
         >
             <Icon path={mdiOpenInNew} size={1} />