Merge pull request #7534 from woocommerce/fix/7318-cancel-all-local-notifs-on-login

jaclync · web-flow · commit 010953a692dc · 2022-08-22T15:36:32.000+08:00
Cancel all local notification cases on login success
diff --git a/WooCommerce/Classes/Authentication/AuthenticationManager.swift b/WooCommerce/Classes/Authentication/AuthenticationManager.swift
@@ -341,7 +341,7 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {
         }
 
         if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginErrorNotifications) {
-            ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: [.loginSiteAddressError])
+            ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: LocalNotification.Scenario.allCases)
         }
 
         let matcher = ULAccountMatcher(storageManager: storageManager)
@@ -496,7 +496,7 @@ private extension AuthenticationManager {
         }
 
         if let notification = notification {
-            ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: [notification.scenario])
+            ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: LocalNotification.Scenario.allCases)
             ServiceLocator.pushNotesManager.requestLocalNotification(notification,
                                                                      // 24 hours from now.
                                                                      trigger: UNTimeIntervalNotificationTrigger(timeInterval: 86400, repeats: false))

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ extension AuthenticationManager: WordPressAuthenticatorDelegate {`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginErrorNotifications) {`
`344`		`- ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: [.loginSiteAddressError])`
	`344`	`+ ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: LocalNotification.Scenario.allCases)`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`let matcher = ULAccountMatcher(storageManager: storageManager)`
`@@ -496,7 +496,7 @@ private extension AuthenticationManager {`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`if let notification = notification {`
`499`		`- ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: [notification.scenario])`
	`499`	`+ ServiceLocator.pushNotesManager.cancelLocalNotification(scenarios: LocalNotification.Scenario.allCases)`
`500`	`500`	`ServiceLocator.pushNotesManager.requestLocalNotification(notification,`
`501`	`501`	`// 24 hours from now.`
`502`	`502`	`trigger: UNTimeIntervalNotificationTrigger(timeInterval: 86400, repeats: false))`