Fixes brave/brave-browser#4476

Author: Jason Sadler

browser/ui/webui/brave_rewards_ui.cc

@@ -598,10 +598,15 @@ void RewardsDOMHandler::OnGetAddresses(
       func_name == "addresses" || func_name == "addressesForPaymentId")) {
     base::DictionaryValue data;
     data.SetString("BAT", addresses.at("BAT"));
-    data.SetString("BTC", addresses.at("BTC"));
-    data.SetString("ETH", addresses.at("ETH"));
-    data.SetString("LTC", addresses.at("LTC"));
-
+    if (addresses.count("BTC") == 1) {
+      data.SetString("BTC", addresses.at("BTC"));
+    }
+    if (addresses.count("ETH") == 1) {
+      data.SetString("ETH", addresses.at("ETH"));
+    }
+    if (addresses.count("LTC") == 1) {
+      data.SetString("LTC", addresses.at("LTC"));
+    }
     web_ui()->CallJavascriptFunctionUnsafe("brave_rewards." + func_name, data);
   }
 }

components/brave_rewards/browser/rewards_service_browsertest.cc

@@ -1409,3 +1409,60 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
   // Stop observing the Rewards service
   rewards_service_->RemoveObserver(this);
 }
+
+IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest, AddFunds) {
+  rewards_service_->AddObserver(this);
+  EnableRewards();
+  content::EvalJsResult js_result = EvalJs(
+    contents(),
+    "document.querySelector(\"[data-test-id='panel-add-funds']\").click();"
+    "new Promise((resolve) => {"
+    "var count = 10;"
+    "var interval = setInterval(function() {"
+    "  if (count === 0) {"
+    "    clearInterval(interval);"
+    "    resolve(false);"
+    "  } else {"
+    "    count -= 1;"
+    "  }"
+    "  const addresses = document.querySelector("
+    "      \"[data-test-id='addresses']\");"
+    "  if (addresses) {"
+    "    clearInterval(interval);"
+    "    resolve(document.querySelectorAll(\"[data-test-id='single-address']\")"
+    "        .length === 4);"
+    "  }"
+    "}, 500);});",
+    content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
+    content::ISOLATED_WORLD_ID_CONTENT_END);
+  ASSERT_TRUE(js_result.ExtractBool());
+}
+
+IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest, AddFundsCountryLimited) {
+  rewards_service_->SetCurrentCountry("JP");
+  rewards_service_->AddObserver(this);
+  EnableRewards();
+  content::EvalJsResult js_result = EvalJs(
+    contents(),
+    "document.querySelector(\"[data-test-id='panel-add-funds']\").click();"
+    "new Promise((resolve) => {"
+    "var count = 10;"
+    "var interval = setInterval(function() {"
+    "  if (count === 0) {"
+    "    clearInterval(interval);"
+    "    resolve(false);"
+    "  } else {"
+    "    count -= 1;"
+    "  }"
+    "  const addresses = document.querySelector("
+    "      \"[data-test-id='addresses']\");"
+    "  if (addresses) {"
+    "    clearInterval(interval);"
+    "    resolve(document.querySelectorAll(\"[data-test-id='single-address']\")"
+    "        .length === 1);"
+    "  }"
+    "}, 500);});",
+    content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
+    content::ISOLATED_WORLD_ID_CONTENT_END);
+  ASSERT_TRUE(js_result.ExtractBool());
+}

components/brave_rewards/browser/rewards_service_impl.cc

@@ -5,6 +5,8 @@
 
 #include "brave/components/brave_rewards/browser/rewards_service_impl.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <functional>
 #include <limits>
@@ -55,6 +57,7 @@
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/country_codes/country_codes.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/prefs/pref_service.h"
@@ -1528,8 +1531,35 @@ void RewardsServiceImpl::GetAddresses(const GetAddressesCallback& callback) {
     return;
   }
 
-  bat_ledger_->GetAddresses(base::BindOnce(&RewardsServiceImpl::OnGetAddresses,
-        AsWeakPtr(), callback));
+  bat_ledger_->GetAddressesLimitedCountries(
+      base::BindOnce(&RewardsServiceImpl::OnGetAddressesLimitedCountries,
+              AsWeakPtr(), callback));
+}
+
+void RewardsServiceImpl::OnGetAddressesLimitedCountries(
+    const GetAddressesCallback& callback,
+    const std::vector<std::string>& country_chars) {
+  int32_t current_code = country_codes::GetCountryIDFromPrefs(
+      profile_->GetPrefs());
+  if (!current_country_for_test_.empty()) {
+    current_code = country_codes::CountryCharsToCountryID(
+      current_country_for_test_.at(0), current_country_for_test_.at(1));
+  }
+
+
+  for (const std::string& country_code : country_chars) {
+    if (country_code.size() == 2 &&
+        current_code == country_codes::CountryCharsToCountryID(
+          country_code.at(0), country_code.at(1))) {
+      bat_ledger_->GetAddresses(true,
+        base::BindOnce(&RewardsServiceImpl::OnGetAddresses,
+              AsWeakPtr(), callback));
+      return;
+    }
+  }
+  bat_ledger_->GetAddresses(false,
+        base::BindOnce(&RewardsServiceImpl::OnGetAddresses,
+              AsWeakPtr(), callback));
 }
 
 void RewardsServiceImpl::SetRewardsMainEnabled(bool enabled) {
@@ -2592,6 +2622,13 @@ void RewardsServiceImpl::HandleFlags(const std::string& options) {
 
       SetShortRetries(short_retries);
     }
+
+    if (name == "current-country") {
+      const std::string& current_country_(base::ToUpperASCII(value));
+      if (!current_country_.empty() && current_country_.size() == 2) {
+        SetCurrentCountry(current_country_);
+      }
+    }
   }
 }
 
