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

Adds different text to grant finish screen #2670

Merged
merged 1 commit into from Jun 12, 2019
Merged

Adds different text to grant finish screen #2670

merged 1 commit into from Jun 12, 2019

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Jun 12, 2019

Resolves brave/brave-browser#4814

UI PR: brave/brave-ui#499

Submitter Checklist:

Test Plan:

Test plan 1:

  • enable rewards
  • claim grant
  • make sure that text on a final screen is ok (ugp text)

Test plan 1:

  • enable rewards
  • restore wallet with ad grant waiting
  • claim ad grant
  • make sure that text on a final screen is ok (ads text)

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.

"description": "Cosmetic text upon captcha success for ads"
},
"grantFinishTextAds": {
"message": "Your rewards grant from Brave Ads is on its way",
Copy link
Collaborator

Choose a reason for hiding this comment

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

needs a full-stop to be consistent with UGP

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

grant.expiryTime = 0
grant.finishText = getMessage('grantFinishTextAds')
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: for consistency swap text/title lines around so they match above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@@ -135,14 +135,43 @@ class Grant extends React.Component<Props, State> {
)
}

grantFinish = (type: string, tokens: string, date: string) => {
let title = getLocale('grantFinishTitleUGP')
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: could we not move to these to an else statement

return grant
}

grant.finishTitle = getMessage('grantFinishTitleUGP')
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: could we not move to these to an else statement

@@ -524,6 +522,13 @@
<message name="IDS_BRAVE_UI_SHOW_ALL" desc="">Show All</message>
<message name="IDS_BRAVE_UI_SUPPORTED_SITES" desc="">Supported Sites</message>

<message name="IDS_BRAVE_UI_GRANT_FINISH_TOKEN_ADS" desc="Token text on final grant screen for UGP">Your Brave Ads Token Grant</message>
<message name="IDS_BRAVE_UI_GRANT_FINISH_TEXT_ADS" desc="Text on final grant screen for UGP">Your rewards grant from Brave Ads is on its way</message>
Copy link
Collaborator

Choose a reason for hiding this comment

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

needs a full-stop to be consistent with UGP

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

tmancey
tmancey previously approved these changes Jun 12, 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

@NejcZdovc NejcZdovc merged commit dc9660c into master Jun 12, 2019
@bsclifton bsclifton deleted the grant-text branch June 25, 2019 16:20
hashmi-waseem pushed a commit to hashmi-waseem/brave-core that referenced this pull request May 6, 2024
put ads header in BRAVE_ADS_ENABLED guard
hashmi-waseem pushed a commit to hashmi-waseem/brave-core that referenced this pull request May 6, 2024
put ads header in BRAVE_ADS_ENABLED guard
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants