From bd88768b115807464fc0976410180d6ec5729d3d Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 29 Nov 2019 13:20:11 +0300 Subject: [PATCH 1/6] Updated on 2026-08-14 --- app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java | 2 +- app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 11497062f0..2f7b74808a 100644 --- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java +++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java @@ -98,7 +98,7 @@ public class XlmEngine extends CoinEngine { @Override public boolean hasBalanceInfo() { if (coinData == null) return false; - return coinData.getBalance() != null; + return (coinData.getBalance() != null) || (coinData.isError404()) ; } 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 3e6e0d1802..8e9e566462 100644 --- a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java @@ -89,11 +89,11 @@ public class XrpEngine extends CoinEngine { @Override public boolean hasBalanceInfo() { if (coinData == null) return false; - return coinData.hasBalanceInfo(); + return coinData.hasBalanceInfo() || coinData.isAccountNotFound(); } public boolean isExtractPossible() { - if (!hasBalanceInfo()) { + if (coinData == null || !coinData.hasBalanceInfo()) { ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { ctx.setMessage(R.string.general_wallet_empty); @@ -242,7 +242,7 @@ public class XrpEngine extends CoinEngine { @Override public Amount getBalance() { - if (!hasBalanceInfo()) return null; + if (coinData == null || !coinData.hasBalanceInfo()) return null; return convertToAmount(coinData.getBalanceInInternalUnits()); } From e0497bb7618a2368b7979b04dc1789d28eca45ab Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 29 Nov 2019 13:34:20 +0300 Subject: [PATCH 2/6] Updated on 2026-08-14 --- .../java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt index 461dff5a5f..f994df8087 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt @@ -323,6 +323,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte super.onStart() if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this) + refresh() } override fun onStop() { From 961fec22cbf75894c007b0e6ddae42a7d8ba8da4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 3 Dec 2019 10:03:49 +0300 Subject: [PATCH 3/6] Updated on 2026-08-14 --- app/src/main/java/com/tangem/wallet/btc/BtcData.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcData.java b/app/src/main/java/com/tangem/wallet/btc/BtcData.java index ba4a6da025..71c1d7c8f1 100644 --- a/app/src/main/java/com/tangem/wallet/btc/BtcData.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcData.java @@ -117,6 +117,7 @@ public class BtcData extends CoinData { balanceConfirmed = null; balanceUnconfirmed = null; unspentTransactions = null; + hasUnconfirmed = false; } public CoinEngine.InternalAmount getBalanceInInternalUnits() { From d33248e86910a7127d9f9854fb877c680049bbe6 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 3 Dec 2019 14:22:40 +0300 Subject: [PATCH 4/6] Updated on 2026-08-14 --- .../tangem/ui/fragment/VerifyCardFragment.kt | 2 -- app/src/main/res/layout/fr_verify_card.xml | 23 +++++++------------ 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt index fd36a67a2e..307a9186b7 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt @@ -69,8 +69,6 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. super.onViewCreated(view, savedInstanceState) updateViews() - srlVerifyCard.setOnRefreshListener { srlVerifyCard.isRefreshing = false } - // set listeners fabMenu.setOnClickListener { showMenu(fabMenu) } diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index 9513a736bd..09cbf321ca 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -9,21 +9,16 @@ tools:context="com.tangem.ui.fragment.VerifyCardFragment" tools:ignore="contentDescription"> - - + android:layout_height="0dp" + android:layout_marginBottom="8dp" + app:layout_constraintBottom_toTopOf="@+id/rlToolButtons1" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0"> - - Date: Wed, 4 Dec 2019 11:29:09 +0300 Subject: [PATCH 5/6] Updated on 2026-08-14 --- .../com/tangem/ui/fragment/MainFragment.kt | 7 ++- app/src/main/res/layout/fragment_main.xml | 44 ++++++++++--------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index 1aae515b7c..a8b9b4ac02 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -88,7 +88,12 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader tvNFCHint.text = String.format(getString(R.string.main_screen_scan_card), getString(R.string.main_screen_phone)) // set listeners - fab.setOnClickListener { showMenu(it) } +// ivMenu.setOnClickListener { showMenu(it) } + + val toolbar = tb_main + (activity as? AppCompatActivity)?.setSupportActionBar(toolbar) + (activity as? AppCompatActivity)?.supportActionBar?.setDisplayShowTitleEnabled(false) + setCardStoreLink() } diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index b048c74c40..b38da8388a 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -1,24 +1,38 @@ - + + + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@id/llShoppingView" + app:layout_constraintTop_toBottomOf="@id/tb_main"> @@ -27,7 +41,6 @@ android:id="@+id/tvNFCHint" android:layout_width="match_parent" android:layout_height="150dp" - android:layout_marginTop="12dp" android:fontFamily="@font/maax" android:gravity="center" android:lineSpacingExtra="8dp" @@ -43,17 +56,17 @@ android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_medium" /> - + android:layout_marginBottom="12dp" + android:gravity="center" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent"> - - - - \ No newline at end of file + \ No newline at end of file From 1b03750e0298582379ec4e08ef494cbaf56b6440 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 4 Dec 2019 14:00:46 +0300 Subject: [PATCH 6/6] Updated on 2026-08-14 --- app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java | 3 ++- .../main/java/com/tangem/wallet/binance/BinanceEngine.java | 3 ++- app/src/main/java/com/tangem/wallet/btc/BtcEngine.java | 2 +- .../main/java/com/tangem/wallet/cardano/CardanoEngine.java | 2 +- .../main/java/com/tangem/wallet/ducatus/DucatusEngine.java | 3 ++- app/src/main/java/com/tangem/wallet/eos/EosEngine.java | 3 ++- app/src/main/java/com/tangem/wallet/eth/EthEngine.java | 3 ++- app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java | 2 +- app/src/main/java/com/tangem/wallet/token/TokenEngine.java | 3 ++- app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java | 5 ++--- app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java | 5 ++--- app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java | 3 ++- 12 files changed, 21 insertions(+), 16 deletions(-) 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