diff --git a/app/build.gradle b/app/build.gradle index bc4e4ae4e0..2675dbef0c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { minSdkVersion 21 targetSdkVersion 27 versionCode 80 - versionName "0.88.1." + generateVersionName() + versionName "0.89.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } androidExtensions { 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 85950430c6..abd3c37958 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -270,6 +270,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific if (l.compareTo(BigInteger.ZERO) == 0) { card!!.blockchainID = Blockchain.Ethereum.id card!!.addTokenToBlockchainName() + updateViews() srlLoadedWallet!!.isRefreshing = false // refresh() return@onInfuraSuccess @@ -330,7 +331,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } override fun onInfuraFail(method: String, message: String) { - + srlLoadedWallet!!.isRefreshing = false } } @@ -520,7 +521,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific // } if (resultCode == Activity.RESULT_OK) { - srlLoadedWallet!!.postDelayed({ this.refresh() }, 3000) + srlLoadedWallet!!.postDelayed({ this.refresh() }, 5000) srlLoadedWallet!!.isRefreshing = true card!!.clearInfo() updateViews() @@ -565,7 +566,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific rlProgressBar.post { rlProgressBar.visibility = View.GONE this.cardProtocol = cardProtocol - refresh() + if (!cardProtocol.card.isWalletPublicKeyValid) refresh() + else updateViews() } } else { // remove last UIDs because of error and no card read