[PB-6742] bugfix/Login screen navigation - #574
Merged
CandelR merged 6 commits intoAug 26, 2026
Merged
Conversation
…reen after login, and fix photo preview closing back to login screen
CandelR
changed the base branch from
bugfixes/PB-6742-photos-fixes
to
release/hide-photos-and-bump-version
August 26, 2026 12:52
|
xabg2
approved these changes
Aug 26, 2026
CandelR
merged commit Aug 26, 2026
515621f
into
release/hide-photos-and-bump-version
3 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
RootNavigatormounted a singleStack.Navigatorwith every screen at once; after login,WebLoginScreenonly did areplace, soSignInstayed underneath in the history and swipe-back / Android back returned to it while logged in.navigation.goBack());, if the user also closed the preview manually, the secondgoBack()had nothing left to pop and landed on the bottom tab navigator, which defaults tobackBehavior: 'firstRoute' (Home`).Changes
src/navigation/AuthStackNavigator.tsx/src/navigation/AppStackNavigator.tsx: split the single root stack into a login stack and an app stack.src/navigation/RootNavigator.tsx: now only picks which of the two stacks to mount, based onstate.auth.loggedIn. Logging in unmounts the auth stack entirely (no history to go back to) and logging out unmounts the app stack.src/screens/WebLoginScreen/index.tsx: removed the manualnavigation.replace('TabExplorer', ...), the stack swap is now driven bysignInThunk.src/components/modals/SignOutModal/index.tsx/src/App.tsx: removed the manualnavigationRef.reset(...)on sign-out. Now logging out unmounts the app stack automatically.src/screens/PhotoPreviewScreen/index.tsx: centralized every way of closing the preview into a singleclosePreview()guarded by a ref, so only the first call actually pops the screen.