Merge pull request #15485 from brave/sszaloki-25918-update-different-account-region-text

Removes `mismatchedProviderAccountRegionsModal`, adds `mismatchedCountriesModal`.

browser/ui/webui/brave_webui_source.cc

@@ -560,8 +560,8 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui,
         { "redirectModalFlaggedWalletTitle", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_FLAGGED_WALLET_TITLE},   // NOLINT
         { "redirectModalKYCRequiredTitle", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_KYC_REQUIRED_TITLE },     // NOLINT
         { "redirectModalKYCRequiredText", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_KYC_REQUIRED_TEXT },     // NOLINT
-        { "redirectModalMismatchedProviderAccountRegionsText", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNT_REGIONS_TEXT},     // NOLINT
-        { "redirectModalMismatchedProviderAccountRegionsTitle", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNT_REGIONS_TITLE},     // NOLINT
+        { "redirectModalMismatchedCountriesText", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_COUNTRIES_TEXT},     // NOLINT
+        { "redirectModalMismatchedCountriesTitle", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_COUNTRIES_TITLE},     // NOLINT
         { "redirectModalMismatchedProviderAccountsText", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNTS_TEXT},     // NOLINT
         { "redirectModalMismatchedProviderAccountsTitle", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNTS_TITLE},     // NOLINT
         { "redirectModalRegionNotSupportedText1", IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_REGION_NOT_SUPPORTED_TEXT_1},     // NOLINT

components/brave_rewards/resources/page/components/provider_redirect_modal.tsx

@@ -80,12 +80,13 @@ export function ProviderRedirectModal () {
           onClick={actions.hideRedirectModal}
         />
       )
-    case 'mismatchedProviderAccountRegionsModal':
+    case 'mismatchedCountriesModal':
       return (
         <ModalRedirect
-          id={'redirect-modal-mismatched-provider-account-regions'}
-          errorText={[getString('redirectModalMismatchedProviderAccountRegionsText')]}
-          titleText={getString('redirectModalMismatchedProviderAccountRegionsTitle')}
+          id={'redirect-modal-mismatched-countries'}
+          errorText={[getString('redirectModalMismatchedCountriesText').replace('$1', providerName)]}
+          titleText={getString('redirectModalMismatchedCountriesTitle')}
+          learnMore={'https://support.brave.com/hc/en-us/articles/9809690466061'}
           buttonText={getString('redirectModalClose')}
           walletType={walletType}
           onClick={actions.hideRedirectModal}

components/brave_rewards/resources/page/reducers/rewards_reducer.ts

@@ -351,8 +351,8 @@ const rewardsReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State
         break
       }
 
-      if (data.result === 46) { // type::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS
-        ui.modalRedirect = 'mismatchedProviderAccountRegionsModal'
+      if (data.result === 46) { // type::Result::MISMATCHED_COUNTRIES
+        ui.modalRedirect = 'mismatchedCountriesModal'
         break
       }
 

components/brave_rewards/resources/page/reducers/wallet_reducer.ts

@@ -199,8 +199,8 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
         break
       }
 
