Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(wallet): do not remove NFT when marked as junk (uplift to 1.68.x) #24802

Merged
merged 1 commit into from
Jul 30, 2024
Merged

fix(wallet): do not remove NFT when marked as junk (uplift to 1.68.x) #24802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions components/brave_wallet_ui/common/slices/endpoints/token.endpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,27 +495,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
}
Expand Down
18 changes: 9 additions & 9 deletions components/brave_wallet_ui/components/desktop/views/nfts/components/nfts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,21 +573,21 @@ export const Nfts = ({
<NftGrid padding='0px'>
{renderedListPage.map((nft) => {
const assetId = getAssetIdKey(nft)
const isSpam = allSpamNftsIds.includes(assetId)
const isSpam = nft.isSpam || allSpamNftsIds.includes(assetId)
const isHidden =
!nft.visible ||
Boolean(
userTokensRegistry?.nonFungibleHiddenTokenIds.includes(
assetId
)
)

return (
<NFTGridViewItem
key={assetId}
token={nft}
onSelectAsset={onSelectAsset}
isTokenHidden={
isSpam ||
Boolean(
userTokensRegistry?.nonFungibleHiddenTokenIds.includes(
assetId
)
)
}
isTokenHidden={isHidden}
isTokenSpam={isSpam}
/>
)
Expand Down
Loading