@@ -2701,6 +2738,11 @@ void RewardsServiceImpl::SetShortRetries(bool short_retries) {
   bat_ledger_service_->SetShortRetries(short_retries);
 }
 
+void RewardsServiceImpl::SetCurrentCountry(
+    const std::string& current_country_) {
+  current_country_for_test_ = current_country_;
+}
+
 ledger::Result SavePendingContributionOnFileTaskRunner(
     PublisherInfoDatabase* backend,
     const ledger::PendingContributionList& list) {

components/brave_rewards/browser/rewards_service_impl.h

@@ -195,6 +195,7 @@ class RewardsServiceImpl : public RewardsService,
   void GetReconcileTime(const GetReconcileTimeCallback& callback);
   void SetShortRetries(bool short_retries);
   void GetShortRetries(const GetShortRetriesCallback& callback);
+  void SetCurrentCountry(const std::string& current_country_);
 
   void GetAutoContributeProps(
       const GetAutoContributePropsCallback& callback) override;
@@ -469,6 +470,9 @@ class RewardsServiceImpl : public RewardsService,
       const base::flat_map<std::string, std::string>& json_reports);
   void OnGetCurrentBalanceReport(
       bool success, const std::string& json_report);
+  void OnGetAddressesLimitedCountries(
+      const GetAddressesCallback& callback,
+      const std::vector<std::string>& country_chars);
   void OnGetAddresses(
       const GetAddressesCallback& callback,
       const base::flat_map<std::string, std::string>& addresses);
@@ -521,6 +525,7 @@ class RewardsServiceImpl : public RewardsService,
   uint32_t next_timer_id_;
 
   GetTestResponseCallback test_response_callback_;
+  std::string current_country_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(RewardsServiceImpl);
 };

components/brave_rewards/resources/ui/components/pageWallet.tsx

@@ -315,7 +315,8 @@ class PageWallet extends React.Component<Props, State> {
             {
               name: getLocale('panelAddFunds'),
               action: this.onModalAddFundsToggle,
-              icon: <WalletAddIcon />
+              icon: <WalletAddIcon />,
+              testId: 'panel-add-funds'
             }
           ]}
           onSettingsClick={this.onModalBackupOpen}

components/brave_rewards/resources/ui/utils.ts

@@ -95,7 +95,7 @@ export const getAddresses = (addresses?: Record<Rewards.AddressesType, Rewards.A
 
   sortedArray.forEach((type: Rewards.AddressesType) => {
     const item: Rewards.Address = addresses[type]
-    if (item) {
+    if (item && item.address) {
       result.push({
         type,
         qr: item.qr,

components/services/bat_ledger/bat_ledger_impl.cc

@@ -233,8 +233,16 @@ void BatLedgerImpl::SolveGrantCaptcha(const std::string& solution,
   ledger_->SolveGrantCaptcha(solution, promotion_id);
 }
 
-void BatLedgerImpl::GetAddresses(GetAddressesCallback callback) {
-  std::move(callback).Run(mojo::MapToFlatMap(ledger_->GetAddresses()));
+void BatLedgerImpl::GetAddressesLimitedCountries(
+    GetAddressesLimitedCountriesCallback callback) {
+  std::move(callback).Run(ledger_->GetAddressesLimitedCountries());
+}
+
+void BatLedgerImpl::GetAddresses(
+    bool limit_addresses,
+    GetAddressesCallback callback) {
+  std::move(callback).Run(mojo::MapToFlatMap(
+      ledger_->GetAddresses(limit_addresses)));
 }
 
 void BatLedgerImpl::GetBATAddress(GetBATAddressCallback callback) {

components/services/bat_ledger/bat_ledger_impl.h

@@ -84,7 +84,11 @@ class BatLedgerImpl : public mojom::BatLedger,
       const std::string& solution,
       const std::string& promotionId) override;
 
-  void GetAddresses(GetAddressesCallback callback) override;
+  void GetAddressesLimitedCountries(
+      GetAddressesLimitedCountriesCallback callback) override;
+  void GetAddresses(
+      bool limit_addresses,
+      GetAddressesCallback callback) override;
   void GetBATAddress(GetBATAddressCallback callback) override;
   void GetBTCAddress(GetBTCAddressCallback callback) override;
   void GetETHAddress(GetETHAddressCallback callback) override;

components/services/bat_ledger/public/interfaces/bat_ledger.mojom

@@ -63,7 +63,8 @@ interface BatLedger {
   RecoverWallet(string passPhrase);
   SolveGrantCaptcha(string solution, string promotionId);
 
-  GetAddresses() => (map<string, string> addresses);
+  GetAddressesLimitedCountries() => (array<string> limited_countries);
+  GetAddresses(bool limit_addresses) => (map<string, string> addresses);
   GetBATAddress() => (string address);
   GetBTCAddress() => (string address);
   GetETHAddress() => (string address);