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

Resolve vpn support #13851

Merged
merged 2 commits into from
Jun 18, 2022
Merged

Resolve vpn support #13851

merged 2 commits into from
Jun 18, 2022

Conversation

deeppandya
Copy link
Contributor

Resolves brave/brave-browser#23490
Resolves brave/brave-browser#23492

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:

@deeppandya deeppandya 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 Jun 17, 2022
@deeppandya deeppandya added this to the 1.42.x - Nightly milestone Jun 17, 2022
@deeppandya deeppandya self-assigned this Jun 17, 2022
@@ -90,7 +90,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
@Override
public void onClick(View v) {
StringBuilder bodyText = new StringBuilder(
"\n\n\n\n\n#### Please do not edit any information below ####\n");
"\n\n\n\n\n#### Brave doesn’t track you or know how you use our app, so we don’t know how you’ve set up VPN. Please share info about the issue you’re experiencing and we’ll do our best to resolve it as soon as we can. ####\n");
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't that string be translated?

Copy link
Member

Choose a reason for hiding this comment

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

same as other strings below

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.

++

@deeppandya deeppandya force-pushed the resolve_support_page branch from dc2acf4 to a51d9d5 Compare June 17, 2022 21:02
@deeppandya
Copy link
Contributor Author

@deeppandya deeppandya force-pushed the resolve_support_page branch from a51d9d5 to 691ecad Compare June 17, 2022 23:18
@deeppandya deeppandya merged commit d29abf4 into master Jun 18, 2022
@deeppandya deeppandya deleted the resolve_support_page branch June 18, 2022 02:05
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.

Launching VPN support page will crash app if set as default Update VPN support text
2 participants