Uplift of #6251 (squashed) to beta

brave · Jul 30, 2020 · e6b4b07 · e6b4b07
1 parent a2e7ed4
commit e6b4b07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom
@@ -132,7 +132,7 @@ interface BatLedger {
 
   GetPendingContributionsTotal() => (double amount);
 
-  FetchBalance() => (ledger.mojom.Result result, ledger.mojom.Balance balance);
+  FetchBalance() => (ledger.mojom.Result result, ledger.mojom.Balance? balance);
 
   GetExternalWallet(string wallet_type) => (ledger.mojom.Result result, ledger.mojom.ExternalWallet? wallet);
 

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_balance.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_balance.cc
@@ -41,6 +41,11 @@ void WalletBalance::Fetch(ledger::FetchBalanceCallback callback) {
   }
 
   const std::string payment_id = braveledger_state::GetPaymentId(ledger_);
+  if (payment_id.empty()) {
+    BLOG(0, "Payment ID is empty");
+    callback(ledger::Result::LEDGER_ERROR, nullptr);
+    return;
+  }
 
   const std::string url = braveledger_request_util::GetBalanceWalletURL(
       braveledger_state::GetPaymentId(ledger_));