diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt index 6a7b97721e..e7543ce473 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt @@ -354,8 +354,11 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. if (ctx.card!!.supportBlock()!!) features += getString(R.string.details_blockable) - if (ctx.card!!.supportLinkingTerminal()) - features += "Linking terminal is supported" + if (ctx.card!!.supportLinkingTerminal()) { + features += getString(R.string.details_linking_card_supported) + llLinkedCard.visibility = View.VISIBLE + } + if (ctx.card!!.supportOnlyOneCommandAtTime()) features += getString(R.string.details_atomic_commmands) @@ -365,6 +368,13 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. tvFeatures.text = features + val textIsLinked = if (ctx.card.terminalIsLinked) { + getString(R.string.details_linked_card_to_phone) + } else { + getString(R.string.general_no) + } + tvIsLinked.text = textIsLinked + if (ctx.card!!.useDefaultPIN1()) { imgPIN.setImageResource(R.drawable.unlock_pin1) imgPIN.setOnClickListener { Toast.makeText(context, R.string.details_protected_by_default_pin_1, Toast.LENGTH_LONG).show() } diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt index b7de010cfa..7a1e83b6ef 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt @@ -595,14 +595,14 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte } if (ctx.message == null || ctx.message.isEmpty()) { - tvMessage.text = "" - tvMessage.visibility = View.GONE + tvMessage?.text = "" + tvMessage?.visibility = View.GONE } else { - tvMessage.text = ctx.message - tvMessage.visibility = View.VISIBLE + tvMessage?.text = ctx.message + tvMessage?.visibility = View.VISIBLE } - if (tvError.visibility == View.VISIBLE || tvMessage.visibility == View.VISIBLE) { + if (tvError?.visibility == View.VISIBLE || tvMessage?.visibility == View.VISIBLE) { timerHideErrorAndMessage = Timer() timerHideErrorAndMessage!!.schedule( timerTask { diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index e139453c5e..9513a736bd 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -189,6 +189,35 @@ + + + + + + + + + This banknote is protected by user\'s PIN2 code Unlocked banknote, only for development use This banknote will enforce %.0f seconds security delay for all operations requiring PIN2 code - Allows to change PIN1 and PIN2/n - Allows to change PIN1/n - Allows to change PIN2/n - Fixed PIN1 and PIN2/n - Requires CVC/n - Dynamic NDEF for iOS/n - NDEF/n - Blockable/n - Atomic command mode - Linking terminal is supported + Allows to change PIN1 and PIN2\n + Allows to change PIN1\n + Allows to change PIN2\n + Fixed PIN1 and PIN2\n + Requires CVC\n + Dynamic NDEF for iOS\n + NDEF\n + Blockable\n + Atomic command mode\n + Linking terminal is supported\n + The card is linked + To this phone Save