Skip to content

feat(wallet): hide zero balance assets under account #24135

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

Merged
merged 1 commit into from
Jun 13, 2024
Merged

feat(wallet): hide zero balance assets under account #24135

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
4 changes: 4 additions & 0 deletions ios/brave-ios/Sources/BraveWallet/Crypto/Stores/AccountActivityStore.swift
View file
Open in desktop
Copy link
Collaborator

@StephenHeaps StephenHeaps Jun 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should also drop the first assignment to (self.userAssets, self.userNFTs) in update() as both will will just be filtered out for having no balance at this point? We probably want to move it after balance fetch in #24072 but before price fetch

Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@ class AccountActivityStore: ObservableObject, WalletObserverStore {
)
)
} else {
guard (tokenBalances[token.id] ?? 0) > 0 else {
// only show assets belonging to this account
continue
}
updatedUserAssets.append(
AssetViewModel(
groupType: .none,
Expand Down
44 changes: 28 additions & 16 deletions ios/brave-ios/Tests/BraveWalletTests/AccountActivityStoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class AccountActivityStoreTests: XCTestCase {
assetTimeframeChange: "-57.23"
),
]
let solTestnetBalance: UInt64 = 1_000_000_000 // 1 SOL
let solTestnetDecimalBalance: Double = 1 // 1 SOL

private func setupServices(
mockEthBalanceWei: String = "",
Expand Down Expand Up @@ -93,7 +95,7 @@ class AccountActivityStoreTests: XCTestCase {
if chainId == BraveWallet.SolanaMainnet {
completion(mockLamportBalance, .success, "")
} else { // testnet balance
completion(0, .success, "")
completion(self.solTestnetBalance, .success, "")
}
}
rpcService._splTokenAccountBalance = { _, tokenMintAddress, _, completion in
Expand Down Expand Up @@ -281,7 +283,7 @@ class AccountActivityStoreTests: XCTestCase {
XCTFail("Unexpected test result")
return
}
XCTAssertEqual(lastUpdatedAssets.count, 3)
XCTAssertEqual(lastUpdatedAssets.count, 2)

XCTAssertEqual(
lastUpdatedAssets[0].token.symbol,
Expand All @@ -299,13 +301,8 @@ class AccountActivityStoreTests: XCTestCase {
XCTAssertEqual(lastUpdatedAssets[1].totalBalance, mockERC20DecimalBalance)
XCTAssertEqual(lastUpdatedAssets[1].price, self.mockAssetPrices[safe: 1]?.price ?? "")

XCTAssertEqual(
lastUpdatedAssets[2].token.symbol,
BraveWallet.NetworkInfo.mockGoerli.nativeToken.symbol
)
XCTAssertEqual(lastUpdatedAssets[2].network, BraveWallet.NetworkInfo.mockGoerli)
XCTAssertEqual(lastUpdatedAssets[2].totalBalance, 0)
XCTAssertEqual(lastUpdatedAssets[2].price, self.mockAssetPrices[safe: 0]?.price ?? "")
// 0 balance asset is hidden
XCTAssertNil(lastUpdatedAssets[safe: 2])

// Verify brave/brave-browser#36806
let daiTokenVisible = lastUpdatedAssets.contains(where: {
Expand Down Expand Up @@ -384,7 +381,8 @@ class AccountActivityStoreTests: XCTestCase {
let mockLamportBalance: UInt64 = 3_876_535_000 // ~3.8765 SOL
let mockSolDecimalBalance: Double = 3.8765 // rounded

let mockSpdTokenBalance: Double = 0
let mockSpdTokenBalance: Double = 1_000_000_000 // 1000
let mockSpdTokenDecimalBalance: Double = 1000
let mockSolanaNFTTokenBalance: Double = 1

let mockSplTokenBalances: [String: String] = [
Expand Down Expand Up @@ -473,24 +471,38 @@ class AccountActivityStoreTests: XCTestCase {

XCTAssertEqual(
lastUpdatedAssets[safe: 0]?.token.symbol,
BraveWallet.NetworkInfo.mockSolana.nativeToken.symbol
BraveWallet.BlockchainToken.mockSpdToken.symbol
)
XCTAssertEqual(lastUpdatedAssets[safe: 0]?.network, BraveWallet.NetworkInfo.mockSolana)
XCTAssertEqual(lastUpdatedAssets[safe: 0]?.totalBalance, mockSolDecimalBalance)
XCTAssertEqual(lastUpdatedAssets[safe: 0]?.totalBalance, mockSpdTokenDecimalBalance)
XCTAssertEqual(
lastUpdatedAssets[safe: 0]?.price,
self.mockAssetPrices[safe: 2]?.price ?? ""
self.mockAssetPrices[safe: 3]?.price ?? ""
)

XCTAssertEqual(
lastUpdatedAssets[safe: 1]?.token.symbol,
BraveWallet.BlockchainToken.mockSpdToken.symbol
BraveWallet.NetworkInfo.mockSolana.nativeToken.symbol
)
XCTAssertEqual(lastUpdatedAssets[safe: 1]?.network, BraveWallet.NetworkInfo.mockSolana)
XCTAssertEqual(lastUpdatedAssets[safe: 1]?.totalBalance, mockSpdTokenBalance)
XCTAssertEqual(lastUpdatedAssets[safe: 1]?.totalBalance, mockSolDecimalBalance)
XCTAssertEqual(
lastUpdatedAssets[safe: 1]?.price,
self.mockAssetPrices[safe: 3]?.price ?? ""
self.mockAssetPrices[safe: 2]?.price ?? ""
)

XCTAssertEqual(
lastUpdatedAssets[safe: 2]?.token.symbol,
BraveWallet.NetworkInfo.mockSolana.nativeToken.symbol
)
XCTAssertEqual(
lastUpdatedAssets[safe: 2]?.network,
BraveWallet.NetworkInfo.mockSolanaTestnet
)
XCTAssertEqual(lastUpdatedAssets[safe: 2]?.totalBalance, self.solTestnetDecimalBalance)
XCTAssertEqual(
lastUpdatedAssets[safe: 2]?.price,
self.mockAssetPrices[safe: 2]?.price ?? ""
)
}
.store(in: &cancellables)
Expand Down
Loading