Full country list displayed for Rewards when only Japan is expected in certain case - Follow up to 28887 and 28321

[LaurenWags]

Description

Found while testing #28887 and #28321

Test case 2 from brave/brave-core#17468 and test case 2 from brave/brave-core#17427 for above issues respectivly failed. Test cases are outlined below.

Note, references to bold are not applicable to macOS per discussion with @Miyayes.

Steps to Reproduce

Scenario A: Test Case 2 from brave/brave-core#17468:
Per test plan, start with old version where we don't have geo declaration yet (I used 1.45.104):
1. connect your bitFlyer account
2. upgrade
3. set your OS region to Japan
4. restart browser
5. make sure Japan is the only item in the list (should be bold if not on macOS)
6. set your OS region to the US
7. restart browser
---> Japan should be the only item in the list at this point (not bold no matter which OS you're using) per brave/brave-core#17468 (comment), however full list of countries is displayed.

Step 1	Step 3	Step 5	Step 6	Step 8

Scenario B: Test Case 2 from brave/brave-core#17427:

Per test plan, start with old version where we don't have geo declaration yet (I used 1.45.104):
1. set your OS region to the US
2. install Brave and launch using staging parameters and the countryid flag (meaning, make sure your --rewards args include countryid=19024 for Japan. Example: --rewards=staging=true,debug=true,countryid=19024)
3. connect your bitFlyer account
4. upgrade to 1.51.x
---> make sure US is not listed in the country dropdown list --> this fails.

Step 1	Step 3	Step 5

Reproduces how often:

easily

Brave version (brave://version info)

1.51.80 Chromium: 112.0.5615.49 (Official Build) beta (x86_64)

Version/Channel Information:

• Can you reproduce this issue with the current release? n/a
• Can you reproduce this issue with the beta channel? yes 1.51.x
• Can you reproduce this issue with the nightly channel?

Other Additional Information:

• Does the issue resolve itself when disabling Brave Shields?
• Does the issue resolve itself when disabling Brave Rewards?
• Is the issue reproducible on the latest version of Chrome?

Miscellaneous Information:

cc @Miyayes

[LaurenWags]

cc @GeetaSarvadnya @Uni-verse to check on Android since original issue had OS/Android. If issue does not reproduce on Android, then can remove label/project for Android.

[LaurenWags]

Different issue occurs on Android, @GeetaSarvadnya to log an issue for it.

[kjozwiak]

The above requires 1.51.95 or higher for 1.51.x verification 👍

[GeetaSarvadnya]

Verification PASSED on

Brave | 1.51.95 Chromium: 112.0.5615.121 (Official Build) beta (64-bit)
-- | --
Revision | 39cc4e45904ae9f1741c4fbaa866e629c96f2268-refs/branch-heads/5615_51@{#8}
OS | Windows 10 Version 21H2 (Build 19044.2846)

• Verified the test plan from Changes GetCountryCode() to use countryid_at_install. brave-core#18025

Case 1 - Clean install, non-Japan region - PASSED

1. Have OS region set to a region other than Japan (I used India)
2. Launch 1.52.x using staging parameters - I used --args --enable-logging=stderr --vmodule="*/variations/*"=9,"*/bat-native-ledger/*"=9,"*/brave_rewards/*"=9,"*/bat-native-ads/*"=9,"*/bat-native-confirmations/*"=9,"*/brave_ads/*"=9,"*/brave_user_model/*"=9,"*/bat_ads/*"=9 --rewards=staging=true,debug=true
3. Close and relaunch to pull griffin seed
4. Click on BAT logo in URL bar, click "Start using Brave Rewards"
5. Confirm your OS region (in this example, India) is first in the list
6. Select and join Rewards
7. Confirm after joining that Uphold and Gemini are custodial options, bitFlyer is not an option
8. Confirm able to join using either Uphold or Gemini (Uphold is not supported for the country India and Gemini custodian is NOT supported for India region)

Step 1	Step 5	Step 7	Step 8

Case 2A - Clean install, Japan region - PASSED

1. Have OS region set to Japan
2. Launch 1.52.x using staging parameters - I used --args --enable-logging=stderr --vmodule="*/variations/*"=9,"*/bat-native-ledger/*"=9,"*/brave_rewards/*"=9,"*/bat-native-ads/*"=9,"*/bat-native-confirmations/*"=9,"*/brave_ads/*"=9,"*/brave_user_model/*"=9,"*/bat_ads/*"=9 --rewards=staging=true,debug=true
3. Close and relaunch to pull griffin seed
4. Click on BAT logo in URL bar, click "Start using Brave Rewards"
5. Confirm your OS region (in this example, Japan) is first in the list
6. Select and join Rewards
7. Confirm after joining that bitFlyer is the only custodial option, Uphold/Gemini are not available
8. Confirm able to join using bitFlyer

Step 1	Step 5	Step 7	Step 8

Case 2B - Reset Rewards, Japan region - PASSED

1. Continue from test case 2A
2. Close the browser
3. Change OS region to something other than Japan (I chose UK)
4. Relaunch with staging parameters
5. Reset Rewards
6. Click on BAT logo in URL bar
7. Confirm your OS at install (in this case Japan) is first in the list, not the OS region you have currently set
8. Select Japan and join Rewards
9. Confirm after joining that bitFlyer is the only custodial option, Uphold/Gemini are not available
10. Confirm able to join using bitFlyer

Step 3	Step 5	Step 7	Step 9	Step 10

Case 3 - Upgrade (connected) from version without geo-declaration, non-Japan region - PASSED

1. Have OS set to non-Japan region (I used United Kingdom)
2. Start with old version where we don't have geo declaration yet (I used 1.45.87 which is a Beta version, not Release channel version).
3. Join rewards and connect a custodian (Uphold or Gemini) for your OS region
4. Upgrade the profile 1.51.95 beta
5. Launch Beta 1.51.95
6. Click on BAT logo, make sure United Kingdom (country at install) is first in the list but don't select it
7. Close Beta
8. Change OS region to something else (ex. India)
9. restart browser
10. Confirm UK is still first in the list
11. Select UK (region that corresponds to your custodian account), confirm still connected to custodian

Step 1	Step 3	Step 6	Step 8	Step 10	Step 11	Step 11	Step 11

Case 4 - Upgrade (connected) from version without geo-declaration, Japan region - PASSED

1. Have OS set to Japan region
2. Start with old version where we don't have geo declaration yet (I used 1.45.87 which is a Beta version, not Release channel version).
3. Join rewards and connect to bitFlyer
4. Upgrade the profile to 1.51.95
5. Launch 1.51.95 via cmd line staging flags
6. Click on BAT logo, make sure Japan (country at install) is the only option in the list but don't select it
7. Close Nightly
8. Change OS region to something else (ex. UK)
9. restart browser
10. Confirm Japan is still the only option
11. Select Japan, confirm still connected to bitFlyer

Step 1	Step 3	Step 6	Step 8	Step 10	Step 11	Step 11

Case 5 - Upgrade (grandfathered unverified) from version without geo-declaration, Japan region - PASSED

1. Have OS set to Japan region
2. Start with old version where we don't have geo declaration yet (I used 1.45.87 which is a Beta version, not Release channel version).
3. Join rewards and but do not connect to custodian
4. Upgrade the profile to 1.51.95
5. Launch 1.51.95 via cmd line staging flags
6. Click on BAT logo, make sure Japan (country at install) is first in the list, but all countries are displayed
7. Close Beta
8. Change OS region to something else (ex. UK)
9. restart browser
10. Confirm Japan is still first, but not the only option

Step 1	Step 3	Step 6	Step 8	Step 10

[LaurenWags]

Verified with

Brave | 1.51.106 Chromium: 113.0.5672.53 (Official Build) (x86_64)
-- | --
Revision | 12f5dac35d12e8f4e72d7dd11df557ef93bc046f-refs/branch-heads/5672@{#703}
OS | macOS Version 13.3.1 (Build 22E261)

Case 1 - Clean install, non-Japan region - PASSED

1. Have OS region set to a region other than Japan (I used United States)
2. Launch 1.51.x using staging parameters - I used --args --enable-logging=stderr --vmodule="*/variations/*"=9,"*/bat-native-ledger/*"=9,"*/brave_rewards/*"=9,"*/bat-native-ads/*"=9,"*/bat-native-confirmations/*"=9,"*/brave_ads/*"=9,"*/brave_user_model/*"=9,"*/bat_ads/*"=9 --rewards=staging=true,debug=true
3. Close and relaunch to pull griffin seed
4. Click on BAT logo in URL bar, click "Start using Brave Rewards"
5. Confirm your OS region (in this example, United States) is first in the list
6. Select and join Rewards
7. Confirm after joining that Uphold and Gemini are custodial options, bitFlyer is not an option
8. Confirm able to join using either Uphold or Gemini

Step 1	Step 5	Step 7	Step 8

Case 2A - Clean install, Japan region - PASSED

1. Have OS region set to Japan
2. Launch 1.51.x using staging parameters - I used --args --enable-logging=stderr --vmodule="*/variations/*"=9,"*/bat-native-ledger/*"=9,"*/brave_rewards/*"=9,"*/bat-native-ads/*"=9,"*/bat-native-confirmations/*"=9,"*/brave_ads/*"=9,"*/brave_user_model/*"=9,"*/bat_ads/*"=9 --rewards=staging=true,debug=true
3. Close and relaunch to pull griffin seed
4. Click on BAT logo in URL bar, click "Start using Brave Rewards"
5. Confirm your OS region (in this example, Japan) is first in the list
6. Select and join Rewards
7. Confirm after joining that bitFlyer is the only custodial option, Uphold/Gemini are not available
8. Confirm able to join using bitFlyer

Step 1	Step 5	Step 7	Step 8

Case 2B - Reset Rewards, Japan region - PASSED

1. Continue from test case 2A
2. Close the browser
3. Change OS region to something other than Japan (I chose US)
4. Relaunch with staging parameters
5. Reset Rewards
6. Click on BAT logo in URL bar
7. Confirm your OS at install (in this case Japan) is first in the list, not the OS region you have currently set
8. Select Japan and join Rewards
9. Confirm after joining that bitFlyer is the only custodial option, Uphold/Gemini are not available
10. Confirm able to join using bitFlyer

Step 3	Step 5	Step 7	Step 9	Step 10

Case 3 - Upgrade (connected) from version without geo-declaration, non-Japan region - PASSED

1. Have OS set to non-Japan region (I used United States)
2. Start with old version where we don't have geo declaration yet (I used 1.45.104 note, this is a Beta version, not Release channel version).
3. Join rewards and connect a custodian (Uphold or Gemini) for your OS region
4. Close and rename profile to be for Release (1.51.x RC)
5. Launch 1.51.x RC
6. Click on BAT logo, make sure United States (country at install) is first in the list but don't select it
7. Close 1.51.x RC
8. Change OS region to something else (ex. Canada)
9. restart browser
10. Confirm US is still first in the list
11. Select US (region that corresponds to your custodian account), confirm still connected to custodian

Step 1	Step 3	Step 6	Step 8	Step 10	Step 11	Step 11

Case 4 - Upgrade (connected) from version without geo-declaration, Japan region - PASSED

1. Have OS set to Japan region
2. Start with old version where we don't have geo declaration yet (I used 1.45.104 which is a Beta version, not Release channel version).
3. Join rewards and connect to bitFlyer
4. Close and rename profile to be for Release (RC 1.51.x)
5. Launch RC
6. Click on BAT logo, make sure Japan (country at install) is the only option in the list but don't select it
7. Close RC
8. Change OS region to something else (ex. Canada)
9. restart browser
10. Confirm Japan is still the only option
11. Select Japan, confirm still connected to bitFlyer

Step 1	Step 3	Step 6	Step 8	Step 10	Step 11	Step 11

Case 5 - Upgrade (grandfathered unverified) from version without geo-declaration, Japan region - PASSED

1. Have OS set to Japan region
2. Start with old version where we don't have geo declaration yet (I used 1.45.104 which is a Beta version, not Release channel version).
3. Join rewards and but do not connect to custodian
4. Close and rename profile to be for Release (1.51.x RC)
5. Launch RC
6. Click on BAT logo, make sure Japan (country at install) is first in the list, but all countries are displayed
7. Close RC
8. Change OS region to something else (ex. Canada)
9. restart RC
10. Confirm Japan is still first, but not the only option

Step 1	Step 3	Step 6	Step 8	Step 10

[btlechowski]

Verification passed on

Brave	1.51.105 Chromium: 112.0.5615.165 (Official Build) beta (64-bit)
Revision	c262f36e6b1d711ee42d4fbe1343b49960593f18-refs/branch-heads/5615@{#1297}
OS	Ubuntu 18.04 LTS

• Verified the test plan from Changes GetCountryCode() to use countryid_at_install. brave-core#18025 (comment)

Case 1 - Clean install, non-Japan region - PASSED

1. Have OS region set to a region other than Japan (I used India)
2. Launch 1.52.x using staging parameters - I used --args --enable-logging=stderr --vmodule="*/variations/*"=9,"*/bat-native-ledger/*"=9,"*/brave_rewards/*"=9,"*/bat-native-ads/*"=9,"*/bat-native-confirmations/*"=9,"*/brave_ads/*"=9,"*/brave_user_model/*"=9,"*/bat_ads/*"=9 --rewards=staging=true,debug=true
3. Close and relaunch to pull griffin seed
4. Click on BAT logo in URL bar, click "Start using Brave Rewards"
5. Confirm your OS region (in this example, India) is first in the list
6. Select and join Rewards
7. Confirm after joining that Uphold and Gemini are custodial options, bitFlyer is not an option
8. Confirm able to join using either Uphold or Gemini (Uphold is not supported for the country India and Gemini custodian is NOT supported for India region)

Step 5	Step 7	Step 8

Case 2A - Clean install, Japan region - PASSED

1. Have OS region set to Japan
2. Launch 1.52.x using staging parameters - I used --args --enable-logging=stderr --vmodule="*/variations/*"=9,"*/bat-native-ledger/*"=9,"*/brave_rewards/*"=9,"*/bat-native-ads/*"=9,"*/bat-native-confirmations/*"=9,"*/brave_ads/*"=9,"*/brave_user_model/*"=9,"*/bat_ads/*"=9 --rewards=staging=true,debug=true
3. Close and relaunch to pull griffin seed
4. Click on BAT logo in URL bar, click "Start using Brave Rewards"
5. Confirm your OS region (in this example, Japan) is first in the list
6. Select and join Rewards
7. Confirm after joining that bitFlyer is the only custodial option, Uphold/Gemini are not available
8. Confirm able to join using bitFlyer

Step 5	Step 7	Step 8

Case 2B - Reset Rewards, Japan region - PASSED

1. Continue from test case 2A
2. Close the browser
3. Change OS region to something other than Japan
4. Relaunch with staging parameters
5. Reset Rewards
6. Click on BAT logo in URL bar
7. Confirm your OS at install (in this case Japan) is first in the list, not the OS region you have currently set
8. Select Japan and join Rewards
9. Confirm after joining that bitFlyer is the only custodial option, Uphold/Gemini are not available
10. Confirm able to join using bitFlyer

Step 5	Step 7	Step 9	Step 10

Case 3 - Upgrade (connected) from version without geo-declaration, non-Japan region - PASSED

1. Have OS set to non-Japan region (I used US)
2. Start with old version where we don't have geo declaration yet (I used 1.45.87 which is a Beta version, not Release channel version).
3. Join rewards and connect a custodian (Uphold or Gemini) for your OS region
4. Upgrade the profile 1.51.x beta
5. Launch Beta 1.51.x
6. Click on BAT logo, make sure United States (country at install) is first in the list but don't select it
7. Close Beta
8. Change OS region to something else (ex. India)
9. restart browser
10. Confirm US is still first in the list
11. Select US (region that corresponds to your custodian account), confirm still connected to custodian

Step 3	Step 6	Step 8	Step 10	Step 11

Case 4 - Upgrade (connected) from version without geo-declaration, Japan region - PASSED

1. Have OS set to Japan region
2. Start with old version where we don't have geo declaration yet (I used 1.45.87 which is a Beta version, not Release channel version).
3. Join rewards and connect to bitFlyer
4. Upgrade the profile to 1.51.95
5. Launch 1.51.95 via cmd line staging flags
6. Click on BAT logo, make sure Japan (country at install) is the only option in the list but don't select it
7. Close Brave
8. Change OS region to something else (ex. UK)
9. restart browser
10. Confirm Japan is still the only option
11. Select Japan, confirm still connected to bitFlyer

Step 1	Step 3	Step 6	Step 10	Step 11

Case 5 - Upgrade (grandfathered unverified) from version without geo-declaration, Japan region - PASSED

1. Have OS set to Japan region
2. Start with old version where we don't have geo declaration yet (I used 1.45.87 which is a Beta version, not Release channel version).
3. Join rewards and but do not connect to custodian
4. Upgrade the profile to 1.51.95
5. Launch 1.51.95 via cmd line staging flags
6. Click on BAT logo, make sure Japan (country at install) is first in the list, but all countries are displayed
7. Close Beta
8. Change OS region to something else (ex. UK)
9. restart browser
10. Confirm Japan is still first, but not the only option

---- | ---- | ----