diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index c8cf5e8bba..f0162c2094 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java b/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java index d690db0021..218edf9088 100644 --- a/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java +++ b/app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java @@ -73,7 +73,7 @@ public class UpdateWalletInfoTask extends ElectrumTask { loadedWallet.mCard.setBalanceRecieved(true); if (sharedCounter != null) { - boolean notEqualBalance = !sharedCounter.UpdatePayload(new BigDecimal(String.valueOf(confBalance))); + boolean notEqualBalance = sharedCounter.UpdatePayload(new BigDecimal(String.valueOf(confBalance))); if (notEqualBalance) loadedWallet.mCard.setIsBalanceEqual(false); int counter = sharedCounter.requestCounter.incrementAndGet(); diff --git a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java index 0b99f9501c..faa6870f40 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java +++ b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java @@ -21,6 +21,9 @@ public class BalanceValidator { String defaultFirstLine = "Unknown balance."; String successFirstLine = "Verified balance."; + firstLine = successFirstLine; + secondLine = ""; + // rule 1 if(!CheckOfflineBalance(card) && !CheckOnlineBalance(card)) { score = 0; diff --git a/app/src/main/java/com/tangem/domain/wallet/SharedData.java b/app/src/main/java/com/tangem/domain/wallet/SharedData.java index d71e5a5bbe..6f162e1ce5 100644 --- a/app/src/main/java/com/tangem/domain/wallet/SharedData.java +++ b/app/src/main/java/com/tangem/domain/wallet/SharedData.java @@ -22,10 +22,12 @@ public class SharedData if(payload == null || payload.compareTo(value)!=0) { boolean isChange = true; - if(payload == null) + if(payload == null || payload == BigDecimal.ZERO) isChange = false; if(value!=BigDecimal.ZERO) payload = value; + else + isChange = false; return isChange; } diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java index 90c5fb63ab..e711eb244b 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -516,6 +516,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre mCard.resetFailedBalanceRequestCounter(); SharedData data = new SharedData(SharedData.COUNT_REQUEST); mCard.resetFailedBalanceRequestCounter(); + mCard.setIsBalanceEqual(true); for (int i = 0; i < data.allRequest; ++i) { String nodeAddress = Objects.requireNonNull(engine).GetNextNode(mCard); int nodePort = engine.GetNextNodePort(mCard); @@ -535,6 +536,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre } else if (mCard.getBlockchain() == Blockchain.BitcoinCash || mCard.getBlockchain() == Blockchain.BitcoinCashTestNet) { mCard.resetFailedBalanceRequestCounter(); SharedData data = new SharedData(SharedData.COUNT_REQUEST); + mCard.setIsBalanceEqual(true); for (int i = 0; i < data.allRequest; ++i) { String nodeAddress = Objects.requireNonNull(engine).GetNextNode(mCard); int nodePort = engine.GetNextNodePort(mCard);