Skip to content

fix: zero persona snackbar in dashboard #5114

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

Merged
guanbinrui merged 2 commits into from
Dec 11, 2021
Merged

fix: zero persona snackbar in dashboard #5114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2da7b9
fix: persona page will check persona and notice user
Lanttcat Dec 8, 2021
970c7a7
fix: add delay for persona changed event
Lanttcat Dec 8, 2021
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
3 changes: 3 additions & 0 deletions packages/dashboard/src/components/Restore/RestoreFromPrivateKey.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { z } from 'zod'
import { useNavigate } from 'react-router-dom'
import { RoutePaths } from '../../type'
import { SignUpRoutePath } from '../../pages/SignUp/routePath'
import { delay } from '@masknet/shared-base'
type FormInputs = {
privateKey: string
}
Expand Down Expand Up @@ -43,6 +44,8 @@ export const RestoreFromPrivateKey = memo(() => {
const persona = await Services.Identity.queryPersonaByPrivateKey(data.privateKey)
if (persona) {
await changeCurrentPersona(persona.identifier)
// Waiting persona changed event notify
await delay(100)
navigate(RoutePaths.Personas)
} else {
navigate(`${RoutePaths.SignUp}/${SignUpRoutePath.PersonaCreate}`, {
Expand Down
4 changes: 1 addition & 3 deletions packages/dashboard/src/pages/Personas/components/LogoutPersonaDialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box, Button, DialogActions, DialogContent, Typography } from '@mui/material'
import { memo, useCallback } from 'react'
import { getMaskColor, makeStyles, MaskDialog, useCustomSnackbar } from '@masknet/theme'
import { getMaskColor, makeStyles, MaskDialog } from '@masknet/theme'
import { useDashboardI18N } from '../../../../locales'
import { Services } from '../../../../API'
import type { PersonaIdentifier } from '@masknet/shared'
Expand Down Expand Up @@ -28,7 +28,6 @@ export const LogoutPersonaDialog = memo<LogoutPersonaDialogProps>(({ open, onClo
const t = useDashboardI18N()
const navigate = useNavigate()
const { classes } = useStyles()
const { showSnackbar } = useCustomSnackbar()
const { changeCurrentPersona } = PersonaContext.useContainer()
const handleLogout = useCallback(async () => {
await Services.Identity.logoutPersona(identifier)
Expand All @@ -38,7 +37,6 @@ export const LogoutPersonaDialog = memo<LogoutPersonaDialogProps>(({ open, onClo
await changeCurrentPersona(lastCreatedPersona.identifier)
onClose()
} else {
showSnackbar(t.personas_setup_tip(), { variant: 'warning' })
onClose()
navigate(RoutePaths.Setup)
}
Expand Down