Merge branch 'main' into improve-swap

ava-labs · Jan 31, 2025 · 9b1d928 · 9b1d928
2 parents 123eef6 + 14ee45c
commit 9b1d928
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core-mobile/app/screens/tokenManagement/TokenManagementItem.tsx b/packages/core-mobile/app/screens/tokenManagement/TokenManagementItem.tsx
@@ -7,6 +7,7 @@ import Avatar from 'components/Avatar'
 import { useDispatch, useSelector } from 'react-redux'
 import { selectTokenVisibility, toggleTokenVisibility } from 'store/portfolio'
 import { MaliciousTokenIconWithWarning } from 'components/MaliciousTokenIconWithWarning'
+import { isTokenVisible } from 'store/balance/utils'
 
 type Props = {
   id: string
@@ -28,8 +29,7 @@ const TokenManagementItem: FC<Props> = ({
 
   const tokenVisibility = useSelector(selectTokenVisibility)
 
-  const isSwitchOn =
-    tokenVisibility[id] !== undefined ? tokenVisibility[id] : !isMalicious
+  const isSwitchOn = isTokenVisible(tokenVisibility[id], isMalicious)
 
   function handleChange(): void {
     dispatch(toggleTokenVisibility({ tokenId: id, value: !isSwitchOn }))

diff --git a/packages/core-mobile/app/store/balance/utils.ts b/packages/core-mobile/app/store/balance/utils.ts
@@ -13,5 +13,5 @@ export function isTokenVisible(
   tokenVisible: boolean | undefined,
   isMalicious: boolean
 ): boolean {
-  return tokenVisible === true || (tokenVisible === undefined && !isMalicious)
+  return tokenVisible !== undefined ? tokenVisible : !isMalicious
 }