Skip to content

only clear pending notifications if we have a login error #29143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoom-ua merged 1 commit into from
Apr 13, 2026
Merged

only clear pending notifications if we have a login error #29143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions shared/constants/config/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,8 +1052,14 @@ export const useConfigState = Z.createZustand<State>((set, get) => {
})
// On login error, turn off the user switching flag so the login screen is not hidden,
// and clear any pending push notification — the switch failed so there's nothing to replay.
get().dispatch.setUserSwitching(false)
storeRegistry.getState('push').dispatch.clearPendingPushNotification()
// Only do this when there is an actual error; login() calls setLoginError() with no
// argument at the start to clear a previous error, and those side effects must not fire
// then — they would clobber the userSwitching flag and pendingPushNotification that
// were set just before login() was called for a push-notification account switch.
if (error) {
get().dispatch.setUserSwitching(false)
storeRegistry.getState('push').dispatch.clearPendingPushNotification()
}
},
setMobileAppState: nextAppState => {
if (get().mobileAppState === nextAppState) return
Expand Down