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): Update remove asset logic #25805

Merged
merged 3 commits into from
Oct 4, 2024
Merged

fix(wallet): Update remove asset logic #25805

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e79795
only NFTs are removable
nuo-xu Oct 2, 2024
f1a28c2
only NFTs and user added custom tokens are removable.
nuo-xu Oct 4, 2024
867fda6
fix warning.
nuo-xu Oct 4, 2024
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
6 changes: 3 additions & 3 deletions ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/EditUserAssetsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ struct EditUserAssetsView: View {
.frame(maxWidth: .infinity)
} else {
ForEach(tokens, id: \.token.id) { store in
if store.isCustomToken {
if store.isRemovable {
EditTokenView(assetStore: store, tokenNeedsTokenId: $tokenNeedsTokenId)
.swipeActions(edge: .trailing) {
Button(role: .destructive) {
removeCustomToken(store.token)
removeToken(store.token)
} label: {
Label(Strings.Wallet.delete, systemImage: "trash")
}
Expand Down Expand Up @@ -248,7 +248,7 @@ struct EditUserAssetsView: View {
)
}

private func removeCustomToken(_ token: BraveWallet.BlockchainToken) {
private func removeToken(_ token: BraveWallet.BlockchainToken) {
Task { @MainActor in
let success = await userAssetsStore.removeUserAsset(token: token)
isPresentingAssetRemovalError = !success
Expand Down
17 changes: 8 additions & 9 deletions ios/brave-ios/Sources/BraveWallet/Crypto/Stores/UserAssetsStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class AssetStore: Identifiable, ObservableObject, Equatable, WalletObserv
private let rpcService: BraveWalletJsonRpcService
private let ipfsApi: IpfsAPI
private let assetManager: WalletUserAssetManagerType
private(set) var isCustomToken: Bool
private(set) var isRemovable: Bool

var isObserving: Bool = false

Expand All @@ -39,15 +39,15 @@ public class AssetStore: Identifiable, ObservableObject, Equatable, WalletObserv
token: BraveWallet.BlockchainToken,
ipfsApi: IpfsAPI,
userAssetManager: WalletUserAssetManagerType,
isCustomToken: Bool,
isRemovable: Bool,
isVisible: Bool
) {
self.rpcService = rpcService
self.network = network
self.token = token
self.ipfsApi = ipfsApi
self.assetManager = userAssetManager
self.isCustomToken = isCustomToken
self.isRemovable = isRemovable
self.isVisible = isVisible
}

Expand Down Expand Up @@ -168,7 +168,7 @@ public class UserAssetsStore: ObservableObject, WalletObserverStore {
)
// Filter `allTokens` to remove any tokens existing in `allUserAssets`. This is possible for ERC721 tokens in the registry without a `tokenId`, which requires the user to add as a custom token
let allUserTokens = allUserAssetsExcludeDeleted.flatMap(\.tokens)
allTokens = allTokens.map { assetsForNetwork in
let updatedAllTokens: [NetworkAssets] = allTokens.map { assetsForNetwork in
NetworkAssets(
network: assetsForNetwork.network,
tokens: assetsForNetwork.tokens.filter { token in
Expand All @@ -188,16 +188,15 @@ public class UserAssetsStore: ObservableObject, WalletObserverStore {
}
}
.map(\.id)
assetStores = (allUserAssetsExcludeDeleted + allTokens)
assetStores = (allUserAssetsExcludeDeleted + updatedAllTokens)
.sorted(by: { $0.sortOrder < $1.sortOrder })
.flatMap { assetsForNetwork in
assetsForNetwork.tokens.map { token in
var isCustomToken: Bool {
var isRemovable: Bool {
if token.contractAddress.isEmpty {
return false
}
// Any token with a tokenId should be considered a custom token.
if !token.tokenId.isEmpty {
if token.isErc721 || token.isErc1155 || token.isNft {
return true
}
return !allTokens.flatMap(\.tokens).contains(where: {
Expand All @@ -212,7 +211,7 @@ public class UserAssetsStore: ObservableObject, WalletObserverStore {
token: token,
ipfsApi: self.ipfsApi,
userAssetManager: assetManager,
isCustomToken: isCustomToken,
isRemovable: isRemovable,
isVisible: visibleIds.contains(where: {
$0.caseInsensitiveCompare(token.id) == .orderedSame
})
Expand Down
Loading