Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

brave / brave-core Public

Notifications You must be signed in to change notification settings
Fork 899
Star 2.5k

Code
Pull requests 226
Actions
Security
Insights

Additional navigation options

Code
Pull requests
Actions
Security
Insights

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

Separates monthly and one time tips in to two panels #3394

Merged

ryanml merged 1 commit into master from tip-split

Sep 30, 2019

Merged

Separates monthly and one time tips in to two panels #3394

ryanml merged 1 commit into master from tip-split

Sep 30, 2019

Conversation 15 Commits 1 Checks 0 Files changed

Conversation

Copy link

Contributor

ryanml commented Sep 10, 2019 •

edited

Loading

Fixes: brave/brave-browser#5957

Submitter Checklist:

Submitted a ticket for my issue if one did not already exist.
Used Github auto-closing keywords in the commit message.
Added/updated tests for this change (for new code or code which already has tests).
Verified that these changes build without errors on
- Android
- iOS
- Linux
- macOS
- Windows
Verified that these changes pass automated tests (unit, browser, security tests) on
- iOS
- Linux
- macOS
- Windows
Verified that all lint errors/warnings are resolved (npm run lint)
Ran git rebase master (if needed).
Ran git rebase -i to squash commits (if needed).
Tagged reviewers and labelled the pull request as needed.
Request a security/privacy review as needed.
Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone
Public documentation has been updated as necessary. For instance:

Test Plan:

Enable Rewards, Claim Grant
Send a few tips, set some to monthly, the rest one-time
Navigate to brave://rewards
Confirm the monthly tips are in the Monthly Contributions box
Confirm the one-time tips are in the tips box
Confirm that the BAT totals between the boxes reflect the total of each tip type

Reviewer Checklist:

New files have MPL-2.0 license header.
Request a security/privacy review as needed.
Adequate test coverage exists to prevent regressions
Verify test plan is specified in PR before merging to source

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on.
All relevant documentation has been updated.

Sorry, something went wrong.

All reactions

ryanml added the feature/rewards label

ryanml added this to the 0.72.x - Nightly milestone

ryanml requested a review from NejcZdovc

September 10, 2019 02:15

ryanml self-assigned this

ryanml force-pushed the tip-split branch from bca6272 to 1b16123 Compare

September 10, 2019 02:16

ryanml commented

View reviewed changes

Copy link

Contributor Author

ryanml left a comment

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Note: The old method for getting the total amount of tips used reports, which contain all tip types. We now just enumerate over recurringList and tipsList individually so each pane can have their own accurate total

Sorry, something went wrong.

All reactions

ryanml force-pushed the tip-split branch 2 times, most recently from 4438577 to 27c2f17 Compare

September 10, 2019 03:11

NejcZdovc previously requested changes

View reviewed changes

Copy link

Contributor

NejcZdovc left a comment

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Please change Monthly Tips to Monthly Contribution everywhere in the code

Sorry, something went wrong.

All reactions

ryanml force-pushed the tip-split branch 2 times, most recently from 4409e78 to 23ef599 Compare

September 12, 2019 01:47

ryanml requested a review from NejcZdovc

September 12, 2019 01:49

ryanml dismissed NejcZdovc’s stale review

September 12, 2019 01:50

Screenshot added, addressed feedback

NejcZdovc reviewed

View reviewed changes

components/brave_rewards/resources/ui/components/monthlyContributionBox.tsx Outdated Show resolved Hide resolved

NejcZdovc reviewed

View reviewed changes

components/brave_rewards/resources/ui/components/monthlyContributionBox.tsx Outdated Show resolved Hide resolved

NejcZdovc reviewed

View reviewed changes

components/brave_rewards/resources/ui/components/monthlyContributionBox.tsx Outdated Show resolved Hide resolved

NejcZdovc reviewed

View reviewed changes

components/brave_rewards/resources/ui/components/monthlyContributionBox.tsx Outdated Show resolved Hide resolved

NejcZdovc reviewed

View reviewed changes

components/brave_rewards/resources/ui/components/monthlyContributionBox.tsx Outdated Show resolved Hide resolved

ryanml force-pushed the tip-split branch from 23ef599 to 903a772 Compare

September 12, 2019 18:26

bsclifton modified the milestones: 0.71.x - Dev, 0.72.x - Nightly

ryanml force-pushed the tip-split branch 4 times, most recently from dbc0101 to 8d7a50c Compare

September 20, 2019 02:49

ryanml requested a review from NejcZdovc

September 20, 2019 02:50

ryanml force-pushed the tip-split branch from 8d7a50c to c879b8f Compare

September 20, 2019 09:03

NejcZdovc previously requested changes

View reviewed changes

Copy link

Contributor

NejcZdovc left a comment •

edited

Loading

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Title for modal needs new title. It should be Monthly Contributions and not Tips when you click see all in Monthly Contributions box

Sorry, something went wrong.

All reactions

ryanml force-pushed the tip-split branch from c879b8f to 74077ed Compare

September 20, 2019 19:10

ryanml requested a review from NejcZdovc

September 20, 2019 19:10

ryanml dismissed NejcZdovc’s stale review

September 20, 2019 19:10

title updated

ryanml mentioned this pull request

Adding new icons for Rewards Settings brave/brave-ui#543

Merged

ryanml force-pushed the tip-split branch 4 times, most recently from d7b91c8 to 0a84433 Compare

September 26, 2019 07:09

NejcZdovc previously requested changes

View reviewed changes

Copy link

Contributor

NejcZdovc left a comment

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

we are showing One time where in issue we only show date. We need to remove one time for tips box (for table and see all modal)

Sorry, something went wrong.

All reactions

ryanml force-pushed the tip-split branch 2 times, most recently from 8abe6b9 to 519e6a3 Compare

September 26, 2019 18:24

ryanml requested a review from NejcZdovc

September 26, 2019 18:30

ryanml dismissed NejcZdovc’s stale review

September 26, 2019 18:31

'One Time' copy removed


          Fixes brave/brave-browser#5957 - separates monthly and one time tips …

d83c04e

…in to two panes

ryanml force-pushed the tip-split branch from 519e6a3 to d83c04e Compare

September 26, 2019 23:22

Copy link

Contributor Author

ryanml commented Sep 30, 2019

@NejcZdovc this one is good to go - CI failure unrelated

All reactions

Sorry, something went wrong.

NejcZdovc approved these changes

View reviewed changes

ryanml merged commit 4758fa7 into master

ryanml deleted the tip-split branch

September 30, 2019 22:16

btlechowski mentioned this pull request

Tips should be split in to two panels on brave://rewards brave/brave-browser#5957

Closed

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

Reviewers

NejcZdovc NejcZdovc approved these changes

Assignees

Labels

feature/rewards

Projects

None yet

Milestone

1.1.x - Release

Development

Successfully merging this pull request may close these issues.

Tips should be split in to two panels on brave://rewards

3 participants

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.