Merge pull request #4667 from brave/connected-state

Don't return balance if connected state

Author: NejcZdovc

test/BUILD.gn

@@ -300,6 +300,7 @@ test("brave_unit_tests") {
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/vimeo_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/youtube_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_util_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/bat_helper_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/bat_util_unittest.cc",

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

@@ -113,7 +113,10 @@ void Uphold::FetchBalance(
     FetchBalanceCallback callback) {
   const auto wallet = GetWallet(std::move(wallets));
 
-  if (!wallet || wallet->token.empty() || wallet->address.empty()) {
+  if (!wallet ||
+      wallet->token.empty() ||
+      wallet->address.empty() ||
+      wallet->status == ledger::WalletStatus::CONNECTED) {
     callback(ledger::Result::LEDGER_OK, 0.0);
     return;
   }

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

@@ -0,0 +1,65 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <utility>
+
+#include "base/test/task_environment.h"
+#include "bat/ledger/internal/ledger_client_mock.h"
+#include "bat/ledger/internal/ledger_impl_mock.h"
+#include "bat/ledger/internal/uphold/uphold.h"
+#include "bat/ledger/ledger.h"
+#include "bat/ledger/global_constants.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+// npm run test -- brave_unit_tests --filter=UpholdTest.*
+
+using ::testing::_;
+using std::placeholders::_1;
+using std::placeholders::_2;
+
+namespace braveledger_uphold {
+
+class UpholdTest : public testing::Test {
+ private:
+  base::test::TaskEnvironment scoped_task_environment_;
+
+ protected:
+  std::unique_ptr<ledger::MockLedgerClient> mock_ledger_client_;
+  std::unique_ptr<bat_ledger::MockLedgerImpl> mock_ledger_impl_;
+  std::unique_ptr<Uphold> uphold_;
+
+  UpholdTest() {
+    mock_ledger_client_ = std::make_unique<ledger::MockLedgerClient>();
+    mock_ledger_impl_ =
+        std::make_unique<bat_ledger::MockLedgerImpl>(mock_ledger_client_.get());
+    uphold_ = std::make_unique<Uphold>(mock_ledger_impl_.get());
+  }
+};
+
+TEST_F(UpholdTest, FetchBalanceConnectedWallet) {
+  EXPECT_CALL(*mock_ledger_impl_, LoadURL(_, _, _, _, _, _)).Times(0);
+
+  std::map<std::string, ledger::ExternalWalletPtr> wallets;
+
+  auto wallet = ledger::ExternalWallet::New();
+  wallet->status = ledger::WalletStatus::CONNECTED;
+  wallet->token = "token";
+  wallet->address = "address";
+
+  wallets.insert(std::make_pair(ledger::kWalletUphold, std::move(wallet)));
+
+  FetchBalanceCallback callback =
+      std::bind(
+          [&](ledger::Result result, double balance) {
+            ASSERT_EQ(result, ledger::Result::LEDGER_OK);
+            ASSERT_EQ(balance, 0.0);
+          },
+          _1,
+          _2);
+
+  uphold_->FetchBalance(std::move(wallets), callback);
+}
+
+}  // namespace braveledger_uphold