Fix #1647, Fix #1650: Only enable ads by default when current region is supported #1688

kylehickinson · 2019-10-15T19:14:19Z

Please choose "Rebase" for merge strategy

Summary of Changes

This pull request fixes issue #1647
This pull request fixes issue #1650

Relevant brave-core changes for #1647: brave/brave-core#3701

Submitter Checklist:

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

Test Plan:

Enable rewards
Set region to non-supported ad region, go through onboarding
Verify ads is disabled due to unsupported region
Set region to supported ad region, ads onboarding should show "Turn On" button instead of "Show Me"
After completing onboarding verify that ads is enabled in Brave Rewards settings

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).


        Fix #1650: Switch "Join" to "Turn on" in enabling ads onboarding flow


        Fix #1647: Enable Ads in onboarding when user's region becomes available

Brandon-T · 2019-10-15T20:15:46Z

BraveShared/BraveStrings.swift

@@ -550,7 +550,7 @@ extension Strings {
    public static let OBSaveButton = NSLocalizedString("OBSaveButton", bundle: Bundle.braveShared, value: "Save", comment: "Save button to save current selection")
    public static let OBFinishButton = NSLocalizedString("OBFinishButton", bundle: Bundle.braveShared, value: "Start browsing", comment: "Button to finish onboarding and start using the app.")
    public static let OBJoinButton = NSLocalizedString("OBJoinButton", bundle: Bundle.braveShared, value: "Join", comment: "Button to join Brave Rewards.")
-    public static let OBShowMeButton = NSLocalizedString("OBShowMeButton", bundle: Bundle.braveShared, value: "Show Me", comment: "Button to show Brave Rewards.")
+    public static let OBTurnOnButton = NSLocalizedString("OBTurnOnButton", bundle: Bundle.braveShared, value: "Turn On", comment: "Button to show Brave Rewards.")


I did this one too: #1684
I'll fix mine AFTER yours merges.
:(

Haha, next time make sure to assign the ticket to yourself in GitHub. Either way these 2 tickets are kind of related 😅 Sorry haha

kylehickinson added 2 commits Oct 15, 2019

Fix #1650: Switch "Join" to "Turn on" in enabling ads onboarding flow

d061101

Fix #1647: Enable Ads in onboarding when user's region becomes available

Loading status checks…

e2be716

kylehickinson requested review from Brandon-T and iccub Oct 15, 2019

Brandon-T approved these changes Oct 15, 2019

View changes

kylehickinson merged commit 8db0528 into development Oct 15, 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 deleted the ads-onboarding branch Oct 15, 2019

brave / brave-ios

Fix #1647, Fix #1650: Only enable ads by default when current region is supported #1688

Fix #1647, Fix #1650: Only enable ads by default when current region is supported #1688

kylehickinson commented Oct 15, 2019 •

edited

This comment has been minimized.

This comment has been minimized.

brave / brave-ios

Join GitHub today

Fix #1647, Fix #1650: Only enable ads by default when current region is supported #1688

Fix #1647, Fix #1650: Only enable ads by default when current region is supported #1688

Conversation

kylehickinson commented Oct 15, 2019 • edited

Summary of Changes

Submitter Checklist:

Test Plan:

Reviewer Checklist:

This comment has been minimized.

Brandon-T Oct 15, 2019

This comment has been minimized.

kylehickinson Oct 15, 2019

kylehickinson commented Oct 15, 2019 •

edited