From 0961769381236be39fb09ede8e032ae8b4e712db Mon Sep 17 00:00:00 2001 From: Terry Mancey Date: Tue, 28 Jan 2020 10:50:46 +0000 Subject: [PATCH] Fixes upgrade from 0.63.x to 1.3.x AC switch OFF and wallet creation failed --- .../bat/ledger/internal/state/wallet_state.cc | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/state/wallet_state.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/state/wallet_state.cc index bf9fb71defdf..18f8ba1590a7 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/state/wallet_state.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/state/wallet_state.cc @@ -75,22 +75,17 @@ bool WalletState::FromDict( // Fee Amount const auto fee_amount = dictionary->FindDoublePath(kFeeBatPath); - if (!fee_amount) { - NOTREACHED(); - return false; + if (fee_amount) { + wallet_properties.fee_amount = *fee_amount; } - wallet_properties.fee_amount = *fee_amount; // Choices BAT const auto* choices_bat_list = dictionary->FindListPath(kChoicesBatPath); - if (!choices_bat_list) { - NOTREACHED(); - return false; - } - - for (const auto&choices_bat_value : choices_bat_list->GetList()) { - const double bat = choices_bat_value.GetDouble(); - wallet_properties.parameters_choices.push_back(bat); + if (choices_bat_list) { + for (const auto&choices_bat_value : choices_bat_list->GetList()) { + const double bat = choices_bat_value.GetDouble(); + wallet_properties.parameters_choices.push_back(bat); + } } // Default tip choices