Notifications: Load global settings on app launch (#1169)

This commit is contained in:
Alexander Zinchuk 2021-06-16 19:00:50 +03:00
parent bf1569cfd6
commit a68ad6fd03

View File

@ -48,7 +48,9 @@ type StateProps = {
isHistoryCalendarOpen: boolean; isHistoryCalendarOpen: boolean;
}; };
type DispatchProps = Pick<GlobalActions, 'loadAnimatedEmojis'>; type DispatchProps = Pick<GlobalActions, (
'loadAnimatedEmojis' | 'loadNotificationSettings' | 'loadNotificationExceptions'
)>;
const ANIMATION_DURATION = 350; const ANIMATION_DURATION = 350;
const NOTIFICATION_INTERVAL = 1000; const NOTIFICATION_INTERVAL = 1000;
@ -71,6 +73,8 @@ const Main: FC<StateProps & DispatchProps> = ({
safeLinkModalUrl, safeLinkModalUrl,
isHistoryCalendarOpen, isHistoryCalendarOpen,
loadAnimatedEmojis, loadAnimatedEmojis,
loadNotificationSettings,
loadNotificationExceptions,
}) => { }) => {
if (DEBUG && !DEBUG_isLogged) { if (DEBUG && !DEBUG_isLogged) {
DEBUG_isLogged = true; DEBUG_isLogged = true;
@ -82,8 +86,10 @@ const Main: FC<StateProps & DispatchProps> = ({
useEffect(() => { useEffect(() => {
if (lastSyncTime) { if (lastSyncTime) {
loadAnimatedEmojis(); loadAnimatedEmojis();
loadNotificationSettings();
loadNotificationExceptions();
} }
}, [lastSyncTime, loadAnimatedEmojis]); }, [lastSyncTime, loadAnimatedEmojis, loadNotificationExceptions, loadNotificationSettings]);
const { const {
transitionClassNames: middleColumnTransitionClassNames, transitionClassNames: middleColumnTransitionClassNames,
@ -213,5 +219,7 @@ export default memo(withGlobal(
isHistoryCalendarOpen: Boolean(global.historyCalendarSelectedAt), isHistoryCalendarOpen: Boolean(global.historyCalendarSelectedAt),
}; };
}, },
(setGlobal, actions): DispatchProps => pick(actions, ['loadAnimatedEmojis']), (setGlobal, actions): DispatchProps => pick(actions, [
'loadAnimatedEmojis', 'loadNotificationSettings', 'loadNotificationExceptions',
]),
)(Main)); )(Main));