diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/TradingRewards/dydxTradingRewardsViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/TradingRewards/dydxTradingRewardsViewPresenter.swift index 5a6be22c6..c28f97390 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/TradingRewards/dydxTradingRewardsViewPresenter.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/TradingRewards/dydxTradingRewardsViewPresenter.swift @@ -57,19 +57,22 @@ private class dydxTradingRewardsViewPresenter: HostedViewPresenter AnyView? { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 10) { - titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.PROFILES_PAGE.REWARDS_LAST_7_DAYS", params: nil) ?? "", value: last7DaysRewardsAmount) + titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.GENERAL.TIME_STRINGS.THIS_WEEK", params: nil) ?? "", value: last7DaysRewardsAmount) if let allTimeRewardsAmount = allTimeRewardsAmount { - titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.PROFILES_PAGE.REWARDS_ALL_TIME", params: nil) ?? "", value: allTimeRewardsAmount) + titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.GENERAL.TIME_STRINGS.ALL_TIME", params: nil) ?? "", value: allTimeRewardsAmount) } } Spacer() diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/Components/dydxRewardsSummaryView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/Components/dydxRewardsSummaryView.swift index fd8c6d12d..0b0c2a2dd 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/Components/dydxRewardsSummaryView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/Components/dydxRewardsSummaryView.swift @@ -21,9 +21,9 @@ public class dydxRewardsSummaryViewModel: dydxTitledCardViewModel { override func createContentView(parentStyle: ThemeStyle = ThemeStyle.defaultStyle, styleKey: String? = nil) -> AnyView? { HStack(spacing: 18) { HStack { - titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.PROFILES_PAGE.REWARDS_LAST_7_DAYS", params: nil) ?? "", primaryValue: last7DaysRewardsAmount, secondaryValue: last7DaysRewardsPeriod) + titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.GENERAL.TIME_STRINGS.THIS_WEEK", params: nil) ?? "", primaryValue: last7DaysRewardsAmount, secondaryValue: last7DaysRewardsPeriod) if let allTimeRewardsAmount = allTimeRewardsAmount { - titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.PROFILES_PAGE.REWARDS_ALL_TIME", params: nil) ?? "", primaryValue: allTimeRewardsAmount, secondaryValue: nil) + titleValueStack(title: DataLocalizer.shared?.localize(path: "APP.GENERAL.TIME_STRINGS.ALL_TIME", params: nil) ?? "", primaryValue: allTimeRewardsAmount, secondaryValue: nil) } } } diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/dydxTradingRewardsView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/dydxTradingRewardsView.swift index bb27bd39d..de49fa714 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/dydxTradingRewardsView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/TradingRewards/dydxTradingRewardsView.swift @@ -16,8 +16,11 @@ public class dydxTradingRewardsViewModel: PlatformViewModel { @Published public var rewardsSummary: dydxRewardsSummaryViewModel = dydxRewardsSummaryViewModel() @Published public var help: dydxRewardsHelpViewModel? = dydxRewardsHelpViewModel() @Published public var history: dydxRewardsHistoryViewModel? = dydxRewardsHistoryViewModel() - @Published public var governanceViewModel: dydxRewardsLearnMoreViewModel? - @Published public var stakingViewModel: dydxRewardsLearnMoreViewModel? + // removed as part of https://linear.app/dydx/issue/TRCL-3445/remove-governance-and-staking-cards + // non-zero chance we add back + // these vars and their corresponding files can be fully deleted if rewards is no longer relevant +// @Published public var governanceViewModel: dydxRewardsLearnMoreViewModel? +// @Published public var stakingViewModel: dydxRewardsLearnMoreViewModel? public init() { } @@ -37,8 +40,9 @@ public class dydxTradingRewardsViewModel: PlatformViewModel { self.rewardsSummary.createView(parentStyle: style) self.help?.createView(parentStyle: style) self.history?.createView(parentStyle: style) - self.governanceViewModel?.createView(parentStyle: style) - self.stakingViewModel?.createView(parentStyle: style) + // see comment near top +// self.governanceViewModel?.createView(parentStyle: style) +// self.stakingViewModel?.createView(parentStyle: style) Spacer(minLength: 80) } }