diff --git a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java index 953259ba17..03a2d3c2ce 100644 --- a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java @@ -4,6 +4,7 @@ import android.net.Uri; import android.text.InputFilter; import android.util.Log; +import com.tangem.App; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; import com.tangem.tangem_card.data.TangemCard; @@ -71,7 +72,7 @@ public class BtcCashEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { if (coinData == null) return false; - return coinData.getBalanceUnconfirmed() != 0; + return coinData.getBalanceUnconfirmed() != 0 || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java index ef2d8e087f..9d4a9be074 100644 --- a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java +++ b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java @@ -6,6 +6,7 @@ import android.util.Log; import androidx.annotation.NonNull; +import com.tangem.App; import com.tangem.data.Blockchain; import com.tangem.data.network.BinanceApi; import com.tangem.data.network.Server; @@ -91,7 +92,7 @@ public class BinanceEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - return false; + return App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java index 5602c1a585..021ce73e38 100644 --- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java @@ -93,7 +93,7 @@ public class BtcEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { if (coinData == null) return false; - return coinData.getBalanceUnconfirmed() != 0 || coinData.isHasUnconfirmed(); + return coinData.getBalanceUnconfirmed() != 0 || coinData.isHasUnconfirmed() || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java index ede859b03e..c9a700254f 100644 --- a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java @@ -85,7 +85,7 @@ public class CardanoEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - return false; + return App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java index 4a29f13377..e108b9373b 100644 --- a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java @@ -4,6 +4,7 @@ import android.net.Uri; import android.text.InputFilter; import android.util.Log; +import com.tangem.App; import com.tangem.data.network.ServerApiInsight; import com.tangem.data.network.model.InsightResponse; import com.tangem.tangem_card.data.TangemCard; @@ -67,7 +68,7 @@ public class DucatusEngine extends BtcEngine { @Override public boolean awaitingConfirmation() { if (coinData == null) return false; - return coinData.getBalanceUnconfirmed() != 0; + return coinData.getBalanceUnconfirmed() != 0 || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java index c97730074a..47ee91442f 100644 --- a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java +++ b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java @@ -6,6 +6,7 @@ import android.util.Log; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.gson.Gson; +import com.tangem.App; import com.tangem.Constant; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiEos; @@ -86,7 +87,7 @@ public class EosEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - return false; + return App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java index fb92bb5751..839d066aa1 100644 --- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java @@ -4,6 +4,7 @@ import android.net.Uri; import android.text.InputFilter; import android.util.Log; +import com.tangem.App; import com.tangem.Constant; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; @@ -65,7 +66,7 @@ public class EthEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - return false; + return !coinData.getUnconfirmedTXCount().equals(coinData.getConfirmedTXCount()) || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java index b8d834bce6..a2a6abc339 100644 --- a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java @@ -76,7 +76,7 @@ public class LtcEngine extends BtcEngine { @Override public boolean awaitingConfirmation() { if (coinData == null) return false; - return coinData.getBalanceUnconfirmed() != 0; + return coinData.getBalanceUnconfirmed() != 0 || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java index aebf1d808d..9361789180 100644 --- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java @@ -6,6 +6,7 @@ import android.text.InputFilter; import android.util.Log; import com.google.common.base.Strings; +import com.tangem.App; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; import com.tangem.data.network.model.InfuraResponse; @@ -73,7 +74,7 @@ public class TokenEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - return false; + return !coinData.getUnconfirmedTXCount().equals(coinData.getConfirmedTXCount()) || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java index b25bdc163d..626b41ff00 100644 --- a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java +++ b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java @@ -5,6 +5,7 @@ import android.os.StrictMode; import android.text.InputFilter; import android.util.Log; +import com.tangem.App; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiStellar; import com.tangem.data.network.StellarRequest; @@ -70,9 +71,7 @@ public class XlmAssetEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - if (coinData == null) return false; - //TODO - return false;//coinData.getBalanceUnconfirmed() != 0; + return App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java index 2f7b74808a..c707517abc 100644 --- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java +++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java @@ -5,6 +5,7 @@ import android.os.StrictMode; import android.text.InputFilter; import android.util.Log; +import com.tangem.App; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiStellar; import com.tangem.data.network.StellarRequest; @@ -68,9 +69,7 @@ public class XlmEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { - if (coinData == null) return false; - //TODO - return false;//coinData.getBalanceUnconfirmed() != 0; + return App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override diff --git a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java index 8e9e566462..9ae763d5fa 100644 --- a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java @@ -9,6 +9,7 @@ import com.ripple.core.coretypes.uint.UInt32; import com.ripple.crypto.ecdsa.ECDSASignature; import com.ripple.encodings.addresses.Addresses; import com.ripple.utils.HashUtils; +import com.tangem.App; import com.tangem.data.network.ServerApiRipple; import com.tangem.data.network.model.RippleResponse; import com.tangem.tangem_card.data.TangemCard; @@ -61,7 +62,7 @@ public class XrpEngine extends CoinEngine { @Override public boolean awaitingConfirmation() { if (coinData == null) return false; - return coinData.hasUnconfirmed(); + return coinData.hasUnconfirmed() || App.pendingTransactionsStorage.hasTransactions(ctx.getCard()); } @Override