revert: undo the accidental merge of #2459 and #2478 into master - #2487
Merged
russellwheatley merged 2 commits intoSep 7, 2026
Merged
Conversation
This reverts commit 4262ca7.
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the authentication flow to use Jetpack Navigation instead of the custom Navigation 3 implementation. It removes the dependency on Navigation 3 and Kotlin Serialization, simplifies the reauthentication flow by introducing an AuthState.ReauthenticationRequired state, and updates the MFA enrollment flow to include a recovery code step. Additionally, it removes several test tags and their associated resource ID exposure logic, opting for simpler testing approaches. No specific issues were identified in the review comments as there were no comments provided.
russellwheatley
approved these changes
Sep 7, 2026
russellwheatley
deleted the
revert/version-10.0.0-beta05-accidental-merge
branch
September 7, 2026 12:11
github-project-automation
Bot
moved this from Backlog
to Done
in studio-2394994192-60a69
This was referenced Sep 7, 2026
Merged
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.
#2459 was merged into master unintentionally, and #2478 - retargeted from
version-10.0.0-beta05tomasterwhen that merge landed - went in two seconds later, stacked on top of it.This reverts both in order (#2478, then #2459), putting master's tree back exactly on
fa2dec53. Reverting #2459 on its own conflicts in 29 files, since #2478 builds on it.Neither PR can be reopened - GitHub refuses once a PR is merged - so the work is open again as #2486, from the same
version-10.0.0-beta05branch, fast-forwarded to include #2478's commits.