Merge pull request #8448 from woocommerce/fix/isSameYear-extension

[Analytics Hub] Use custom timezone in isSameYear Date extension

Author: ealeksandrov

WooCommerce/Classes/Extensions/Date+Woo.swift

@@ -97,8 +97,7 @@ extension Date {
 
     /// Returns `true` if `self` is in the same year as `other`.
     ///
-    func isSameYear(as otherDate: Date) -> Bool {
-        let calendar = Calendar.current
+    func isSameYear(as otherDate: Date, using calendar: Calendar = .current) -> Bool {
         guard let selfYear = calendar.dateComponents([.year], from: self).year,
             let otherYear = calendar.dateComponents([.year], from: otherDate).year else {
                 return false

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRange.swift

@@ -10,7 +10,7 @@ struct AnalyticsHubTimeRange {
         }
 
         let startDateDescription: String
-        if start.isSameYear(as: end) {
+        if start.isSameYear(as: end, using: calendar) {
             startDateDescription = DateFormatter.Stats.createAnalyticsHubDayMonthFormatter(timezone: timezone).string(from: start)
         } else {
             startDateDescription = DateFormatter.Stats.createAnalyticsHubDayMonthYearFormatter(timezone: timezone).string(from: start)