Merge branch 'task/19447-phase-1' into task/19447-phase-1-test

Author: hassaanelgarem

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackOverlayFrequencyTracker.swift

@@ -63,7 +63,7 @@ class JetpackOverlayFrequencyTracker {
         guard let lastSavedGenericDate = lastSavedGenericDate else {
             return true // First overlay ever
         }
-        let secondsSinceLastSavedGenericDate = lastSavedGenericDate.timeIntervalSinceNow
+        let secondsSinceLastSavedGenericDate = -lastSavedGenericDate.timeIntervalSinceNow
         let generalFreqPassed = secondsSinceLastSavedGenericDate > frequencyConfig.generalInSeconds
         if generalFreqPassed == false {
             return false // An overlay was shown recently so we can't show one now
@@ -73,7 +73,7 @@ class JetpackOverlayFrequencyTracker {
             return true // This specific overlay was never shown, so we can show it
         }
 
-        let secondsSinceLastSavedSourceDate = lastSavedSourceDate.timeIntervalSinceNow
+        let secondsSinceLastSavedSourceDate = -lastSavedSourceDate.timeIntervalSinceNow
         let featureSpecificFreqPassed = secondsSinceLastSavedSourceDate > frequencyConfig.featureSpecificInSeconds
         // Check if this specific overlay was shown recently
         return featureSpecificFreqPassed

WordPress/WordPressTest/JetpackOverlayFrequencyTrackerTests.swift

@@ -95,15 +95,15 @@ final class JetpackOverlayFrequencyTrackerTests: XCTestCase {
         XCTAssertTrue(tracker.shouldShow()) // First time
 
         // Given
-        let threeDaysAgo = Date(timeInterval: Constants.threeDaysInSeconds, since: Date())
+        let threeDaysAgo = Date(timeInterval: -Constants.threeDaysInSeconds, since: Date())
         mockUserDefaults.set(threeDaysAgo, forKey: statsKey)
         mockUserDefaults.set(threeDaysAgo, forKey: genericKey)
 
         // When & Then
         XCTAssertFalse(tracker.shouldShow()) // Before feature-specific frequency have passed
 
         // Given
-        let fiveDaysAgo = Date(timeInterval: Constants.fiveDaysInSeconds, since: Date())
+        let fiveDaysAgo = Date(timeInterval: -Constants.fiveDaysInSeconds, since: Date())
         mockUserDefaults.set(fiveDaysAgo, forKey: statsKey)
         mockUserDefaults.set(fiveDaysAgo, forKey: genericKey)
 
@@ -127,7 +127,7 @@ final class JetpackOverlayFrequencyTrackerTests: XCTestCase {
         XCTAssertTrue(readerTracker.shouldShow()) // First time
 
         // Given
-        let oneDayAgo = Date(timeInterval: Constants.oneDayInSeconds, since: Date())
+        let oneDayAgo = Date(timeInterval: -Constants.oneDayInSeconds, since: Date())
         mockUserDefaults.set(oneDayAgo, forKey: statsKey)
         mockUserDefaults.set(oneDayAgo, forKey: genericKey)
 
@@ -136,7 +136,7 @@ final class JetpackOverlayFrequencyTrackerTests: XCTestCase {
         XCTAssertFalse(readerTracker.shouldShow()) // Before generic frequency have passed
 
         // Given
-        let threeDaysAgo = Date(timeInterval: Constants.threeDaysInSeconds, since: Date())
+        let threeDaysAgo = Date(timeInterval: -Constants.threeDaysInSeconds, since: Date())
         mockUserDefaults.set(threeDaysAgo, forKey: statsKey)
         mockUserDefaults.set(threeDaysAgo, forKey: genericKey)