From 3d1bad92b40b0b845a643a9049472588fa30a95e Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 20 Nov 2018 12:53:09 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 2 +- .../presentation/fragment/LoadedWallet.kt | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1f4656bf93..eafdf9665f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 28 - versionCode 99 + versionCode 100 versionName "0.811.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } 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 a13a757175..1a8b547dfa 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -28,15 +28,14 @@ import com.tangem.data.network.ServerApiInfura import com.tangem.data.network.model.CardVerifyAndGetInfo import com.tangem.data.network.model.InfuraResponse import com.tangem.data.nfc.VerifyCardTask -import com.tangem.di.Navigator import com.tangem.domain.cardReader.CardProtocol import com.tangem.domain.cardReader.NfcManager import com.tangem.domain.wallet.* +import com.tangem.domain.wallet.bch.BtcCashEngine import com.tangem.domain.wallet.btc.BtcData import com.tangem.domain.wallet.eth.EthData import com.tangem.domain.wallet.token.TokenData import com.tangem.domain.wallet.token.TokenEngine -import com.tangem.domain.wallet.bch.BtcCashEngine import com.tangem.presentation.activity.* import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog import com.tangem.presentation.dialog.PINSwapWarningDialog @@ -50,7 +49,6 @@ import org.json.JSONException import java.io.InputStream import java.math.BigInteger import java.util.* -import javax.inject.Inject class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener { companion object { @@ -762,19 +760,20 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } val engine = CoinEngineFactory.create(ctx) - if (engine!!.hasBalanceInfo() || ctx.card!!.offlineBalance == null) { - val html = Html.fromHtml(engine.balanceHTML) - tvBalance.text = html - // TODO??? - tvBalanceEquivalent.text = engine.balanceEquivalent - } else { - // TODO - val html = Html.fromHtml(engine.offlineBalanceHTML) - tvBalance.text = html + when { + engine!!.hasBalanceInfo() -> { + val html = Html.fromHtml(engine.balanceHTML) + tvBalance.text = html + tvBalanceEquivalent.text = engine.balanceEquivalent + } + ctx.card!!.offlineBalance != null -> { + val html = Html.fromHtml(engine.offlineBalanceHTML) + tvBalance.text = html + } + else -> tvBalance.text = getString(R.string.no_data_string) } tvWallet.text = ctx.card!!.wallet -// tvBlockchain.text = card!!.blockchainName if (ctx.card!!.tokenSymbol.length > 1) { val html = Html.fromHtml(ctx.card!!.blockchainName)