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 #1651: Update Rewards UI based on if region is set to JP #1755

Merged
merged 1 commit into from Oct 22, 2019

Conversation

@kylehickinson
Copy link
Contributor

kylehickinson commented Oct 22, 2019

  • "BAT" becomes "BAT Points" in most scenarios
  • An additional disclaimer message is shown in the rewards summary (when non-empty)
  • Powered by Uphold message is not shown in wallet details screen

Summary of Changes

This pull request fixes issue #1651

Submitter Checklist:

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

Test Plan:

  • Verify all is normal in non-JP region
  • Set device region to JP (language doesn't matter)
  • Verify most places that say "BAT" now say "BAT Points" (exclusions: Tipping screen options)
  • Verify that in wallet details the footer "Powered by Uphold" message is not visible
  • Send a one-time tip to a verified publisher
  • Verify that the JP disclaimer shows up in wallet summary
  • Send a tip to an unverified publisher
  • Verify both disclaimers appear in wallet summary

Screenshots:

BAT Points Powered By Uphold
Simulator Screen Shot - iPhone Xs - 2019-10-22 at 11 25 17 Simulator Screen Shot - iPhone Xs - 2019-10-22 at 11 25 22
JP Disclaimer Both Disclaimers
Simulator Screen Shot - iPhone Xs - 2019-10-22 at 11 26 22 Simulator Screen Shot - iPhone Xs - 2019-10-22 at 11 27 18

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).
- "BAT" becomes "BAT Points" in most scenarios
- An additional disclaimer message is shown in the rewards summary (when non-empty)
- Powered by Uphold message is not shown in wallet details screen
@kylehickinson kylehickinson requested review from Brandon-T and iccub Oct 22, 2019
$0.edges.equalTo(self).inset(8)
}

backgroundColor = UIColor(white: 0.0, alpha: 0.04)

This comment has been minimized.

Copy link
@iccub

iccub Oct 22, 2019

Contributor

Could you check if this looks good on iOS 12 with light and dark theme?
If not we would need to change this to appearanceBackgroundColor I believe

This comment has been minimized.

Copy link
@kylehickinson

kylehickinson Oct 22, 2019

Author Contributor

It seemed to work?
Simulator Screen Shot - iPhone Xs - 2019-10-22 at 12 00 17

Maybe I should change it to appearanceBackgroundColor anyways?

This comment has been minimized.

Copy link
@iccub

iccub Oct 22, 2019

Contributor

no, leave it as it is, we do not use this property in specific classes only in appearance proxies from what I see, theming is gonna drag us down a bit until we drop iOS 12 support

@iccub
iccub approved these changes Oct 22, 2019
@kylehickinson kylehickinson merged commit f9fb842 into development Oct 22, 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 branch Oct 22, 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

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