chore: merge master into dev after pull request #20751#20752
Merged
screendriver merged 5 commits intodevfrom Mar 18, 2026
Merged
chore: merge master into dev after pull request #20751#20752screendriver merged 5 commits intodevfrom
screendriver merged 5 commits intodevfrom
Conversation
The AppLock regression came from the crypto adapter reading crypto_pwhash_OPSLIMIT_INTERACTIVE and crypto_pwhash_MEMLIMIT_INTERACTIVE before libsodium.ready resolved. That left both values undefined at runtime, so setting an app lock passcode failed with: TypeError: opsLimit cannot be null or undefined This change makes the adapter read the libsodium limits lazily after initialization, restoring app lock passcode setup and keeping the recent AppLockRepository refactor intact.
Wait for the app lock setup modal to fully close after submitting the passcode before continuing with sidebar interactions. This removes a CI race where the modal still intercepted clicks on the All conversations tab, causing TC-8639 to fail intermittently.
Add an optional history-info confirmation helper and use it in authentication re-login flows where the screen may be skipped after logging out of a temporary/public session. This fixes CI timeouts caused by waiting for the do-history-confirm button when the app correctly navigates past the history-info route.
fix(webapp): initialize app lock crypto limits after libsodium is ready test(e2e): stabilize TC-8639 app lock setup flow] test(e2e): handle optional history info on auth re-login
fix: Resolve app lock error and fix e2e tests [WPB-22420]
otto-the-bot
requested review from
V-Gira,
arjita-mitra,
e-maad,
nkaramarko,
screendriver,
thisisamir98 and
zskhan
as code owners
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
thisisamir98
approved these changes
Mar 18, 2026
|
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
3 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.
This pull request was generated automatically after a pull request was merged into
master.Source pull request:
Reason:
devand edge deployments aligned with merged hotfixes onmaster.Merge note: