Merge pull request #4160 from Expensify/horus-remove-notification-bad…

…ge-icon Clear push notifications when logging out
Expensify · Jul 22, 2021 · c9c2ee9 · c9c2ee9
2 parents ed33dcb + dc0f373
commit c9c2ee9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/src/Expensify.js b/src/Expensify.js
@@ -101,6 +101,9 @@ class Expensify extends PureComponent {
                 // boot screen right away
                 if (!this.getAuthToken()) {
                     this.hideSplash();
+
+                    // In case of a crash that led to disconnection, we want to remove all the push notifications.
+                    PushNotification.clearNotifications();
                 }
 
                 this.setState({isOnyxMigrated: true});

diff --git a/src/libs/Notification/PushNotification/index.js b/src/libs/Notification/PushNotification/index.js
@@ -7,4 +7,5 @@ export default {
     onReceived: () => {},
     onSelected: () => {},
     TYPE: NotificationType,
+    clearNotifications: () => {},
 };
diff --git a/src/libs/Notification/PushNotification/index.native.js b/src/libs/Notification/PushNotification/index.native.js
@@ -141,10 +141,18 @@ function onSelected(notificationType, callback) {
     bind(notificationType, callback, EventType.NotificationResponse);
 }
 
+/**
+ * Clear all push notifications
+ */
+function clearNotifications() {
+    UrbanAirship.clearNotifications();
+}
+
 export default {
     register,
     deregister,
     onReceived,
     onSelected,
     TYPE: NotificationType,
+    clearNotifications,
 };
diff --git a/src/libs/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js
@@ -28,6 +28,7 @@ Onyx.connect({
 function redirectToSignIn(errorMessage) {
     UnreadIndicatorUpdater.stopListeningForReportChanges();
     PushNotification.deregister();
+    PushNotification.clearNotifications();
     Pusher.disconnect();
     Timers.clearAll();