Fix #6652: Asset auto-discovery on wallet open (#6751)

Call `discoverAssetsOnAllSupportedChains` when Wallet is opened. Show loading state beside Assets in Section title.
brave · Jan 16, 2023 · fb96c48 · fb96c48
1 parent 902f49f
commit fb96c48
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/Sources/BraveWallet/Crypto/CryptoPagesView.swift b/Sources/BraveWallet/Crypto/CryptoPagesView.swift
@@ -33,7 +33,7 @@ struct CryptoPagesView: View {
         // Give the animation time
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
           self.fetchedPendingRequestsThisSession = true
-          self.cryptoStore.prepare()
+          self.cryptoStore.prepare(isInitialOpen: true)
         }
       }
     }

diff --git a/Sources/BraveWallet/Crypto/Portfolio/PortfolioView.swift b/Sources/BraveWallet/Crypto/Portfolio/PortfolioView.swift
@@ -152,6 +152,10 @@ struct PortfolioView: View {
       }, header: {
         HStack {
           Text(Strings.Wallet.assetsTitle)
+          if portfolioStore.isLoadingDiscoverAssets {
+            ProgressView()
+              .padding(.leading, 5)
+          }
           Spacer()
           networkFilterButton
         }

diff --git a/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift b/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift
@@ -277,8 +277,11 @@ public class CryptoStore: ObservableObject {
     }
   }
 
-  func prepare() {
+  func prepare(isInitialOpen: Bool = false) {
     Task { @MainActor in
+      if isInitialOpen {
+        portfolioStore.discoverAssetsOnAllSupportedChains()
+      }
       let pendingTransactions = await fetchPendingTransactions()
       if !pendingTransactions.isEmpty {
         if self.buySendSwapDestination != nil {

diff --git a/Sources/BraveWallet/Crypto/Stores/PortfolioStore.swift b/Sources/BraveWallet/Crypto/Stores/PortfolioStore.swift
@@ -92,6 +92,7 @@ public class PortfolioStore: ObservableObject {
       update()
     }
   }
+  @Published private(set) var isLoadingDiscoverAssets: Bool = false
 
   public private(set) lazy var userAssetsStore: UserAssetsStore = .init(
     walletService: self.walletService,
@@ -147,6 +148,11 @@ public class PortfolioStore: ObservableObject {
     }
   }
 
+  func discoverAssetsOnAllSupportedChains() {
+    isLoadingDiscoverAssets = true
+    walletService.discoverAssetsOnAllSupportedChains()
+  }
+
   func update() {
     self.updateTask?.cancel()
     self.updateTask = Task { @MainActor in
@@ -419,5 +425,9 @@ extension PortfolioStore: BraveWalletBraveWalletServiceObserver {
   }
 
   public func onDiscoverAssetsCompleted(_ discoveredAssets: [BraveWallet.BlockchainToken]) {
+    isLoadingDiscoverAssets = false
+    if !discoveredAssets.isEmpty {
+      update()
+    }
   }
 }