@@ -47,10 +47,9 @@ final class StoreStatsV4PeriodViewController: UIViewController {
4747 @IBOutlet private weak var visitorsTitle : UILabel !
4848 @IBOutlet private weak var visitorsDataOrRedactedView : StoreStatsDataOrRedactedView !
4949 @IBOutlet private weak var ordersTitle : UILabel !
50- @IBOutlet private weak var ordersData : UILabel !
51- @IBOutlet private weak var conversionStackView : UIStackView !
50+ @IBOutlet private weak var ordersDataOrRedactedView : StoreStatsDataOrRedactedView !
5251 @IBOutlet private weak var conversionTitle : UILabel !
53- @IBOutlet private weak var conversionData : UILabel !
52+ @IBOutlet private weak var conversionDataOrRedactedView : StoreStatsDataOrRedactedView !
5453 @IBOutlet private weak var revenueTitle : UILabel !
5554 @IBOutlet private weak var revenueData : UILabel !
5655 @IBOutlet private weak var lineChartView : LineChartView !
@@ -181,7 +180,7 @@ final class StoreStatsV4PeriodViewController: UIViewController {
181180private extension StoreStatsV4PeriodViewController {
182181 func observeStatsLabels( ) {
183182 viewModel. orderStatsText. sink { [ weak self] orderStatsLabel in
184- self ? . ordersData . text = orderStatsLabel
183+ self ? . ordersDataOrRedactedView . data = orderStatsLabel
185184 } . store ( in: & cancellables)
186185
187186 viewModel. revenueStatsText. sink { [ weak self] revenueStatsLabel in
@@ -193,18 +192,19 @@ private extension StoreStatsV4PeriodViewController {
193192 } . store ( in: & cancellables)
194193
195194 viewModel. conversionStatsText. sink { [ weak self] conversionStatsLabel in
196- self ? . conversionData . text = conversionStatsLabel
195+ self ? . conversionDataOrRedactedView . data = conversionStatsLabel
197196 } . store ( in: & cancellables)
198197 }
199198
200199 func observeSelectedBarIndex( ) {
201200 viewModel. $selectedIntervalIndex. sink { [ weak self] selectedIndex in
202201 guard let self = self else { return }
203- let textColor = selectedIndex == nil ? Constants . statsTextColor: Constants . statsHighlightTextColor
204- self . ordersData. textColor = textColor
205- self . visitorsDataOrRedactedView. isHighlighted = selectedIndex != nil
202+ let isHighlighted = selectedIndex != nil
203+ let textColor = isHighlighted ? Constants . statsHighlightTextColor: Constants . statsTextColor
204+ self . ordersDataOrRedactedView. isHighlighted = isHighlighted
205+ self . visitorsDataOrRedactedView. isHighlighted = isHighlighted
206+ self . conversionDataOrRedactedView. isHighlighted = isHighlighted
206207 self . revenueData. textColor = textColor
207- self . conversionData. textColor = textColor
208208
209209 self . updateSiteVisitStatsAndConversionRate ( selectedIndex: selectedIndex)
210210 } . store ( in: & cancellables)
@@ -469,15 +469,15 @@ private extension StoreStatsV4PeriodViewController {
469469 }
470470
471471 func updateConversionStatsVisibility( visitStatsMode: SiteVisitStatsMode ) {
472- guard conversionData != nil else {
472+ guard conversionDataOrRedactedView != nil else {
473473 return
474474 }
475475
476476 switch visitStatsMode {
477477 case . hidden, . redactedDueToJetpack:
478- conversionStackView . isHidden = true
478+ conversionDataOrRedactedView . isHidden = true
479479 case . default:
480- conversionStackView . isHidden = false
480+ conversionDataOrRedactedView . isHidden = false
481481 }
482482 }
483483}
@@ -593,13 +593,13 @@ private extension StoreStatsV4PeriodViewController {
593593 reloadChart ( animateChart: animateChart)
594594
595595 view. accessibilityElements = [ ordersTitle as Any ,
596- ordersData as Any ,
596+ ordersDataOrRedactedView as Any ,
597597 visitorsTitle as Any ,
598598 visitorsDataOrRedactedView as Any ,
599599 revenueTitle as Any ,
600600 revenueData as Any ,
601601 conversionTitle as Any ,
602- conversionData as Any ,
602+ conversionDataOrRedactedView as Any ,
603603 yAxisAccessibilityView as Any ,
604604 xAxisAccessibilityView as Any ,
605605 chartAccessibilityView as Any ]
@@ -697,10 +697,6 @@ private extension StoreStatsV4PeriodViewController {
697697 }
698698
699699 func updateStatsDataToDefaultStyles( ) {
700- [ ordersData, conversionData] . forEach { label in
701- label? . font = Constants . statsFont
702- label? . textColor = Constants . statsTextColor
703- }
704700 revenueData. font = Constants . revenueFont
705701 revenueData. textColor = Constants . statsTextColor
706702 }
0 commit comments