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

Hides expiry date for ads #2182

Merged
merged 1 commit into from
Apr 10, 2019
Merged

Hides expiry date for ads #2182

merged 1 commit into from
Apr 10, 2019

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Apr 9, 2019

Resolves brave/brave-browser#4042

UI implementation: brave/brave-ui#444

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
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) on
    • Windows
    • macOS
    • Linux
  • 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

Test Plan:

plan 1:

  • clean profile
  • enable rewards
  • claim grant from settings page and panel and make sure that it shows expiration date
  • make sure that you also see expiration date in the wallet under details (settings and panel)

plan 2:

  • clean profile
  • enable rewards
  • view some ads
  • get ads grant
  • make sure that you don't see expiration date on the final step
  • make sure that you don't see expiration date in the wallet under details (settings and panel)

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

@NejcZdovc NejcZdovc self-assigned this Apr 9, 2019
@NejcZdovc NejcZdovc force-pushed the expiry-ads branch 2 times, most recently from 51be23c to 4036e4f Compare April 9, 2019 12:04
@NejcZdovc NejcZdovc added this to the 0.65.x - Nightly milestone Apr 9, 2019
@NejcZdovc NejcZdovc marked this pull request as ready for review April 9, 2019 12:06
@NejcZdovc NejcZdovc force-pushed the expiry-ads branch 2 times, most recently from 73c5c14 to 994119e Compare April 9, 2019 12:27
@@ -156,9 +156,14 @@ class PageWallet extends React.Component<Props, State> {
}

return grants.map((grant: Rewards.Grant) => {
let expireDate = ''
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: same logic is used in a couple places, consider decoupling into a method?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we only use it here for the settings page, sadly extension code has different util files

@NejcZdovc NejcZdovc merged commit 5df9e99 into master Apr 10, 2019
@NejcZdovc NejcZdovc deleted the expiry-ads branch April 10, 2019 10:26
NejcZdovc added a commit that referenced this pull request Apr 12, 2019
NejcZdovc added a commit that referenced this pull request Apr 12, 2019
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: Expiry date change
3 participants