From c2da7b9e76e2f2d3266e90c0d3af69763dfeac06 Mon Sep 17 00:00:00 2001 From: Lantt Date: Wed, 8 Dec 2021 13:39:25 +0800 Subject: [PATCH 1/2] fix: persona page will check persona and notice user --- .../pages/Personas/components/LogoutPersonaDialog/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/dashboard/src/pages/Personas/components/LogoutPersonaDialog/index.tsx b/packages/dashboard/src/pages/Personas/components/LogoutPersonaDialog/index.tsx index 12a355c3cbed..e68f20d9bbcb 100644 --- a/packages/dashboard/src/pages/Personas/components/LogoutPersonaDialog/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/LogoutPersonaDialog/index.tsx @@ -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' @@ -28,7 +28,6 @@ export const LogoutPersonaDialog = memo(({ 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) @@ -38,7 +37,6 @@ export const LogoutPersonaDialog = memo(({ open, onClo await changeCurrentPersona(lastCreatedPersona.identifier) onClose() } else { - showSnackbar(t.personas_setup_tip(), { variant: 'warning' }) onClose() navigate(RoutePaths.Setup) } From 970c7a763b05b8a18886ca52a8f9bbb525651066 Mon Sep 17 00:00:00 2001 From: Lantt Date: Wed, 8 Dec 2021 15:45:05 +0800 Subject: [PATCH 2/2] fix: add delay for persona changed event --- .../dashboard/src/components/Restore/RestoreFromPrivateKey.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/dashboard/src/components/Restore/RestoreFromPrivateKey.tsx b/packages/dashboard/src/components/Restore/RestoreFromPrivateKey.tsx index 523a45340161..26fda043ccd9 100644 --- a/packages/dashboard/src/components/Restore/RestoreFromPrivateKey.tsx +++ b/packages/dashboard/src/components/Restore/RestoreFromPrivateKey.tsx @@ -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 } @@ -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}`, {