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

Integrate Rewards panel 2.0 #9883

Merged
merged 1 commit into from
Sep 8, 2021
Merged

Conversation

zenparsing
Copy link
Collaborator

@zenparsing zenparsing commented Aug 27, 2021

Resolves brave/brave-browser#14602

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
  • 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:

Figma: https://www.figma.com/file/p4F6ItJQVeKPeFQhjoaPGm/BR-panel-2.0?node-id=1170%3A35310

Functional differences from previous UI

  • Unverified publisher notice has been removed from the panel. See Add publisher status hover note to Rewards panel brave-browser#17941 for a follow-up issue.
  • "BAT arriving soon" messaging as been added.
  • Rewards summary no longer contains "Total Grants Claimed".
  • Rewards summary no longer displays "Rewards from Ads" when user has connected an external wallet.
  • Grant captcha is no longer shown directly on the rewards page. Instead, the rewards panel is always opened.

Test cases: Rewards Panel

  • Wallet Card:
    • "Verify wallet" button should open the Connect Wallet modal.
    • "Disconnect" link should allow disconnection from external wallet.
  • Publisher Info:
    • Publisher information should be correctly displayed for "normal" sites.
    • Publisher information should be correctly displayed for greaselion domains.
    • Refresh status button should work.
    • "Set" button should open the tip panel for monthly tips.
    • "Change amount" button should open the tip panel for monthly tips.
    • "Cancel" button should open the tip panel for clearing the monthly tip.
    • Verified icon should be displayed correctly.
      • It should display a checkmark if publisher is "registered"
      • It should read "Verified" if the publisher has a verified wallet address, or "Unverified" otherwise.
    • Publisher icons are displayed correctly.
  • Grant Captcha:
    • Should work when opened from the rewards page.
    • Should work when opened from the new tab page.

Test cases: Rewards Page

  • "Claim" button should open up the rewards panel with the captcha displayed.
  • "Manage your wallet" button should open the manage wallet modal.
  • "View statement" link should open the wallet activity modal.
  • "Verify wallet" button should open the Connect Wallet modal.
  • "Disconnect" link should allow disconnection from external wallet.

@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch 4 times, most recently from fe17082 to ab0c3c1 Compare September 1, 2021 20:18
@zenparsing zenparsing marked this pull request as ready for review September 1, 2021 20:21
@zenparsing zenparsing requested a review from a team as a code owner September 1, 2021 20:21
@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch from ab0c3c1 to 0da5b0a Compare September 1, 2021 21:15
@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch from 0da5b0a to 012cad7 Compare September 2, 2021 17:41
@zenparsing zenparsing requested a review from emerick September 2, 2021 17:43
@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch from 012cad7 to 05a6464 Compare September 2, 2021 17:46
@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch from 05a6464 to f41dcb2 Compare September 3, 2021 18:48
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

@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch 2 times, most recently from 40808f2 to 0bd6f5d Compare September 7, 2021 15:48
@zenparsing zenparsing force-pushed the ksmith-rewards-panel-integration branch from 0bd6f5d to 58de26b Compare September 7, 2021 19:00
@zenparsing zenparsing merged commit 4d08ddb into master Sep 8, 2021
@zenparsing zenparsing deleted the ksmith-rewards-panel-integration branch September 8, 2021 15:36
@zenparsing zenparsing added this to the 1.31.x - Nightly milestone Sep 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement Rewards UI 2.0 for Rewards panel
3 participants