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

Removes date from ads grants in the wallet #2337

Merged
merged 1 commit into from
Apr 27, 2019
Merged

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Apr 24, 2019

Resolves brave/brave-browser#4169

UI PR: brave/brave-ui#458

Submitter Checklist:

Test Plan:

  • enable rewards
  • view some ads, trigger ads grant (or recover wallet with ads grant)
  • claim ads grant
  • claim ugp grant
  • make sure that you see something like this (first one is ads, second one is ugp)
    image

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.

@NejcZdovc NejcZdovc self-assigned this Apr 24, 2019
@NejcZdovc NejcZdovc force-pushed the claimed-grant-date branch 2 times, most recently from 344442d to bafe446 Compare April 25, 2019 06:53
@NejcZdovc NejcZdovc marked this pull request as ready for review April 25, 2019 06:54
@NejcZdovc NejcZdovc added this to the 0.66.x - Nightly milestone Apr 25, 2019
tmancey
tmancey previously approved these changes Apr 25, 2019
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 but does have test failures so please check these

@NejcZdovc
Copy link
Contributor Author

@tmancey are you talking about test-security?

ryanml
ryanml previously approved these changes Apr 26, 2019
Copy link
Contributor

@ryanml ryanml left a comment

Choose a reason for hiding this comment

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

straightforward, lgtm

@NejcZdovc NejcZdovc merged commit bd67ee7 into master Apr 27, 2019
@NejcZdovc NejcZdovc deleted the claimed-grant-date branch April 27, 2019 14:42
NejcZdovc added a commit that referenced this pull request May 3, 2019
Removes date from ads grants in the wallet
NejcZdovc added a commit that referenced this pull request May 3, 2019
Removes date from ads grants in the wallet
NejcZdovc added a commit that referenced this pull request May 3, 2019
Removes date from ads grants in the wallet
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ads Rewards Grants - expiration date in UI - follow up to 4042
3 participants