Skip to content

Commit fdc3380

Browse files
committed
Add some more UX improvements
1 parent ede1108 commit fdc3380

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

ui/components/multichain-accounts/multichain-account-list/multichain-account-list.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,16 @@ export type MultichainAccountListProps = {
4141
wallets: AccountTreeWallets;
4242
selectedAccountGroups: AccountGroupId[];
4343
handleAccountClick?: (accountGroupId: AccountGroupId) => void;
44+
isInSearchMode?: boolean;
45+
hasMultipleWallets?: boolean;
4446
};
4547

4648
export const MultichainAccountList = ({
4749
wallets,
4850
selectedAccountGroups,
4951
handleAccountClick,
52+
isInSearchMode = false,
53+
hasMultipleWallets,
5054
}: MultichainAccountListProps) => {
5155
const dispatch = useDispatch();
5256
const history = useHistory();
@@ -144,7 +148,7 @@ export const MultichainAccountList = ({
144148
},
145149
);
146150

147-
if (walletData.type === AccountWalletType.Entropy) {
151+
if (!isInSearchMode && walletData.type === AccountWalletType.Entropy) {
148152
groupsItems.push(
149153
<AddMultichainAccount
150154
walletId={walletId as AccountWalletId}
@@ -153,7 +157,11 @@ export const MultichainAccountList = ({
153157
);
154158
}
155159

156-
return [...walletsAccumulator, walletHeader, ...groupsItems];
160+
return [
161+
...walletsAccumulator,
162+
hasMultipleWallets ? walletHeader : null,
163+
...groupsItems,
164+
];
157165
},
158166
[] as React.ReactNode[],
159167
);

ui/pages/multichain-accounts/account-list/account-list.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ export const AccountList = () => {
4747
const { selectedAccountGroup } = accountTree;
4848
const [searchPattern, setSearchPattern] = useState<string>('');
4949

50+
const hasMultipleWallets = useMemo(
51+
() => Object.keys(wallets).length > 1,
52+
[wallets],
53+
);
54+
5055
const onSearchBarChange = useCallback(
5156
(e: React.ChangeEvent<HTMLInputElement>) =>
5257
setSearchPattern(e.target.value),
@@ -118,6 +123,8 @@ export const AccountList = () => {
118123
<MultichainAccountList
119124
wallets={filteredWallets}
120125
selectedAccountGroups={[selectedAccountGroup]}
126+
isInSearchMode={Boolean(searchPattern)}
127+
hasMultipleWallets={hasMultipleWallets}
121128
/>
122129
) : (
123130
<Box

0 commit comments

Comments
 (0)