Skip to content

Commit 22e4fe2

Browse files
committed
Merge timezon branch
2 parents 72e118c + eedc08e commit 22e4fe2

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

WooCommerce/Classes/Extensions/UserDefaults+Woo.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ extension UserDefaults {
1111
case defaultSiteAddress
1212
case defaultStoreID
1313
case defaultStoreName
14-
case defaultStoreTimeZoneGMTOffset
1514
case defaultStoreCurrencySettings
1615
case defaultAnonymousID
1716
case defaultRoles

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,6 @@ private extension DefaultStoresManager {
510510
// Non-critical store info
511511
UserDefaults.group?[.defaultStoreID] = siteID
512512
UserDefaults.group?[.defaultStoreName] = sessionManager.defaultSite?.name
513-
UserDefaults.group?[.defaultStoreTimeZoneGMTOffset] = sessionManager.defaultSite?.siteTimezone.secondsFromGMT() ?? TimeZone.current.secondsFromGMT()
514513

515514
// Reload widgets UI
516515
WidgetCenter.shared.reloadAllTimelines()

WooCommerce/StoreWidgets/StoreInfoDataService.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,10 @@ final class StoreInfoDataService {
2525
///
2626
private var network: AlamofireNetwork
2727

28-
/// Timezone of the website
29-
///
30-
private let siteTimeZone: TimeZone
31-
32-
init(authToken: String, siteTimeZone: TimeZone) {
28+
init(authToken: String) {
3329
network = AlamofireNetwork(credentials: Credentials(authToken: authToken))
3430
orderStatsRemoteV4 = OrderStatsRemoteV4(network: network)
3531
siteVisitStatsRemote = SiteVisitStatsRemote(network: network)
36-
self.siteTimeZone = siteTimeZone
3732
}
3833

3934
/// Async function that fetches todays stats data.
@@ -63,12 +58,12 @@ private extension StoreInfoDataService {
6358
///
6459
func fetchTodaysRevenueAndOrders(for storeID: Int64) async throws -> OrderStatsV4 {
6560
try await withCheckedThrowingContinuation { continuation in
66-
// `WKWebView` is accessed internally, we are foreced to dispatch the call in the main thread.
61+
// `WKWebView` is accessed internally, we are forced to dispatch the call in the main thread.
6762
Task { @MainActor in
6863
orderStatsRemoteV4.loadOrderStats(for: storeID,
6964
unit: .hourly,
70-
earliestDateToInclude: Date().startOfDay(timezone: siteTimeZone),
71-
latestDateToInclude: Date().endOfDay(timezone: siteTimeZone),
65+
earliestDateToInclude: Date().startOfDay(timezone: .current),
66+
latestDateToInclude: Date().endOfDay(timezone: .current),
7267
quantity: 24,
7368
forceRefresh: true) { result in
7469
continuation.resume(with: result)
@@ -85,7 +80,7 @@ private extension StoreInfoDataService {
8580
Task { @MainActor in
8681
siteVisitStatsRemote.loadSiteVisitorStats(for: storeID,
8782
unit: .day,
88-
latestDateToInclude: Date().endOfDay(timezone: siteTimeZone),
83+
latestDateToInclude: Date().endOfDay(timezone: .current),
8984
quantity: 1) { result in
9085
continuation.resume(with: result)
9186
}

WooCommerce/StoreWidgets/StoreInfoProvider.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ final class StoreInfoProvider: TimelineProvider {
8383
return completion(Timeline<StoreInfoEntry>(entries: [StoreInfoEntry.notConnected], policy: .never))
8484
}
8585

86-
let strongService = StoreInfoDataService(authToken: dependencies.authToken, siteTimeZone: dependencies.storeTimeZone)
86+
let strongService = StoreInfoDataService(authToken: dependencies.authToken)
8787
networkService = strongService
8888
Task {
8989
do {
@@ -121,7 +121,6 @@ private extension StoreInfoProvider {
121121
let authToken: String
122122
let storeID: Int64
123123
let storeName: String
124-
let storeTimeZone: TimeZone
125124
let storeCurrencySettings: CurrencySettings
126125
}
127126

@@ -132,16 +131,13 @@ private extension StoreInfoProvider {
132131
guard let authToken = keychain[WooConstants.authToken],
133132
let storeID = UserDefaults.group?[.defaultStoreID] as? Int64,
134133
let storeName = UserDefaults.group?[.defaultStoreName] as? String,
135-
let storeTimeZoneGMTOffset = UserDefaults.group?[.defaultStoreTimeZoneGMTOffset] as? Int,
136-
let storeTimeZone = TimeZone(secondsFromGMT: storeTimeZoneGMTOffset),
137134
let storeCurrencySettingsData = UserDefaults.group?[.defaultStoreCurrencySettings] as? Data,
138135
let storeCurrencySettings = try? JSONDecoder().decode(CurrencySettings.self, from: storeCurrencySettingsData) else {
139136
return nil
140137
}
141138
return Dependencies(authToken: authToken,
142139
storeID: storeID,
143140
storeName: storeName,
144-
storeTimeZone: storeTimeZone,
145141
storeCurrencySettings: storeCurrencySettings)
146142
}
147143
}

0 commit comments

Comments
 (0)