adjust for breaking abacus changes

dydxprotocol · Jun 28, 2024 · 5ed1476 · 5ed1476
1 parent b7c6356
commit 5ed1476
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileRewardsViewPresenter.swift b/...ydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileRewardsViewPresenter.swift
@@ -39,7 +39,7 @@ public class dydxProfileRewardsViewPresenter: HostedViewPresenter<dydxProfileRew
                 // allTimeRewardsAmount is commented out because we do not have historical data accurate for "all time"
                 // see thread: https://dydx-team.slack.com/archives/C066T2L1HM4/p1703107669507409
                 // self?.viewModel?.allTimeRewardsAmount = dydxFormatter.shared.format(decimal: account?.tradingRewards?.total?.decimalValue)
-                if let amount = account?.tradingRewards?.historical?["WEEKLY"]?.first?.amount {
+                if let amount = account?.tradingRewards?.filledHistory?["WEEKLY"]?.first?.amount {
                     self?.viewModel?.last7DaysRewardsAmount = dydxFormatter.shared.raw(number: NSNumber(value: amount), digits: 4)
                 }
             }

diff --git a/...ydxPresenters/_v4/Profile/TradingRewards/Components/dydxRewardsHistoryViewPresenter.swift b/...ydxPresenters/_v4/Profile/TradingRewards/Components/dydxRewardsHistoryViewPresenter.swift
@@ -79,7 +79,7 @@ public class dydxRewardsHistoryViewPresenter: HostedViewPresenter<dydxRewardsHis
 
         AbacusStateManager.shared.setHistoricalTradingRewardPeriod(period: self.period.abacusPeriod)
         AbacusStateManager.shared.state.account
-            .map(\.?.tradingRewards?.historical)
+            .map(\.?.tradingRewards?.filledHistory)
             .sink { [weak self] historicalRewards in
                 self?.viewModel?.onSelectionChanged = {[weak self] index in
                     guard let self = self else { return }

diff --git a/...rs/dydxPresenters/_v4/Profile/TradingRewards/Components/dydxRewardsSummaryPresenter.swift b/...rs/dydxPresenters/_v4/Profile/TradingRewards/Components/dydxRewardsSummaryPresenter.swift
@@ -32,7 +32,7 @@ public class dydxRewardsSummaryViewPresenter: HostedViewPresenter<dydxRewardsSum
                 // allTimeRewardsAmount is commented out because we do not have historical data accurate for "all time"
                 // see thread: https://dydx-team.slack.com/archives/C066T2L1HM4/p1703107669507409
                 // self?.viewModel?.allTimeRewardsAmount = dydxFormatter.shared.format(decimal: account?.tradingRewards?.total?.decimalValue)
-                if let thisWeekRewards = account?.tradingRewards?.historical?["WEEKLY"]?.first {
+                if let thisWeekRewards = account?.tradingRewards?.filledHistory?["WEEKLY"]?.first {
                     self?.viewModel?.last7DaysRewardsAmount = dydxFormatter.shared.raw(number: NSNumber(value: thisWeekRewards.amount), digits: 4)
                     let startedAt = dydxFormatter.shared.millisecondsToDate(thisWeekRewards.startedAtInMilliseconds, format: .MMM_d)
                     let endedAt = dydxFormatter.shared.millisecondsToDate(thisWeekRewards.endedAtInMilliseconds, format: .MMM_d)