[Wallet/iOS] Fix #35986: Persist balance in Portfolio Assets

ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/AddCustomAssetView.swift

@@ -15,7 +15,6 @@ struct AddCustomAssetView: View {
   @ObservedObject var userAssetStore: UserAssetsStore
   var tokenNeedsTokenId: BraveWallet.BlockchainToken?
   var supportedTokenTypes: [TokenType] = [.token, .nft]
-  var onNewAssetAdded: (() -> Void)?
 
   @Environment(\.presentationMode) @Binding private var presentationMode
 
@@ -377,7 +376,6 @@ struct AddCustomAssetView: View {
     }
     userAssetStore.addUserAsset(token) { [self] success in
       if success {
-        onNewAssetAdded?()
         presentationMode.dismiss()
       } else {
         showError = true

ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/EditUserAssetsView.swift

@@ -75,7 +75,6 @@ struct EditUserAssetsView: View {
   var networkStore: NetworkStore
   var keyringStore: KeyringStore
   @ObservedObject var userAssetsStore: UserAssetsStore
-  var assetsUpdated: () -> Void
 
   @Environment(\.presentationMode) @Binding private var presentationMode
   @State private var query = ""
@@ -173,7 +172,6 @@ struct EditUserAssetsView: View {
         }
         ToolbarItemGroup(placement: .confirmationAction) {
           Button(action: {
-            assetsUpdated()
             presentationMode.dismiss()
           }) {
             Text(Strings.done)

ios/brave-ios/Sources/BraveWallet/Crypto/Portfolio/PortfolioView.swift

@@ -59,9 +59,7 @@ struct PortfolioView: View {
           networkStore: networkStore,
           keyringStore: keyringStore,
           userAssetsStore: portfolioStore.userAssetsStore
-        ) {
-          cryptoStore.updateAssets()
-        }
+        )
       })
     .background(Color.clear
       .sheet(isPresented: $isPresentingAssetsFilters) {
@@ -93,9 +91,7 @@ struct PortfolioView: View {
           keyringStore: keyringStore,
           userAssetStore: cryptoStore.nftStore.userAssetsStore,
           supportedTokenTypes: [.nft]
-        ) {
-          cryptoStore.updateAssets()
-        }
+        )
       })
     .background(Color.clear
       .sheet(isPresented: $isPresentingNFTsFilters) {

ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift

@@ -154,7 +154,12 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     self.ethTxManagerProxy = ethTxManagerProxy
     self.solTxManagerProxy = solTxManagerProxy
     self.ipfsApi = ipfsApi
-    self.userAssetManager = WalletUserAssetManager(rpcService: rpcService, walletService: walletService)
+    self.userAssetManager = WalletUserAssetManager(
+      keyringService: keyringService,
+      rpcService: rpcService,
+      walletService: walletService,
+      txService: txService
+    )
     self.origin = origin
 
     self.networkStore = .init(
@@ -246,7 +251,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
         guard let isUpdatingUserAssets = self?.isUpdatingUserAssets, !isUpdatingUserAssets else { return }
         self?.isUpdatingUserAssets = true
         Preferences.Wallet.migrateCoreToWalletUserAssetCompleted.reset()
-        WalletUserAssetGroup.removeAllGroup() {
+        self?.userAssetManager.removeUserAssetsAndBalance(for: nil) {
           self?.userAssetManager.migrateUserAssets(completion: {
             self?.updateAssets()
             self?.isUpdatingUserAssets = false
@@ -334,6 +339,9 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     marketStore.setupObservers()
     settingsStore.setupObservers()
 
+    // user asset manager's observers
+    userAssetManager.setupObservers()
+
     accountActivityStore?.setupObservers()
     assetDetailStore?.setupObservers()
     nftDetailStore?.setupObservers()
@@ -343,7 +351,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     swapTokenStore?.setupObservers()
   }
 
-  // A manual tear-down that nil all the wallet service observer classes 
+  // A manual tear-down that nil all the wallet service observer classes
   public func tearDown() {
     keyringServiceObserver = nil
     walletServiceObserver = nil
@@ -358,6 +366,9 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     marketStore.tearDown()
     settingsStore.tearDown()
 
+    // user asset manager
+    userAssetManager.tearDown()
+
     accountActivityStore?.tearDown()
     assetDetailStore?.tearDown()
     nftDetailStore?.tearDown()
@@ -561,7 +572,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     }
     let store = SignMessageRequestStore(
       requests: requests,
-          keyringService: keyringService,
+      keyringService: keyringService,
       rpcService: rpcService,
       assetRatioService: assetRatioService,
       blockchainRegistry: blockchainRegistry,
@@ -591,11 +602,13 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
   }
 
   func updateAutoDiscoveredAssets() {
-    // at this point, all auto-discovered assets have been added to CD
-    // update `Portfolio/Assets`
-    portfolioStore.update()
-    // fetch junk NFTs from SimpleHash which will also update `Portfolio/NFTs`
-    nftStore.fetchJunkNFTs()
+    // at this point, all auto-discovered assets have been added to CD. We now need to fetch and cache their balance
+    userAssetManager.refreshBalances { [weak self] in
+      // update `Portfolio/Assets`
+      self?.portfolioStore.update()
+      // fetch junk NFTs from SimpleHash which will also update `Portfolio/NFTs`
+      self?.nftStore.fetchJunkNFTs()
+    }
   }
 
   func prepare(isInitialOpen: Bool = false) {
@@ -633,7 +646,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
       self.pendingRequest = newPendingRequest
     }
   }
-
+  
   @MainActor
   func fetchPendingTransactions() async -> [BraveWallet.TransactionInfo] {
     let allAccounts = await keyringService.allAccounts().accounts
@@ -644,7 +657,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     }
     return await txService.pendingTransactions(networksForCoin: allNetworksForCoin, for: allAccounts)
   }
-
+  
   @MainActor
   func fetchPendingWebpageRequest() async -> PendingRequest? {
     if let chainRequest = await rpcService.pendingAddChainRequests().first {
@@ -688,7 +701,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
     }
     return pendingRequest != nil
   }
-
+  
   // Helper to store the completion block of an Add Network dapp request.
   typealias AddNetworkCompletion = (_ error: String?) -> Void
   // The completion closure(s) are handled in `onAddEthereumChainRequestCompleted`

ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NFTStore.swift

@@ -128,7 +128,7 @@ public class NFTStore: ObservableObject, WalletObserverStore {
       }
     }
   }
-
+  
   /// Current group to display
   @Published var displayType: NFTDisplayType = .visible
   /// View model for all NFT include visible, hidden and spams
@@ -194,6 +194,9 @@ public class NFTStore: ObservableObject, WalletObserverStore {
     self.assetManager = userAssetManager
     self.txService = txService
 
+    // user asset data update observer
+    self.assetManager.addUserAssetDataObserver(self)
+
     self.setupObservers()
 
     keyringService.isLocked { [self] isLocked in
@@ -267,6 +270,9 @@ public class NFTStore: ObservableObject, WalletObserverStore {
   func update(forceUpdateNFTBalances: Bool = false) {
     self.updateTask?.cancel()
     self.updateTask = Task { @MainActor in
+      let isLocked = await keyringService.isLocked()
+      guard !isLocked else { return } // `update() will be called after unlock`
+
       self.allAccounts = await keyringService.allAccounts().accounts
         .filter { account in
           WalletConstants.supportedCoinTypes().contains(account.coin)
@@ -544,7 +550,7 @@ public class NFTStore: ObservableObject, WalletObserverStore {
     )
 
     let allUserNFTs = (userVisibleNFTs + userHiddenNFTs + spams).flatMap(\.tokens)
-
+    
     let groups: [NFTGroupViewModel]
     switch filters.groupBy {
     case .none:
@@ -623,7 +629,7 @@ public class NFTStore: ObservableObject, WalletObserverStore {
       guard let self else { return }
       let selectedAccounts = self.filters.accounts.filter(\.isSelected).map(\.model)
       let selectedNetworks = self.filters.networks.filter(\.isSelected).map(\.model)
-
+      
       let unionedSpamNFTs = computeSpamNFTs(
         selectedNetworks: selectedNetworks,
         selectedAccounts: selectedAccounts,
@@ -662,6 +668,16 @@ extension NFTStore: PreferencesObserver {
   }
 }
 
+extension NFTStore: WalletUserAssetDataObserver {
+  public func cachedBalanceRefreshed() {
+    update()
+  }
+
+  public func userAssetUpdated() {
+    update()
+  }
+}
+
 private extension Array where Element == NFTAssetViewModel {
   /// Optionally filters out NFTs not belonging to the given `selectedAccounts`.
   func optionallyFilterUnownedNFTs(

ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NetworkStore.swift

@@ -310,8 +310,8 @@ public class NetworkStore: ObservableObject, WalletObserverStore {
         if network.id.lowercased() == defaultSelectedChainId.lowercased() {
           rpcService.setNetwork(BraveWallet.MainnetChainId, coin: .eth, origin: nil, completion: { _ in })
         }
-        // delete local stored user assets that in this custom network
-        assetManager.removeGroup(for: network.walletUserAssetGroupId, completion: nil)
+        // delete local stored user assets' balances that in this custom network
+        assetManager.removeUserAssetsAndBalance(for: network, completion: nil)
         Task {
           await updateChainList()
         }