From a68ad6fd0390fc75191112661ce057b1168b5661 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 16 Jun 2021 19:00:50 +0300 Subject: [PATCH] Notifications: Load global settings on app launch (#1169) --- src/components/main/Main.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/main/Main.tsx b/src/components/main/Main.tsx index 0ea6a46db..052898d64 100644 --- a/src/components/main/Main.tsx +++ b/src/components/main/Main.tsx @@ -48,7 +48,9 @@ type StateProps = { isHistoryCalendarOpen: boolean; }; -type DispatchProps = Pick; +type DispatchProps = Pick; const ANIMATION_DURATION = 350; const NOTIFICATION_INTERVAL = 1000; @@ -71,6 +73,8 @@ const Main: FC = ({ safeLinkModalUrl, isHistoryCalendarOpen, loadAnimatedEmojis, + loadNotificationSettings, + loadNotificationExceptions, }) => { if (DEBUG && !DEBUG_isLogged) { DEBUG_isLogged = true; @@ -82,8 +86,10 @@ const Main: FC = ({ useEffect(() => { if (lastSyncTime) { loadAnimatedEmojis(); + loadNotificationSettings(); + loadNotificationExceptions(); } - }, [lastSyncTime, loadAnimatedEmojis]); + }, [lastSyncTime, loadAnimatedEmojis, loadNotificationExceptions, loadNotificationSettings]); const { transitionClassNames: middleColumnTransitionClassNames, @@ -213,5 +219,7 @@ export default memo(withGlobal( isHistoryCalendarOpen: Boolean(global.historyCalendarSelectedAt), }; }, - (setGlobal, actions): DispatchProps => pick(actions, ['loadAnimatedEmojis']), + (setGlobal, actions): DispatchProps => pick(actions, [ + 'loadAnimatedEmojis', 'loadNotificationSettings', 'loadNotificationExceptions', + ]), )(Main));