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.

Sign up for GitHub

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

Jump to bottom

Revert bap modal changes 1.20.x #8001

Merged
merged 4 commits into from
Feb 19, 2021
Merged

Revert bap modal changes 1.20.x #8001

merged 4 commits into from
Feb 19, 2021

Conversation

deeppandya
Copy link
Contributor

@deeppandya deeppandya commented Feb 18, 2021 •
edited by bsclifton
Loading

Reverting the following work

Android

Desktop

moving the following issues to 1.21:

Android

Desktop

Submitter Checklist:

  • 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)
  • Requested a security/privacy review as needed

Reviewer Checklist:

  • 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
Revert "Merge pull request #7990 from brave/bap_modal_update_android_…
114a6d6 
…1.20.x"

This reverts commit ef57585, reversing
changes made to 3d767de.
@deeppandya
Revert "Merge pull request #7833 from brave/pr7817_deprecate_bap_moda…
45bbf7c 
…l_android_1.20.x"

This reverts commit 1ac3a51, reversing
changes made to 472b8a6.
@deeppandya deeppandya requested a review from a team February 18, 2021 20:37
@deeppandya deeppandya self-assigned this Feb 18, 2021
@bsclifton bsclifton mentioned this pull request Feb 19, 2021
Closed
23 tasks
@bsclifton
Revert "Merge pull request #7798 from brave/pr7698_ksmith-bap-depreca…
2d696fc 
…tion-ui_1.20.x"

This reverts commit 850f811, reversing
changes made to 94b0001.
@deeppandya deeppandya requested review from tmancey and a team as code owners February 19, 2021 00:12
@deeppandya deeppandya requested review from emerick and zenparsing and removed request for a team February 19, 2021 00:12
@bsclifton bsclifton self-assigned this Feb 19, 2021
@bsclifton bsclifton added this to the 1.20.x - Release #2 milestone Feb 19, 2021
@kjozwiak
Copy link
Member

@bsclifton looks good 👍 Went through the following:

Looks like we have everything.

kjozwiak
kjozwiak approved these changes Feb 19, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.20.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit e910133 into 1.20.x Feb 19, 2021
@kjozwiak kjozwiak deleted the revert_bap_modal_changes branch February 19, 2021 05:57
@kjozwiak kjozwiak mentioned this pull request Feb 26, 2021
Merged
kylehickinson pushed a commit that referenced this pull request Jan 4, 2024
@soner-yuksel
Fix #8001: Display the VPN subscription in the App Store (#8415)
8a467bc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zenparsing zenparsing zenparsing approved these changes

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@bsclifton bsclifton

@deeppandya deeppandya

Labels
None yet
Projects
None yet
Milestone
1.20.x - Release #2
Development

Successfully merging this pull request may close these issues.
4 participants
@deeppandya @kjozwiak @zenparsing @bsclifton