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 03b7db0d98..767d9b6e99 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -759,13 +759,17 @@ 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 - tvBalanceEquivalent.text = engine.balanceEquivalent - } else { - 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