Skip to content
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.

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

Sync confirmation alert on Android is proper cancelable by touch from outside #10931

Merged
merged 1 commit into from
Nov 8, 2021

Conversation

AlexeyBarabash
Copy link
Contributor

Resolves https://github.com/brave/internal/issues/825

It is possible to press outside the alert dialog and then scan of qr code stops work. This PR does proper cancellation for such cases

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

see https://github.com/brave/internal/issues/825

@AlexeyBarabash AlexeyBarabash added CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Nov 8, 2021
@AlexeyBarabash AlexeyBarabash self-assigned this Nov 8, 2021
Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@AlexeyBarabash AlexeyBarabash merged commit 070fe27 into master Nov 8, 2021
@AlexeyBarabash AlexeyBarabash deleted the android_sync_dialog_modal branch November 8, 2021 16:53
@AlexeyBarabash AlexeyBarabash added this to the 1.33.x - Nightly milestone Nov 9, 2021
@AlexeyBarabash
Copy link
Contributor Author

Verified on apk installed from https://github.com/brave/brave-browser/releases/tag/v1.34.1

AlexeyBarabash added a commit that referenced this pull request Nov 10, 2021
Sync confirmation alert on Android is proper cancelable by touch from outside
@btlechowski
Copy link

Looks good to uplift

Verification passed on Brave v1.34.4 on Samsung Galaxy Tab S5e (Android 10.0)

Verified tapping outside of the modal dismisses the modal
Verified re-scanning the QR code brings the modal
Verified tapping Cancel dismisses the modal
Verified tapping Yes establishes the sync chain.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants