Merge branch 'trunk' into task/22447-stats-traffic-update-ui-tests

Author: staskus

WordPress/Classes/ViewRelated/Jetpack/Install/JetpackNativeConnectionService.swift

@@ -76,6 +76,7 @@ final class JetpackNativeConnectionService: NSObject {
                     }
                     return .failure(.remote(original.localizedDescription))
                 }
+            completion(result)
         }
     }
 }

WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift

@@ -40,8 +40,8 @@ final class SiteStatsPeriodTableViewController: SiteStatsBaseTableViewController
         return ImmuTableDiffableViewHandler(takeOver: self, with: analyticsTracker)
     }()
 
-    init(selectedDate: Date, selectedPeriod: StatsPeriodUnit) {
-        datePickerViewModel = StatsTrafficDatePickerViewModel(period: selectedPeriod, date: selectedDate)
+    init(date: Date, period: StatsPeriodUnit) {
+        datePickerViewModel = StatsTrafficDatePickerViewModel(period: period, date: date)
         datePickerView = StatsTrafficDatePickerView(viewModel: datePickerViewModel)
         super.init(nibName: nil, bundle: nil)
         tableStyle = .insetGrouped
@@ -159,7 +159,6 @@ private extension SiteStatsPeriodTableViewController {
         tableHandler.diffableDataSource.apply(viewModel.tableViewSnapshot(), animatingDifferences: false)
 
         refreshControl.endRefreshing()
-//        tableHeaderView?.animateGhostLayers(viewModel.isFetchingChart() == true)
 
         if viewModel.fetchingFailed() {
             displayFailureViewIfNecessary()

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

@@ -1,5 +1,4 @@
 import UIKit
-import SwiftUI
 
 enum StatsPeriodType: Int, FilterTabBarItem, CaseIterable {
     case insights = 0
@@ -80,16 +79,16 @@ class SiteStatsDashboardViewController: UIViewController {
     private var insightsTableViewController = SiteStatsInsightsTableViewController.loadFromStoryboard()
     private lazy var periodTableViewControllerDeprecated = SiteStatsPeriodTableViewControllerDeprecated.loadFromStoryboard()
     private lazy var trafficTableViewController = {
-        let selectedDate: Date
-        if let date = getLastSelectedDateFromUserDefaults() {
-            selectedDate = date
+        let date: Date
+        if let selectedDate = getLastSelectedDateFromUserDefaults() {
+            date = selectedDate
         } else {
-            selectedDate = StatsDataHelper.currentDateForSite()
+            date = StatsDataHelper.currentDateForSite()
         }
 
-        let selectedPeriod = StatsPeriodUnit(rawValue: currentSelectedPeriod.rawValue - 1) ?? .day
+        let currentPeriod = StatsPeriodUnit(rawValue: currentSelectedPeriod.rawValue - 1) ?? .day
 
-        return SiteStatsPeriodTableViewController(selectedDate: selectedDate, selectedPeriod: selectedPeriod)
+        return SiteStatsPeriodTableViewController(date: date, period: currentPeriod)
     }()
     private var pageViewController: UIPageViewController?
     private lazy var displayedPeriods: [StatsPeriodType] = StatsPeriodType.displayedPeriods

WordPress/Classes/ViewRelated/Stats/Traffic/StatsTrafficDatePickerView.swift

@@ -38,7 +38,7 @@ struct StatsTrafficDatePickerView: View {
                 .foregroundColor(Color.DS.Foreground.primary)
                 .lineLimit(1)
 
-            Spacer().frame(width: Length.Padding.single)
+            Spacer().frame(width: Length.Padding.split)
 
             Button(action: {
                 viewModel.goToPreviousPeriod()
@@ -61,7 +61,8 @@ struct StatsTrafficDatePickerView: View {
                     .imageScale(.small)
                     .foregroundColor(isNextDisabled ? disabledColor : enabledColor)
                     .flipsForRightToLeftLayoutDirection(true)
-            }.disabled(isNextDisabled)
+            }
+            .disabled(isNextDisabled)
         }.padding(.vertical, Length.Padding.single)
             .padding(.horizontal, Length.Padding.double)
             .background(Color.DS.Background.primary)

WordPress/Classes/ViewRelated/Stats/Traffic/StatsTrafficDatePickerViewModel.swift

@@ -20,12 +20,12 @@ class StatsTrafficDatePickerViewModel: ObservableObject {
     }
 
     func goToPreviousPeriod() {
-        date = Calendar.current.date(byAdding: period.calendarComponent, value: -1, to: date) ?? date
+        date = StatsDataHelper.calendar.date(byAdding: period.calendarComponent, value: -1, to: date) ?? date
         track(isNext: false)
     }
 
     func goToNextPeriod() {
-        date = Calendar.current.date(byAdding: period.calendarComponent, value: 1, to: date) ?? date
+        date = StatsDataHelper.calendar.date(byAdding: period.calendarComponent, value: 1, to: date) ?? date
         track(isNext: true)
     }