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

Rewards reset profile android #18844

Merged
merged 4 commits into from
Jun 16, 2023
Merged

Conversation

deeppandya
Copy link
Contributor

Resolves brave/brave-browser#26902

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 wiki
    • npm run lint, npm run presubmit wiki, 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 this to the 1.54.x - Nightly milestone Jun 9, 2023
@deeppandya deeppandya self-assigned this Jun 9, 2023
@deeppandya deeppandya requested review from a team as code owners June 9, 2023 15:04
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jun 9, 2023
Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

Ads changes LGTM++

@@ -297,7 +297,6 @@ export function Settings () {
<BatIcon />{getString('braveRewards')}
</style.title>
{
!isAndroid &&
<style.manageAction>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it possible to remove the enclosing brackets now?

...
</style.title>
<style.manageAction>
  ...
</style.manageAction>
...

Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

LGTM, just had a nit about the wording.

<message name="IDS_SHOW_ADS_WHEN_BRAVE_IS_NOT_IN_USE" desc="Title for Show Ads when Brave is not in use option in Brave rewards settings.">
Show Ads when Brave is not in use
<message name="IDS_SHOW_ADS_WHEN_BRAVE_IS_NOT_IN_USE_TITLE" desc="Title for Show Ads when Brave is not in use option in Brave rewards settings.">
Brave Notification Ads
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: Is that the correct terminology now? The "notification" part seems superfluous/technical.

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@deeppandya deeppandya force-pushed the rewards_reset_profile_android branch from a3f8c2a to ddbe59c Compare June 15, 2023 21:13
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.

lgtm

{
!isAndroid &&
<style.manageAction>
<style.manageAction>
<button
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: looks like the indenting is off here (through </style.manageAction>)?

Reset rewards prefs on onCompleteReset
Remove brave rewards preference

Refactor rewards prefernce changes
Resolve presubmit check

Rebase and Address PR comments

Resolve indentation issue
@deeppandya deeppandya force-pushed the rewards_reset_profile_android branch from ddbe59c to 39655ff Compare June 15, 2023 21:36
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

string reviewers ++

@deeppandya deeppandya merged commit a33f0e3 into master Jun 16, 2023
@deeppandya deeppandya deleted the rewards_reset_profile_android branch June 16, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
7 participants