From 73008d1a5bce785af8879d42ff9591d0c2446dd7 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Wed, 26 Feb 2020 17:00:37 +0100 Subject: [PATCH] Automated cherry pick of #3967 (#3969) * Fix in-app notification crashing when receiving multiple * Dismiss the overlay when tap without waiting for interaction manager Co-authored-by: Elias Nahum --- app/actions/navigation/index.js | 1 - app/actions/navigation/index.test.js | 1 - app/screens/notification/notification.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/actions/navigation/index.js b/app/actions/navigation/index.js index 48ae3da72..3bda5eee4 100644 --- a/app/actions/navigation/index.js +++ b/app/actions/navigation/index.js @@ -347,7 +347,6 @@ export function showOverlay(name, passProps, options = {}) { Navigation.showOverlay({ component: { - id: name, name, passProps, options: merge(defaultOptions, options), diff --git a/app/actions/navigation/index.test.js b/app/actions/navigation/index.test.js index ad0cf0014..2f9c26c3a 100644 --- a/app/actions/navigation/index.test.js +++ b/app/actions/navigation/index.test.js @@ -440,7 +440,6 @@ describe('app/actions/navigation', () => { const expectedLayout = { component: { - id: name, name, passProps, options: merge(defaultOptions, options), diff --git a/app/screens/notification/notification.js b/app/screens/notification/notification.js index 6284b4b98..c01c831e6 100644 --- a/app/screens/notification/notification.js +++ b/app/screens/notification/notification.js @@ -145,8 +145,8 @@ export default class Notification extends PureComponent { EventEmitter.emit(NavigationTypes.CLOSE_MAIN_SIDEABR); EventEmitter.emit(NavigationTypes.CLOSE_SETTINGS_SIDEBAR); + this.dismissOverlay(); InteractionManager.runAfterInteractions(() => { - this.dismissOverlay(); if (!notification.localNotification) { actions.loadFromPushNotification(notification); }