diff --git a/packages/extension-polkagate/src/popup/accountsLists/AccountRowSimple.tsx b/packages/extension-polkagate/src/popup/accountsLists/AccountRowSimple.tsx index 84c524a53..1b1beb3c8 100644 --- a/packages/extension-polkagate/src/popup/accountsLists/AccountRowSimple.tsx +++ b/packages/extension-polkagate/src/popup/accountsLists/AccountRowSimple.tsx @@ -54,10 +54,10 @@ function AccountRowSimple ({ account, isFirstAccount, isFirstProfile, isInSettin return ( - + { isSelected && !isInSettingMode && diff --git a/packages/extension-polkagate/src/popup/accountsLists/BodySection.tsx b/packages/extension-polkagate/src/popup/accountsLists/BodySection.tsx index bfd614b31..98d442b52 100644 --- a/packages/extension-polkagate/src/popup/accountsLists/BodySection.tsx +++ b/packages/extension-polkagate/src/popup/accountsLists/BodySection.tsx @@ -6,11 +6,12 @@ import type { AccountJson } from '@polkadot/extension-base/background/types'; import { Box, Container, Stack } from '@mui/material'; import { AddCircle, Trash } from 'iconsax-react'; import React, { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'; +import { useNavigate } from 'react-router-dom'; import { windowOpen } from '@polkadot/extension-polkagate/src/messaging'; import { PROFILE_TAGS } from '@polkadot/extension-polkagate/src/util/constants'; -import { AccountContext, ActionButton, ActionContext, FadeOnScroll, GradientButton, MyTooltip } from '../../components'; +import { AccountContext, ActionButton, FadeOnScroll, GradientButton, MyTooltip } from '../../components'; import { AccountProfileLabel } from '../../fullscreen/components'; import { useCategorizedAccountsInProfiles, useSelectedAccount, useTranslation } from '../../hooks'; import { VelvetBox } from '../../style'; @@ -48,7 +49,7 @@ interface Props { function BodySection ({ mode, onApply, searchKeyword, setMode, setShowDeleteConfirmation }: Props): React.ReactElement { const { t } = useTranslation(); const { accounts: flatAccounts } = useContext(AccountContext); - const onAction = useContext(ActionContext); + const navigate = useNavigate(); const refContainer = useRef(null); const selectedAccount = useSelectedAccount(); const { categorizedAccounts: initialCategorizedAccounts } = useCategorizedAccountsInProfiles(); @@ -64,9 +65,9 @@ function BodySection ({ mode, onApply, searchKeyword, setMode, setShowDeleteConf useEffect(() => { if (flatAccounts.length === 0) { // when all accounts/profiles are deleted - onAction('/'); + navigate('/') as void; } - }, [flatAccounts.length, onAction]); + }, [flatAccounts.length, navigate]); const onCreateClick = useCallback(() => { windowOpen('/account/create').catch(console.error); @@ -103,8 +104,8 @@ function BodySection ({ mode, onApply, searchKeyword, setMode, setShowDeleteConf } - - + + {Object.keys(filteredCategorizedAccounts).length > 0 && ( <> {Object.entries(filteredCategorizedAccounts).map(([label, accounts], profileIndex) => { diff --git a/packages/extension-polkagate/src/popup/accountsLists/index.tsx b/packages/extension-polkagate/src/popup/accountsLists/index.tsx index cde33df93..48bcc882a 100644 --- a/packages/extension-polkagate/src/popup/accountsLists/index.tsx +++ b/packages/extension-polkagate/src/popup/accountsLists/index.tsx @@ -73,7 +73,7 @@ export function AccountsListManagement ({ defaultMode = PROFILE_MODE.NONE, onDon function AccountsLists (): React.ReactElement { return ( - +