From a48935f0b78e5d9b8c2a2dd49dfcb095dbeed907 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Mon, 2 Dec 2019 06:53:12 +0000 Subject: [PATCH] Uplift of #4085 (squashed) to dev --- .../src/bat/ledger/internal/uphold/uphold_util.cc | 5 +---- .../src/bat/ledger/internal/uphold/uphold_wallet.cc | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util.cc index cd5f4fbf4ba..fff0db42946 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util.cc @@ -217,10 +217,7 @@ std::string GenerateVerifyLink(ledger::ExternalWalletPtr wallet) { } switch (wallet->status) { - case ledger::WalletStatus::PENDING: { - url = GetSecondStepVerify(); - break; - } + case ledger::WalletStatus::PENDING: case ledger::WalletStatus::CONNECTED: { url = GetSecondStepVerify(); break; diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_wallet.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_wallet.cc index a7277c725c9..c606fb9e23c 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_wallet.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_wallet.cc @@ -47,6 +47,12 @@ void UpholdWallet::Generate( wallet->one_time_string = GenerateRandomString(ledger::is_testing); } + if (wallet->token.empty() && + (wallet->status == ledger::WalletStatus::PENDING || + wallet->status == ledger::WalletStatus::CONNECTED)) { + wallet->status = ledger::WalletStatus::NOT_CONNECTED; + } + wallet = GenerateLinks(std::move(wallet)); if (wallet->status == ledger::WalletStatus::CONNECTED ||