Create multisig alias (#149)

chain4travel · Aug 21, 2023 · 245b45b · 245b45b
1 parent 5964f7c
commit 245b45b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/src/components/Navbar/AliasPicker.tsx b/src/components/Navbar/AliasPicker.tsx
@@ -1,6 +1,6 @@
 import { mdiClose } from '@mdi/js'
 import Icon from '@mdi/react'
-import { Box, DialogContent, DialogTitle, Divider, Typography } from '@mui/material'
+import { Box, DialogContent, DialogTitle, Divider, Typography, IconButton } from '@mui/material'
 import React, { useEffect, useState } from 'react'
 import store from 'wallet/store'
 import { getMultisigAliases } from '../../api'
@@ -40,22 +40,25 @@ const AliasPicker = () => {
                 Switch Wallet
             </MainButton>
             <DialogAnimate open={open} onClose={handleCloseModal}>
-                <DialogTitle
-                    sx={{
-                        position: 'relative',
-                        display: 'flex',
-                        flexDirection: 'row',
-                        alignItems: 'center',
-                        justifyContent: 'space-between',
-                    }}
-                >
-                    <Typography variant="h4" component="h4">
+                <DialogTitle sx={{ m: 0, p: 2 }}>
+                    <Typography variant="h4" component="span">
                         Wallet Switcher
                     </Typography>
-                    <Box sx={{ cursor: 'pointer' }} onClick={handleCloseModal}>
+                    <IconButton
+                        aria-label="close"
+                        onClick={handleCloseModal}
+                        sx={{
+                            position: 'absolute',
+                            right: 10,
+                            top: 15,
+                            cursor: 'pointer',
+                            color: theme => theme.palette.grey[500],
+                        }}
+                    >
                         <Icon path={mdiClose} size={1} />
-                    </Box>
+                    </IconButton>
                 </DialogTitle>
+
                 <Divider sx={{ borderWidth: '1.5px' }} />
                 <DialogContent>
                     <Box

diff --git a/src/components/Navbar/NetworkSwitcher.tsx b/src/components/Navbar/NetworkSwitcher.tsx
@@ -91,7 +91,7 @@ export default function NetworkSwitcher() {
                                     </Typography>
                                 </Box>
                                 <Box sx={{ flexGrow: 1 }} />
-                                {!network.readonly && (
+                                {!network.readonly && network.url !== activeNetwork.url && (
                                     <Box sx={{ display: 'flex', justifyContent: 'flex-end' }}>
                                         <IconButton onClick={() => handleEditCustomNetwork()}>
                                             <Icon path={mdiPencilOutline} size={0.8} />
@@ -173,7 +173,7 @@ export default function NetworkSwitcher() {
                             <Typography variant="subtitle1" component="span" noWrap>
                                 {network.name}
                             </Typography>
-                            {!network.readonly && (
+                            {!network.readonly && network.url !== activeNetwork.url && (
                                 <Box sx={{ display: 'flex', gap: 1, ml: 1 }}>
                                     <Button
                                         sx={{

diff --git a/src/views/settings/Links.tsx b/src/views/settings/Links.tsx
@@ -14,15 +14,13 @@ function a11yProps(index: number) {
 export default function Links() {
     const [value, setValue] = useState(0)
     const navigate = useNavigate()
-    const handleChange = (event: React.SyntheticEvent, newValue: number) => setValue(newValue)
     const path = window.location.pathname
-
+    const handleChange = (event: React.SyntheticEvent, newValue: number) => setValue(newValue)
     useEffect(() => {
         if (path === '/settings') setValue(0)
         else if (path === '/settings/create-multisig') setValue(1)
         else setValue(0)
-    }, [path]) // eslint-disable-line react-hooks/exhaustive-deps
-
+    }, [path])
     return (
         <Box sx={{ display: 'flex', cursor: 'pointer', width: '100%', maxWidth: '1536px' }}>
             <Tabs

diff --git a/src/views/settings/MultisigWallet.tsx b/src/views/settings/MultisigWallet.tsx
@@ -34,7 +34,7 @@ const LoadMultisigWalletSetting = () => {
     )
 }
 
-export default function MultisigWallet() {
+export default function MultisigWalletSetting() {
     return (
         <React.Suspense fallback={<div>Loading...</div>}>
             <LoadMultisigWalletSetting />