fix(suite): search closing on account change

trezor · Jul 1, 2024 · 40eb425 · 40eb425
1 parent fdff6c2
commit 40eb425
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayoutNavigation.tsx b/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayoutNavigation.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction, useState } from 'react';
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import styled, { css } from 'styled-components';
 
 import { TranslationKey } from '@suite-common/intl-types';
@@ -127,6 +127,11 @@ export const TokensLayoutNavigation = ({
         dispatch(openModal({ type: 'add-token' }));
     };
 
+    useEffect(() => {
+        setSearchQuery('');
+        setExpanded(false);
+    }, [account.symbol, account.index, account.accountType, setSearchQuery]);
+
     return (
         <Wrapper>
             <List>

diff --git a/...ews/wallet/transactions/TransactionList/TransactionListActions/TransactionListActions.tsx b/...ews/wallet/transactions/TransactionList/TransactionListActions/TransactionListActions.tsx
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 import { SearchAction } from 'src/components/wallet/SearchAction';
 import { ExportAction } from './ExportAction';
-import { ChangeEvent, Dispatch, SetStateAction, useCallback, useState } from 'react';
+import { ChangeEvent, Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react';
 import { useDispatch, useTranslation } from 'src/hooks/suite';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { fetchAllTransactionsForAccountThunk } from '@suite-common/wallet-core';
@@ -65,6 +65,12 @@ export const TransactionListActions = ({
         [account, dispatch, hasFetchedAll, setSearch, setSelectedPage, translationString],
     );
 
+    useEffect(() => {
+        setHasFetchedAll(false);
+        setExpanded(false);
+        setSearch('');
+    }, [account.symbol, account.index, account.accountType, setSearch]);
+
     return (
         <Wrapper>
             <SearchAction