Revert some of the changes

Author: kean

Modules/Sources/JetpackStats/Cards/ChartCard.swift

@@ -79,7 +79,7 @@ struct ChartCard: View {
     @ViewBuilder
     private var contentView: some View {
         VStack(spacing: Constants.step1) {
-            if dateRange.comparison != .off {
+            if dateRange.comparison != .off || metrics.count == 1 {
                 chartHeaderView
                     .padding(.trailing, -Constants.step0_5)
             }
@@ -92,7 +92,7 @@ struct ChartCard: View {
 
     private var chartHeaderView: some View {
         // Showing currently selected (not loaded period) by design
-        HStack(alignment: .top, spacing: 0) {
+        HStack(alignment: .center, spacing: 0) {
             if let data = viewModel.chartData[selectedMetric] {
                 ChartValuesSummaryView(
                     trend: .make(data, context: .regular),

Modules/Sources/JetpackStats/Cards/ChartCardViewModel.swift

@@ -165,15 +165,18 @@ final class ChartCardViewModel: ObservableObject, TrafficCardViewModel {
 
         let granularity = selectedGranularity ?? dateRange.dateInterval.preferredGranularity
 
-        let currentResponse = try await service.getSiteStats(
+        // Fetch both current and previous period data concurrently
+        async let currentResponseTask = service.getSiteStats(
             interval: dateRange.dateInterval,
             granularity: granularity
         )
-        let previousResponse = try await service.getSiteStats(
+        async let previousResponseTask = service.getSiteStats(
             interval: dateRange.effectiveComparisonInterval,
             granularity: granularity
         )
 
+        let (currentResponse, previousResponse) = try await (currentResponseTask, previousResponseTask)
+
         for (metric, dataPoints) in currentResponse.metrics {
             let previousDataPoints = previousResponse.metrics[metric] ?? []
 

Modules/Sources/JetpackStats/Cards/StandaloneChartCard.swift

@@ -98,7 +98,7 @@ struct StandaloneChartCard: View {
             ChartLegendView(
                 metric: metric,
                 currentPeriod: dateRange.dateInterval,
-                previousPeriod: dateRange.comparison != .off ? dateRange.effectiveComparisonInterval : nil
+                previousPeriod: dateRange.effectiveComparisonInterval
             )
         }
     }

Modules/Sources/JetpackStats/Cards/TopListViewModel.swift

@@ -210,7 +210,7 @@ final class TopListViewModel: ObservableObject, TrafficCardViewModel {
         }
 
         // Fetch current data
-        let current = try await service.getTopListData(
+        async let currentTask = service.getTopListData(
             fetchItem,
             metric: selection.metric,
             interval: dateRange.dateInterval,
@@ -219,20 +219,22 @@ final class TopListViewModel: ObservableObject, TrafficCardViewModel {
             locationLevel: selection.locationLevel
         )
 
-        // Fetch previous data only for items that support it and if comparison is enabled
-        let previous: TopListResponse?
-        if dateRange.comparison != .off && selection.item != .archive {
-            previous = try await service.getTopListData(
+        // Fetch previous data only for items that support it
+        async let previousTask: TopListResponse? = {
+            guard selection.item != .archive && dateRange.comparison != .off else {
+                return nil
+            }
+            return try await service.getTopListData(
                 fetchItem,
                 metric: selection.metric,
                 interval: dateRange.effectiveComparisonInterval,
                 granularity: granularity,
                 limit: fetchLimit,
                 locationLevel: selection.locationLevel
             )
-        } else {
-            previous = nil
-        }
+        }()
+
+        let (current, previous) = try await (currentTask, previousTask)
 
         let currentItems = filteredItems(current.items)
         let previousItems = filteredItems(previous?.items ?? [])