Merge branch 'stop-showing-the-changelog-to-users-when-it-is-empty-io…

…s-346'
mullvad · Oct 17, 2023 · 391268b · 391268b
2 parents 9ea790f + d903827
commit 391268b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift
@@ -326,7 +326,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
         }
 
         // Change log can be presented simultaneously with other routes.
-        if !appPreferences.isSeenLatestChanges {
+        if !appPreferences.hasSeenLastChanges {
             routes.append(.changelog)
         }
 
@@ -995,12 +995,13 @@ extension DeviceState {
 }
 
 fileprivate extension AppPreferencesDataSource {
-    var isSeenLatestChanges: Bool {
-        self.lastSeenChangeLogVersion == Bundle.main.shortVersion
+    var hasSeenLastChanges: Bool {
+        !ChangeLogInteractor().hasNewChanges ||
+            (lastSeenChangeLogVersion == Bundle.main.shortVersion)
     }
 
     mutating func markChangeLogSeen() {
-        self.lastSeenChangeLogVersion = Bundle.main.shortVersion
+        lastSeenChangeLogVersion = Bundle.main.shortVersion
     }
 
     // swiftlint:disable:next file_length

diff --git a/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift b/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogInteractor.swift
@@ -12,6 +12,11 @@ import MullvadLogging
 final class ChangeLogInteractor {
     private let logger = Logger(label: "ChangeLogInteractor")
     private var items: [String] = []
+
+    var hasNewChanges: Bool {
+        !items.isEmpty
+    }
+
     var viewModel: ChangeLogViewModel {
         return ChangeLogViewModel(
             body: items