-      if (action.payload.result === 46) { // type::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS
-        state.ui.modalRedirect = 'mismatchedProviderAccountRegionsModal'
+      if (action.payload.result === 46) { // type::Result::MISMATCHED_COUNTRIES
+        state.ui.modalRedirect = 'mismatchedCountriesModal'
         break
       }
 

components/definitions/rewards.d.ts

@@ -65,7 +65,7 @@ declare namespace Rewards {
         | 'flaggedWalletModal'
         | 'hide'
         | 'kycRequiredModal'
-        | 'mismatchedProviderAccountRegionsModal'
+        | 'mismatchedCountriesModal'
         | 'mismatchedProviderAccountsModal'
         | 'regionNotSupportedModal'
         | 'show'

components/resources/brave_components_strings.grd

@@ -627,8 +627,8 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_FLAGGED_WALLET_TITLE" desc="">Error: Brave Rewards profile is flagged</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_KYC_REQUIRED_TEXT" desc="">Please try again after you have completed ID verification on <ph name="PROVIDER">$1<ex>Uphold</ex></ph>.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_KYC_REQUIRED_TITLE" desc="">Error: You need a verified account to log in</message>
-      <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNT_REGIONS_TEXT" desc="">Hmm, it looks like your Brave Rewards profile was already connected to a custodial account in another region. Please try connecting again with your previous custodial account, or update your custodial account's region to match your previous account.</message>
-      <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNT_REGIONS_TITLE" desc="">Error: Different account region</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_COUNTRIES_TEXT" desc="">Hmm, it looks like your Brave Rewards country does not match the country of the <ph name="PROVIDER">$1<ex>Uphold</ex></ph> account you're trying to connect.</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_COUNTRIES_TITLE" desc="">Error: Country mismatch</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNTS_TEXT" desc="">Hmm, it looks like your Brave Rewards has already been verified with another <ph name="PROVIDER">$1<ex>Uphold</ex></ph> account. Please try verifying again using your previous account.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_MISMATCHED_PROVIDER_ACCOUNTS_TITLE" desc="">Error: Different account</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_REDIRECT_MODAL_REGION_NOT_SUPPORTED_TEXT_1" desc="">Your <ph name="PROVIDER">$1<ex>Uphold</ex></ph> account can't be connected to your Brave Rewards profile at this time. Your <ph name="PROVIDER">$1<ex>Uphold</ex></ph> account is registered in a country that's not currently supported for connecting to Brave Rewards.</message>

vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom

@@ -250,7 +250,7 @@ enum Result {
   UPHOLD_INSUFFICIENT_CAPABILITIES = 43,
   FLAGGED_WALLET = 44,
   REGION_NOT_SUPPORTED = 45,
-  MISMATCHED_PROVIDER_ACCOUNT_REGIONS = 46
+  MISMATCHED_COUNTRIES = 46
 };
 
 enum PublisherStatus {

vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger_endpoints.mojom

@@ -26,7 +26,7 @@ enum PatchWalletsError {
 enum PostConnectError {
   kFailedToCreateRequest,
   kFlaggedWallet,                       // HTTP 400
-  kMismatchedProviderAccountRegions,    // HTTP 400
+  kMismatchedCountries,                 // HTTP 400
   kRegionNotSupported,                  // HTTP 400
   kUnknownMessage,                      // HTTP 400, HTTP 403
   kKycRequired,                         // HTTP 403, HTTP 404

vendor/bat-native-ledger/src/bat/ledger/internal/bitflyer/bitflyer_authorization.cc

@@ -198,7 +198,7 @@ void BitflyerAuthorization::OnConnectWallet(
     case mojom::Result::REQUEST_SIGNATURE_VERIFICATION_FAILURE:
     case mojom::Result::FLAGGED_WALLET:
     case mojom::Result::REGION_NOT_SUPPORTED:
-    case mojom::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS:
+    case mojom::Result::MISMATCHED_COUNTRIES:
       ledger_->database()->SaveEventLog(
           log::GetEventLogKeyForLinkingResult(legacy_result),
           constant::kWalletBitflyer + std::string("/") + abbreviated_address);

vendor/bat-native-ledger/src/bat/ledger/internal/endpoints/post_connect/post_connect.cc

@@ -65,8 +65,8 @@ Result ParseBody(const std::string& body) {
   } else if (message->find("mismatched provider account regions") !=
              std::string::npos) {
     // HTTP 400: bitFlyer, Gemini, Uphold
-    BLOG(0, "Mismatched provider account regions!");
-    return base::unexpected(Error::kMismatchedProviderAccountRegions);
+    BLOG(0, "Mismatched countries!");
+    return base::unexpected(Error::kMismatchedCountries);
   } else {
     // bitFlyer, Gemini, Uphold
     BLOG(0, "Unknown message!");
@@ -108,8 +108,8 @@ mojom::Result PostConnect::ToLegacyResult(const Result& result) {
         return mojom::Result::LEDGER_ERROR;
       case Error::kFlaggedWallet:  // HTTP 400
         return mojom::Result::FLAGGED_WALLET;
-      case Error::kMismatchedProviderAccountRegions:  // HTTP 400
-        return mojom::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS;
+      case Error::kMismatchedCountries:  // HTTP 400
+        return mojom::Result::MISMATCHED_COUNTRIES;
       case Error::kRegionNotSupported:  // HTTP 400
         return mojom::Result::REGION_NOT_SUPPORTED;
       case Error::kUnknownMessage:  // HTTP 400, HTTP 403

vendor/bat-native-ledger/src/bat/ledger/internal/endpoints/post_connect/post_connect_unittest.cc

@@ -123,7 +123,7 @@ INSTANTIATE_TEST_SUITE_P(
       base::unexpected(Error::kFlaggedWallet)
     },
     PostConnectParamType{
-      "02_HTTP_400_mismatched_provider_account_regions",
+      "02_HTTP_400_mismatched_countries",
       net::HTTP_BAD_REQUEST,
       R"(
         {
@@ -131,7 +131,7 @@ INSTANTIATE_TEST_SUITE_P(
           "code": 400
         }
       )",
-      base::unexpected(Error::kMismatchedProviderAccountRegions)
+      base::unexpected(Error::kMismatchedCountries)
     },
     PostConnectParamType{
       "03_HTTP_400_region_not_supported",

vendor/bat-native-ledger/src/bat/ledger/internal/gemini/gemini_authorization.cc

@@ -231,7 +231,7 @@ void GeminiAuthorization::OnConnectWallet(
     case mojom::Result::REQUEST_SIGNATURE_VERIFICATION_FAILURE:
     case mojom::Result::FLAGGED_WALLET:
     case mojom::Result::REGION_NOT_SUPPORTED:
-    case mojom::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS:
+    case mojom::Result::MISMATCHED_COUNTRIES:
       ledger_->database()->SaveEventLog(
           log::GetEventLogKeyForLinkingResult(legacy_result),
           constant::kWalletGemini + std::string("/") + abbreviated_address);

vendor/bat-native-ledger/src/bat/ledger/internal/logging/event_log_keys.h

@@ -16,8 +16,7 @@ const char kDatabaseMigrated[] = "database_migrated";
 const char kDeviceLimitReached[] = "device_limit_reached";
 const char kFlaggedWallet[] = "flagged_wallet";
 const char kKYCRequired[] = "kyc_required";
-const char kMismatchedProviderAccountRegions[] =
-    "mismatched_provider_account_regions";
+const char kMismatchedCountries[] = "mismatched_countries";
 const char kMismatchedProviderAccounts[] = "mismatched_provider_accounts";
 const char kPromotionVBATDrained[] = "promotion_vbat_drained";
 const char kRecurringTipAdded[] = "recurring_tip_added";

vendor/bat-native-ledger/src/bat/ledger/internal/logging/event_log_util.cc

@@ -14,8 +14,8 @@ std::string GetEventLogKeyForLinkingResult(mojom::Result result) {
       return log::kDeviceLimitReached;
     case mojom::Result::FLAGGED_WALLET:
       return log::kFlaggedWallet;
-    case mojom::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS:
-      return log::kMismatchedProviderAccountRegions;
+    case mojom::Result::MISMATCHED_COUNTRIES:
+      return log::kMismatchedCountries;
     case mojom::Result::MISMATCHED_PROVIDER_ACCOUNTS:
       return log::kMismatchedProviderAccounts;
     case mojom::Result::NOT_FOUND:

vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_unittest.cc

@@ -1528,8 +1528,8 @@ INSTANTIATE_TEST_SUITE_P(
       mojom::Result::REGION_NOT_SUPPORTED,
       mojom::WalletStatus::NOT_CONNECTED
     },
-    ClaimWalletParamType{  // Mismatched provider account regions.
-      "06_mismatched_provider_account_regions",
+    ClaimWalletParamType{  // Mismatched countries.
+      "06_mismatched_countries",
       R"({ "status": 5, "token": "0047c2fd8f023e067354dbdb5639ee67acf77150" })",
       R"({ "payment_id":"fa5dea51-6af4-44ca-801b-07b6df3dcfe4", "recovery_seed":"AN6DLuI2iZzzDxpzywf+IKmK1nzFRarNswbaIDI3pQg=" })",
       mojom::UrlResponse{
@@ -1565,7 +1565,7 @@ INSTANTIATE_TEST_SUITE_P(
         )",
         {}
       },
-      mojom::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS,
+      mojom::Result::MISMATCHED_COUNTRIES,
       mojom::WalletStatus::NOT_CONNECTED
     },
     ClaimWalletParamType{  // Rewards Link (Claim) Wallet failed.

vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_wallet.cc

@@ -244,7 +244,7 @@ void UpholdWallet::OnConnectWallet(ledger::ResultCallback callback,
     case mojom::Result::UPHOLD_TRANSACTION_VERIFICATION_FAILURE:
     case mojom::Result::FLAGGED_WALLET:
     case mojom::Result::REGION_NOT_SUPPORTED:
-    case mojom::Result::MISMATCHED_PROVIDER_ACCOUNT_REGIONS:
+    case mojom::Result::MISMATCHED_COUNTRIES:
       // Entering NOT_CONNECTED.
       ledger_->uphold()->DisconnectWallet("");
       ledger_->database()->SaveEventLog(