Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create multisig alias #149

Merged
merged 11 commits into from
Aug 21, 2023
Merged

Create multisig alias #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c5f98e3
feat: add create multisig alias page
Ayagoumi Jun 19, 2023
b8acddb
feat: add notification to create msig page
Ayagoumi Jul 10, 2023
cad2e1d
Merge remote-tracking branch 'origin/suite' into create-multisig-alias
Ayagoumi Jul 13, 2023
4c89526
Merge remote-tracking branch 'origin/suite' into create-multisig-alias
Ayagoumi Jul 18, 2023
d08544a
fix(Setting): adjust structure of theming for Tabs in setting page
Ayagoumi Jul 18, 2023
01dbe47
fix: update multisig creation component
Ayagoumi Jul 19, 2023
3c154b1
fix: error h4 instide h2
Ayagoumi Aug 17, 2023
f30ed69
fix: switch tabs on link change
Ayagoumi Aug 17, 2023
aa712bb
Merge remote-tracking branch 'origin/suite' into create-multisig-alias
Ayagoumi Aug 17, 2023
d5ba24a
Merge remote-tracking branch 'origin/suite' into create-multisig-alias
Ayagoumi Aug 18, 2023
5c41d5d
feat: disable delete/edit buttons when custom network is active
Ayagoumi Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/components/Navbar/AliasPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar/NetworkSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
Expand Down Expand Up @@ -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={{
Expand Down
6 changes: 2 additions & 4 deletions src/views/settings/Links.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/views/settings/MultisigWallet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const LoadMultisigWalletSetting = () => {
)
}

export default function MultisigWallet() {
export default function MultisigWalletSetting() {
return (
<React.Suspense fallback={<div>Loading...</div>}>
<LoadMultisigWalletSetting />
Expand Down
Loading