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

Fix sync error text on Android #14095

Merged
merged 1 commit into from
Jul 8, 2022
Merged

Conversation

AlexeyBarabash
Copy link
Contributor

@AlexeyBarabash AlexeyBarabash commented Jul 8, 2022

Now errors produced by join via QR and via sync words are the similar

Resolves brave/brave-browser#23948

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
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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 brave/brave-browser#23948
Or

  1. Join sync chain on Android with code words;
  2. Enter AAA BBB CCC
  3. Expected to see Wrong sync code instead of Sync could be setup [Wrong sync code]

Now errors produced by join via QR and via sync words are the similar

fixes brave/brave-browser#23948
@AlexeyBarabash AlexeyBarabash added UI feature/sync 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 Jul 8, 2022
@AlexeyBarabash AlexeyBarabash added this to the 1.43.x - Nightly milestone Jul 8, 2022
@AlexeyBarabash AlexeyBarabash self-assigned this Jul 8, 2022
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.

++

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.

++

@AlexeyBarabash AlexeyBarabash merged commit c0656ca into master Jul 8, 2022
@AlexeyBarabash AlexeyBarabash deleted the android_sync_error_text_23948 branch July 8, 2022 19:37
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 feature/sync UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error message is different for QR Code and Code words
3 participants