From 0782b5c4cdd32c96164f21b7d0b04d30b17f900d Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Fri, 15 Mar 2024 12:07:52 +0800
Subject: [PATCH 1/2] fix: FTs should not display if no user setting and no
 balance (#138)

---
 .../hooks/queries/ordinals/useGetBrc20FungibleTokens.ts   | 7 +++++--
 src/app/hooks/queries/runes/useGetRuneFungibleTokens.ts   | 6 +++++-
 src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts    | 8 +++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts b/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
index 5fa318ba..17d5d09e 100644
--- a/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
+++ b/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
@@ -7,6 +7,7 @@ import {
   getOrdinalsFtBalance,
 } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
+import BigNumber from 'bignumber.js';
 
 export const brc20TokenToFungibleToken = (coin: Brc20Token): FungibleToken => ({
   name: coin.name,
@@ -43,7 +44,6 @@ export const fetchBrc20FungibleTokens =
           ...ft,
           tokenFiatRate: Number(found.tokenFiatRate),
           name: found.name,
-          supported: found.supported,
         };
       })
       .concat(
@@ -71,6 +71,9 @@ export const useVisibleBrc20FungibleTokens = (): ReturnType<typeof useGetBrc20Fu
   const brc20Query = useGetBrc20FungibleTokens();
   return {
     ...brc20Query,
-    visible: (brc20Query.data ?? []).filter((ft) => brc20ManageTokens[ft.principal] !== false),
+    visible: (brc20Query.data ?? []).filter((ft) => {
+      const userSetting = brc20ManageTokens[ft.principal];
+      return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
+    }),
   };
 };
diff --git a/src/app/hooks/queries/runes/useGetRuneFungibleTokens.ts b/src/app/hooks/queries/runes/useGetRuneFungibleTokens.ts
index 0efbbe6e..e0ceb5a4 100644
--- a/src/app/hooks/queries/runes/useGetRuneFungibleTokens.ts
+++ b/src/app/hooks/queries/runes/useGetRuneFungibleTokens.ts
@@ -3,6 +3,7 @@ import useRunesApi from '@hooks/useRunesApi';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { FungibleToken } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
+import BigNumber from 'bignumber.js';
 
 export const useGetRuneFungibleTokens = () => {
   const { ordinalsAddress, network } = useWalletSelector();
@@ -26,6 +27,9 @@ export const useVisibleRuneFungibleTokens = (): ReturnType<typeof useGetRuneFung
   const runesQuery = useGetRuneFungibleTokens();
   return {
     ...runesQuery,
-    visible: (runesQuery.data ?? []).filter((rune) => runesManageTokens[rune.principal] !== false),
+    visible: (runesQuery.data ?? []).filter((ft) => {
+      const userSetting = runesManageTokens[ft.principal];
+      return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
+    }),
   };
 };
diff --git a/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts b/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
index 238d9fdf..66058ff0 100644
--- a/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
+++ b/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
@@ -9,6 +9,7 @@ import {
   getFtData,
 } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
+import BigNumber from 'bignumber.js';
 
 export const fetchSip10FungibleTokens =
   (
@@ -35,7 +36,6 @@ export const fetchSip10FungibleTokens =
         return {
           ...ft,
           ...found,
-          visible: true,
           name: found.name || ft.principal.split('.')[1],
         };
       })
@@ -48,7 +48,6 @@ export const fetchSip10FungibleTokens =
             assetName: coin.name || coin.contract.split('.')[1],
             protocol: 'stacks',
             balance: '0',
-            visible: true,
             total_sent: '',
             total_received: '',
           })),
@@ -80,6 +79,9 @@ export const useVisibleSip10FungibleTokens = (): ReturnType<typeof useGetSip10Fu
   const sip10Query = useGetSip10FungibleTokens();
   return {
     ...sip10Query,
-    visible: (sip10Query.data ?? []).filter((ft) => sip10ManageTokens[ft.principal] !== false),
+    visible: (sip10Query.data ?? []).filter((ft) => {
+      const userSetting = sip10ManageTokens[ft.principal];
+      return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
+    }),
   };
 };

From 723aec8bd3254bd4995427970be1ace9b6094b0b Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Fri, 15 Mar 2024 04:08:50 +0000
Subject: [PATCH 2/2] release: v0.32.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 622fbf34..d54d7ce7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.32.0",
+      "version": "0.32.1",
       "dependencies": {
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
         "@phosphor-icons/react": "^2.0.10",
diff --git a/package.json b/package.json
index 1b6d8bdb..b57a6275 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"