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

Implement Rewards 2.5 user states #16232

Merged
merged 45 commits into from
Dec 6, 2022
Merged

Implement Rewards 2.5 user states #16232

merged 45 commits into from
Dec 6, 2022

Conversation

zenparsing
Copy link
Collaborator

@zenparsing zenparsing commented Dec 5, 2022 •
edited by deeppandya
Loading

Resolves brave/brave-browser#27054
Resolves brave/brave-browser#27055
Resolves brave/brave-browser#15344
Resolves brave/brave-browser#17034
Resolves brave/brave-browser#20450
Resolves brave/brave-browser#20603
Resolves brave/brave-browser#20626
Resolves brave/brave-browser#20684
Resolves brave/brave-browser#20823
Resolves brave/brave-browser#20830
Resolves brave/brave-browser#21236
Resolves brave/brave-browser#22374
Resolves brave/brave-browser#20310
Resolves brave/brave-browser#23553
Resolves brave/brave-browser#25541
Resolves brave/brave-browser#25573
Resolves brave/brave-browser#25581
Resolves brave/brave-browser#25582
Resolves brave/brave-browser#26732
Resolves brave/brave-browser#26743
Resolves brave/brave-browser#26764
Resolves brave/brave-browser#26726

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 December 5, 2022 17:35
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Dec 5, 2022
@zenparsing zenparsing changed the title Implement Rewards 2.5 User States Implement Rewards 2.5 user states Dec 5, 2022
@brave-builds
Copy link
Collaborator

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

@brave-builds
Copy link
Collaborator

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

kylehickinson
kylehickinson approved these changes Dec 5, 2022
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

github-actions bot commented Dec 5, 2022

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

zenparsing and others added 19 commits December 5, 2022 17:00
@zenparsing
Add a preference for determining Rewards user unverified state
e211077
@zenparsing
Add new Rewards panel view for unverified users
c766a30
@emerick @zenparsing
Fix definition of getRewardsParameters
5f4d81f
@zenparsing
Fix license URLs in new TypeScript files
c4d5ccb
@emerick @zenparsing
Update text on Reset screen of Manage Rewards modal
df91567
@zenparsing
Update Rewards page for unverified users
cceff91
@zenparsing
Update NTP Rewards widget for unverified users
16926d2
@zenparsing
Update Rewards connect wallet modal
fb15717
@zenparsing
Remove ability to disconnect external Rewards wallet
4c661c1
@zenparsing
Hide estimated earnings from unverified users
70e3cf8
@tmancey @zenparsing
Decouple Brave Ads reset confirmations
f1ccbca
@tmancey @zenparsing
Add Brave Ads pref to migrate verified rewards users
a92a556
@tmancey @zenparsing
Add Brave Ads verified rewards user migration
e7592a4
@tmancey @zenparsing
Add Brave Ads migration if verified rewards user toggles ads on/off s…
7d41371 
…witch
@tmancey @zenparsing
Add Brave Ads verified rewards user migration on ads startup
9fa103c
@tmancey @zenparsing
Add Brave Ads migration when a rewards user becomes verified
93392c2
@tmancey @zenparsing
Brave Ads OnPrefDidChange should only be called if ads are initialized
30f4e2b
@zenparsing
Update Rewards onboarding slides
ee92dac
@zenparsing
Add Android support for getPluralString on Rewards page
eb3fc3a
zenparsing and others added 16 commits December 5, 2022 17:00
@zenparsing
Fix issue with editing data in Auto Contribute modal
97ad643
@zenparsing
Do not show grant claims to users in "unconnected" state
292d223
@zenparsing
Improve ads-per-hour slider
7a795ed
@emerick @zenparsing
Change modal darkening overlay to 0.7 opacity
1fa9e93
@emerick @zenparsing
Update custodian verification disclaimer text
c5114fa
@emerick @zenparsing
Hide ac settings box for unconnected users
df9de89
@emerick @zenparsing
Update assets in connect wallet modal
d814d5b
@emerick @zenparsing
Update description styles on Rewards panel boxes
02d2c3b
@emerick @zenparsing
Adjust Rewards panel padding to factor in WebUI bubble padding
b5c45cf
@tmancey @zenparsing
[Rewards 2.5] Bump version # on the issuers endpoint
3713e25
@zenparsing
Update ads-per-hour options on Rewards tour
c86d0ff
@zenparsing
Maintain preferred width of Rewards page main column
194f3c5
@deeppandya @zenparsing
Add new Rewards 2.5 states for Android
5091773
@deeppandya @zenparsing
Update missing fonts
45f5a57
@emerick @zenparsing
Specify noopener when visiting support URL
64d96ae
@zenparsing
Resolve presubmit check errors
8f6a785
emerick
emerick approved these changes Dec 5, 2022
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.

LGTM

@brave-builds
Copy link
Collaborator

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

tmancey
tmancey approved these changes Dec 6, 2022
View reviewed changes
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.

LGTM++

@zenparsing zenparsing merged commit 6b5a967 into master Dec 6, 2022
@zenparsing zenparsing deleted the rewards-2.5.3 branch December 6, 2022 14:17
@github-actions github-actions bot added this to the 1.48.x - Nightly milestone Dec 6, 2022
zenparsing added a commit that referenced this pull request Dec 6, 2022
@zenparsing
Uplift of #16232 to beta
aa0a3cb 
Implement Rewards 2.5 user states
@zenparsing zenparsing mentioned this pull request Dec 6, 2022
Closed
7 tasks
zenparsing added a commit that referenced this pull request Dec 6, 2022
@zenparsing
Uplift of #16232 to beta
f127efc 
Implement Rewards 2.5 user states
aseren pushed a commit that referenced this pull request Dec 9, 2022
@tmancey @aseren
Revert "Merge pull request #16232 from brave/rewards-2.5.3"
019754a 
This reverts commit 6b5a967, reversing
changes made to 2f78e57.
@deeppandya deeppandya mentioned this pull request Dec 14, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@szilardszaloki szilardszaloki szilardszaloki approved these changes

@emerick emerick emerick approved these changes

@tmancey tmancey tmancey 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.48.x - Release
Development

Successfully merging this pull request may close these issues.

[Android] Add Logged out toast notification in Rewards panel when user goes into Logged out state [Android] inconsistent UI for Disconnected/Logged out state [Android] Tip banner incorrectly showing messaging that creator cannot be tipped after refresh status - follow up to 20232 [Android] Unable to perform contribution Crash when claiming rewards
[Android] Add UI messaging/design that tells users they have 90 days to claim ad earnings and solve CAPTCHA [Android] sometimes balance won't display in panel, just spins indefinitely [Android] Auto-Contribute success toast notification in Rewards panel sometimes does not appear [Android] Wallet state text is different between Rewards settings page and Panel [Android] Badges on Rewards icon appearing without any corresponding notifications or items
7 participants
@zenparsing @brave-builds @kylehickinson @tmancey @emerick @szilardszaloki @deeppandya