Updated on 2026-08-14

This commit is contained in:
Tangem 2020-02-12 14:22:31 +03:00
parent 39fa3780e8
commit 8013392219
2 changed files with 21 additions and 1 deletions

View file

@ -773,7 +773,8 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
}
private fun showWarningIfPendingTransactionIsPossible() {
if (ctx.card.signedHashes > 0 && isNewCid(ctx.card.cidDescription)) {
if (ctx.card.signedHashes > 0 && isNewCid(ctx.card.cidDescription)
&& ctx.card.signedHashes != ctx.coinData.sentTransactionsCount) {
AlertDialog.Builder(context)
.setTitle(R.string.dialog_warning)
.setMessage(R.string.loaded_wallet_warning_card_signed_transactions)

View file

@ -54,6 +54,10 @@ public abstract class CoinData {
rate = B.getFloat("rate");
if (B.containsKey("rateAlter"))
rateAlter = B.getFloat("rateAlter");
if (B.containsKey("sentTransactionsCount")) {
sentTransactionsCount = B.getInt("sentTransactionsCount");
}
}
public void saveToBundle(Bundle B) {
@ -70,6 +74,10 @@ public abstract class CoinData {
B.putBoolean("balanceReceived", balanceReceived);
B.putString("validationNodeDescription", validationNodeDescription);
if (sentTransactionsCount != null) {
B.putInt("sentTransactionsCount", sentTransactionsCount);
}
} catch (Exception e) {
Log.e("Can't save to bundle ", e.getMessage());
}
@ -148,6 +156,7 @@ public abstract class CoinData {
normalFee=null;
rate=0f;
rateAlter=0f;
sentTransactionsCount = null;
}
// private AtomicInteger failedBalanceRequestCounter;
@ -191,4 +200,14 @@ public abstract class CoinData {
public CoinEngine.Amount minFee = null;
public CoinEngine.Amount normalFee = null;
public CoinEngine.Amount maxFee = null;
private Integer sentTransactionsCount = null;
public Integer getSentTransactionsCount() {
return sentTransactionsCount;
}
public void setSentTransactionsCount(Integer sentTransactionsCount) {
this.sentTransactionsCount = sentTransactionsCount;
}
}