Fix #2512: Update Rewards Balance Report fetch

BraveRewardsUI/Settings/Tips/Details/TipsDetailViewController.swift

@@ -49,11 +49,13 @@ class TipsDetailViewController: UIViewController {
   }
 
   private func loadData() {
-    _ = getTipsThisMonth().then {
-      totalBatTips = $0.oneTimeDonation + $0.recurringDonation
+    getTipsThisMonth { [weak self] report in
+      guard let self = self else { return }
+      self.totalBatTips = report.oneTimeDonation + report.recurringDonation
+      (self.view as? SettingsTableView)?.tableView.reloadData()
     }
 
-    state.ledger.listOneTimeTips {[weak self] infoList in
+    state.ledger.listOneTimeTips { [weak self] infoList in
       guard let self = self else { return }
       infoList.forEach({$0.category = Int32(RewardsType.oneTimeTip.rawValue)})
       self.tipsList.append(contentsOf: infoList)
@@ -163,14 +165,12 @@ extension TipsDetailViewController: UITableViewDataSource, UITableViewDelegate {
 }
 
 extension TipsDetailViewController {
-  fileprivate func getTipsThisMonth() -> BalanceReportInfo {
+  fileprivate func getTipsThisMonth(_ completion: @escaping (BalanceReportInfo) -> Void) {
     let month = Date().currentMonthNumber
     let year = Date().currentYear
-    var report = BalanceReportInfo()
     state.ledger.balanceReport(for: ActivityMonth(rawValue: month) ?? .any, year: Int32(year)) {
-      if let balance = $0 { report = balance }
+      completion($0 ?? .init())
     }
-    return report
   }
 
   func setupLedgerObservers() {

BraveRewardsUI/Wallet/RewardsSummaryProtocol.swift

@@ -20,7 +20,7 @@ protocol RewardsSummaryProtocol {
   var summaryPeriod: String { get }
 
   /// Rows showing different types of earnings, tips etc.
-  var summaryRows: [RowView] { get }
+  func summaryRows(_ completion: @escaping ([RowView]) -> Void)
 
   /// A view informing users about contributing to unverified publishers.
   func disclaimerLabels(for pendingContributionTotal: Double) -> [LinkLabel]
@@ -49,33 +49,35 @@ extension RewardsSummaryProtocol {
     return "\(now.currentMonthName().uppercased()) \(now.currentYear)"
   }
 
-  var summaryRows: [RowView] {
+  func summaryRows(_ completion: @escaping ([RowView]) -> Void) {
     let now = Date()
     guard let activityMonth = ActivityMonth(rawValue: now.currentMonthNumber) else {
-      return []
+      completion([])
+      return
     }
 
     let ledger = state.ledger
-    var activities: [Activity] = []
     ledger.balanceReport(for: activityMonth, year: Int32(now.currentYear)) { balance in
       guard let balance = balance else { return }
-      activities = [
+      let rows: [RowView] = [
         Activity(balance.grants, title: Strings.totalGrantsClaimed, color: BraveUX.adsTintColor),
         Activity(balance.earningFromAds, title: Strings.earningFromAds, color: BraveUX.adsTintColor),
         Activity(balance.autoContribute, title: Strings.autoContribute, color: BraveUX.autoContributeTintColor),
         Activity(balance.oneTimeDonation, title: Strings.oneTimeTips, color: BraveUX.tipsTintColor),
         Activity(balance.recurringDonation, title: Strings.monthlyTips, color: BraveUX.tipsTintColor)
-      ].compactMap { $0 }
-    }
-    return activities.map {
-      let bat = $0.value.displayString
-      let usd = ledger.dollarStringForBATAmount(bat)
-      return RowView(
-        title: $0.title,
-        cryptoValueColor: $0.color,
-        batValue: bat,
-        usdDollarValue: usd
-      )
+      ]
+      .compactMap { $0 }
+      .map {
+        let bat = $0.value.displayString
+        let usd = ledger.dollarStringForBATAmount(bat)
+        return RowView(
+          title: $0.title,
+          cryptoValueColor: $0.color,
+          batValue: bat,
+          usdDollarValue: usd
+        )
+      }
+      completion(rows)
     }
   }
 

BraveRewardsUI/Wallet/WalletViewController.swift

@@ -102,7 +102,9 @@ class WalletViewController: UIViewController, RewardsSummaryProtocol {
     updateExternalWallet()
 
     rewardsSummaryView.monthYearLabel.text = summaryPeriod
-    rewardsSummaryView.rows = summaryRows
+    summaryRows { [weak self] rows in
+      self?.rewardsSummaryView.rows = rows
+    }
 
     reloadUIState()
     setupPublisherView(publisherSummaryView)
@@ -719,24 +721,26 @@ extension WalletViewController {
       guard let self = self, self.isViewLoaded else {
         return
       }
-      let rows = self.summaryRows.map({ row -> RowView in
-        row.isHidden = true
-        return row
-      })
-      UIView.animate(withDuration: 0.15, animations: {
-        self.rewardsSummaryView.stackView.arrangedSubviews.forEach({
+      self.summaryRows { [weak self] rows in
+        guard let self = self else { return }
+        rows.forEach {
           $0.isHidden = true
-          $0.alpha = 0
-        })
-      }, completion: { _ in
-        self.rewardsSummaryView.rows = rows
+        }
         UIView.animate(withDuration: 0.15, animations: {
           self.rewardsSummaryView.stackView.arrangedSubviews.forEach({
-            $0.isHidden = false
-            $0.alpha = 1
+            $0.isHidden = true
+            $0.alpha = 0
+          })
+        }, completion: { _ in
+          self.rewardsSummaryView.rows = rows
+          UIView.animate(withDuration: 0.15, animations: {
+            self.rewardsSummaryView.stackView.arrangedSubviews.forEach({
+              $0.isHidden = false
+              $0.alpha = 1
+            })
           })
         })
-      })
+      }
     }
     ledgerObserver.pendingContributionAdded = { [weak self] in
       self?.updatePendingContributionsState()