Change account expiry text to display 'less than a day'

mullvad · Nov 3, 2023 · c976d9c · c976d9c
1 parent 7e9bb04
commit c976d9c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/ios/MullvadVPN/Classes/CustomDateComponentsFormatting.swift b/ios/MullvadVPN/Classes/CustomDateComponentsFormatting.swift
@@ -15,22 +15,31 @@ extension CustomDateComponentsFormatting {
     ///
     /// The behaviour of that method differs from `DateComponentsFormatter`:
     ///
-    /// 1. Intervals of two years or more are formatted in years quantity.
-    /// 2. Otherwise intervals matching none of the above are formatted in days quantity.
+    /// 1. Intervals of less than a day return a custom string.
+    /// 2. Intervals of two years or more are formatted in years quantity.
+    /// 3. Otherwise intervals matching none of the above are formatted in days quantity.
     ///
     static func localizedString(
         from start: Date,
         to end: Date,
         calendar: Calendar = Calendar.current,
         unitsStyle: DateComponentsFormatter.UnitsStyle
     ) -> String? {
-        let years = calendar.dateComponents([.year], from: start, to: max(start, end)).year ?? 0
+        let dateComponents = calendar.dateComponents([.year, .day], from: start, to: max(start, end))
+
+        guard dateComponents.day != nil else {
+            return NSLocalizedString(
+                "ACCOUNT_EXPIRY_INAPP_NOTIFICATION_LESS_THAN_ONE_DAY",
+                value: "Less than a day",
+                comment: ""
+            )
+        }
 
         let formatter = DateComponentsFormatter()
         formatter.calendar = calendar
         formatter.unitsStyle = unitsStyle
         formatter.maximumUnitCount = 1
-        formatter.allowedUnits = years >= 2 ? .year : .day
+        formatter.allowedUnits = (dateComponents.year ?? 0) >= 2 ? .year : .day
 
         return formatter.string(from: start, to: max(start, end))
     }

diff --git a/...lvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift b/...lvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift
@@ -50,18 +50,7 @@ final class AccountExpiryInAppNotificationProvider: NotificationProvider, InAppN
         formatter.allowedUnits = [.minute, .hour, .day]
         formatter.maximumUnitCount = 1
 
-        let duration: String?
-        if accountExpiry.timeIntervalSince(now) < .minutes(1) {
-            duration = NSLocalizedString(
-                "ACCOUNT_EXPIRY_INAPP_NOTIFICATION_LESS_THAN_ONE_MINUTE",
-                value: "Less than a minute",
-                comment: ""
-            )
-        } else {
-            duration = formatter.string(from: now, to: accountExpiry)
-        }
-
-        guard let duration else { return nil }
+        guard let duration = formatter.string(from: now, to: accountExpiry) else { return nil }
 
         return InAppNotificationDescriptor(
             identifier: identifier,