diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 2b1b07812e..0000000000 Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68eddd7..5d76e8dd5e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,10 +25,7 @@ - + - - \ No newline at end of file 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 cdcdbf070b..5c04f5f681 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -587,7 +587,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific timerHideErrorAndMessage!!.cancel() timerHideErrorAndMessage = null } - tvCardID.text = mCard!!.cidDescription if (mCard!!.error == null || mCard!!.error.isEmpty()) { tvError.visibility = View.GONE @@ -664,33 +663,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific tvValidationNode.text = mCard!!.validationNodeDescription - if (mCard!!.useDefaultPIN1()!!) { - ivPIN.setImageResource(R.drawable.unlock_pin1) - ivPIN.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() } - } else { - ivPIN!!.setImageResource(R.drawable.lock_pin1) - ivPIN!!.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN1_code, Toast.LENGTH_LONG).show() } - } - - if (mCard!!.pauseBeforePIN2 > 0 && (mCard!!.useDefaultPIN2()!! || !mCard!!.useSmartSecurityDelay())) { - ivPIN2orSecurityDelay.setImageResource(R.drawable.timer) - ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, String.format(getString(R.string.this_banknote_will_enforce), mCard!!.pauseBeforePIN2 / 1000.0), Toast.LENGTH_LONG).show()} - - } else if (mCard!!.useDefaultPIN2()!!) { - ivPIN2orSecurityDelay.setImageResource(R.drawable.unlock_pin2) - ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN2_code, Toast.LENGTH_LONG).show() } - } else { - ivPIN2orSecurityDelay.setImageResource(R.drawable.lock_pin2) - ivPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN2_code, Toast.LENGTH_LONG).show() } - } - - if (mCard!!.useDevelopersFirmware()!!) { - ivDeveloperVersion.setImageResource(R.drawable.ic_developer_version) - ivDeveloperVersion.visibility = View.VISIBLE - ivDeveloperVersion.setOnClickListener { v -> Toast.makeText(context, R.string.unlocked_banknote_only_development_use, Toast.LENGTH_LONG).show() } - } else - ivDeveloperVersion.visibility = View.INVISIBLE - btnExtract!!.isEnabled = mCard!!.hasBalanceInfo() tvIssuer.text = mCard!!.issuerDescription diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 5a46cc0985..e05c029c52 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -68,7 +68,8 @@ android:layout_height="180dp" android:layout_centerHorizontal="true" android:elevation="3dp" - android:visibility="gone"> + android:visibility="gone" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible"/> + android:visibility="gone" + tools:visibility="visible"/> @@ -571,9 +574,4 @@ - - - - - \ No newline at end of file