fix(wallet): do not remove NFT when marked as junk (uplift to 1.69.x) (…

…#24793) Uplift of #24786 (squashed) to beta
brave · Jul 23, 2024 · 2cb8966 · 2cb8966
1 parent a40f8d0
commit 2cb8966
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/components/brave_wallet_ui/common/slices/endpoints/token.endpoints.ts b/components/brave_wallet_ui/common/slices/endpoints/token.endpoints.ts
@@ -501,27 +501,6 @@ export const tokenEndpoints = ({
 
           cache.clearUserTokensRegistry()
 
-          const deleteResult = await braveWalletService.removeUserAsset(
-            arg.token
-          )
-
-          if (!deleteResult.success) {
-            throw new Error('Unable to delete token')
-          }
-
-          // track token if not spam
-          if (!arg.isSpam) {
-            const { success: addTokenSuccess } = await addUserToken({
-              braveWalletService,
-              cache,
-              tokenArg: { ...arg.token, isSpam: arg.isSpam }
-            })
-
-            if (!addTokenSuccess) {
-              throw new Error('Unable to add token')
-            }
-          }
-
           return {
             data: success
           }

diff --git a/components/brave_wallet_ui/components/desktop/views/nfts/components/nfts.tsx b/components/brave_wallet_ui/components/desktop/views/nfts/components/nfts.tsx
@@ -576,9 +576,10 @@ export const Nfts = ({
                   })
                 : renderedListPage.map((nft) => {
                     const assetId = getAssetIdKey(nft)
-                    const isSpam = allSpamNftsIds.includes(assetId)
+                    const isSpam =
+                      nft.isSpam || allSpamNftsIds.includes(assetId)
                     const isHidden =
-                      isSpam ||
+                      !nft.visible ||
                       Boolean(
                         userTokensRegistry?.nonFungibleHiddenTokenIds.includes(
                           assetId