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 4a7ce71e04..7f8519e143 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java +++ b/app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java @@ -62,14 +62,14 @@ public class BalanceValidator { if (card.getBalanceUnconfirmed() != 0) { score = 0; firstLine = "Transaction in progress"; - secondLine = "Wait for full confirmation in blockchain. "; + secondLine = "Wait for confirmation in blockchain"; return; } if (card.isBalanceReceived() && card.isBalanceEqual()) { score = 100; firstLine = "Verified balance"; - secondLine = "Balance confirmed in blockchain. "; + secondLine = "Balance confirmed in blockchain"; if (card.getBalance() == 0) { firstLine = "Empty wallet"; secondLine = ""; @@ -117,14 +117,14 @@ public class BalanceValidator { if (!card.getUnconfirmedTXCount().equals(card.getConfirmedTXCount())) { score = 0; firstLine = "Unguaranteed balance"; - secondLine = "Transaction is in progress. Wait for confirmation in blockchain. "; + secondLine = "Transaction is in progress. Wait for confirmation in blockchain."; return; } if (card.isBalanceReceived()) { score = 100; firstLine = "Verified balance"; - secondLine = "Balance confirmed in blockchain. "; + secondLine = "Balance confirmed in blockchain"; if (card.getBalance() == 0) { firstLine = "Empty wallet"; secondLine = ""; diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java index 2aa2d06741..e5af43c198 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java @@ -289,6 +289,7 @@ public class TangemCard { balanceDecimal = null; balanceDecimalAlter = null; setIsBalanceEqual(false); + if (tokenSymbol.length() > 1) blockchainID = Blockchain.Token.getID(); // Reset blockchain to Token from ETH for token cards with zero token balance on it } public Date getPersonalizationDateTime() { diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index ec3684e06f..3b82c3a854 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -850,51 +850,56 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } private fun refresh() { - // clear all card data and request again - srl!!.isRefreshing = true - card!!.clearInfo() - card!!.error = null - card!!.message = null - requestCounter = 0 + if ((srl == null) || (card == null)) return; + try { + // clear all card data and request again + srl!!.isRefreshing = true + card!!.clearInfo() + card!!.error = null + card!!.message = null + requestCounter = 0 - updateViews() + updateViews() - val engine = CoinEngineFactory.create(card!!.blockchain) + val engine = CoinEngineFactory.create(card!!.blockchain) - requestCardVerify() + requestCardVerify() - // Bitcoin - if (card!!.blockchain == Blockchain.Bitcoin || card!!.blockchain == Blockchain.BitcoinTestNet) { - card!!.setIsBalanceEqual(true) + // Bitcoin + if (card!!.blockchain == Blockchain.Bitcoin || card!!.blockchain == Blockchain.BitcoinTestNet) { + card!!.setIsBalanceEqual(true) - requestElectrum(card!!, ElectrumRequest.checkBalance(card!!.wallet)) - requestElectrum(card!!, ElectrumRequest.listUnspent(card!!.wallet)) - requestRateInfo("bitcoin") - } + requestElectrum(card!!, ElectrumRequest.checkBalance(card!!.wallet)) + requestElectrum(card!!, ElectrumRequest.listUnspent(card!!.wallet)) + requestRateInfo("bitcoin") + } - // BitcoinCash - else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet) { - card!!.setIsBalanceEqual(true) + // BitcoinCash + else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet) { + card!!.setIsBalanceEqual(true) - requestElectrum(card!!, ElectrumRequest.checkBalance(card!!.wallet)) - requestElectrum(card!!, ElectrumRequest.listUnspent(card!!.wallet)) - requestRateInfo("bitcoin-cash") - } + requestElectrum(card!!, ElectrumRequest.checkBalance(card!!.wallet)) + requestElectrum(card!!, ElectrumRequest.listUnspent(card!!.wallet)) + requestRateInfo("bitcoin-cash") + } - // Ethereum - else if (card!!.blockchain == Blockchain.Ethereum || card!!.blockchain == Blockchain.EthereumTestNet) { + // Ethereum + else if (card!!.blockchain == Blockchain.Ethereum || card!!.blockchain == Blockchain.EthereumTestNet) { - requestInfura(ServerApiHelper.INFURA_ETH_GET_BALANCE, "") - requestInfura(ServerApiHelper.INFURA_ETH_GET_TRANSACTION_COUNT, "") - requestInfura(ServerApiHelper.INFURA_ETH_GET_PENDING_COUNT, "") - requestRateInfo("ethereum") - } + requestInfura(ServerApiHelper.INFURA_ETH_GET_BALANCE, "") + requestInfura(ServerApiHelper.INFURA_ETH_GET_TRANSACTION_COUNT, "") + requestInfura(ServerApiHelper.INFURA_ETH_GET_PENDING_COUNT, "") + requestRateInfo("ethereum") + } - // Token - else if (card!!.blockchain == Blockchain.Token) { + // Token + else if (card!!.blockchain == Blockchain.Token) { - requestInfura(ServerApiHelper.INFURA_ETH_CALL, engine.getContractAddress(card)) - requestRateInfo("ethereum") + requestInfura(ServerApiHelper.INFURA_ETH_CALL, engine.getContractAddress(card)) + requestRateInfo("ethereum") + } + } catch (e: Exception) { + e.printStackTrace() } } @@ -985,13 +990,14 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific var showTime: Date = Date() private fun showSingleToast(text: Int) { - if (singleToast == null || !singleToast!!.view.isShown || showTime.time + 2000 < Date().time) { - if (singleToast != null) - singleToast!!.cancel() - singleToast = Toast.makeText(context, text, Toast.LENGTH_LONG) - singleToast!!.show() - showTime = Date() - } +// if (singleToast == null || !singleToast!!.view.isShown || showTime.time + 2000 < Date().time) { +// if (singleToast != null) +// singleToast!!.cancel() +// singleToast = Toast.makeText(context, text, Toast.LENGTH_LONG) +// singleToast!!.show() +// showTime = Date() +// } + singleToast = Toast.makeText(context, text, Toast.LENGTH_LONG) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f7476c99f6..672cde8300 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -107,6 +107,7 @@ android:alpha="1" android:text="@string/reading" android:textColor="@color/colorPrimary" + android:textSize="10sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 4d25c1369e..77369e04c1 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -27,21 +27,23 @@ android:layout_height="match_parent" android:layout_alignParentBottom="false" android:background="@color/white" - android:gravity="center" android:orientation="vertical"> + app:layout_constraintHeight_max="200dp" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0"> @@ -113,7 +116,7 @@ @@ -140,6 +144,7 @@ android:fontFamily="@font/maax" android:paddingEnd="5dp" android:paddingStart="5dp" + android:text=" " android:textAlignment="center" android:visibility="visible" /> @@ -151,7 +156,6 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" - android:paddingLeft="8dp" app:layout_constraintBottom_toBottomOf="parent"> #BFFF4444 #4a086e #0c15c1 - #FFE3E3E3 - #FFC3C3C3 + #e3e3e3 + #c3c3c3 #303030 @color/white #edcdcc diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 8aec9399f6..4f658b4efc 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -24,7 +24,7 @@ 26sp 34sp - 200dp + 180dp 30dp 135dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2c71ed439a..8964e49d5c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ OK Cancel - Отсутствует подключение к сети + No connection with blockchain nodes Continue Not found Not ISO tag!