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

Fix #1765, Fix #1744: Adds missing JP rewards UI updates #1766

Merged
merged 1 commit into from Oct 23, 2019

Conversation

@kylehickinson
Copy link
Contributor

kylehickinson commented Oct 22, 2019

  • "Grants" -> "Details" on wallet header
  • "Your wallet" -> "Your balance" in wallet header
  • "wallet balance" -> "balance" in tipping view
  • "tokens" → "points"
  • removed "Please Add Funds" to insufficient wallet balance label in tipping view

Summary of Changes

This pull request fixes issue #1765
This pull request fixes issue #1744

Submitter Checklist:

  • Unit Tests are updated to cover new or changed functionality
  • User-facing strings use NSLocalizableString()

Reviewer Checklist:

  • Issues include necessary QA labels:
    • QA/(Yes|No)
    • release-notes/(include|exclude)
    • bug / enhancement
  • Necessary security reviews have taken place.
  • Adequate unit test coverage exists to prevent regressions.
  • Adequate test plan exists for QA to validate (if applicable).
  • Issue is assigned to a milestone (should happen at merge time).
@kylehickinson kylehickinson force-pushed the bat-points-fixes branch from 5bb747a to 8282090 Oct 23, 2019
@kylehickinson kylehickinson marked this pull request as ready for review Oct 23, 2019
@kylehickinson kylehickinson requested review from iccub and Brandon-T Oct 23, 2019
@iccub
iccub approved these changes Oct 23, 2019
@@ -53,7 +53,7 @@ extension OnboardingRewardsViewController {
private let titleLabel = CommonViews.primaryText(Strings.OBRewardsTitle)

private let descriptionLabel = CommonViews.secondaryText("").then {
$0.attributedText = BraveAds.isCurrentRegionSupported() ? Strings.OBRewardsDetailInAdRegion.boldWords(with: $0.font, amount: 2) : Strings.OBRewardsDetailOutsideAdRegion.boldWords(with: $0.font, amount: 1)
$0.attributedText = BraveAds.isCurrentRegionSupported() ? (Locale.current.isJapan ? Strings.OBRewardsDetailInAdRegionJapan : Strings.OBRewardsDetailInAdRegion).boldWords(with: $0.font, amount: 2) : Strings.OBRewardsDetailOutsideAdRegion.boldWords(with: $0.font, amount: 1)

This comment has been minimized.

Copy link
@iccub

iccub Oct 23, 2019

Contributor

That's a long line :D

@kylehickinson kylehickinson force-pushed the bat-points-fixes branch from 8282090 to 0e1df30 Oct 23, 2019
@kylehickinson kylehickinson changed the title Fix #1765: Adds missing JP rewards UI updates Fix #1765, Fix #1744: Adds missing JP rewards UI updates Oct 23, 2019
@kylehickinson
Copy link
Contributor Author

kylehickinson commented Oct 23, 2019

A few more strings were added, please don't merge until after

- "Grants" -> "Details" on wallet header
- "Your wallet" -> "Your balance" in wallet header
- "wallet balance" -> "balance" in tipping view
- "tokens" -> "points"
- "BAT" -> "BAT Points" where missed
@kylehickinson kylehickinson force-pushed the bat-points-fixes branch from 0e1df30 to 5d55200 Oct 23, 2019
@kylehickinson kylehickinson removed the blocked label Oct 23, 2019
@kylehickinson kylehickinson merged commit cd9b18a into development Oct 23, 2019
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@kylehickinson kylehickinson deleted the bat-points-fixes branch Oct 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.