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

Rewards 2.5 phase 4 #16710

Merged
merged 4 commits into from
Jan 18, 2023
Merged

Rewards 2.5 phase 4 #16710

merged 4 commits into from
Jan 18, 2023

Conversation

zenparsing
Copy link
Collaborator

@zenparsing zenparsing commented Jan 17, 2023 •
edited by Miyayes
Loading

Resolves brave/brave-browser#27882

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:

@zenparsing zenparsing requested review from a team as code owners January 17, 2023 18:56
@github-actions
Copy link
Contributor

⚠️ PR head is an unsigned commit
commit: 3ffd71ff4b2fc4ee1fd09384c07bfbd0df3aa4fb
reason: unsigned
Please follow the handbook to configure commit signing
cc: @zenparsing

1 similar comment
@github-actions
Copy link
Contributor

⚠️ PR head is an unsigned commit
commit: 3ffd71ff4b2fc4ee1fd09384c07bfbd0df3aa4fb
reason: unsigned
Please follow the handbook to configure commit signing
cc: @zenparsing

@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jan 17, 2023
@github-actions
Copy link
Contributor

⚠️ PR head is an unsigned commit
commit: 3ffd71ff4b2fc4ee1fd09384c07bfbd0df3aa4fb
reason: unsigned
Please follow the handbook to configure commit signing
cc: @zenparsing

@brave-builds
Copy link
Collaborator

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

kylehickinson
kylehickinson approved these changes Jan 17, 2023
View reviewed changes
Copy link
Collaborator

@kylehickinson kylehickinson left a comment

Choose a reason for hiding this comment

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

iOS++

@github-actions
Copy link
Contributor

⚠️ PR head is an unsigned commit
commit: 3ffd71ff4b2fc4ee1fd09384c07bfbd0df3aa4fb
reason: unsigned
Please follow the handbook to configure commit signing
cc: @zenparsing

emerick
emerick approved these changes Jan 17, 2023
View reviewed changes
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.

Looks awesome, just had two really minor nits.

components/brave_rewards/resources/shared/components/vbat_notice.tsx Outdated Show resolved Hide resolved
components/brave_rewards/resources/rewards_panel/components/vbat_notice_modal.style.ts Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

⚠️ PR head is an unsigned commit
commit: 3ffd71ff4b2fc4ee1fd09384c07bfbd0df3aa4fb
reason: unsigned
Please follow the handbook to configure commit signing
cc: @zenparsing

@brave-builds
Copy link
Collaborator

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

@zenparsing zenparsing merged commit 20a96b3 into master Jan 18, 2023
@zenparsing zenparsing deleted the rewards-2.5.4 branch January 18, 2023 17:43
@github-actions github-actions bot added this to the 1.49.x - Nightly milestone Jan 18, 2023
tmancey
tmancey reviewed Jan 18, 2023
View reviewed changes
browser/extensions/api/brave_rewards_api.cc
@@ -644,6 +645,12 @@ void BraveRewardsGetRewardsParametersFunction::OnGetRewardsParameters(
}
data.Set("walletProviderRegions", std::move(provider_regions));

if (!parameters->vbat_deadline.is_null()) {
data.Set("vbatDeadline", floor(parameters->vbat_deadline.ToDoubleT() *
Copy link
Collaborator

@tmancey tmancey Jan 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

nit: it is recommended when using base::Value to use the helpers in //base/json/values_util.h for serialization

Copy link
Collaborator

Choose a reason for hiding this comment

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

See TimeToValue and ValueToTime

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmancey tmancey tmancey left review comments

@emerick emerick emerick approved these changes

@kylehickinson kylehickinson kylehickinson approved these changes

Assignees

@zenparsing zenparsing

Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Milestone
1.49.x - Release
Development

Successfully merging this pull request may close these issues.

Implement vBAT notices and sunset
6 participants
@zenparsing @brave-builds @kylehickinson @tmancey @emerick @szilardszaloki