From 402284dd27c55a04506417314f3b4255d006865a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Apr 2020 13:33:44 +0300
Subject: [PATCH 01/24] Updated on 2026-08-14

---
 tangem-demo/build.gradle                      |  5 +-
 .../tangemtest/_main/entryPoint/RvActions.kt  |  2 -
 .../ucase/ui/BaseCardActionFragment.kt        | 16 +++--
 .../ui/DepersonalizeActionFragment.kt         |  3 -
 .../personalize/ui/PersonalizationFragment.kt | 71 ++++++++++++-------
 .../variants/responses/ui/ResponseFragment.kt |  2 +-
 .../variants/scan/ui/ScanActionFragment.kt    | 32 ++++++++-
 .../variants/sign/ui/SignActionFragment.kt    |  3 -
 .../main/res/layout/fg_action_card_scan.xml   | 50 -------------
 .../main/res/layout/fg_action_card_sign.xml   | 40 -----------
 ...lization.xml => fg_base_action_layout.xml} | 18 +----
 .../src/main/res/layout/fg_card_response.xml  |  2 +-
 .../src/main/res/layout/fg_depersonalize.xml  | 40 -----------
 .../main/res/layout/v_content_container.xml   | 20 ++++++
 .../main/res/layout/v_item_list_container.xml | 26 +++++++
 .../src/main/res/navigation/navigation.xml    |  8 +--
 .../src/main/res/values/strings_scan.xml      |  3 +-
 17 files changed, 148 insertions(+), 193 deletions(-)
 delete mode 100644 tangem-demo/src/main/res/layout/fg_action_card_scan.xml
 delete mode 100644 tangem-demo/src/main/res/layout/fg_action_card_sign.xml
 rename tangem-demo/src/main/res/layout/{fg_personalization.xml => fg_base_action_layout.xml} (64%)
 delete mode 100644 tangem-demo/src/main/res/layout/fg_depersonalize.xml
 create mode 100644 tangem-demo/src/main/res/layout/v_content_container.xml
 create mode 100644 tangem-demo/src/main/res/layout/v_item_list_container.xml

diff --git a/tangem-demo/build.gradle b/tangem-demo/build.gradle
index fa9e64d58f..fd56546bed 100644
--- a/tangem-demo/build.gradle
+++ b/tangem-demo/build.gradle
@@ -46,10 +46,11 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta4"
     implementation "androidx.navigation:navigation-fragment-ktx:2.2.1"
     implementation "androidx.navigation:navigation-ui-ktx:2.2.1"
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha02"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "com.google.android.material:material:1.2.0-alpha05"
     implementation "androidx.viewpager2:viewpager2:1.0.0"
 
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.github.gbIxaHue:eu4d:0.3.7'
+    implementation 'com.github.gbIxaHue:eu4d:0.3.8'
 }
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt
index df045a572d..5433027e92 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt
@@ -59,8 +59,6 @@ class RvActionsVH(
 
         containerDescription.visibility = if (wrapper.descriptionIsVisible) View.VISIBLE else View.GONE
     }
-
-    override fun onDataBound(data: ActionType) {}
 }
 
 fun RecyclerView.ViewHolder.getString(@StringRes id: Int?, ifNull: String = ""): String {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
index e9916b33f0..1449441016 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
@@ -8,6 +8,7 @@ import androidx.core.view.plusAssign
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.tangem.TangemSdk
 import com.tangem.commands.Card
@@ -28,7 +29,8 @@ import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
  */
 abstract class BaseCardActionFragment : BaseFragment(), ActionView {
 
-    protected lateinit var itemContainer: ViewGroup
+    protected lateinit var swrLayout: SwipeRefreshLayout
+    protected lateinit var contentContainer: ViewGroup
     protected lateinit var actionFab: FloatingActionButton
 
     protected abstract val itemsManager: ItemsManager
@@ -38,6 +40,8 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
 
     private val paramsWidgetList = mutableListOf<ParameterWidget>()
 
+    override fun getLayoutId(): Int = R.layout.fg_base_action_layout
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         Log.d(this, "onViewCreated")
@@ -47,7 +51,7 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
         actionVM.setCardManager(TangemSdk.init(requireActivity()))
         actionVM.attachToPayload(mutableMapOf(PayloadKey.actionView to this as ActionView))
 
-        initFab()
+        initViews()
         createWidgets {
             widgetsWasCreated()
             subscribeToViewModelChanges()
@@ -57,11 +61,13 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
     protected open fun widgetsWasCreated() {}
 
     protected open fun bindViews() {
-        itemContainer = mainView.findViewById(R.id.ll_container)
+        swrLayout = mainView.findViewById(R.id.swr_layout)
+        contentContainer = mainView.findViewById(R.id.ll_content_container)
         actionFab = mainView.findViewById(R.id.fab_action)
     }
 
-    protected open fun initFab() {
+    protected open fun initViews() {
+        swrLayout.isEnabled = false
         enableActionFab(false)
         actionFab.setOnClickListener { actionVM.invokeMainAction() }
     }
@@ -70,7 +76,7 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
         Log.d(this, "createWidgets")
         actionVM.ldItemList.observe(viewLifecycleOwner, Observer { itemList ->
             itemList.forEach { param ->
-                val widget = ParameterWidget(inflateParamView(itemContainer), param)
+                val widget = ParameterWidget(inflateParamView(contentContainer), param)
                 widget.onValueChanged = { id, value -> actionVM.userChangedItem(id, value) }
                 widget.onActionBtnClickListener = actionVM.getItemAction(param.id)
                 paramsWidgetList.add(widget)
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepersonalizeActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepersonalizeActionFragment.kt
index e2ae9cdbdd..107ab9b3b3 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepersonalizeActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepersonalizeActionFragment.kt
@@ -1,6 +1,5 @@
 package com.tangem.tangemtest.ucase.variants.depersonalize.ui
 
-import com.tangem.tangemtest.R
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
 import com.tangem.tangemtest.ucase.domain.paramsManager.managers.DepersonalizeItemsManager
 import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
@@ -11,6 +10,4 @@ import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
 class DepersonalizeActionFragment : BaseCardActionFragment() {
 
     override val itemsManager: ItemsManager by lazy { DepersonalizeItemsManager() }
-
-    override fun getLayoutId(): Int = R.layout.fg_depersonalize
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 40133ebfd6..313410115c 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -4,7 +4,10 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.LinearLayout
 import androidx.lifecycle.Observer
+import androidx.transition.Fade
+import androidx.transition.TransitionManager
 import com.tangem.commands.Card
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
@@ -24,6 +27,8 @@ import com.tangem.tangemtest.ucase.variants.personalize.PersonalizationConfigSto
 import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.PersonalizationItemBuilder
 import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate
 import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
+import ru.dev.gbixahue.eu4d.lib.android.global.threading.postUI
+import ru.dev.gbixahue.eu4d.lib.android.global.threading.postWork
 
 /**
 [REDACTED_AUTHOR]
@@ -32,17 +37,56 @@ class PersonalizationFragment : BaseCardActionFragment() {
 
     override val itemsManager: ItemsManager by lazy { PersonalizationItemsManager(PersonalizationConfigStore(requireContext())) }
 
-    override fun getLayoutId(): Int = R.layout.fg_personalization
+    override fun getLayoutId(): Int = R.layout.fg_base_action_layout
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         lifecycle.addObserver(itemsManager as PersonalizationItemsManager)
     }
 
+    override fun bindViews() {
+        super.bindViews()
+        swrLayout.isRefreshing = true
+    }
+
+    override fun initViews() {
+        actionFab.setOnClickListener { actionVM.invokeMainAction() }
+    }
+
+    override fun createWidgets(widgetCreatedCallback: () -> Unit) {
+        Log.d(this, "createWidgets")
+        val itemList = mutableListOf<Item>()
+
+        val maxDelay = 500
+        val timeStart = System.currentTimeMillis()
+        actionVM.ldItemList.observe(viewLifecycleOwner, Observer { list ->
+            Log.d(this, "ldBlockList size: ${list.size}")
+            itemList.addAll(list)
+            val llContainer = LinearLayout(requireContext()).apply { orientation = LinearLayout.VERTICAL }
+            postWork {
+                val builder = WidgetBuilder(PersonalizationItemBuilder())
+                itemList.forEach { builder.build(it, llContainer) }
+                actionVM.attachToPayload(mutableMapOf(
+                        PayloadKey.actionView to this as ActionView,
+                        PayloadKey.itemList to itemList
+                ))
+                val timeEnd = System.currentTimeMillis()
+                val diff = timeEnd - timeStart
+                postUI(maxDelay - diff) {
+                    TransitionManager.beginDelayedTransition(contentContainer, Fade())
+                    contentContainer.addView(llContainer)
+                    widgetCreatedCallback()
+                    swrLayout.isRefreshing = false
+                    swrLayout.isEnabled = false
+                }
+            }
+        })
+    }
+
     override fun widgetsWasCreated() {
         super.widgetsWasCreated()
 
-        val btnContainer = itemContainer.inflate<ViewGroup>(R.layout.view_simple_button)
+        val btnContainer = contentContainer.inflate<ViewGroup>(R.layout.view_simple_button)
         val btn = btnContainer.findViewById<Button>(R.id.button)
 
         val show = StringId("show")
@@ -55,28 +99,7 @@ class PersonalizationFragment : BaseCardActionFragment() {
             multiAction.state = if (it == show) hide else show
         }
         multiAction.performAction(hide)
-        itemContainer.addView(btnContainer)
-    }
-
-    override fun initFab() {
-        actionFab.setOnClickListener { actionVM.invokeMainAction() }
-    }
-
-    override fun createWidgets(widgetCreatedCallback: () -> Unit) {
-        Log.d(this, "createWidgets")
-        val itemList = mutableListOf<Item>()
-
-        actionVM.ldItemList.observe(viewLifecycleOwner, Observer { list ->
-            Log.d(this, "ldBlockList size: ${list.size}")
-            itemList.clear()
-            itemList.addAll(list)
-            itemList.forEach { WidgetBuilder(PersonalizationItemBuilder()).build(it, itemContainer) }
-            actionVM.attachToPayload(mutableMapOf(
-                    PayloadKey.actionView to this as ActionView,
-                    PayloadKey.itemList to itemList
-            ))
-            widgetCreatedCallback()
-        })
+        contentContainer.addView(btnContainer)
     }
 
     override fun showSnackbar(id: Id, additionalHandler: ((Id) -> Int)?) {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
index a42d51e237..6244bc7a1f 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
@@ -23,7 +23,7 @@ open class ResponseFragment : BaseFragment() {
     private val mainActivityVM: MainViewModel by activityViewModels()
     private val selfVM: ResponseViewModel by viewModels()
 
-    private val itemContainer: ViewGroup by lazy { mainView.findViewById<LinearLayout>(R.id.ll_container) }
+    private val itemContainer: ViewGroup by lazy { mainView.findViewById<LinearLayout>(R.id.ll_content_container) }
 
     override fun getLayoutId(): Int = R.layout.fg_card_response
 
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
index 90e3931375..591532eab4 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
@@ -1,10 +1,17 @@
 package com.tangem.tangemtest.ucase.variants.scan.ui
 
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.Gravity
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.TextView
 import com.tangem.commands.Card
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
 import com.tangem.tangemtest.ucase.domain.paramsManager.managers.ScanItemsManager
 import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
+import ru.dev.gbixahue.eu4d.lib.android._android.views.dpToPx
 
 /**
 [REDACTED_AUTHOR]
@@ -13,9 +20,30 @@ class ScanActionFragment : BaseCardActionFragment() {
 
     override val itemsManager: ItemsManager by lazy { ScanItemsManager() }
 
-    override fun getLayoutId(): Int = R.layout.fg_action_card_scan
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-    override fun initFab() {
+        val howToUseView = createHowToUse()
+        contentContainer.layoutParams = FrameLayout.LayoutParams(-1, -1, Gravity.CENTER)
+        contentContainer.addView(howToUseView)
+    }
+
+    private fun createHowToUse(): View {
+        val fl = FrameLayout(requireContext())
+        fl.layoutParams = FrameLayout.LayoutParams(-1, -1, Gravity.CENTER)
+        val tv = TextView(requireContext()).apply {
+            val padding = dpToPx(16f).toInt()
+            setPadding(padding, 0, padding, 0)
+            gravity = Gravity.CENTER
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 18f)
+            setText(R.string.htu_scan_action)
+        }
+        fl.addView(tv)
+        return fl
+    }
+
+    override fun initViews() {
+        swrLayout.isEnabled = false
         actionFab.setOnClickListener { actionVM.invokeMainAction() }
     }
 
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt
index 1699672834..4453eec6e1 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt
@@ -1,6 +1,5 @@
 package com.tangem.tangemtest.ucase.variants.sign.ui
 
-import com.tangem.tangemtest.R
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
 import com.tangem.tangemtest.ucase.domain.paramsManager.managers.SignItemsManager
 import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
@@ -11,6 +10,4 @@ import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
 class SignActionFragment : BaseCardActionFragment() {
 
     override val itemsManager: ItemsManager by lazy { SignItemsManager() }
-
-    override fun getLayoutId(): Int = R.layout.fg_action_card_sign
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/fg_action_card_scan.xml b/tangem-demo/src/main/res/layout/fg_action_card_scan.xml
deleted file mode 100644
index 8b2deca0e8..0000000000
--- a/tangem-demo/src/main/res/layout/fg_action_card_scan.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinator_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/ll_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-            </LinearLayout>
-
-            <include layout="@layout/w_action_response_json" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <TextView
-        android:id="@+id/tv_screen_stub"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textSize="18sp"
-        android:layout_margin="@dimen/def_double_indent"
-        android:text="@string/empty_screen_stub" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/def_indent"
-        android:layout_marginBottom="@dimen/def_double_indent"
-        android:src="@drawable/ic_nfc" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/fg_action_card_sign.xml b/tangem-demo/src/main/res/layout/fg_action_card_sign.xml
deleted file mode 100644
index 8013659452..0000000000
--- a/tangem-demo/src/main/res/layout/fg_action_card_sign.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinator_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/ll_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-            </LinearLayout>
-
-            <include layout="@layout/w_action_response_json" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/def_indent"
-        android:layout_marginBottom="@dimen/def_double_indent"
-        android:src="@drawable/ic_nfc" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/fg_personalization.xml b/tangem-demo/src/main/res/layout/fg_base_action_layout.xml
similarity index 64%
rename from tangem-demo/src/main/res/layout/fg_personalization.xml
rename to tangem-demo/src/main/res/layout/fg_base_action_layout.xml
index 81cd81dc72..f7736dd529 100644
--- a/tangem-demo/src/main/res/layout/fg_personalization.xml
+++ b/tangem-demo/src/main/res/layout/fg_base_action_layout.xml
@@ -5,29 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/ll_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        </LinearLayout>
-
-    </ScrollView>
+    <include layout="@layout/v_content_container" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_action"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/def_indent"
         android:layout_marginBottom="@dimen/def_double_indent"
         android:src="@drawable/ic_nfc"
-        app:layout_anchor="@id/scroll_view"
+        app:layout_anchor="@id/swr_layout"
         app:layout_anchorGravity="bottom|end" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/fg_card_response.xml b/tangem-demo/src/main/res/layout/fg_card_response.xml
index 357f9c82c6..3e6522c4cb 100644
--- a/tangem-demo/src/main/res/layout/fg_card_response.xml
+++ b/tangem-demo/src/main/res/layout/fg_card_response.xml
@@ -10,7 +10,7 @@
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/ll_container"
+            android:id="@+id/ll_content_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
diff --git a/tangem-demo/src/main/res/layout/fg_depersonalize.xml b/tangem-demo/src/main/res/layout/fg_depersonalize.xml
deleted file mode 100644
index 8013659452..0000000000
--- a/tangem-demo/src/main/res/layout/fg_depersonalize.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinator_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/ll_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-            </LinearLayout>
-
-            <include layout="@layout/w_action_response_json" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/def_indent"
-        android:layout_marginBottom="@dimen/def_double_indent"
-        android:src="@drawable/ic_nfc" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/v_content_container.xml b/tangem-demo/src/main/res/layout/v_content_container.xml
new file mode 100644
index 0000000000..96ed99a517
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/v_content_container.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swr_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/ll_content_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/v_item_list_container.xml b/tangem-demo/src/main/res/layout/v_item_list_container.xml
new file mode 100644
index 0000000000..0a8f44dbfb
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/v_item_list_container.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/root_items"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/item_header_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <LinearLayout
+        android:id="@+id/item_list_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <LinearLayout
+        android:id="@+id/item_footer_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/navigation/navigation.xml b/tangem-demo/src/main/res/navigation/navigation.xml
index 7209eb2e22..1f734fb81c 100644
--- a/tangem-demo/src/main/res/navigation/navigation.xml
+++ b/tangem-demo/src/main/res/navigation/navigation.xml
@@ -57,25 +57,25 @@
         android:id="@+id/nav_scan"
         android:name="com.tangem.tangemtest.ucase.variants.scan.ui.ScanActionFragment"
         android:label="@string/action_card_scan"
-        tools:layout="@layout/fg_action_card_scan" />
+        tools:layout="@layout/fg_base_action_layout" />
 
     <fragment
         android:id="@+id/nav_sign"
         android:name="com.tangem.tangemtest.ucase.variants.sign.ui.SignActionFragment"
         android:label="@string/action_card_sign"
-        tools:layout="@layout/fg_action_card_sign" />
+        tools:layout="@layout/fg_base_action_layout" />
 
     <fragment
         android:id="@+id/nav_personalize"
         android:name="com.tangem.tangemtest.ucase.variants.personalize.ui.PersonalizationFragment"
         android:label="@string/action_personalize"
-        tools:layout="@layout/fg_personalization" />
+        tools:layout="@layout/fg_base_action_layout" />
 
     <fragment
         android:id="@+id/nav_depersonalize"
         android:name="com.tangem.tangemtest.ucase.variants.depersonalize.ui.DepersonalizeActionFragment"
         android:label="@string/action_depersonalize"
-        tools:layout="@layout/fg_depersonalize" />
+        tools:layout="@layout/fg_base_action_layout" />
 
     <fragment
         android:id="@+id/nav_issuer_read_data"
diff --git a/tangem-demo/src/main/res/values/strings_scan.xml b/tangem-demo/src/main/res/values/strings_scan.xml
index 33703cac79..5a5f7e095e 100644
--- a/tangem-demo/src/main/res/values/strings_scan.xml
+++ b/tangem-demo/src/main/res/values/strings_scan.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="empty_screen_stub">To read the card, press the button at the right bottom corner of the screen</string>
+    <!--  How to use  -->
+    <string name="htu_scan_action">To read the card, press the button at the right bottom corner of the screen</string>
 
 </resources>
\ No newline at end of file

From 133b3ebc0a7794b2c0d57d65008c088ea06988b1 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Apr 2020 19:33:11 +0300
Subject: [PATCH 02/24] Updated on 2026-08-14

---
 .../ucase/variants/personalize/ui/widgets/SpinnerWidget.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/SpinnerWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/SpinnerWidget.kt
index 7703222579..c1c9a5a3f8 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/SpinnerWidget.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/SpinnerWidget.kt
@@ -46,9 +46,8 @@ class SpinnerWidget(
         }
         spinner.onItemSelectedListener = onItemSelectedListener
         item.viewModel.onDataUpdated = {
-            val selectedItem = it as? String
             spinner.onItemSelectedListener = null
-            viewModel.itemList.firstOrNull { item -> item.value == selectedItem }?.let { keyValue ->
+            viewModel.itemList.firstOrNull { item -> item.value == it }?.let { keyValue ->
                 val position = viewModel.itemList.indexOf(keyValue)
                 spinner.setSelection(position)
             }

From 91835911f18301fd30bc7a943accfd69004cfd01 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Apr 2020 21:14:26 +0300
Subject: [PATCH 03/24] Updated on 2026-08-14

---
 .../ucase/variants/personalize/converter/DefaultValues.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
index 37364a0f8a..b49629ed8c 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
@@ -19,7 +19,7 @@ class ConfigValuesHolder : BaseTypedHolder<Id, Value>() {
         register(CardNumber.BatchId, Value(default.batchId))
         register(Common.Curve, Value(default.curveID, Helper.listOfCurves()))
         register(Common.Blockchain, Value(default.blockchain, Helper.listOfBlockchain()))
-        register(Common.BlockchainCustom, Value(""))
+        register(Common.BlockchainCustom, Value(default.blockchainCustom))
         register(Common.MaxSignatures, Value(default.MaxSignatures))
         register(Common.CreateWallet, Value(default.createWallet))
         register(SigningMethod.SignTx, Value(default.SigningMethod0))

From 5aa06a30744ab0143b32dd3ac878af20f6302584 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Apr 2020 21:58:27 +0300
Subject: [PATCH 04/24] Updated on 2026-08-14

---
 .../_arch/structure/abstraction/Item.kt       |  10 +-
 .../_arch/structure/abstraction/ItemGroup.kt  |   4 +
 .../structure/abstraction/ItemViewModel.kt    |  18 ++-
 .../tangem/tangemtest/_main/MainActivity.kt   |   2 +-
 .../tangem/tangemtest/commons/Abstractions.kt |   9 +-
 .../tangemtest/commons/DialogController.kt    |  76 +++++++++
 .../ucase/domain/actions/PersonalizeAction.kt |   2 +-
 .../domain/paramsManager/ItemsManager.kt      |   1 +
 .../managers/BaseItemsManager.kt              |   5 +
 .../managers/PersonalizationItemsManager.kt   |   2 +-
 .../ucase/ui/BaseCardActionFragment.kt        |  61 +++----
 .../personalize/PersonalizationConfigStore.kt |  40 ++++-
 .../personalize/dto/PersonalizationConfig.kt  | 150 +++++++++++++-----
 .../personalize/ui/PersonalizationFragment.kt |  70 +++++++-
 .../presets/PersonalizationPresetManager.kt   |  47 ++++++
 .../ui/presets/PersonalizationPresetView.kt   |   9 ++
 .../personalize/ui/presets/PresetRv.kt        |  47 ++++++
 .../responses/ui/widget/ResponseWidget.kt     |   2 +-
 .../variants/scan/ui/ScanActionFragment.kt    |   4 +-
 .../dlg_personalization_preset_load.xml       |   6 +
 .../dlg_personalization_preset_save.xml       |  26 +++
 .../layout/vh_personalization_preset_name.xml |  32 ++++
 tangem-demo/src/main/res/menu/main_menu.xml   |  22 ++-
 tangem-demo/src/main/res/values/strings.xml   |  11 +-
 .../res/values/strings_personalization.xml    |   6 +
 25 files changed, 565 insertions(+), 97 deletions(-)
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/commons/DialogController.kt
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetView.kt
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
 create mode 100644 tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml
 create mode 100644 tangem-demo/src/main/res/layout/dlg_personalization_preset_save.xml
 create mode 100644 tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Item.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Item.kt
index eaf3d7afa4..7800192199 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Item.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Item.kt
@@ -5,7 +5,12 @@ import com.tangem.tangemtest._arch.structure.Id
 /**
 [REDACTED_AUTHOR]
  */
-interface Item {
+
+interface UpdateBy<B>{
+    fun update(value: B)
+}
+
+interface Item: UpdateBy<Item> {
     val id: Id
     var parent: Item?
     var viewModel: ItemViewModel
@@ -36,4 +41,7 @@ open class BaseItem(
 
     override var parent: Item? = null
 
+    override fun update(value: Item) {
+        viewModel.update(value.viewModel)
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemGroup.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemGroup.kt
index 61a43a0d1c..20a8def0e6 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemGroup.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemGroup.kt
@@ -49,4 +49,8 @@ open class SimpleItemGroup(
         ILog.d(this, "clear $id")
         itemList.clear()
     }
+
+    override fun update(value: Item) {
+        // nothing to do
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt
index a542a3be4d..b3fdf6c422 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt
@@ -16,7 +16,7 @@ class KeyValue(val key: String, val value: Any)
 class ViewState(
         isVisible: Boolean? = null,
         bgColor: Int? = -1
-) {
+) : UpdateBy<ViewState> {
 
     class State<T>(
             stateValue: T,
@@ -41,9 +41,15 @@ class ViewState(
         val states = listOf(isVisibleState, backgroundColor, descriptionVisibility)
         states.forEach { it.preventSameChanges = isPrevented }
     }
+
+    override fun update(value: ViewState) {
+        isVisibleState = value.isVisibleState
+        backgroundColor = value.backgroundColor
+        descriptionVisibility = value.descriptionVisibility
+    }
 }
 
-interface ItemViewModel : PayloadHolder {
+interface ItemViewModel : PayloadHolder, UpdateBy<ItemViewModel> {
     val viewState: ViewState
     var data: Any?
     var defaultData: Any?
@@ -92,6 +98,14 @@ open class BaseItemViewModel(
         this.data = data
         onDataUpdated = callback
     }
+
+    override fun update(value: ItemViewModel) {
+        viewState.update(value.viewState)
+        defaultData = value.defaultData
+        data = value.data
+        payload.clear()
+        payload.putAll(value.payload)
+    }
 }
 
 class ListViewModel(
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt
index 92e093d2c8..3b6c05f333 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt
@@ -53,7 +53,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.main_menu, menu)
-        val switchMenu = menu.findItem(R.id.action_favorite)
+        val switchMenu = menu.findItem(R.id.action_toggle_description_visibility)
         (switchMenu.actionView as? SwitchCompat)?.let {
             it.setOnCheckedChangeListener { buttonView, isChecked -> vm.switchToggled(isChecked) }
         }
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt
index f5f02c0ace..8699900359 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt
@@ -4,6 +4,13 @@ package com.tangem.tangemtest.commons
 [REDACTED_AUTHOR]
  */
 interface Store<M> {
-    fun save(config: M)
+    fun save(value: M)
     fun restore(): M
+}
+
+interface KeyedStore<M> {
+    fun save(key: String, value: M)
+    fun restore(key: String): M
+    fun restoreAll(): Map<String, M>
+    fun delete(key: String)
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/DialogController.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/DialogController.kt
new file mode 100644
index 0000000000..de7db7ae3e
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/DialogController.kt
@@ -0,0 +1,76 @@
+package com.tangem.tangemtest.commons
+
+import android.app.Activity
+import android.app.Dialog
+import android.view.LayoutInflater
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+
+class DialogController {
+    var onDismissCallback: (() -> Unit)? = null
+    var onShowCallback: (() -> Unit)? = null
+    var view: View? = null
+
+    private var rawDialog: Dialog? = null
+
+    private var inShowingProcess = false
+    private var inDismissingProcess = false
+    private var autoReleaseOnDismiss = false
+
+    fun createAlert(context: Activity, resLayout: Int): AlertDialog {
+        view = LayoutInflater.from(context).inflate(resLayout, null)
+        rawDialog = AlertDialog.Builder(context).setView(view).create().apply {
+            setOnShowListener { onShow() }
+            setOnDismissListener { onDismiss() }
+        }
+        return rawDialog as AlertDialog
+    }
+
+    fun set(dialog: Dialog) {
+        rawDialog = dialog
+        dialog.setOnShowListener { onShow() }
+        dialog.setOnDismissListener { onDismiss() }
+    }
+
+    private fun onShow() {
+        inShowingProcess = false
+        onShowCallback?.invoke()
+    }
+
+    private fun onDismiss() {
+        inDismissingProcess = false
+        if (autoReleaseOnDismiss) release()
+        onDismissCallback?.invoke()
+    }
+
+    fun show() {
+        val dialog = rawDialog ?: return
+        if (inShowingProcess) return
+        if (dialog.isShowing) return
+
+        inShowingProcess = true
+        dialog.show()
+    }
+
+    fun dismiss(autoRelease: Boolean = true) {
+        val dialog = rawDialog ?: return
+        if (inDismissingProcess) return
+        if (!dialog.isShowing) return
+
+        autoReleaseOnDismiss = autoRelease
+        inDismissingProcess = true
+        dialog.dismiss()
+    }
+
+    fun release() {
+        onDismissCallback = null
+        onShowCallback = null
+
+        inShowingProcess = false
+        inDismissingProcess = false
+        autoReleaseOnDismiss = false
+
+        view = null
+        rawDialog = null
+    }
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt
index 612b728c24..457b4baac3 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt
@@ -37,7 +37,7 @@ class PersonalizeAction : BaseAction() {
         val acquirer = DefaultPersonalizationParams.acquirer()
         val manufacturer = DefaultPersonalizationParams.manufacturer()
 
-        val personalizeConfig = PersonalizationConfigConverter().convert(itemList, PersonalizationConfig())
+        val personalizeConfig = PersonalizationConfigConverter().convert(itemList, PersonalizationConfig.default())
         val cardConfig = PersonalizationConfigToCardConfig().convert(personalizeConfig)
 
         attrs.tangemSdk.personalize(cardConfig, issuer, manufacturer, acquirer) {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ItemsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ItemsManager.kt
index a43809684b..20d2ed3eb8 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ItemsManager.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ItemsManager.kt
@@ -25,6 +25,7 @@ interface ItemsManager : PayloadHolder {
     fun invokeMainAction(tangemSdk: TangemSdk, callback: ActionCallback)
     fun getActionByTag(id: Id, tangemSdk: TangemSdk): ((ActionCallback) -> Unit)?
     fun attachPayload(payload: Payload)
+    fun updateByItemList(list: List<Item>)
 }
 
 interface PayloadKey {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseItemsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseItemsManager.kt
index 6ddbc6a916..a3308d623d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseItemsManager.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseItemsManager.kt
@@ -6,6 +6,7 @@ import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.Payload
 import com.tangem.tangemtest._arch.structure.abstraction.Item
 import com.tangem.tangemtest._arch.structure.abstraction.findItem
+import com.tangem.tangemtest._arch.structure.abstraction.iterate
 import com.tangem.tangemtest.ucase.domain.actions.Action
 import com.tangem.tangemtest.ucase.domain.actions.AttrForAction
 import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback
@@ -47,6 +48,10 @@ open class BaseItemsManager(protected val action: Action) : ItemsManager, Lifecy
         this.changeConsequence = consequence
     }
 
+    override fun updateByItemList(list: List<Item>) {
+        list.iterate { itemList.findItem(it.id)?.update(it) }
+    }
+
     override fun invokeMainAction(tangemSdk: TangemSdk, callback: ActionCallback) {
         action.executeMainAction(this, getAttrsForAction(tangemSdk), callback)
     }
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt
index 1652cd2833..4a9c0b0572 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt
@@ -29,7 +29,7 @@ class PersonalizationItemsManager(
 
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     fun onDestroy() {
-        val config = converter.convert(itemList, PersonalizationConfig())
+        val config = converter.convert(itemList, PersonalizationConfig.default())
         store.save(config)
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
index 1449441016..e438ba167f 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
@@ -12,6 +12,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.tangem.TangemSdk
 import com.tangem.commands.Card
+import com.tangem.commands.CommandResponse
 import com.tangem.tangem_sdk_new.extensions.init
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
@@ -87,39 +88,45 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
 
     protected open fun subscribeToViewModelChanges() {
         Log.d(this, "subscribeToViewModelChanges")
-        listenResponse()
-        listenResponseData()
-        listenResponseCardData()
-        listenError()
-        listenChangedItems()
-        listenDescriptionSwitchChanges()
-    }
-
-    private fun listenResponse() {
         actionVM.seResponse.observe(viewLifecycleOwner, Observer {
-            Log.d(this, "listen response: $it")
-            mainActivityVM.changeResponseEvent(it)
+            Log.d(this, "handle response: $it")
+            handleResponse(it)
         })
-    }
-
-    protected open fun listenResponseData() {
         actionVM.seResponseData.observe(viewLifecycleOwner, Observer {
-            Log.d(this, "listen responseData: $it")
-            navigateTo(R.id.action_nav_card_action_to_response_screen)
+            Log.d(this, "handle responseData: $it")
+            handleResponseData(it)
         })
-    }
-
-    protected open fun listenResponseCardData() {
         actionVM.seResponseCardData.observe(viewLifecycleOwner, Observer {
-            Log.d(this, "listen responseCardData: $it")
-            responseCardDataHandled(it)
+            Log.d(this, "handle responseCardData: $it")
+            handleResponseCardData(it)
         })
+        actionVM.seError.observe(viewLifecycleOwner, Observer {
+            Log.d(this, "handle error: $it")
+            handleError(it)
+        })
+        mainActivityVM.ldDescriptionSwitch.observe(viewLifecycleOwner, Observer {
+            Log.d(this, "handle descriptionVisibilityState: $it")
+            handleDescriptionSwitchChanges(it)
+        })
+        listenChangedItems()
     }
 
-    protected open fun responseCardDataHandled(card: Card?) {}
+    protected open fun handleResponse(response: CommandResponse) {
+        mainActivityVM.changeResponseEvent(response)
+    }
 
-    protected open fun listenError() {
-        actionVM.seError.observe(viewLifecycleOwner, Observer { showSnackbar(it) })
+    protected open fun handleResponseData(response: CommandResponse) {
+        navigateTo(R.id.action_nav_card_action_to_response_screen)
+    }
+
+    protected open fun handleResponseCardData(card: Card) {}
+
+    protected open fun handleError(error: String) {
+        showSnackbar(error)
+    }
+
+    protected open fun handleDescriptionSwitchChanges(descriptionVisibilityState: Boolean) {
+        actionVM.toggleDescriptionVisibility(descriptionVisibilityState)
     }
 
     @Deprecated("Start to use itemViewModel")
@@ -132,12 +139,6 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
         })
     }
 
-    protected open fun listenDescriptionSwitchChanges() {
-        mainActivityVM.ldDescriptionSwitch.observe(viewLifecycleOwner, Observer {
-            actionVM.toggleDescriptionVisibility(it)
-        })
-    }
-
     private fun inflateParamView(where: ViewGroup): ViewGroup {
         val inflater = LayoutInflater.from(where.context)
         val view = inflater.inflate(R.layout.w_card_incoming_param, where, false)
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
index 77a68278f8..cf39429e76 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
@@ -5,22 +5,46 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.google.gson.Gson
 import com.tangem.tangemtest.AppTangemDemo
+import com.tangem.tangemtest.commons.KeyedStore
 import com.tangem.tangemtest.commons.Store
 import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 
-class PersonalizationConfigStore(context: Context) : Store<PersonalizationConfig> {
+class PersonalizationConfigStore(context: Context) : Store<PersonalizationConfig>, KeyedStore<PersonalizationConfig> {
 
-    private val key = "personalization_config"
+    private val sharedPreferencesKey = "personalization_presets"
+    private val defaultKey = "default"
 
-    private val sp: SharedPreferences = (context.applicationContext as AppTangemDemo).sharedPreferences()
+    private val sp: SharedPreferences = (context.applicationContext as AppTangemDemo).sharedPreferences(sharedPreferencesKey)
     private val gson: Gson = Gson()
 
-    override fun save(config: PersonalizationConfig) {
-        sp.edit(true) { putString(key, gson.toJson(config)) }
+    override fun save(value: PersonalizationConfig) {
+        save(defaultKey, value)
     }
 
-    override fun restore(): PersonalizationConfig {
-        val json = sp.getString(key, gson.toJson(PersonalizationConfig()))
-        return gson.fromJson(json, PersonalizationConfig::class.java)
+    override fun restore(): PersonalizationConfig = restore(defaultKey)
+
+    override fun save(key: String, value: PersonalizationConfig) {
+        sp.edit(true) { putString(key, toJson(value)) }
     }
+
+    override fun restore(key: String): PersonalizationConfig {
+        val json = sp.getString(key, toJson(getDefaultConfig()))
+        return fromJson(json!!)
+    }
+
+    override fun restoreAll(): Map<String, PersonalizationConfig> {
+        val map = mutableMapOf<String, PersonalizationConfig>()
+        sp.all.forEach { map[it.key] = fromJson(it.value as String) }
+        return map.toSortedMap()
+    }
+
+    override fun delete(key: String) {
+        sp.edit(true) { remove(key) }
+    }
+
+    private fun getDefaultConfig(): PersonalizationConfig = PersonalizationConfig.default()
+
+    private fun toJson(value: PersonalizationConfig): String = gson.toJson(value)
+
+    private fun fromJson(json: String): PersonalizationConfig = gson.fromJson(json, PersonalizationConfig::class.java)
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
index 2bfd50514c..ba97f5768d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
@@ -6,20 +6,19 @@ package com.tangem.tangemtest.ucase.variants.personalize.dto
 class PersonalizationConfig {
 
     // Card number
-    var series = "BB"
-    var startNumber: Long = 300000000000
-    var batchId = "ffff"
-
+    var series = ""
+    var startNumber: Long = 0
+    var batchId = ""
 
     // Common
-    var curveID = "ed25519"
-    var blockchain = "BTC/test"
+    var curveID = ""
+    var blockchain = ""
     var blockchainCustom = ""
-    var MaxSignatures: Long = 999999
-    var createWallet = true
+    var MaxSignatures: Long = 0
+    var createWallet = false
 
     // Signing method
-    var SigningMethod0 = true
+    var SigningMethod0 = false
     var SigningMethod1 = false
     var SigningMethod2 = false
     var SigningMethod3 = false
@@ -27,19 +26,16 @@ class PersonalizationConfig {
     var SigningMethod5 = false
     var SigningMethod6 = false
 
-
     // Sign hash external properties
-    var pinLessFloorLimit: Long = 100000
-    var hexCrExKey = "00112233445566778899AABBCCDDEEFFFFEEDDCCBBAA998877665544332211000000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF"
+    var pinLessFloorLimit: Long = 0
+    var hexCrExKey = ""
     var requireTerminalTxSignature = false
     var requireTerminalCertSignature = false
-    var checkPIN3onCard = true
-
+    var checkPIN3onCard = false
 
     // Denomination
     var writeOnPersonalization = false
-    var denomination: Long = 1000000
-
+    var denomination: Long = 0
 
     // Token
     var itsToken = false
@@ -47,49 +43,125 @@ class PersonalizationConfig {
     var contractAddress = ""
     var decimal: Long = 0
 
-
     var cardData = CardData()
 
-
     // Settings mask
-    var isReusable = true
+    var isReusable = false
     var useActivation = false
     var forbidPurgeWallet = false
     var allowSelectBlockchain = false
     var useBlock = false
     var oneApdu = false
     var useCVC = false
-    var allowSwapPIN = true
-    var allowSwapPIN2 = true
+    var allowSwapPIN = false
+    var allowSwapPIN2 = false
     var forbidDefaultPIN = false
-    var smartSecurityDelay = true
-    var protectIssuerDataAgainstReplay = true
-    var skipSecurityDelayIfValidatedByIssuer = true
-    var skipCheckPIN2andCVCIfValidatedByIssuer = true
-    var skipSecurityDelayIfValidatedByLinkedTerminal = true
+    var smartSecurityDelay = false
+    var protectIssuerDataAgainstReplay = false
+    var skipSecurityDelayIfValidatedByIssuer = false
+    var skipCheckPIN2andCVCIfValidatedByIssuer = false
+    var skipSecurityDelayIfValidatedByLinkedTerminal = false
     var restrictOverwriteIssuerDataEx = false
 
-
     // Settings mask - protocol encryption
-    var protocolAllowUnencrypted = true
-    var protocolAllowStaticEncryption = true
+    var protocolAllowUnencrypted = false
+    var protocolAllowStaticEncryption = false
 
-
-    var useNDEF = true
-    var useDynamicNDEF = true
+    var useNDEF = false
+    var useDynamicNDEF = false
     var disablePrecomputedNDEF = false
-    var aar = "com.tangem.wallet"
+    var aar = ""
     var aarCustom = ""
-    var uri = "https://tangem.com"
-
+    var uri = ""
 
     // Pins
-    var PIN = "000000"
-    var PIN2 = "000"
+    var PIN = ""
+    var PIN2 = ""
     var PIN3 = ""
-    var CVC = "000"
-    var pauseBeforePIN2: Long = 5000L
+    var CVC = ""
+    var pauseBeforePIN2: Long = 0
 
+    companion object {
+        fun default(): PersonalizationConfig {
+            return PersonalizationConfig().apply {
+                // Card number
+                series = "BB"
+                startNumber = 300000000000L
+                batchId = "ffff"
+
+                // Common
+                curveID = "ed25519"
+                blockchain = "BTC/test"
+                blockchainCustom = ""
+                MaxSignatures = 999999L
+                createWallet = true
+
+                // Signing method
+                SigningMethod0 = true
+                SigningMethod1 = false
+                SigningMethod2 = false
+                SigningMethod3 = false
+                SigningMethod4 = false
+                SigningMethod5 = false
+                SigningMethod6 = false
+
+                // Sign hash external properties
+                pinLessFloorLimit = 100000L
+                hexCrExKey = "00112233445566778899AABBCCDDEEFFFFEEDDCCBBAA998877665544332211000000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF"
+                requireTerminalTxSignature = false
+                requireTerminalCertSignature = false
+                checkPIN3onCard = true
+
+                // Denomination
+                writeOnPersonalization = false
+                denomination = 1000000L
+
+                // Token
+                itsToken = false
+                symbol = ""
+                contractAddress = ""
+                decimal = 0L
+
+                cardData = CardData()
+
+                // Settings mask
+                isReusable = true
+                useActivation = false
+                forbidPurgeWallet = false
+                allowSelectBlockchain = false
+                useBlock = false
+                oneApdu = false
+                useCVC = false
+                allowSwapPIN = true
+                allowSwapPIN2 = true
+                forbidDefaultPIN = false
+                smartSecurityDelay = true
+                protectIssuerDataAgainstReplay = true
+                skipSecurityDelayIfValidatedByIssuer = true
+                skipCheckPIN2andCVCIfValidatedByIssuer = true
+                skipSecurityDelayIfValidatedByLinkedTerminal = true
+                restrictOverwriteIssuerDataEx = false
+
+                // Settings mask - protocol encryption
+                protocolAllowUnencrypted = true
+                protocolAllowStaticEncryption = true
+
+                useNDEF = true
+                useDynamicNDEF = true
+                disablePrecomputedNDEF = false
+                aar = "com.tangem.wallet"
+                aarCustom = ""
+                uri = "https://tangem.com"
+
+                // Pins
+                PIN = "000000"
+                PIN2 = "000"
+                PIN3 = ""
+                CVC = "000"
+                pauseBeforePIN2 = 5000L
+            }
+        }
+    }
 }
 
 class CardData {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 313410115c..4d771cd24b 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -1,11 +1,14 @@
 package com.tangem.tangemtest.ucase.variants.personalize.ui
 
+import android.content.DialogInterface
 import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.Button
+import android.widget.EditText
 import android.widget.LinearLayout
 import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
 import androidx.transition.TransitionManager
 import com.tangem.commands.Card
@@ -13,7 +16,9 @@ import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.StringId
 import com.tangem.tangemtest._arch.structure.abstraction.Item
+import com.tangem.tangemtest._arch.structure.abstraction.SafeValueChanged
 import com.tangem.tangemtest._arch.widget.WidgetBuilder
+import com.tangem.tangemtest.commons.DialogController
 import com.tangem.tangemtest.commons.view.MultiActionView
 import com.tangem.tangemtest.commons.view.ViewAction
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
@@ -24,6 +29,9 @@ import com.tangem.tangemtest.ucase.tunnel.ActionView
 import com.tangem.tangemtest.ucase.tunnel.ItemError
 import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
 import com.tangem.tangemtest.ucase.variants.personalize.PersonalizationConfigStore
+import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.PersonalizationPresetManager
+import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.PersonalizationPresetView
+import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.RvPresetNamesAdapter
 import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.PersonalizationItemBuilder
 import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate
 import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
@@ -33,12 +41,17 @@ import ru.dev.gbixahue.eu4d.lib.android.global.threading.postWork
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizationFragment : BaseCardActionFragment() {
+class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetView {
 
     override val itemsManager: ItemsManager by lazy { PersonalizationItemsManager(PersonalizationConfigStore(requireContext())) }
 
     override fun getLayoutId(): Int = R.layout.fg_base_action_layout
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        setHasOptionsMenu(true)
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         lifecycle.addObserver(itemsManager as PersonalizationItemsManager)
@@ -102,6 +115,28 @@ class PersonalizationFragment : BaseCardActionFragment() {
         contentContainer.addView(btnContainer)
     }
 
+    override fun handleResponseCardData(card: Card) {
+        super.handleResponseCardData(card)
+        navigateTo(R.id.action_nav_card_action_to_response_screen)
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        super.onPrepareOptionsMenu(menu)
+        menu.setGroupVisible(R.id.menu_group_personalization_preset, true)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val store = PersonalizationConfigStore(requireContext())
+        val presetManager = PersonalizationPresetManager(itemsManager, store, this)
+        when (item.itemId) {
+            R.id.action_reset -> presetManager.resetToDefault()
+            R.id.action_save -> presetManager.savePreset()
+            R.id.action_load -> presetManager.loadPreset()
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
     override fun showSnackbar(id: Id, additionalHandler: ((Id) -> Int)?) {
         super.showSnackbar(id) {
             when (id) {
@@ -112,8 +147,31 @@ class PersonalizationFragment : BaseCardActionFragment() {
         }
     }
 
-    override fun responseCardDataHandled(card: Card?) {
-        super.responseCardDataHandled(card)
-        navigateTo(R.id.action_nav_card_action_to_response_screen)
+    override fun showSavePresetDialog(onOk: SafeValueChanged<String>) {
+        val dlgController = DialogController()
+        val dlg = dlgController.createAlert(requireActivity(), R.layout.dlg_personalization_preset_save)
+        dlg.setTitle(R.string.menu_preset_save)
+        dlg.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.btn_cancel)) { dialog, which -> }
+        dlg.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.btn_ok)) { dialog, which ->
+            val tvName = dlgController.view?.findViewById<EditText>(R.id.et_item) ?: return@setButton
+            val name = tvName.text.toString()
+            if (name.isEmpty()) showSnackbar("Not saved")
+            else onOk.invoke(name)
+        }
+        dlgController.show()
+    }
+
+    override fun showLoadPresetDialog(namesList: List<String>, onChoose: SafeValueChanged<String>, onDelete: SafeValueChanged<String>) {
+        val dlgController = DialogController()
+        val dlg = dlgController.createAlert(requireActivity(), R.layout.dlg_personalization_preset_load)
+        dlg.setTitle(R.string.menu_preset_load)
+        val rvPresetNames: RecyclerView = dlgController.view?.findViewById(R.id.recycler_view) ?: return
+
+        rvPresetNames.layoutManager = LinearLayoutManager(context)
+        rvPresetNames.adapter = RvPresetNamesAdapter({
+            onChoose(it)
+            dlgController.dismiss()
+        }, onDelete).apply { setItemList(namesList.toMutableList()) }
+        dlgController.show()
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt
new file mode 100644
index 0000000000..b9f821902a
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt
@@ -0,0 +1,47 @@
+package com.tangem.tangemtest.ucase.variants.personalize.ui.presets
+
+import com.tangem.tangemtest.R
+import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
+import com.tangem.tangemtest.ucase.variants.personalize.PersonalizationConfigStore
+import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizationConfigConverter
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
+
+class PersonalizationPresetManager(
+        private val itemsManager: ItemsManager,
+        private val store: PersonalizationConfigStore,
+        private val view: PersonalizationPresetView
+) {
+
+    fun resetToDefault() {
+        val config = PersonalizationConfig.default()
+        val converter = PersonalizationConfigConverter()
+        itemsManager.updateByItemList(converter.convert(config))
+        store.save(config)
+    }
+
+    fun loadPreset() {
+        val presets = store.restoreAll()
+        val namesList = presets.map { it.key }.toMutableList()
+        if (namesList.size <= 1) {
+            view.showSnackbar(R.string.error_nothing_to_load)
+            return
+        }
+
+        namesList.removeAt(0)
+        view.showLoadPresetDialog(namesList, {
+            val converter = PersonalizationConfigConverter()
+            val config = store.restore(it)
+            itemsManager.updateByItemList(converter.convert(config))
+        }, {
+            store.delete(it)
+        })
+    }
+
+    fun savePreset() {
+        view.showSavePresetDialog { name ->
+            val converter = PersonalizationConfigConverter()
+            val config = converter.convert(itemsManager.getItems(), PersonalizationConfig.default())
+            store.save(name, config)
+        }
+    }
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetView.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetView.kt
new file mode 100644
index 0000000000..d4988973dc
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetView.kt
@@ -0,0 +1,9 @@
+package com.tangem.tangemtest.ucase.variants.personalize.ui.presets
+
+import com.tangem.tangemtest._arch.structure.abstraction.SafeValueChanged
+import com.tangem.tangemtest.ucase.tunnel.SnackbarHolder
+
+interface PersonalizationPresetView : SnackbarHolder {
+    fun showSavePresetDialog(onOk: SafeValueChanged<String>)
+    fun showLoadPresetDialog(namesList: List<String>, onChoose: SafeValueChanged<String>, onDelete: SafeValueChanged<String>)
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
new file mode 100644
index 0000000000..885fd24554
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
@@ -0,0 +1,47 @@
+package com.tangem.tangemtest.ucase.variants.personalize.ui.presets
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import com.tangem.tangemtest.R
+import com.tangem.tangemtest._arch.structure.abstraction.SafeValueChanged
+import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate
+import ru.dev.gbixahue.eu4d.lib.android._android.views.recycler_view.RvBaseAdapter
+import ru.dev.gbixahue.eu4d.lib.android._android.views.recycler_view.RvVH
+
+/**
+[REDACTED_AUTHOR]
+ */
+class RvPresetNamesAdapter(
+        private val onItemClicked: SafeValueChanged<String>,
+        private val onDeleteClicked: SafeValueChanged<String>
+) : RvBaseAdapter<PresetNameVH, String>() {
+    override fun onBindViewHolder(holder: PresetNameVH, position: Int) {
+        holder.bindData(itemList[position])
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PresetNameVH {
+        val view = parent.inflate<View>(R.layout.vh_personalization_preset_name, false)
+        return PresetNameVH(view, onItemClicked, { position, value ->
+            onDeleteClicked(value)
+            itemList.removeAt(position)
+            this.notifyItemRemoved(position)
+        })
+    }
+}
+
+class PresetNameVH(
+        itemView: View,
+        private val onItemClicked: SafeValueChanged<String>,
+        private val onDeleteClicked: (Int, String) -> Unit
+) : RvVH<String>(itemView) {
+    private val tvName = itemView.findViewById<TextView>(R.id.tv_name)
+    private val btnDelete = itemView.findViewById<Button>(R.id.btn_delete)
+    override fun onDataBound(data: String) {
+        tvName.text = data
+        tvName.isClickable = false
+        itemView.setOnClickListener { onItemClicked(data) }
+        btnDelete.setOnClickListener { onDeleteClicked(absoluteAdapterPosition, data) }
+    }
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseWidget.kt
index 054ab81dbc..f6554124cf 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseWidget.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseWidget.kt
@@ -14,7 +14,7 @@ import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
 /**
 [REDACTED_AUTHOR]
  */
-abstract class ResponseWidget(parent: ViewGroup, item: Item): DescriptionWidget(parent, item)  {
+abstract class ResponseWidget(parent: ViewGroup, item: Item) : DescriptionWidget(parent, item) {
 
     init {
         view.setOnClickListener {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
index 591532eab4..07de8bf618 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
@@ -47,8 +47,8 @@ class ScanActionFragment : BaseCardActionFragment() {
         actionFab.setOnClickListener { actionVM.invokeMainAction() }
     }
 
-    override fun responseCardDataHandled(card: Card?) {
-        super.responseCardDataHandled(card)
+    override fun handleResponseCardData(card: Card) {
+        super.handleResponseCardData(card)
         navigateTo(R.id.action_nav_card_action_to_response_screen)
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml b/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml
new file mode 100644
index 0000000000..4cc3e807ed
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/def_indent"/>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/dlg_personalization_preset_save.xml b/tangem-demo/src/main/res/layout/dlg_personalization_preset_save.xml
new file mode 100644
index 0000000000..ce4e7e91a3
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/dlg_personalization_preset_save.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/til_item"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        app:boxBackgroundColor="@android:color/transparent"
+        android:hint="Enter a preset name"
+        tools:hint="Field name">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/et_item"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Some text field" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml b/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml
new file mode 100644
index 0000000000..c2705b1e04
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/tv_name"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btn_delete"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:hint="Field name" />
+
+    <Button
+        android:id="@+id/btn_delete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:text="@string/btn_delete"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/menu/main_menu.xml b/tangem-demo/src/main/res/menu/main_menu.xml
index 7f4be83642..f05978a433 100644
--- a/tangem-demo/src/main/res/menu/main_menu.xml
+++ b/tangem-demo/src/main/res/menu/main_menu.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <item
         android:id="@+id/action_share"
@@ -10,9 +11,26 @@
         app:showAsAction="always" />
 
     <item
-        android:id="@+id/action_favorite"
+        android:id="@+id/action_toggle_description_visibility"
         android:title=""
         app:actionLayout="@layout/menu_item_switch"
         app:showAsAction="always" />
 
+    <group
+        android:id="@+id/menu_group_personalization_preset"
+        android:visible="false"
+        tools:visible="true">
+
+        <item
+            android:id="@+id/action_reset"
+            android:title="@string/menu_preset_reset" />
+        <item
+            android:id="@+id/action_save"
+            android:title="@string/menu_preset_save" />
+        <item
+            android:id="@+id/action_load"
+            android:title="@string/menu_preset_load" />
+
+    </group>
+
 </menu>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/values/strings.xml b/tangem-demo/src/main/res/values/strings.xml
index 9987b584dc..60ba9ba1cc 100644
--- a/tangem-demo/src/main/res/values/strings.xml
+++ b/tangem-demo/src/main/res/values/strings.xml
@@ -1,14 +1,21 @@
 <resources>
     <string name="app_name">Tangem Development Kit</string>
 
+    <string name="unknown">unknown</string>
+    <string name="copy_to_clipboard">Copy to clipboard</string>
+    <string name="btn_delete">Delete</string>
+    <string name="btn_ok">OK</string>
+    <string name="btn_cancel">Cancel</string>
+    <string name="btn_save">Save</string>
+    <string name="btn_load">Load</string>
+
     <string name="fg_name_entry_point">@string/app_name</string>
     <string name="fg_name_response_scan">Scan response</string>
     <string name="fg_name_response_sign">Sign response</string>
     <string name="fg_name_response_personalization">Personalization response</string>
     <string name="fg_name_response_depersonalization">Depersonalization response</string>
 
-    <string name="unknown">unknown</string>
-    <string name="copy_to_clipboard">Copy to clipboard</string>
+
     <string name="switch_description">Docs</string>
 
     <string name="card_error_not_personalized">Your card hasn\'t been personalized yet. You need to run personalize command first.</string>
diff --git a/tangem-demo/src/main/res/values/strings_personalization.xml b/tangem-demo/src/main/res/values/strings_personalization.xml
index 47e8e48a14..a919e32390 100644
--- a/tangem-demo/src/main/res/values/strings_personalization.xml
+++ b/tangem-demo/src/main/res/values/strings_personalization.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="menu_preset_reset">Reset configuration to default</string>
+    <string name="menu_preset_save">Save configuration</string>
+    <string name="menu_preset_load">Load configuration</string>
+    <string name="error_nothing_to_load">Nothing to load</string>
+
+
     <string name="personalize">Personalize</string>
     <string name="depersonalize">Depersonalize</string>
     <string name="pers_block_card_number">Card number</string>

From 585a83982b6bff732d7a95613fea44ca9afc276e Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Apr 2020 22:39:19 +0300
Subject: [PATCH 05/24] Updated on 2026-08-14

---
 .../src/main/res/values/theme_debug.xml       | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 tangem-demo/src/main/res/values/theme_debug.xml

diff --git a/tangem-demo/src/main/res/values/theme_debug.xml b/tangem-demo/src/main/res/values/theme_debug.xml
new file mode 100644
index 0000000000..14996863a8
--- /dev/null
+++ b/tangem-demo/src/main/res/values/theme_debug.xml
@@ -0,0 +1,73 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- You can change the parent around to whatever you normally use -->
+	<style name="DebugColors" parent="Theme.AppCompat.Light.NoActionBar">
+
+		<!-- System colors -->
+		<item name="android:windowBackground">@color/__debugWindowBackground</item>
+
+		<item name="android:colorPressedHighlight">#FF4400</item>
+		<item name="android:colorLongPressedHighlight">#FF0044</item>
+		<item name="android:colorFocusedHighlight">#44FF00</item>
+		<item name="android:colorActivatedHighlight">#00FF44</item>
+		<item name="android:colorMultiSelectHighlight">#4400FF</item>
+
+		<item name="android:statusBarColor">#FFF000</item>
+		<item name="android:navigationBarColor">#000FFF</item>
+
+		<item name="android:colorForeground">#440000</item>
+		<item name="android:colorForegroundInverse">#004400</item>
+		<item name="android:colorBackground">#444400</item>
+		<item name="android:colorBackgroundCacheHint">#440044</item>
+
+		//Only for >21
+		<item name="android:textColorPrimary">#FFFF00</item>
+		<item name="android:textColorSecondary">#FF00FF</item>
+		<item name="android:textColorTertiary">#00FFFF</item>       <!-- Overrides a TextView textColor-->
+
+		<item name="android:textColorPrimaryInverse">#CCCC00</item>
+		<item name="android:textColorSecondaryInverse">#CC00CC</item>
+		<item name="android:textColorTertiaryInverse">#00CCCC</item>
+
+		<item name="android:textColorPrimaryDisableOnly">#FFCC00</item>
+		<item name="android:textColorPrimaryInverseDisableOnly">#FF00CC</item>
+
+		<item name="android:textColorPrimaryNoDisable">#CCFF00</item>
+		<item name="android:textColorSecondaryNoDisable">#00FFCC</item>
+
+		<item name="android:textColorPrimaryInverseNoDisable">#CC00FF</item>
+		<item name="android:textColorSecondaryInverseNoDisable">#00CCFF</item>
+
+		<item name="android:textColorHint">#FF8800</item>
+		<item name="android:textColorHintInverse">#FF0088</item>
+
+		<item name="android:textColorHighlight">#88FF00</item>
+		<item name="android:textColorHighlightInverse">#00FF88</item>
+
+		<item name="android:textColorLink">#8800FF</item>
+		<item name="android:textColorLinkInverse">#0088FF</item>
+
+		<item name="android:textColorAlertDialogListItem">#444444</item>
+
+		<!-- Color palette (via app-compat) -->
+		<item name="colorPrimary">#FF0000</item>
+		<item name="colorPrimaryDark">#00FF00</item>
+		<item name="colorAccent">#0000FF</item>
+
+		<item name="colorControlNormal">#CC0000</item>
+		<item name="colorControlActivated">#00CC00</item>
+		<item name="colorControlHighlight">#0000CC</item>
+
+		<item name="colorButtonNormal">#880000</item>
+		<item name="colorSwitchThumbNormal">#008800</item>
+
+		<!-- Random other things found in app-compat -->
+		<item name="actionMenuTextColor">#440000</item>
+		<item name="editTextColor">#FF4400</item>             <!-- Overrides textColorPrimary-->
+		<item name="textColorSearchUrl">#000044</item>
+
+	</style>
+
+	<!-- Also needed, since windowBackground is a reference, not a color -->
+	<color name="__debugWindowBackground">#888888</color>
+
+</resources>
\ No newline at end of file

From a1d168f62183aa1ec0bb9fe559d92472f07b3fd8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Apr 2020 22:52:46 +0300
Subject: [PATCH 06/24] Updated on 2026-08-14

---
 tangem-demo/src/main/res/layout/a_main.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tangem-demo/src/main/res/layout/a_main.xml b/tangem-demo/src/main/res/layout/a_main.xml
index a3736051f4..bc25c94505 100644
--- a/tangem-demo/src/main/res/layout/a_main.xml
+++ b/tangem-demo/src/main/res/layout/a_main.xml
@@ -10,7 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorPrimary"
-        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"/>
 
     <fragment
         android:id="@+id/nav_host_fragment"

From 04ba03319db1318c2901940ffe74e9c7c96dae96 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 02:16:10 +0300
Subject: [PATCH 07/24] Updated on 2026-08-14

---
 .../_main/entryPoint/ActionListFragment.kt          |  6 ++----
 .../tangemtest/extensions/view/Transitions.kt       | 13 +++++++++++++
 .../tangemtest/ucase/ui/widgets/ParameterWidget.kt  |  7 +++----
 .../personalize/ui/PersonalizationFragment.kt       |  4 ++--
 .../personalize/ui/widgets/DescriptionWidget.kt     |  5 ++---
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/extensions/view/Transitions.kt

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt
index ea17194439..4e10211223 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt
@@ -2,16 +2,14 @@ package com.tangem.tangemtest._main.entryPoint
 
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.transition.AutoTransition
-import androidx.transition.TransitionManager
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._main.MainViewModel
+import com.tangem.tangemtest.extensions.view.beginDelayedTransition
 import com.tangem.tangemtest.ucase.getDefaultNavigationOptions
 import com.tangem.tangemtest.ucase.resources.ActionType
 import com.tangem.tangemtest.ucase.resources.MainResourceHolder
@@ -47,7 +45,7 @@ class ActionListFragment : BaseFragment() {
         }
         mainActivityVM.ldDescriptionSwitch.observe(viewLifecycleOwner, Observer {
             vhDataWrapper.descriptionIsVisible = it
-            TransitionManager.beginDelayedTransition(rvActions as ViewGroup, AutoTransition())
+            rvActions.beginDelayedTransition()
             rvActions.adapter?.notifyDataSetChanged()
         })
     }
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/extensions/view/Transitions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/extensions/view/Transitions.kt
new file mode 100644
index 0000000000..d58f12aa97
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/extensions/view/Transitions.kt
@@ -0,0 +1,13 @@
+package com.tangem.tangemtest.extensions.view
+
+import android.view.ViewGroup
+import androidx.transition.AutoTransition
+import androidx.transition.Transition
+import androidx.transition.TransitionManager
+
+/**
+[REDACTED_AUTHOR]
+ */
+fun ViewGroup.beginDelayedTransition(transition: Transition = AutoTransition()) {
+    TransitionManager.beginDelayedTransition(this, transition)
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt
index 96037984ea..ab01e1a692 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt
@@ -6,14 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
-import androidx.transition.AutoTransition
-import androidx.transition.TransitionManager
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.abstraction.Item
 import com.tangem.tangemtest._arch.structure.impl.EditTextItem
+import com.tangem.tangemtest.extensions.view.beginDelayedTransition
 import com.tangem.tangemtest.ucase.resources.ActionType
 import com.tangem.tangemtest.ucase.resources.MainResourceHolder
 import com.tangem.tangemtest.ucase.resources.Resources
@@ -73,7 +72,7 @@ class ParameterWidget(
     }
 
     fun toggleDescriptionVisibility(state: Boolean) {
-        TransitionManager.beginDelayedTransition(parent.parent as ViewGroup, AutoTransition())
+        (parent.parent as ViewGroup).beginDelayedTransition()
         descriptionContainer.visibility = if (state) View.VISIBLE else View.GONE
     }
 
@@ -95,7 +94,7 @@ class ParameterWidget(
     private fun toggleActionBtnVisibility() {
         fun switchVisibilityState(newState: Int) {
             actionBtnVisibilityState = newState
-            TransitionManager.beginDelayedTransition(parent, AutoTransition())
+            parent.beginDelayedTransition()
             btnAction.visibility = actionBtnVisibilityState
         }
         when {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 4d771cd24b..4f63996dcf 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -10,7 +10,6 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
-import androidx.transition.TransitionManager
 import com.tangem.commands.Card
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
@@ -21,6 +20,7 @@ import com.tangem.tangemtest._arch.widget.WidgetBuilder
 import com.tangem.tangemtest.commons.DialogController
 import com.tangem.tangemtest.commons.view.MultiActionView
 import com.tangem.tangemtest.commons.view.ViewAction
+import com.tangem.tangemtest.extensions.view.beginDelayedTransition
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
 import com.tangem.tangemtest.ucase.domain.paramsManager.PayloadKey
 import com.tangem.tangemtest.ucase.domain.paramsManager.managers.PersonalizationItemsManager
@@ -86,7 +86,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
                 val timeEnd = System.currentTimeMillis()
                 val diff = timeEnd - timeStart
                 postUI(maxDelay - diff) {
-                    TransitionManager.beginDelayedTransition(contentContainer, Fade())
+                    contentContainer.beginDelayedTransition(Fade())
                     contentContainer.addView(llContainer)
                     widgetCreatedCallback()
                     swrLayout.isRefreshing = false
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/DescriptionWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/DescriptionWidget.kt
index 02d2a3612a..a8fe8af66c 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/DescriptionWidget.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/DescriptionWidget.kt
@@ -2,11 +2,10 @@ package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets
 
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.transition.AutoTransition
-import androidx.transition.TransitionManager
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.abstraction.Item
 import com.tangem.tangemtest._arch.structure.abstraction.ViewState
+import com.tangem.tangemtest.extensions.view.beginDelayedTransition
 
 /**
 [REDACTED_AUTHOR]
@@ -31,7 +30,7 @@ abstract class DescriptionWidget(
         if (description.isEmpty()) return
 
         tv.text = description
-        TransitionManager.beginDelayedTransition(view.parent as ViewGroup, AutoTransition())
+        (view.parent as ViewGroup).beginDelayedTransition()
         descriptionContainer.visibility = state
     }
 }
\ No newline at end of file

From 4b4e0e3027665a4b2a6b666e093183877abeddb8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 14:10:23 +0300
Subject: [PATCH 08/24] Updated on 2026-08-14

---
 .../tangem/tangemtest/_main/MainActivity.kt   | 27 ++++++++++----
 .../tangem/tangemtest/_main/MainViewModel.kt  |  2 ++
 .../personalize/ui/PersonalizationFragment.kt | 20 +++++------
 .../variants/responses/ui/ResponseFragment.kt |  6 ++--
 tangem-demo/src/main/res/menu/main_menu.xml   | 36 -------------------
 .../src/main/res/menu/menu_activity_main.xml  | 11 ++++++
 .../main/res/menu/menu_fg_peronalization.xml  | 18 ++++++++++
 .../src/main/res/menu/menu_fg_response.xml    | 11 ++++++
 tangem-demo/src/main/res/values/strings.xml   |  6 +++-
 .../res/values/strings_personalization.xml    |  8 ++---
 .../src/main/res/values/strings_response.xml  |  1 +
 11 files changed, 83 insertions(+), 63 deletions(-)
 delete mode 100644 tangem-demo/src/main/res/menu/main_menu.xml
 create mode 100644 tangem-demo/src/main/res/menu/menu_activity_main.xml
 create mode 100644 tangem-demo/src/main/res/menu/menu_fg_peronalization.xml
 create mode 100644 tangem-demo/src/main/res/menu/menu_fg_response.xml

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt
index 3b6c05f333..c47ac39601 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainActivity.kt
@@ -3,9 +3,9 @@ package com.tangem.tangemtest._main
 import android.content.res.Resources
 import android.os.Bundle
 import android.view.Menu
+import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.SwitchCompat
 import androidx.appcompat.widget.Toolbar
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
@@ -20,7 +20,7 @@ import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
  */
 class MainActivity : AppCompatActivity() {
 
-    private val vm: MainViewModel by viewModels<MainViewModel>()
+    private val mainVM: MainViewModel by viewModels<MainViewModel>()
     private lateinit var appBarConfiguration: AppBarConfiguration
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -52,11 +52,24 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.main_menu, menu)
-        val switchMenu = menu.findItem(R.id.action_toggle_description_visibility)
-        (switchMenu.actionView as? SwitchCompat)?.let {
-            it.setOnCheckedChangeListener { buttonView, isChecked -> vm.switchToggled(isChecked) }
+        menuInflater.inflate(R.menu.menu_activity_main, menu)
+        return true
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+        val switchItem = menu.findItem(R.id.action_toggle_description_visibility)
+        switchItem.isChecked = mainVM.descriptionSwitchState
+        return super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val result = when (item.itemId) {
+            R.id.action_toggle_description_visibility -> {
+                item.isChecked = !item.isChecked
+                mainVM.switchToggled(item.isChecked)
+            }
+            else -> null
         }
-        return super.onCreateOptionsMenu(menu)
+        return if (result == null) super.onOptionsItemSelected(item) else true
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainViewModel.kt
index a50da93a68..3900d86530 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainViewModel.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/MainViewModel.kt
@@ -10,10 +10,12 @@ import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
  */
 class MainViewModel : ViewModel() {
     val ldDescriptionSwitch = MutableLiveData<Boolean>(false)
+    var descriptionSwitchState = false
 
     var commandResponse: CommandResponse? = null
 
     fun switchToggled(state: Boolean) {
+        descriptionSwitchState = state
         ldDescriptionSwitch.postValue(state)
     }
 
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 4f63996dcf..196828c168 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -47,9 +47,9 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
 
     override fun getLayoutId(): Int = R.layout.fg_base_action_layout
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -120,21 +120,21 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
         navigateTo(R.id.action_nav_card_action_to_response_screen)
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        super.onPrepareOptionsMenu(menu)
-        menu.setGroupVisible(R.id.menu_group_personalization_preset, true)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_fg_peronalization, menu)
+        super.onCreateOptionsMenu(menu, inflater)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val store = PersonalizationConfigStore(requireContext())
         val presetManager = PersonalizationPresetManager(itemsManager, store, this)
-        when (item.itemId) {
+        val result = when (item.itemId) {
             R.id.action_reset -> presetManager.resetToDefault()
             R.id.action_save -> presetManager.savePreset()
             R.id.action_load -> presetManager.loadPreset()
-            else -> return super.onOptionsItemSelected(item)
+            else -> null
         }
-        return true
+        return if (result == null) super.onOptionsItemSelected(item) else true
     }
 
     override fun showSnackbar(id: Id, additionalHandler: ((Id) -> Int)?) {
@@ -150,7 +150,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
     override fun showSavePresetDialog(onOk: SafeValueChanged<String>) {
         val dlgController = DialogController()
         val dlg = dlgController.createAlert(requireActivity(), R.layout.dlg_personalization_preset_save)
-        dlg.setTitle(R.string.menu_preset_save)
+        dlg.setTitle(R.string.menu_personalization_preset_save)
         dlg.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.btn_cancel)) { dialog, which -> }
         dlg.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.btn_ok)) { dialog, which ->
             val tvName = dlgController.view?.findViewById<EditText>(R.id.et_item) ?: return@setButton
@@ -164,7 +164,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
     override fun showLoadPresetDialog(namesList: List<String>, onChoose: SafeValueChanged<String>, onDelete: SafeValueChanged<String>) {
         val dlgController = DialogController()
         val dlg = dlgController.createAlert(requireActivity(), R.layout.dlg_personalization_preset_load)
-        dlg.setTitle(R.string.menu_preset_load)
+        dlg.setTitle(R.string.menu_personalization_preset_load)
         val rvPresetNames: RecyclerView = dlgController.view?.findViewById(R.id.recycler_view) ?: return
 
         rvPresetNames.layoutManager = LinearLayoutManager(context)
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
index 6244bc7a1f..51616a2a4c 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
@@ -30,6 +30,7 @@ open class ResponseFragment : BaseFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setTittle()
+        setHasOptionsMenu(true)
     }
 
     private fun setTittle() {
@@ -40,7 +41,6 @@ open class ResponseFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        setHasOptionsMenu(true)
         buildWidgets()
         listenDescriptionSwitchChanges()
     }
@@ -58,10 +58,8 @@ open class ResponseFragment : BaseFragment() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_fg_response, menu)
         super.onCreateOptionsMenu(menu, inflater)
-
-        val menuItem = menu.findItem(R.id.action_share)
-        menuItem.isVisible = true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/tangem-demo/src/main/res/menu/main_menu.xml b/tangem-demo/src/main/res/menu/main_menu.xml
deleted file mode 100644
index f05978a433..0000000000
--- a/tangem-demo/src/main/res/menu/main_menu.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <item
-        android:id="@+id/action_share"
-        android:icon="@drawable/ic_share_white_18dp"
-        android:title="Share"
-        android:visible="false"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/action_toggle_description_visibility"
-        android:title=""
-        app:actionLayout="@layout/menu_item_switch"
-        app:showAsAction="always" />
-
-    <group
-        android:id="@+id/menu_group_personalization_preset"
-        android:visible="false"
-        tools:visible="true">
-
-        <item
-            android:id="@+id/action_reset"
-            android:title="@string/menu_preset_reset" />
-        <item
-            android:id="@+id/action_save"
-            android:title="@string/menu_preset_save" />
-        <item
-            android:id="@+id/action_load"
-            android:title="@string/menu_preset_load" />
-
-    </group>
-
-</menu>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/menu/menu_activity_main.xml b/tangem-demo/src/main/res/menu/menu_activity_main.xml
new file mode 100644
index 0000000000..f357bec858
--- /dev/null
+++ b/tangem-demo/src/main/res/menu/menu_activity_main.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_toggle_description_visibility"
+        android:checkable="true"
+        android:title="@string/menu_main_docs"
+        app:showAsAction="never" />
+
+</menu>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/menu/menu_fg_peronalization.xml b/tangem-demo/src/main/res/menu/menu_fg_peronalization.xml
new file mode 100644
index 0000000000..e216e70905
--- /dev/null
+++ b/tangem-demo/src/main/res/menu/menu_fg_peronalization.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <group android:id="@+id/menu_group_personalization_preset">
+
+        <item
+            android:id="@+id/action_reset"
+            android:title="@string/menu_personalization_preset_reset" />
+        <item
+            android:id="@+id/action_save"
+            android:title="@string/menu_personalization_preset_save" />
+        <item
+            android:id="@+id/action_load"
+            android:title="@string/menu_personalization_preset_load" />
+
+    </group>
+
+</menu>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/menu/menu_fg_response.xml b/tangem-demo/src/main/res/menu/menu_fg_response.xml
new file mode 100644
index 0000000000..6ab677d644
--- /dev/null
+++ b/tangem-demo/src/main/res/menu/menu_fg_response.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_share"
+        android:icon="@drawable/ic_share_white_18dp"
+        android:title="@string/menu_response_share"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/values/strings.xml b/tangem-demo/src/main/res/values/strings.xml
index 60ba9ba1cc..105c2bc808 100644
--- a/tangem-demo/src/main/res/values/strings.xml
+++ b/tangem-demo/src/main/res/values/strings.xml
@@ -1,7 +1,8 @@
 <resources>
     <string name="app_name">Tangem Development Kit</string>
 
-    <string name="unknown">unknown</string>
+    <string name="menu_main_docs">Docs</string>
+
     <string name="copy_to_clipboard">Copy to clipboard</string>
     <string name="btn_delete">Delete</string>
     <string name="btn_ok">OK</string>
@@ -9,6 +10,9 @@
     <string name="btn_save">Save</string>
     <string name="btn_load">Load</string>
 
+    <string name="unknown">unknown</string>
+    <string name="error_nothing_to_load">Nothing to load</string>
+
     <string name="fg_name_entry_point">@string/app_name</string>
     <string name="fg_name_response_scan">Scan response</string>
     <string name="fg_name_response_sign">Sign response</string>
diff --git a/tangem-demo/src/main/res/values/strings_personalization.xml b/tangem-demo/src/main/res/values/strings_personalization.xml
index a919e32390..62814c5b2d 100644
--- a/tangem-demo/src/main/res/values/strings_personalization.xml
+++ b/tangem-demo/src/main/res/values/strings_personalization.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="menu_preset_reset">Reset configuration to default</string>
-    <string name="menu_preset_save">Save configuration</string>
-    <string name="menu_preset_load">Load configuration</string>
-    <string name="error_nothing_to_load">Nothing to load</string>
-
+    <string name="menu_personalization_preset_reset">Reset configuration to default</string>
+    <string name="menu_personalization_preset_save">Save configuration</string>
+    <string name="menu_personalization_preset_load">Load configuration</string>
 
     <string name="personalize">Personalize</string>
     <string name="depersonalize">Depersonalize</string>
diff --git a/tangem-demo/src/main/res/values/strings_response.xml b/tangem-demo/src/main/res/values/strings_response.xml
index c0086d1186..e0f0676ca9 100644
--- a/tangem-demo/src/main/res/values/strings_response.xml
+++ b/tangem-demo/src/main/res/values/strings_response.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="menu_response_share">Share</string>
 
     <!--  Field names - Response: Card  -->
     <string name="response_card_cid">CID</string>

From 6ed8b23dff546cce0b3d514b46eebf4f5800452b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 14:21:52 +0300
Subject: [PATCH 09/24] Updated on 2026-08-14

---
 .../personalize/ui/PersonalizationFragment.kt     |  3 ++-
 .../variants/responses/ui/ResponseFragment.kt     | 15 +++++++++++++--
 .../ucase/variants/scan/ui/ScanActionFragment.kt  |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 196828c168..d05c81f2d0 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -33,6 +33,7 @@ import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.Personalizati
 import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.PersonalizationPresetView
 import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.RvPresetNamesAdapter
 import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.PersonalizationItemBuilder
+import com.tangem.tangemtest.ucase.variants.responses.ui.ResponseFragment
 import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate
 import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
 import ru.dev.gbixahue.eu4d.lib.android.global.threading.postUI
@@ -117,7 +118,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
 
     override fun handleResponseCardData(card: Card) {
         super.handleResponseCardData(card)
-        navigateTo(R.id.action_nav_card_action_to_response_screen)
+        navigateTo(R.id.action_nav_card_action_to_response_screen, ResponseFragment.setTittle(R.string.fg_name_response_personalization))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
index 51616a2a4c..07676a18f2 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt
@@ -3,6 +3,8 @@ package com.tangem.tangemtest.ucase.variants.responses.ui
 import android.os.Bundle
 import android.view.*
 import android.widget.LinearLayout
+import androidx.annotation.StringRes
+import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
@@ -29,12 +31,13 @@ open class ResponseFragment : BaseFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setTittle()
+
         setHasOptionsMenu(true)
+        setTittle()
     }
 
     private fun setTittle() {
-        val titleId = selfVM.determineTitleId(mainActivityVM.commandResponse)
+        val titleId = getTittleId(arguments) ?: selfVM.determineTitleId(mainActivityVM.commandResponse)
         activity?.setTitle(titleId)
     }
 
@@ -70,4 +73,12 @@ open class ResponseFragment : BaseFragment() {
         }
         return super.onOptionsItemSelected(item)
     }
+
+    companion object {
+        private val argTittle = "tittle"
+
+        fun setTittle(@StringRes id: Int): Bundle = bundleOf(Pair(argTittle, id))
+
+        private fun getTittleId(args: Bundle?): Int? = args?.getInt(argTittle)
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
index 07de8bf618..b3b8c89d33 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
@@ -11,6 +11,7 @@ import com.tangem.tangemtest.R
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
 import com.tangem.tangemtest.ucase.domain.paramsManager.managers.ScanItemsManager
 import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
+import com.tangem.tangemtest.ucase.variants.responses.ui.ResponseFragment
 import ru.dev.gbixahue.eu4d.lib.android._android.views.dpToPx
 
 /**
@@ -49,6 +50,6 @@ class ScanActionFragment : BaseCardActionFragment() {
 
     override fun handleResponseCardData(card: Card) {
         super.handleResponseCardData(card)
-        navigateTo(R.id.action_nav_card_action_to_response_screen)
+        navigateTo(R.id.action_nav_card_action_to_response_screen, ResponseFragment.setTittle(R.string.fg_name_response_scan))
     }
 }
\ No newline at end of file

From 98bbd7622bab6e1724d36c5572ab0b83af4a5d6f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 15:57:14 +0300
Subject: [PATCH 10/24] Updated on 2026-08-14

---
 .../tangemtest/_arch/structure/abstraction/ItemViewModel.kt | 6 +++---
 .../ucase/variants/personalize/dto/PersonalizationConfig.kt | 6 ++++--
 tangem-demo/src/main/res/values/strings.xml                 | 4 ++--
 tangem-demo/src/main/res/values/strings_personalization.xml | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt
index b3fdf6c422..fc106588e6 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/ItemViewModel.kt
@@ -43,9 +43,9 @@ class ViewState(
     }
 
     override fun update(value: ViewState) {
-        isVisibleState = value.isVisibleState
-        backgroundColor = value.backgroundColor
-        descriptionVisibility = value.descriptionVisibility
+//        isVisibleState.update(value.isVisibleState)
+//        backgroundColor.update(value.backgroundColor)
+//        descriptionVisibility.update(value.descriptionVisibility)
     }
 }
 
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
index ba97f5768d..ebb7daea63 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
@@ -1,5 +1,7 @@
 package com.tangem.tangemtest.ucase.variants.personalize.dto
 
+import com.tangem.commands.EllipticCurve
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -90,8 +92,8 @@ class PersonalizationConfig {
                 batchId = "ffff"
 
                 // Common
-                curveID = "ed25519"
-                blockchain = "BTC/test"
+                curveID = EllipticCurve.Secp256k1.curve
+                blockchain = "ETH"
                 blockchainCustom = ""
                 MaxSignatures = 999999L
                 createWallet = true
diff --git a/tangem-demo/src/main/res/values/strings.xml b/tangem-demo/src/main/res/values/strings.xml
index 105c2bc808..6df259b3e4 100644
--- a/tangem-demo/src/main/res/values/strings.xml
+++ b/tangem-demo/src/main/res/values/strings.xml
@@ -29,7 +29,7 @@
     <string name="stub">Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit</string>
 <!--    <string name="stub">Sed ut perspiciatis unde omnis iste natus</string>-->
 
-    <string name="show_rare_fields">Show rarely used fields</string>
-    <string name="hide_rare_fields">Hide</string>
+    <string name="show_rare_fields">Show all fields</string>
+    <string name="hide_rare_fields">Hide fields</string>
 
 </resources>
diff --git a/tangem-demo/src/main/res/values/strings_personalization.xml b/tangem-demo/src/main/res/values/strings_personalization.xml
index 62814c5b2d..4a1f94bb2e 100644
--- a/tangem-demo/src/main/res/values/strings_personalization.xml
+++ b/tangem-demo/src/main/res/values/strings_personalization.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="menu_personalization_preset_reset">Reset configuration to default</string>
+    <string name="menu_personalization_preset_reset">Reset to default</string>
     <string name="menu_personalization_preset_save">Save configuration</string>
     <string name="menu_personalization_preset_load">Load configuration</string>
 

From 24e2963d2263d891b4c5f75a604d115c1d592063 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 16:45:29 +0300
Subject: [PATCH 11/24] Updated on 2026-08-14

---
 tangem-demo/src/main/res/menu/menu_activity_main.xml | 2 +-
 tangem-demo/src/main/res/values/strings.xml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tangem-demo/src/main/res/menu/menu_activity_main.xml b/tangem-demo/src/main/res/menu/menu_activity_main.xml
index f357bec858..b92266e699 100644
--- a/tangem-demo/src/main/res/menu/menu_activity_main.xml
+++ b/tangem-demo/src/main/res/menu/menu_activity_main.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_toggle_description_visibility"
         android:checkable="true"
-        android:title="@string/menu_main_docs"
+        android:title="@string/menu_main_description"
         app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/values/strings.xml b/tangem-demo/src/main/res/values/strings.xml
index 6df259b3e4..c777b19115 100644
--- a/tangem-demo/src/main/res/values/strings.xml
+++ b/tangem-demo/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">Tangem Development Kit</string>
 
-    <string name="menu_main_docs">Docs</string>
+    <string name="menu_main_description">Description</string>
 
     <string name="copy_to_clipboard">Copy to clipboard</string>
     <string name="btn_delete">Delete</string>

From 0ef866f5daa0e05e0a2eb5aecf75185136c92665 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 17:05:08 +0300
Subject: [PATCH 12/24] Updated on 2026-08-14

---
 .../tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt  | 2 +-
 .../variants/personalize/ui/PersonalizationFragment.kt    | 3 ++-
 .../ucase/variants/scan/ui/ScanActionFragment.kt          | 3 ++-
 tangem-demo/src/main/res/navigation/navigation.xml        | 8 +++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
index e438ba167f..526e6e995c 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
@@ -116,7 +116,7 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
     }
 
     protected open fun handleResponseData(response: CommandResponse) {
-        navigateTo(R.id.action_nav_card_action_to_response_screen)
+        navigateTo(R.id.action_nav_card_action_to_response_screen, options = null)
     }
 
     protected open fun handleResponseCardData(card: Card) {}
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index d05c81f2d0..ee1e27df9d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -118,7 +118,8 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
 
     override fun handleResponseCardData(card: Card) {
         super.handleResponseCardData(card)
-        navigateTo(R.id.action_nav_card_action_to_response_screen, ResponseFragment.setTittle(R.string.fg_name_response_personalization))
+        val bundle = ResponseFragment.setTittle(R.string.fg_name_response_personalization)
+        navigateTo(R.id.action_nav_card_action_to_response_screen, bundle, null)
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
index b3b8c89d33..a125e30adf 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt
@@ -50,6 +50,7 @@ class ScanActionFragment : BaseCardActionFragment() {
 
     override fun handleResponseCardData(card: Card) {
         super.handleResponseCardData(card)
-        navigateTo(R.id.action_nav_card_action_to_response_screen, ResponseFragment.setTittle(R.string.fg_name_response_scan))
+        val bundle = ResponseFragment.setTittle(R.string.fg_name_response_scan)
+        navigateTo(R.id.action_nav_card_action_to_response_screen, bundle, null)
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/navigation/navigation.xml b/tangem-demo/src/main/res/navigation/navigation.xml
index 1f734fb81c..c8d276f4d7 100644
--- a/tangem-demo/src/main/res/navigation/navigation.xml
+++ b/tangem-demo/src/main/res/navigation/navigation.xml
@@ -6,7 +6,13 @@
 
     <action
         android:id="@+id/action_nav_card_action_to_response_screen"
-        app:destination="@+id/nav_card_response" />
+        app:destination="@+id/nav_card_response"
+        app:enterAnim="@anim/slide_in_right"
+        app:exitAnim="@anim/slide_out_left"
+        app:popEnterAnim="@anim/slide_in_left"
+        app:popExitAnim="@anim/slide_out_right"
+        app:popUpTo="@id/nav_entry_point"
+        app:popUpToInclusive="false" />
 
     <fragment
         android:id="@+id/nav_entry_point"

From 6a7d67e0c0c2f714bfaaf08cee2be39936d80971 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 17:44:29 +0300
Subject: [PATCH 13/24] Updated on 2026-08-14

---
 .../java/com/tangem/tangemtest/commons/Abstractions.kt     | 2 +-
 .../variants/personalize/PersonalizationConfigStore.kt     | 7 +++++--
 .../personalize/ui/presets/PersonalizationPresetManager.kt | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt
index 8699900359..6c3b1abc26 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Abstractions.kt
@@ -11,6 +11,6 @@ interface Store<M> {
 interface KeyedStore<M> {
     fun save(key: String, value: M)
     fun restore(key: String): M
-    fun restoreAll(): Map<String, M>
+    fun restoreAll(): MutableMap<String, M>
     fun delete(key: String)
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
index cf39429e76..9c774a8071 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
@@ -11,8 +11,11 @@ import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfi
 
 class PersonalizationConfigStore(context: Context) : Store<PersonalizationConfig>, KeyedStore<PersonalizationConfig> {
 
+    companion object {
+        val defaultKey = "default"
+    }
+
     private val sharedPreferencesKey = "personalization_presets"
-    private val defaultKey = "default"
 
     private val sp: SharedPreferences = (context.applicationContext as AppTangemDemo).sharedPreferences(sharedPreferencesKey)
     private val gson: Gson = Gson()
@@ -32,7 +35,7 @@ class PersonalizationConfigStore(context: Context) : Store<PersonalizationConfig
         return fromJson(json!!)
     }
 
-    override fun restoreAll(): Map<String, PersonalizationConfig> {
+    override fun restoreAll(): MutableMap<String, PersonalizationConfig> {
         val map = mutableMapOf<String, PersonalizationConfig>()
         sp.all.forEach { map[it.key] = fromJson(it.value as String) }
         return map.toSortedMap()
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt
index b9f821902a..ff63bca036 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PersonalizationPresetManager.kt
@@ -21,13 +21,13 @@ class PersonalizationPresetManager(
 
     fun loadPreset() {
         val presets = store.restoreAll()
+        presets.remove(PersonalizationConfigStore.defaultKey)
         val namesList = presets.map { it.key }.toMutableList()
-        if (namesList.size <= 1) {
+        if (namesList.isEmpty()) {
             view.showSnackbar(R.string.error_nothing_to_load)
             return
         }
 
-        namesList.removeAt(0)
         view.showLoadPresetDialog(namesList, {
             val converter = PersonalizationConfigConverter()
             val config = store.restore(it)

From a0c675b05180be93bd954056f8530bbde8b6fc15 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 18:08:11 +0300
Subject: [PATCH 14/24] Updated on 2026-08-14

---
 .../personalize/ui/PersonalizationFragment.kt |  9 ++++++--
 .../personalize/ui/presets/PresetRv.kt        |  2 +-
 .../dlg_personalization_preset_load.xml       | 21 ++++++++++++++++---
 .../layout/vh_personalization_preset_name.xml | 15 +++++++------
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index ee1e27df9d..6168556532 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -7,6 +7,7 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.LinearLayout
 import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
@@ -155,7 +156,8 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
         dlg.setTitle(R.string.menu_personalization_preset_save)
         dlg.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.btn_cancel)) { dialog, which -> }
         dlg.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.btn_ok)) { dialog, which ->
-            val tvName = dlgController.view?.findViewById<EditText>(R.id.et_item) ?: return@setButton
+            val tvName = dlgController.view?.findViewById<EditText>(R.id.et_item)
+                    ?: return@setButton
             val name = tvName.text.toString()
             if (name.isEmpty()) showSnackbar("Not saved")
             else onOk.invoke(name)
@@ -169,7 +171,10 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
         dlg.setTitle(R.string.menu_personalization_preset_load)
         val rvPresetNames: RecyclerView = dlgController.view?.findViewById(R.id.recycler_view) ?: return
 
-        rvPresetNames.layoutManager = LinearLayoutManager(context)
+        val layoutManager = LinearLayoutManager(context)
+        rvPresetNames.layoutManager = layoutManager
+        rvPresetNames.addItemDecoration(DividerItemDecoration(activity, layoutManager.orientation))
+
         rvPresetNames.adapter = RvPresetNamesAdapter({
             onChoose(it)
             dlgController.dismiss()
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
index 885fd24554..ed6ae83074 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
@@ -37,7 +37,7 @@ class PresetNameVH(
         private val onDeleteClicked: (Int, String) -> Unit
 ) : RvVH<String>(itemView) {
     private val tvName = itemView.findViewById<TextView>(R.id.tv_name)
-    private val btnDelete = itemView.findViewById<Button>(R.id.btn_delete)
+    private val btnDelete = itemView.findViewById<View>(R.id.btn_delete)
     override fun onDataBound(data: String) {
         tvName.text = data
         tvName.isClickable = false
diff --git a/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml b/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml
index 4cc3e807ed..78795aa96b 100644
--- a/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml
+++ b/tangem-demo/src/main/res/layout/dlg_personalization_preset_load.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/recycler_view"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/def_indent"/>
\ No newline at end of file
+    android:orientation="vertical"
+    android:paddingTop="@dimen/def_indent"
+    android:paddingBottom="@dimen/def_half_indent">
+
+    <include
+        layout="@layout/m_divider_h"
+        android:layout_width="match_parent"
+        android:layout_height="2dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/def_indent"
+        android:layout_marginEnd="@dimen/def_indent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml b/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml
index c2705b1e04..03a57c1aff 100644
--- a/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml
+++ b/tangem-demo/src/main/res/layout/vh_personalization_preset_name.xml
@@ -11,22 +11,25 @@
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
+        android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
+        android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btn_delete"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:hint="Field name" />
 
-    <Button
+    <ImageView
         android:id="@+id/btn_delete"
-        android:layout_width="wrap_content"
+        android:layout_width="26dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="32dp"
-        android:text="@string/btn_delete"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@android:drawable/ic_menu_delete" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4b2eb829c2a7dc2f4ac413a8303111bed196d2f4 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 18:54:04 +0300
Subject: [PATCH 15/24] Updated on 2026-08-14

---
 .../personalize/ui/PersonalizationFragment.kt | 31 ++++++++++++++++---
 .../personalize/ui/presets/PresetRv.kt        |  2 +-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 6168556532..cab78e4834 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -3,9 +3,12 @@ package com.tangem.tangemtest.ucase.variants.personalize.ui
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.*
+import android.view.inputmethod.InputMethodManager
 import android.widget.Button
 import android.widget.EditText
 import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat.getSystemService
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -37,9 +40,11 @@ import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.Personalizati
 import com.tangem.tangemtest.ucase.variants.responses.ui.ResponseFragment
 import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate
 import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
+import ru.dev.gbixahue.eu4d.lib.android.global.threading.post
 import ru.dev.gbixahue.eu4d.lib.android.global.threading.postUI
 import ru.dev.gbixahue.eu4d.lib.android.global.threading.postWork
 
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -162,23 +167,39 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV
             if (name.isEmpty()) showSnackbar("Not saved")
             else onOk.invoke(name)
         }
+        dlgController.onShowCallback = {
+            dlgController.view?.findViewById<TextView>(R.id.et_item)?.let {
+                post(150) {
+                    it.requestFocus()
+                    val imm = getSystemService(requireContext(), InputMethodManager::class.java)
+                    imm?.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
+                }
+            }
+        }
         dlgController.show()
     }
 
     override fun showLoadPresetDialog(namesList: List<String>, onChoose: SafeValueChanged<String>, onDelete: SafeValueChanged<String>) {
         val dlgController = DialogController()
-        val dlg = dlgController.createAlert(requireActivity(), R.layout.dlg_personalization_preset_load)
-        dlg.setTitle(R.string.menu_personalization_preset_load)
-        val rvPresetNames: RecyclerView = dlgController.view?.findViewById(R.id.recycler_view) ?: return
+        dlgController.createAlert(requireActivity(), R.layout.dlg_personalization_preset_load)
+                .setTitle(R.string.menu_personalization_preset_load)
 
+        val rvPresetNames: RecyclerView = dlgController.view?.findViewById(R.id.recycler_view) ?: return
         val layoutManager = LinearLayoutManager(context)
         rvPresetNames.layoutManager = layoutManager
         rvPresetNames.addItemDecoration(DividerItemDecoration(activity, layoutManager.orientation))
 
-        rvPresetNames.adapter = RvPresetNamesAdapter({
+        val adapter = RvPresetNamesAdapter({
             onChoose(it)
             dlgController.dismiss()
-        }, onDelete).apply { setItemList(namesList.toMutableList()) }
+        }, {
+            onDelete(it)
+            if (rvPresetNames.adapter?.itemCount == 0)
+                dlgController.dismiss()
+        })
+        adapter.setItemList(namesList.toMutableList())
+
+        rvPresetNames.adapter = adapter
         dlgController.show()
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
index ed6ae83074..ff00dcf179 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/presets/PresetRv.kt
@@ -24,9 +24,9 @@ class RvPresetNamesAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PresetNameVH {
         val view = parent.inflate<View>(R.layout.vh_personalization_preset_name, false)
         return PresetNameVH(view, onItemClicked, { position, value ->
-            onDeleteClicked(value)
             itemList.removeAt(position)
             this.notifyItemRemoved(position)
+            onDeleteClicked(value)
         })
     }
 }

From f838a0f894dd74b672f38b443ab7ded4dbecd5ec Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 14 Apr 2020 23:48:04 +0300
Subject: [PATCH 16/24] Updated on 2026-08-14

---
 .../ucase/variants/personalize/converter/DefaultValues.kt       | 2 +-
 tangem-demo/src/main/res/values/strings.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
index b49629ed8c..2f406d98c3 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
@@ -66,7 +66,7 @@ class ConfigValuesHolder : BaseTypedHolder<Id, Value>() {
         register(SettingsMaskNdef.DynamicNdef, Value(default.useDynamicNDEF))
         register(SettingsMaskNdef.DisablePrecomputedNdef, Value(default.disablePrecomputedNDEF))
         register(SettingsMaskNdef.Aar, Value(default.aar, Helper.aarList()))
-        register(SettingsMaskNdef.AarCustom, Value(default.aar))
+        register(SettingsMaskNdef.AarCustom, Value(default.aarCustom))
         register(SettingsMaskNdef.Uri, Value(default.uri))
         register(Pins.Pin, Value(default.PIN))
         register(Pins.Pin2, Value(default.PIN2))
diff --git a/tangem-demo/src/main/res/values/strings.xml b/tangem-demo/src/main/res/values/strings.xml
index c777b19115..38c96cca46 100644
--- a/tangem-demo/src/main/res/values/strings.xml
+++ b/tangem-demo/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="error_nothing_to_load">Nothing to load</string>
 
     <string name="fg_name_entry_point">@string/app_name</string>
-    <string name="fg_name_response_scan">Scan response</string>
+    <string name="fg_name_response_scan">Read response</string>
     <string name="fg_name_response_sign">Sign response</string>
     <string name="fg_name_response_personalization">Personalization response</string>
     <string name="fg_name_response_depersonalization">Depersonalization response</string>

From cb7cb22909013c55b5a150510ed7b6fd3043d0db Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 00:30:17 +0300
Subject: [PATCH 17/24] Updated on 2026-08-14

---
 .../domain/responses/ResponseJsonConverter.kt | 98 ++++++++++++++++---
 .../responses/converter/CardConverter.kt      | 23 +++--
 tangem-demo/src/main/res/values/colors.xml    |  2 +-
 3 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt
index d54bc08a5d..794f4aa727 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt
@@ -3,6 +3,7 @@ package com.tangem.tangemtest.ucase.domain.responses
 import com.google.gson.*
 import com.tangem.commands.*
 import com.tangem.common.extensions.toHexString
+import com.tangem.tangemtest.extensions.print
 import java.lang.reflect.Type
 import java.text.DateFormat
 import java.util.*
@@ -11,14 +12,17 @@ import java.util.*
 [REDACTED_AUTHOR]
  */
 class ResponseJsonConverter {
+
     val gson: Gson by lazy { init() }
 
+    private val fieldConverter = ResponseFieldConverter()
+
     private fun init(): Gson {
         val builder = GsonBuilder().apply {
-            registerTypeAdapter(ByteArray::class.java, ByteTypeAdapter())
-            registerTypeAdapter(SigningMethod::class.java, SigningMethodTypeAdapter())
-            registerTypeAdapter(SettingsMask::class.java, SettingsMaskTypeAdapter())
-            registerTypeAdapter(ProductMask::class.java, ProductMaskTypeAdapter())
+            registerTypeAdapter(ByteArray::class.java, ByteTypeAdapter(fieldConverter))
+            registerTypeAdapter(SigningMethod::class.java, SigningMethodTypeAdapter(fieldConverter))
+            registerTypeAdapter(SettingsMask::class.java, SettingsMaskTypeAdapter(fieldConverter))
+            registerTypeAdapter(ProductMask::class.java, ProductMaskTypeAdapter(fieldConverter))
             registerTypeAdapter(Date::class.java, DateTypeAdapter())
         }
         builder.setPrettyPrinting()
@@ -28,31 +32,41 @@ class ResponseJsonConverter {
     fun convertResponse(response: CommandResponse?): String = gson.toJson(response)
 }
 
-class ByteTypeAdapter : JsonSerializer<ByteArray> {
+class ByteTypeAdapter(
+        private val fieldConverter: ResponseFieldConverter
+) : JsonSerializer<ByteArray> {
     override fun serialize(src: ByteArray, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        return JsonPrimitive(src.toHexString())
+        return JsonPrimitive(fieldConverter.byteArray(src))
     }
 }
 
-class SettingsMaskTypeAdapter : JsonSerializer<SettingsMask> {
+class SettingsMaskTypeAdapter(
+        private val fieldConverter: ResponseFieldConverter
+) : JsonSerializer<SettingsMask> {
     override fun serialize(src: SettingsMask, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        val arrayElement = JsonArray()
-        Settings.values()
-                .filter { src.contains(it) }
-                .forEach { arrayElement.add(it.name) }
-        return arrayElement
+        return JsonArray().apply {
+            fieldConverter.settingsMaskList(src).forEach { add(it) }
+        }
     }
 }
 
-class ProductMaskTypeAdapter : JsonSerializer<ProductMask> {
+class ProductMaskTypeAdapter(
+        private val fieldConverter: ResponseFieldConverter
+) : JsonSerializer<ProductMask> {
     override fun serialize(src: ProductMask, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        return JsonPrimitive(src.rawValue.toString())
+        return JsonArray().apply {
+            fieldConverter.productMaskList(src).forEach { add(it) }
+        }
     }
 }
 
-class SigningMethodTypeAdapter : JsonSerializer<SigningMethod> {
+class SigningMethodTypeAdapter(
+        private val fieldConverter: ResponseFieldConverter
+) : JsonSerializer<SigningMethod> {
     override fun serialize(src: SigningMethod, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        return JsonPrimitive(src.rawValue.toString())
+        return JsonArray().apply {
+            fieldConverter.signingMethodList(src).forEach { add(it) }
+        }
     }
 }
 
@@ -61,4 +75,56 @@ class DateTypeAdapter : JsonSerializer<Date> {
         val formatter = DateFormat.getDateInstance(DateFormat.DEFAULT, Locale("en_US"))
         return JsonPrimitive(formatter.format(src).toString())
     }
+}
+
+class ResponseFieldConverter {
+
+    fun productMask(productMask: ProductMask?): String {
+        return productMaskList(productMask).print(wrap = false)
+    }
+
+    fun productMaskList(productMask: ProductMask?): List<String> {
+        val mask = productMask ?: return emptyList()
+
+        val signingMap = mutableMapOf(
+                ProductMask.note to "Note",
+                ProductMask.tag to "Tag",
+                ProductMask.idCard to "IdCard",
+                ProductMask.idIssuer to "IdIssuer"
+        )
+        return signingMap.filter { mask.contains(it.key) }.map { it.value }
+    }
+
+    fun signingMethod(signingMethod: SigningMethod?): String {
+        return signingMethodList(signingMethod).print(wrap = false)
+    }
+
+    fun signingMethodList(signingMethod: SigningMethod?): List<String> {
+        val methods = signingMethod ?: return emptyList()
+
+        val signingMap = mutableMapOf(
+                SigningMethod.signHash to "Hash",
+                SigningMethod.signRaw to "Raw",
+                SigningMethod.signHashValidatedByIssuer to "HashValidatedByIssuer",
+                SigningMethod.signRawValidatedByIssuer to "RawValidatedByIssuer",
+                SigningMethod.signHashValidatedByIssuerAndWriteIssuerData to "HashValidatedByIssuerAndWriteIssuerData",
+                SigningMethod.signRawValidatedByIssuerAndWriteIssuerData to "RawValidatedByIssuerAndWriteIssuerData",
+                SigningMethod.signPos to "Pos"
+        )
+        return signingMap.filter { methods.contains(it.key) }.map { it.value }
+    }
+
+    fun settingsMask(settingsMask: SettingsMask?): String {
+        return settingsMaskList(settingsMask).print(wrap = false)
+    }
+
+    fun settingsMaskList(settingsMask: SettingsMask?): List<String> {
+        val masks = settingsMask ?: return emptyList()
+
+        return Settings.values().filter { masks.contains(it) }.map { it.name }
+    }
+
+    fun byteArray(byteArray: ByteArray?): String {
+        return byteArray?.toHexString() ?: ""
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
index 7ccf0d0a13..cb8d978fbe 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
@@ -4,13 +4,13 @@ import com.tangem.commands.Card
 import com.tangem.commands.CardData
 import com.tangem.commands.Settings
 import com.tangem.commands.SettingsMask
-import com.tangem.common.extensions.toHexString
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.StringId
 import com.tangem.tangemtest._arch.structure.abstraction.*
 import com.tangem.tangemtest._arch.structure.impl.BoolItem
 import com.tangem.tangemtest._arch.structure.impl.TextItem
+import com.tangem.tangemtest.ucase.domain.responses.ResponseFieldConverter
 import com.tangem.tangemtest.ucase.variants.personalize.BlockId
 import com.tangem.tangemtest.ucase.variants.responses.CardDataId
 import com.tangem.tangemtest.ucase.variants.responses.CardId
@@ -20,11 +20,11 @@ import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
 [REDACTED_AUTHOR]
  */
 class CardConverter : ModelToItems<Card> {
+
+    private val fieldConverter = ResponseFieldConverter()
+
     override fun convert(from: Card): List<Item> {
         val itemList = mutableListOf<Item>()
-//        val holder = GsonInitializer()
-//        itemList.add(TextItem(Additional.JSON_INCOMING, holder.gson.toJson(from)))
-
         itemList.add(simpleFields(from))
         itemList.add(cardData(from.cardData))
         itemList.add(settingsMask(from.settingsMask))
@@ -52,13 +52,13 @@ class CardConverter : ModelToItems<Card> {
         group.addItem(TextItem(CardId.manufacturerName, from.manufacturerName))
         group.addItem(TextItem(CardId.status, stringOf(from.status)))
         group.addItem(TextItem(CardId.firmwareVersion, from.firmwareVersion))
-        group.addItem(TextItem(CardId.cardPublicKey, from.cardPublicKey?.toHexString()))
-        group.addItem(TextItem(CardId.issuerPublicKey, from.issuerPublicKey?.toHexString()))
+        group.addItem(TextItem(CardId.cardPublicKey, fieldConverter.byteArray(from.cardPublicKey)))
+        group.addItem(TextItem(CardId.issuerPublicKey, fieldConverter.byteArray(from.issuerPublicKey)))
         group.addItem(TextItem(CardId.curve, stringOf(from.curve)))
         group.addItem(TextItem(CardId.maxSignatures, stringOf(from.maxSignatures)))
-        group.addItem(TextItem(CardId.signingMethod, stringOf(from.signingMethod?.rawValue)))
+        group.addItem(TextItem(CardId.signingMethod, fieldConverter.signingMethod(from.signingMethod)))
         group.addItem(TextItem(CardId.pauseBeforePin2, stringOf(from.pauseBeforePin2)))
-        group.addItem(TextItem(CardId.walletPublicKey, stringOf(from.walletPublicKey)))
+        group.addItem(TextItem(CardId.walletPublicKey, fieldConverter.byteArray(from.walletPublicKey)))
         group.addItem(TextItem(CardId.walletRemainingSignatures, stringOf(from.walletRemainingSignatures)))
         group.addItem(TextItem(CardId.walletSignedHashes, stringOf(from.walletSignedHashes)))
         group.addItem(TextItem(CardId.health, stringOf(from.health)))
@@ -80,8 +80,8 @@ class CardConverter : ModelToItems<Card> {
         group.addItem(TextItem(CardDataId.manufactureDateTime, stringOf(data.manufactureDateTime)))
         group.addItem(TextItem(CardDataId.issuerName, data.issuerName))
         group.addItem(TextItem(CardDataId.blockchainName, data.blockchainName))
-        group.addItem(TextItem(CardDataId.manufacturerSignature, data.manufacturerSignature?.toHexString()))
-        group.addItem(TextItem(CardDataId.productMask, stringOf(data.productMask?.rawValue)))
+        group.addItem(TextItem(CardDataId.manufacturerSignature, fieldConverter.byteArray(data.manufacturerSignature)))
+        group.addItem(TextItem(CardDataId.productMask, fieldConverter.productMask(data.productMask)))
         group.addItem(TextItem(CardDataId.tokenSymbol, data.tokenSymbol))
         group.addItem(TextItem(CardDataId.tokenContractAddress, data.tokenContractAddress))
         group.addItem(TextItem(CardDataId.tokenDecimal, data.tokenSymbol))
@@ -90,10 +90,9 @@ class CardConverter : ModelToItems<Card> {
     }
 
     private fun settingsMask(from: SettingsMask?): Item {
-        val group = createGroup(CardId.settingsMask, R.color.group_signing_method)
+        val group = createGroup(CardId.settingsMask, R.color.group_settings_mask)
         val data = from ?: return group
 
-//        group.addItem(TextItem(StringResId(R.string.response_card_settings_mask)))
         Settings.values().forEach { group.addItem(BoolItem(StringId(it.name), data.contains(it))) }
         return group
     }
diff --git a/tangem-demo/src/main/res/values/colors.xml b/tangem-demo/src/main/res/values/colors.xml
index 1c183064f5..180f557ffd 100644
--- a/tangem-demo/src/main/res/values/colors.xml
+++ b/tangem-demo/src/main/res/values/colors.xml
@@ -14,7 +14,7 @@
     <color name="field_description">@color/field_info</color>
 
     <color name="group_card_data">#D7E4F3</color>
-    <color name="group_signing_method">#D7F3E6</color>
+    <color name="group_settings_mask">#D7F3E6</color>
 
 
     <color name="switchTrack">#C6C6C6</color>

From a64fcc7a64f5b14ab28207f7f4eed4c2bf41c347 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 12:15:24 +0300
Subject: [PATCH 18/24] Updated on 2026-08-14

---
 .../_arch/structure/abstraction/Extension.kt           |  5 ++++-
 .../tangem/tangemtest/_arch/structure/impl/Items.kt    | 10 +++++-----
 .../ui/widgets/PersonalizationItemBuilder.kt           |  2 +-
 .../{GroupTitleWidget.kt => TextHeaderWidget.kt}       |  4 ++--
 ...ize_item_text.xml => w_personalize_item_header.xml} |  0
 .../main/res/layout/w_personalize_widgets_together.xml |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/{GroupTitleWidget.kt => TextHeaderWidget.kt} (86%)
 rename tangem-demo/src/main/res/layout/{w_personalize_item_text.xml => w_personalize_item_header.xml} (100%)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Extension.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Extension.kt
index 76b43ce50a..2aa3fb6af5 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Extension.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/abstraction/Extension.kt
@@ -20,7 +20,10 @@ fun List<Item>.iterate(func: (Item) -> Unit) {
     forEach {
         when (it) {
             is BaseItem -> func(it)
-            is ItemGroup -> it.itemList.iterate(func)
+            is ItemGroup -> {
+                func(it)
+                it.itemList.iterate(func)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/impl/Items.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/impl/Items.kt
index e402650802..d4e4dde775 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/impl/Items.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/structure/impl/Items.kt
@@ -11,29 +11,29 @@ open class TypedItem<D>(id: Id, viewModel: ItemViewModel) : BaseItem(id, viewMod
     open fun getTypedData(): D? = viewModel.data as? D
 }
 
-class TextItem(id: Id, viewModel: ItemViewModel) : TypedItem<String>(id, viewModel) {
+open class TextItem(id: Id, viewModel: ItemViewModel) : TypedItem<String>(id, viewModel) {
     constructor(id: Id, value: String? = null, viewState: ViewState = ViewState())
             : this(id, BaseItemViewModel(value, viewState))
 }
 
-class NumberItem(id: Id, viewModel: ItemViewModel) : TypedItem<Number>(id, viewModel) {
+open class NumberItem(id: Id, viewModel: ItemViewModel) : TypedItem<Number>(id, viewModel) {
     constructor(id: Id, value: Number? = null, viewState: ViewState = ViewState())
             : this(id, BaseItemViewModel(value, viewState))
 }
 
-class BoolItem(id: Id, viewModel: ItemViewModel) : TypedItem<Boolean>(id, viewModel) {
+open class BoolItem(id: Id, viewModel: ItemViewModel) : TypedItem<Boolean>(id, viewModel) {
     constructor(id: Id, value: Boolean? = null, viewState: ViewState = ViewState())
             : this(id, BaseItemViewModel(value, viewState))
 }
 
 
-class EditTextItem(id: Id, viewModel: ItemViewModel) : TypedItem<String>(id, viewModel) {
+open class EditTextItem(id: Id, viewModel: ItemViewModel) : TypedItem<String>(id, viewModel) {
     constructor(id: Id, value: String? = null, viewState: ViewState = ViewState())
             : this(id, BaseItemViewModel(value, viewState))
 }
 
 
-class SpinnerItem(id: Id, viewModel: ListViewModel) : TypedItem<ListViewModel>(id, viewModel) {
+open class SpinnerItem(id: Id, viewModel: ListViewModel) : TypedItem<ListViewModel>(id, viewModel) {
     constructor(id: Id, list: List<KeyValue>, selectedValue: Any?, viewState: ViewState = ViewState())
             : this(id, ListViewModel(list, selectedValue, viewState))
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt
index fdbead0989..f18839f056 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt
@@ -12,7 +12,7 @@ import com.tangem.tangemtest._arch.widget.abstraction.ViewWidget
 class PersonalizationItemBuilder : ItemWidgetBuilder {
     override fun build(item: BaseItem, parent: ViewGroup): ViewWidget? {
         return when (item) {
-            is TextItem -> GroupTitleWidget(parent, item)
+            is TextItem -> TextHeaderWidget(parent, item)
             is EditTextItem -> EditTextWidget(parent, item)
             is NumberItem -> NumberWidget(parent, item)
             is BoolItem -> SwitchWidget(parent, item)
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/GroupTitleWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/TextHeaderWidget.kt
similarity index 86%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/GroupTitleWidget.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/TextHeaderWidget.kt
index 27167508ad..ab52a1981b 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/GroupTitleWidget.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/TextHeaderWidget.kt
@@ -8,8 +8,8 @@ import com.tangem.tangemtest._arch.structure.impl.TextItem
 /**
 [REDACTED_AUTHOR]
  */
-class GroupTitleWidget(parent: ViewGroup, data: TextItem) : DescriptionWidget(parent, data) {
-    override fun getLayoutId(): Int = R.layout.w_personalize_item_text
+class TextHeaderWidget(parent: ViewGroup, data: TextItem) : DescriptionWidget(parent, data) {
+    override fun getLayoutId(): Int = R.layout.w_personalize_item_header
 
     private val tvName = view.findViewById<TextView>(R.id.tv_name)
 
diff --git a/tangem-demo/src/main/res/layout/w_personalize_item_text.xml b/tangem-demo/src/main/res/layout/w_personalize_item_header.xml
similarity index 100%
rename from tangem-demo/src/main/res/layout/w_personalize_item_text.xml
rename to tangem-demo/src/main/res/layout/w_personalize_item_header.xml
diff --git a/tangem-demo/src/main/res/layout/w_personalize_widgets_together.xml b/tangem-demo/src/main/res/layout/w_personalize_widgets_together.xml
index 83787d982c..ada27eb0ac 100644
--- a/tangem-demo/src/main/res/layout/w_personalize_widgets_together.xml
+++ b/tangem-demo/src/main/res/layout/w_personalize_widgets_together.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/w_personalize_item_text" />
+    <include layout="@layout/w_personalize_item_header" />
 
     <include layout="@layout/w_personalize_item_edit_text" />
 

From c99ba58925d707d114a1864d33bea132029f662e Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 14:28:13 +0300
Subject: [PATCH 19/24] Updated on 2026-08-14

---
 .../com/tangem/tangemtest/ucase/domain/actions/SignAction.kt  | 4 ++--
 .../triggers/changeConsequence/ParamChangeConsequence.kt      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt
index 375c2ce9a7..f44f36d1ee 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt
@@ -13,10 +13,10 @@ import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
 class SignAction : BaseAction() {
     override fun executeMainAction(payload: PayloadHolder, attrs: AttrForAction, callback: ActionCallback) {
         val dataForHashing = attrs.itemList.findItem(TlvId.TransactionOutHash) ?: return
-        val hash = dataForHashing.getData() as? ByteArray ?: return
+        val hash = dataForHashing.getData() as? String ?: return
         val cardId = attrs.itemList.findItem(TlvId.CardId)?.viewModel?.data ?: return
 
-        attrs.tangemSdk.sign(arrayOf(hash), stringOf(cardId)) { handleResult(payload, it, null, attrs, callback) }
+        attrs.tangemSdk.sign(arrayOf(hash.toByteArray()), stringOf(cardId)) { handleResult(payload, it, null, attrs, callback) }
     }
 
     override fun getActionByTag(payload: PayloadHolder, id: Id, attrs: AttrForAction): ((ActionCallback) -> Unit)? {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt
index 730c570be6..bb771e86f6 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt
@@ -4,6 +4,7 @@ import com.tangem.commands.Card
 import com.tangem.commands.EllipticCurve
 import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.extensions.calculateSha512
+import com.tangem.common.extensions.toHexString
 import com.tangem.tangemtest._arch.structure.PayloadHolder
 import com.tangem.tangemtest._arch.structure.abstraction.Item
 import com.tangem.tangemtest._arch.structure.abstraction.findItem
@@ -40,7 +41,7 @@ class SignScanConsequence : ItemsChangeConsequence {
                 EllipticCurve.Ed25519 -> dataForHashing.calculateSha512()
                 else -> return null
             }
-            hashItem.setData(hashedData)
+            hashItem.setData(hashedData.toHexString())
         }
         return affectedItems.toList()
     }

From 16a60b16aee986fa5e7741ccdc17c3d1d5684370 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 14:54:40 +0300
Subject: [PATCH 20/24] Updated on 2026-08-14

---
 .../com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
index 526e6e995c..32c0746431 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt
@@ -127,6 +127,7 @@ abstract class BaseCardActionFragment : BaseFragment(), ActionView {
 
     protected open fun handleDescriptionSwitchChanges(descriptionVisibilityState: Boolean) {
         actionVM.toggleDescriptionVisibility(descriptionVisibilityState)
+        paramsWidgetList.forEach { it.toggleDescriptionVisibility(descriptionVisibilityState) }
     }
 
     @Deprecated("Start to use itemViewModel")

From a314353f7fd13fef011bbcb4b1b86b35a2e06eaf Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 15:06:37 +0300
Subject: [PATCH 21/24] Updated on 2026-08-14

---
 .../initializers/ResponseResources.kt         | 15 +++++++++++
 .../ucase/variants/responses/Ids.kt           | 12 +++++++++
 .../converter/BaseResponseConverter.kt        | 27 +++++++++++++++++++
 .../responses/converter/SimpleConverters.kt   | 24 +++++++----------
 .../res/layout/w_personalize_item_header.xml  |  2 +-
 tangem-demo/src/main/res/values/colors.xml    |  1 +
 .../src/main/res/values/strings_response.xml  | 19 +++++++++++++
 7 files changed, 84 insertions(+), 16 deletions(-)
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/BaseResponseConverter.kt

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt
index a9ad0a3d69..989bdce039 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt
@@ -5,6 +5,8 @@ import com.tangem.tangemtest.ucase.resources.MainResourceHolder
 import com.tangem.tangemtest.ucase.resources.Resources
 import com.tangem.tangemtest.ucase.variants.responses.CardDataId
 import com.tangem.tangemtest.ucase.variants.responses.CardId
+import com.tangem.tangemtest.ucase.variants.responses.DepersonalizeId
+import com.tangem.tangemtest.ucase.variants.responses.SignId
 
 /**
 [REDACTED_AUTHOR]
@@ -13,6 +15,8 @@ class ResponseResources {
     fun init(holder: MainResourceHolder) {
         initCard(holder)
         initCardData(holder)
+        initSignResponse(holder)
+        initDepersonalizeResponse(holder)
     }
 
     private fun initCard(holder: MainResourceHolder) {
@@ -50,4 +54,15 @@ class ResponseResources {
         holder.register(CardDataId.tokenContractAddress, Resources(R.string.response_card_card_data_token_contract_address, R.string.info_response_card_card_data_token_contract_address))
         holder.register(CardDataId.tokenDecimal, Resources(R.string.response_card_card_data_token_decimal, R.string.info_response_card_card_data_token_decimal))
     }
+
+    private fun initSignResponse(holder: MainResourceHolder) {
+        holder.register(SignId.cid, Resources(R.string.response_sign_cid, R.string.info_response_sign_cid))
+        holder.register(SignId.walletSignedHashes, Resources(R.string.response_sign_wallet_signed_hashes, R.string.info_response_sign_wallet_signed_hashes))
+        holder.register(SignId.walletRemainingSignatures, Resources(R.string.response_sign_wallet_remaining_signatures, R.string.info_response_sign_wallet_remaining_signatures))
+        holder.register(SignId.signature, Resources(R.string.response_sign_signature, R.string.info_response_sign_signature))
+    }
+
+    private fun initDepersonalizeResponse(holder: MainResourceHolder) {
+        holder.register(DepersonalizeId.isSuccess, Resources(R.string.response_depersonalize_is_success, R.string.info_response_depersonalize_is_success))
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/Ids.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/Ids.kt
index 05e0d37d44..2e84215136 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/Ids.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/Ids.kt
@@ -29,6 +29,7 @@ enum class CardId : ResponseId {
     paymentFlowVersion,
     userCounter,
     userProtectedCounter,
+    empty
 }
 
 enum class CardDataId : ResponseId {
@@ -41,4 +42,15 @@ enum class CardDataId : ResponseId {
     tokenSymbol,
     tokenContractAddress,
     tokenDecimal,
+}
+
+enum class SignId : ResponseId {
+    cid,
+    walletSignedHashes,
+    walletRemainingSignatures,
+    signature,
+}
+
+enum class DepersonalizeId: ResponseId {
+    isSuccess
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/BaseResponseConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/BaseResponseConverter.kt
new file mode 100644
index 0000000000..b685392de9
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/BaseResponseConverter.kt
@@ -0,0 +1,27 @@
+package com.tangem.tangemtest.ucase.variants.responses.converter
+
+import com.tangem.tangemtest._arch.structure.Id
+import com.tangem.tangemtest._arch.structure.abstraction.*
+import com.tangem.tangemtest.ucase.domain.responses.ResponseFieldConverter
+import com.tangem.tangemtest.ucase.variants.responses.item.TextHeaderItem
+import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
+
+/**
+[REDACTED_AUTHOR]
+ */
+abstract class BaseResponseConverter<M> : ModelToItems<M> {
+    protected val fieldConverter = ResponseFieldConverter()
+
+    protected open fun createGroup(id: Id, colorId: Int? = null, addHeaderItem: Boolean = true): ItemGroup {
+        val group = if (colorId == null) SimpleItemGroup(id)
+        else SimpleItemGroup(id, BaseItemViewModel(viewState = ViewState(bgColor = colorId)))
+
+        if (addHeaderItem) group.addItem(TextHeaderItem(id, ""))
+        return group
+    }
+
+    protected open fun valueToString(value: Any?): String? {
+        if (value == null) return null
+        return stringOf(value)
+    }
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/SimpleConverters.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/SimpleConverters.kt
index b0c43734b1..64b8edbec5 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/SimpleConverters.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/SimpleConverters.kt
@@ -1,36 +1,30 @@
 package com.tangem.tangemtest.ucase.variants.responses.converter
 
-import com.tangem.commands.Card
 import com.tangem.commands.SignResponse
 import com.tangem.commands.personalization.DepersonalizeResponse
-import com.tangem.common.CompletionResult
-import com.tangem.tangemtest._arch.structure.StringId
 import com.tangem.tangemtest._arch.structure.abstraction.Item
-import com.tangem.tangemtest._arch.structure.abstraction.ModelToItems
 import com.tangem.tangemtest._arch.structure.impl.TextItem
+import com.tangem.tangemtest.ucase.variants.responses.DepersonalizeId
+import com.tangem.tangemtest.ucase.variants.responses.SignId
 import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
 
 /**
 [REDACTED_AUTHOR]
  */
-class ReadEventConverter : ModelToItems<CompletionResult.Success<Card>> {
-    override fun convert(from: CompletionResult.Success<Card>): List<Item> = CardConverter().convert(from.data)
-}
-
-class SignResponseConverter : ModelToItems<SignResponse> {
+class SignResponseConverter : BaseResponseConverter<SignResponse>() {
 
     override fun convert(from: SignResponse): List<Item> {
         return listOf(
-                TextItem(StringId("CID"), from.cardId),
-                TextItem(StringId("Wallet signed hashes"), stringOf(from.walletSignedHashes)),
-                TextItem(StringId("Wallet remaining signatures"), stringOf(from.walletRemainingSignatures)),
-                TextItem(StringId("Signature"), stringOf(from.signature))
+                TextItem(SignId.cid, from.cardId),
+                TextItem(SignId.walletSignedHashes, valueToString(from.walletSignedHashes)),
+                TextItem(SignId.walletRemainingSignatures, valueToString(from.walletRemainingSignatures)),
+                TextItem(SignId.signature, fieldConverter.byteArray(from.signature))
         )
     }
 }
 
-class DepersonalizeResponseConverter : ModelToItems<DepersonalizeResponse> {
+class DepersonalizeResponseConverter : BaseResponseConverter<DepersonalizeResponse>() {
     override fun convert(from: DepersonalizeResponse): List<Item> {
-        return listOf(TextItem(StringId("Is success"), stringOf(from.success)))
+        return listOf(TextItem(DepersonalizeId.isSuccess, stringOf(from.success)))
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/w_personalize_item_header.xml b/tangem-demo/src/main/res/layout/w_personalize_item_header.xml
index 43997729b0..f7c15672e3 100644
--- a/tangem-demo/src/main/res/layout/w_personalize_item_header.xml
+++ b/tangem-demo/src/main/res/layout/w_personalize_item_header.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/delimiter"
+    android:background="@color/field_header_background"
     android:minHeight="@dimen/iw_layout_frame_header_min_height"
     android:paddingTop="6dp"
     android:paddingBottom="6dp">
diff --git a/tangem-demo/src/main/res/values/colors.xml b/tangem-demo/src/main/res/values/colors.xml
index 180f557ffd..4de83d2669 100644
--- a/tangem-demo/src/main/res/values/colors.xml
+++ b/tangem-demo/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
 
     <color name="action_name">#2B2B2B</color>
 
+    <color name="field_header_background">#C3C3C3</color>
     <color name="field_info">#888888</color>
     <color name="field_content">#303030</color>
     <color name="field_description">@color/field_info</color>
diff --git a/tangem-demo/src/main/res/values/strings_response.xml b/tangem-demo/src/main/res/values/strings_response.xml
index e0f0676ca9..825ce94f41 100644
--- a/tangem-demo/src/main/res/values/strings_response.xml
+++ b/tangem-demo/src/main/res/values/strings_response.xml
@@ -136,4 +136,23 @@
     <string name="info_response_card_card_data_token_symbol"></string>
     <string name="info_response_card_card_data_token_contract_address"></string>
     <string name="info_response_card_card_data_token_decimal"></string>
+
+
+    <!--  Field names - Response: Sign  -->
+    <string name="response_sign_cid">CID</string>
+    <string name="response_sign_wallet_signed_hashes">Wallet signed hashes</string>
+    <string name="response_sign_wallet_remaining_signatures">Wallet remaining signatures</string>
+    <string name="response_sign_signature">Signature</string>
+
+    <string name="info_response_sign_cid">@string/info_response_card_cid</string>
+    <string name="info_response_sign_wallet_signed_hashes">Total number of signed single hashes returned by the card in SIGN command responses since card personalization. Sums up array elements within all SIGN commands.</string>
+    <string name="info_response_sign_wallet_remaining_signatures">Remaining number of SIGN operations before the wallet will stop signing transactions.</string>
+    <string name="info_response_sign_signature">Array of resulting signatures that App should embed into a raw transaction according to a transaction format of an appropriate blockchain.</string>
+
+
+    <!--  Field names - Response: Depersonalize  -->
+    <string name="response_depersonalize_is_success">Is success</string>
+
+    <string name="info_response_depersonalize_is_success">Is success</string>
+
 </resources>
\ No newline at end of file

From 57d9d807f68ab23f2e409e129bf3f50d75874d3b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 15:29:16 +0300
Subject: [PATCH 22/24] Updated on 2026-08-14

---
 .../personalize/converter/PersonalizationConfigConverter.kt      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt
index d450ab54d9..3d7fb1e3d1 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt
@@ -52,6 +52,7 @@ class ItemsToPersonalizationConfig : ItemsToModel<PersonalizationConfig> {
         val export = PersonalizationConfig()
         export.series = getTyped(CardNumber.Series)
         export.startNumber = getTyped(CardNumber.Number)
+        export.batchId = getTyped(CardNumber.BatchId)
         export.curveID = getTyped(Common.Curve)
         export.blockchain = getTyped(Common.Blockchain)
         export.blockchainCustom = getTyped(Common.BlockchainCustom)

From f0ba8cca13131809e23484f78ff538211a97d3e8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 16:58:19 +0300
Subject: [PATCH 23/24] Updated on 2026-08-14

---
 .../domain/responses/ResponseJsonConverter.kt | 37 +++----
 .../initializers/ResponseResources.kt         |  2 +-
 .../responses/converter/CardConverter.kt      | 98 +++++++++----------
 .../ucase/variants/responses/item/TextItem.kt | 12 +++
 .../ui/widget/ResponseItemBuilder.kt          |  2 +
 .../responses/ui/widget/ResponseTextWidget.kt | 15 +++
 .../res/layout/w_response_item_header.xml     | 35 +++++++
 .../src/main/res/values/strings_response.xml  | 28 +++---
 8 files changed, 134 insertions(+), 95 deletions(-)
 create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/item/TextItem.kt
 create mode 100644 tangem-demo/src/main/res/layout/w_response_item_header.xml

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt
index 794f4aa727..5533c3682d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/responses/ResponseJsonConverter.kt
@@ -20,7 +20,7 @@ class ResponseJsonConverter {
     private fun init(): Gson {
         val builder = GsonBuilder().apply {
             registerTypeAdapter(ByteArray::class.java, ByteTypeAdapter(fieldConverter))
-            registerTypeAdapter(SigningMethod::class.java, SigningMethodTypeAdapter(fieldConverter))
+            registerTypeAdapter(SigningMethodMask::class.java, SigningMethodTypeAdapter(fieldConverter))
             registerTypeAdapter(SettingsMask::class.java, SettingsMaskTypeAdapter(fieldConverter))
             registerTypeAdapter(ProductMask::class.java, ProductMaskTypeAdapter(fieldConverter))
             registerTypeAdapter(Date::class.java, DateTypeAdapter())
@@ -62,8 +62,8 @@ class ProductMaskTypeAdapter(
 
 class SigningMethodTypeAdapter(
         private val fieldConverter: ResponseFieldConverter
-) : JsonSerializer<SigningMethod> {
-    override fun serialize(src: SigningMethod, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
+) : JsonSerializer<SigningMethodMask> {
+    override fun serialize(src: SigningMethodMask, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
         return JsonArray().apply {
             fieldConverter.signingMethodList(src).forEach { add(it) }
         }
@@ -86,32 +86,17 @@ class ResponseFieldConverter {
     fun productMaskList(productMask: ProductMask?): List<String> {
         val mask = productMask ?: return emptyList()
 
-        val signingMap = mutableMapOf(
-                ProductMask.note to "Note",
-                ProductMask.tag to "Tag",
-                ProductMask.idCard to "IdCard",
-                ProductMask.idIssuer to "IdIssuer"
-        )
-        return signingMap.filter { mask.contains(it.key) }.map { it.value }
+        return Product.values().filter { mask.contains(it) }.map { it.name }
     }
 
-    fun signingMethod(signingMethod: SigningMethod?): String {
-        return signingMethodList(signingMethod).print(wrap = false)
+    fun signingMethod(signingMask: SigningMethodMask?): String {
+        return signingMethodList(signingMask).print(wrap = false)
     }
 
-    fun signingMethodList(signingMethod: SigningMethod?): List<String> {
-        val methods = signingMethod ?: return emptyList()
+    fun signingMethodList(signingMask: SigningMethodMask?): List<String> {
+        val mask = signingMask ?: return emptyList()
 
-        val signingMap = mutableMapOf(
-                SigningMethod.signHash to "Hash",
-                SigningMethod.signRaw to "Raw",
-                SigningMethod.signHashValidatedByIssuer to "HashValidatedByIssuer",
-                SigningMethod.signRawValidatedByIssuer to "RawValidatedByIssuer",
-                SigningMethod.signHashValidatedByIssuerAndWriteIssuerData to "HashValidatedByIssuerAndWriteIssuerData",
-                SigningMethod.signRawValidatedByIssuerAndWriteIssuerData to "RawValidatedByIssuerAndWriteIssuerData",
-                SigningMethod.signPos to "Pos"
-        )
-        return signingMap.filter { methods.contains(it.key) }.map { it.value }
+        return SigningMethod.values().filter { mask.contains(it) }.map { it.name }
     }
 
     fun settingsMask(settingsMask: SettingsMask?): String {
@@ -124,7 +109,7 @@ class ResponseFieldConverter {
         return Settings.values().filter { masks.contains(it) }.map { it.name }
     }
 
-    fun byteArray(byteArray: ByteArray?): String {
-        return byteArray?.toHexString() ?: ""
+    fun byteArray(byteArray: ByteArray?): String? {
+        return byteArray?.toHexString()
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt
index 989bdce039..a199a04a26 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ResponseResources.kt
@@ -30,7 +30,7 @@ class ResponseResources {
         holder.register(CardId.issuerPublicKey, Resources(R.string.response_card_issuer_data_public_key, R.string.info_response_card_issuer_data_public_key))
         holder.register(CardId.curve, Resources(R.string.response_card_curve, R.string.info_response_card_curve))
         holder.register(CardId.maxSignatures, Resources(R.string.response_card_max_signatures, R.string.info_response_card_max_signatures))
-        holder.register(CardId.signingMethod, Resources(R.string.response_card_signing_method, R.string.response_card_signing_method))
+        holder.register(CardId.signingMethod, Resources(R.string.response_card_signing_method, R.string.info_response_card_signing_method))
         holder.register(CardId.pauseBeforePin2, Resources(R.string.response_card_pause_before_pin2, R.string.info_response_card_allow_pin2))
         holder.register(CardId.walletPublicKey, Resources(R.string.response_card_wallet_public_key, R.string.info_response_card_wallet_public_key))
         holder.register(CardId.walletRemainingSignatures, Resources(R.string.response_card_wallet_remaining_signatures, R.string.info_response_card_wallet_remaining_signatures))
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
index cb8d978fbe..f7676fd1b4 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
@@ -1,33 +1,27 @@
 package com.tangem.tangemtest.ucase.variants.responses.converter
 
-import com.tangem.commands.Card
-import com.tangem.commands.CardData
-import com.tangem.commands.Settings
-import com.tangem.commands.SettingsMask
+import com.tangem.commands.*
 import com.tangem.tangemtest.R
-import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.StringId
-import com.tangem.tangemtest._arch.structure.abstraction.*
+import com.tangem.tangemtest._arch.structure.abstraction.Item
+import com.tangem.tangemtest._arch.structure.abstraction.ItemGroup
+import com.tangem.tangemtest._arch.structure.abstraction.iterate
 import com.tangem.tangemtest._arch.structure.impl.BoolItem
 import com.tangem.tangemtest._arch.structure.impl.TextItem
-import com.tangem.tangemtest.ucase.domain.responses.ResponseFieldConverter
-import com.tangem.tangemtest.ucase.variants.personalize.BlockId
 import com.tangem.tangemtest.ucase.variants.responses.CardDataId
 import com.tangem.tangemtest.ucase.variants.responses.CardId
-import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
+import com.tangem.tangemtest.ucase.variants.responses.item.TextHeaderItem
 
 /**
 [REDACTED_AUTHOR]
  */
-class CardConverter : ModelToItems<Card> {
-
-    private val fieldConverter = ResponseFieldConverter()
+class CardConverter : BaseResponseConverter<Card>() {
 
     override fun convert(from: Card): List<Item> {
         val itemList = mutableListOf<Item>()
-        itemList.add(simpleFields(from))
-        itemList.add(cardData(from.cardData))
-        itemList.add(settingsMask(from.settingsMask))
+        commonGroup(itemList, from)
+        cardDataGroup(itemList, from.cardData)
+        settingsMaskGroup(itemList, from.settingsMask)
         hideEmptyNullFields(itemList)
 
         return itemList
@@ -35,70 +29,66 @@ class CardConverter : ModelToItems<Card> {
 
     private fun hideEmptyNullFields(itemList: MutableList<Item>) {
         itemList.iterate {
-            val data = it.getData<Any?>()
-            val isHidden = if (data == null) true
-            else when (data) {
-                is String -> data.isEmpty()
-                else -> false
-            }
+            if (it is ItemGroup) return@iterate
 
-            if (isHidden) it.viewModel.viewState.isVisibleState.value = false
+            if (it.getData<Any?>() == null) it.viewModel.viewState.isVisibleState.value = false
         }
     }
 
-    private fun simpleFields(from: Card): Item {
-        val group = createGroup(BlockId.Common)
+    private fun commonGroup(itemList: MutableList<Item>, from: Card) {
+        val group = createGroup(CardId.empty, addHeaderItem = false)
+        itemList.add(group)
+
         group.addItem(TextItem(CardId.cardId, from.cardId))
         group.addItem(TextItem(CardId.manufacturerName, from.manufacturerName))
-        group.addItem(TextItem(CardId.status, stringOf(from.status)))
+        group.addItem(TextItem(CardId.status, valueToString(from.status)))
         group.addItem(TextItem(CardId.firmwareVersion, from.firmwareVersion))
         group.addItem(TextItem(CardId.cardPublicKey, fieldConverter.byteArray(from.cardPublicKey)))
         group.addItem(TextItem(CardId.issuerPublicKey, fieldConverter.byteArray(from.issuerPublicKey)))
-        group.addItem(TextItem(CardId.curve, stringOf(from.curve)))
-        group.addItem(TextItem(CardId.maxSignatures, stringOf(from.maxSignatures)))
-        group.addItem(TextItem(CardId.signingMethod, fieldConverter.signingMethod(from.signingMethod)))
-        group.addItem(TextItem(CardId.pauseBeforePin2, stringOf(from.pauseBeforePin2)))
+        group.addItem(TextItem(CardId.curve, valueToString(from.curve)))
+        group.addItem(TextItem(CardId.maxSignatures, valueToString(from.maxSignatures)))
+        group.addItem(TextItem(CardId.pauseBeforePin2, valueToString(from.pauseBeforePin2)))
         group.addItem(TextItem(CardId.walletPublicKey, fieldConverter.byteArray(from.walletPublicKey)))
-        group.addItem(TextItem(CardId.walletRemainingSignatures, stringOf(from.walletRemainingSignatures)))
-        group.addItem(TextItem(CardId.walletSignedHashes, stringOf(from.walletSignedHashes)))
-        group.addItem(TextItem(CardId.health, stringOf(from.health)))
-        group.addItem(TextItem(CardId.isActivated, stringOf(from.isActivated)))
-        group.addItem(TextItem(CardId.activationSeed, stringOf(from.activationSeed)))
-        group.addItem(TextItem(CardId.paymentFlowVersion, stringOf(from.paymentFlowVersion)))
-        group.addItem(TextItem(CardId.userCounter, stringOf(from.userCounter)))
-//        block.addItem(TextItem(CardId.UserProtectedCounter, stringOf(from.userProtectedCounter)))
-        return group
+        group.addItem(TextItem(CardId.walletRemainingSignatures, valueToString(from.walletRemainingSignatures)))
+        group.addItem(TextItem(CardId.walletSignedHashes, valueToString(from.walletSignedHashes)))
+        group.addItem(TextItem(CardId.health, valueToString(from.health)))
+        group.addItem(TextItem(CardId.isActivated, valueToString(from.isActivated)))
+        group.addItem(TextItem(CardId.activationSeed, valueToString(from.activationSeed)))
+        group.addItem(TextItem(CardId.paymentFlowVersion, valueToString(from.paymentFlowVersion)))
+        group.addItem(TextItem(CardId.userCounter, valueToString(from.userCounter)))
+
+        val settingsMask = from.settingsMask ?: return
+
+        group.addItem(TextHeaderItem(CardId.signingMethod, ""))
+        Settings.values().forEach { group.addItem(BoolItem(StringId(it.name), settingsMask.contains(it))) }
     }
 
-    private fun cardData(from: CardData?): Item {
-        val group = createGroup(BlockId.Common, R.color.group_card_data)
-        val data = from ?: return group
+    private fun cardDataGroup(itemList: MutableList<Item>, cardData: CardData?) {
+        val data = cardData ?: return
 
-//        group.addItem(TextItem(StringResId(R.string.response_card_card_data)))
+        val group = createGroup(CardId.cardData, R.color.group_card_data)
+        itemList.add(group)
         group.addItem(TextItem(CardDataId.batchId, data.batchId))
-//        Format: Year (2 bytes) | Month (1 byte) | Day (1 byte)
-        group.addItem(TextItem(CardDataId.manufactureDateTime, stringOf(data.manufactureDateTime)))
+        group.addItem(TextItem(CardDataId.manufactureDateTime, valueToString(data.manufactureDateTime)))
         group.addItem(TextItem(CardDataId.issuerName, data.issuerName))
         group.addItem(TextItem(CardDataId.blockchainName, data.blockchainName))
         group.addItem(TextItem(CardDataId.manufacturerSignature, fieldConverter.byteArray(data.manufacturerSignature)))
-        group.addItem(TextItem(CardDataId.productMask, fieldConverter.productMask(data.productMask)))
         group.addItem(TextItem(CardDataId.tokenSymbol, data.tokenSymbol))
         group.addItem(TextItem(CardDataId.tokenContractAddress, data.tokenContractAddress))
         group.addItem(TextItem(CardDataId.tokenDecimal, data.tokenSymbol))
 
-        return group
+        val productMask = data.productMask ?: return
+
+        group.addItem(TextHeaderItem(CardDataId.productMask, ""))
+        Product.values().forEach { group.addItem(BoolItem(StringId(it.name), productMask.contains(it))) }
     }
 
-    private fun settingsMask(from: SettingsMask?): Item {
+    private fun settingsMaskGroup(itemList: MutableList<Item>, from: SettingsMask?) {
+        val data = from ?: return
+
         val group = createGroup(CardId.settingsMask, R.color.group_settings_mask)
-        val data = from ?: return group
+        itemList.add(group)
 
         Settings.values().forEach { group.addItem(BoolItem(StringId(it.name), data.contains(it))) }
-        return group
-    }
-
-    private fun createGroup(id: Id, colorId: Int? = null): ItemGroup {
-        return if (colorId == null) SimpleItemGroup(id)
-        else SimpleItemGroup(id, BaseItemViewModel(viewState = ViewState(bgColor = colorId)))
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/item/TextItem.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/item/TextItem.kt
new file mode 100644
index 0000000000..452b1e47bc
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/item/TextItem.kt
@@ -0,0 +1,12 @@
+package com.tangem.tangemtest.ucase.variants.responses.item
+
+import com.tangem.tangemtest._arch.structure.Id
+import com.tangem.tangemtest._arch.structure.abstraction.BaseItemViewModel
+import com.tangem.tangemtest._arch.structure.abstraction.ItemViewModel
+import com.tangem.tangemtest._arch.structure.abstraction.ViewState
+import com.tangem.tangemtest._arch.structure.impl.TypedItem
+
+open class TextHeaderItem(id: Id, viewModel: ItemViewModel) : TypedItem<String>(id, viewModel) {
+    constructor(id: Id, value: String? = null, viewState: ViewState = ViewState())
+            : this(id, BaseItemViewModel(value, viewState))
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseItemBuilder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseItemBuilder.kt
index 051974e674..ec39879032 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseItemBuilder.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseItemBuilder.kt
@@ -6,6 +6,7 @@ import com.tangem.tangemtest._arch.structure.impl.BoolItem
 import com.tangem.tangemtest._arch.structure.impl.TextItem
 import com.tangem.tangemtest._arch.widget.ItemWidgetBuilder
 import com.tangem.tangemtest._arch.widget.abstraction.ViewWidget
+import com.tangem.tangemtest.ucase.variants.responses.item.TextHeaderItem
 
 /**
 [REDACTED_AUTHOR]
@@ -13,6 +14,7 @@ import com.tangem.tangemtest._arch.widget.abstraction.ViewWidget
 class ResponseItemBuilder : ItemWidgetBuilder {
     override fun build(item: BaseItem, parent: ViewGroup): ViewWidget? {
         return when (item) {
+            is TextHeaderItem -> ResponseHeaderWidget(parent, item)
             is TextItem -> ResponseTextWidget(parent, item)
             is BoolItem -> CheckBoxWidget(parent, item)
             else -> null
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseTextWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseTextWidget.kt
index 8859d78527..a221c03124 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseTextWidget.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/widget/ResponseTextWidget.kt
@@ -4,6 +4,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.impl.TextItem
+import com.tangem.tangemtest.ucase.variants.responses.item.TextHeaderItem
 
 /**
 [REDACTED_AUTHOR]
@@ -27,4 +28,18 @@ class ResponseTextWidget(
         tvName.text = getName()
         tvValue.text = data
     }
+}
+
+class ResponseHeaderWidget(
+        parent: ViewGroup,
+        private val typedItem: TextHeaderItem
+) : ResponseWidget(parent, typedItem) {
+    override fun getLayoutId(): Int = R.layout.w_response_item_header
+
+    private val tvName: TextView = view.findViewById(R.id.tv_name)
+
+    init {
+        tvName.text = getName()
+
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/w_response_item_header.xml b/tangem-demo/src/main/res/layout/w_response_item_header.xml
new file mode 100644
index 0000000000..626c8ba735
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/w_response_item_header.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/field_header_background">
+
+    <LinearLayout
+        android:id="@+id/container_field"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/def_indent"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/field_content"
+            android:textSize="16sp"
+            tools:text="Custom blockchain" />
+
+        <include layout="@layout/w_field_description" />
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/m_divider_h"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/values/strings_response.xml b/tangem-demo/src/main/res/values/strings_response.xml
index 825ce94f41..489e0a7bd5 100644
--- a/tangem-demo/src/main/res/values/strings_response.xml
+++ b/tangem-demo/src/main/res/values/strings_response.xml
@@ -57,7 +57,7 @@
     <string name="info_response_card_status">Current status of the card</string>
     <string name="info_response_card_firmware_version">Version of Tangem COS</string>
     <string name="info_response_card_public_key">Public key that is used to authenticate the card against manufacturer’s database. It is generated one time during card manufacturing. See Security section for more details.</string>
-    <string name="info_response_card_settings_mask">Card settings defined by personalization (bit mask: 0 – Enabled, 1 – Disabled):</string>
+    <string name="info_response_card_settings_mask">Card settings defined by personalization.</string>
     <string name="info_response_card_is_reusable">Defines what happens when user calls PURGE_WALLET command:
     \n0 - Card will switch to Purged state
     \n1 - Card will switch to Empty state and let create a new wallet again</string>
@@ -72,29 +72,29 @@
     <string name="info_response_card_one_apdu_at_time">Card will execute only one command during one communication session, thus requiring user to physically take the card away from the host after each action (all commands except for READ_CARD).</string>
     <string name="info_response_card_use_ndef">Whether the card should emulate NDEF. In default configuration, two NDEF records are loaded during personalization: (1) Tangem web site address, (2) name of Android App package in Google Play Store.</string>
     <string name="info_response_card_use_dynamic_ndef">0 – Disable dynamic generation of NDEF for iOS. See Dynamic NDEF section for more details.
-    /n1 – Enable dynamic NDEF for iOS.</string>
+    \n1 – Enable dynamic NDEF for iOS.</string>
     <string name="info_response_card_smart_security_delay">Security delay Pause_Before_PIN2 will not be applied if PIN2 is not default.</string>
     <string name="info_response_card_allow_unencrypted">Whether the card supports unencrypted NFC communication. See NFC communication section for more details.</string>
     <string name="info_response_card_allow_fast_encryption">Whether the card supports fast encrypted NFC communication. See NFC communication section for more details.</string>
     <string name="info_response_card_protect_issuer_data_against_replay">0 – No replay protection on write issuer data
-    /n1 – Enable replay protection on write issuer data (card will require additional Issuer_Data_Counter incremented on each write)</string>
+    \n1 – Enable replay protection on write issuer data (card will require additional Issuer_Data_Counter incremented on each write)</string>
     <string name="info_response_card_allow_select_blockchain">0 – Wallet elliptic curve and blockchain information stored during PERSONALIZE command and never change
-    /n1 – Wallet elliptic curve and blockchain information can be changed on CREATE_WALLET command</string>
+    \n1 – Wallet elliptic curve and blockchain information can be changed on CREATE_WALLET command</string>
     <string name="info_response_card_disable_precomputed_ndef">0 – Enable  precomputed dynamic NDEF to work around iPhone 7+ NFC bug.
-    /n1 – Disable precomputed dynamic NDEF. See Dynamic NDEF section for more details.</string>
+    \n1 – Disable precomputed dynamic NDEF. See Dynamic NDEF section for more details.</string>
     <string name="info_response_card_security_delay_if_validated">0 – Enforce security delay in SIGN command if the issuer validates the transaction (for signing methods 2, 3, 4 and 5).
-    /n1 – Skip security delay in SIGN command if the issuer validates the transaction (for signing methods 2, 3, 4 and 5).</string>
+    \n1 – Skip security delay in SIGN command if the issuer validates the transaction (for signing methods 2, 3, 4 and 5).</string>
     <string name="info_response_card_skip_pin2_cvc_if_validated_by_issuer">0 – Require and check PIN2 and CVC in SIGN command if the issuer validates the transaction (for signing method 2, 3, 4 and 5).
-    /n1 – Skip checking PIN2 and CVC in SIGN command if the issuer validates the transaction (for signing method 2, 3, 4 and 5).</string>
+    \n1 – Skip checking PIN2 and CVC in SIGN command if the issuer validates the transaction (for signing method 2, 3, 4 and 5).</string>
     <string name="info_response_card_skip_security_delay_if_validated_by_linked_terminal">1 - Store Terminal_PublicKey public key of linked terminal no each SIGN command, skip security delay if valid signature of transaction is made with Terminal_PrivateKey is provided in SIGN command</string>
     <string name="info_response_card_restrict_overwrite_issuer_ex_data"></string>
     <string name="info_info_response_card_prohibit_overwriting_issuer_ex_data"></string>
     <string name="info_response_card_require_terminal_tx_sig">0 – Skip checking terminal’s signature when signing POS transaction
-    /n1 – Check terminal’s signature when signing POS transaction</string>
+    \n1 – Check terminal’s signature when signing POS transaction</string>
     <string name="info_response_card_require_terminal_cert_sig">0 – Skip checking acquirer’s signature of terminal certificate when signing POS transaction
-    /n1 – Check acquirer’s signature of terminal certificate when signing POS transaction</string>
+    \n1 – Check acquirer’s signature of terminal certificate when signing POS transaction</string>
     <string name="info_response_card_check_pin3">0 – Additionally encrypt POS transaction signature with key derived from PIN3 when the transaction amount exceeds PIN3 floor limit
-    /n1 – Require terminal to send PIN3 to card when the POS transaction amount exceeds PIN3_Floor_Limit</string>
+    \n1 – Require terminal to send PIN3 to card when the POS transaction amount exceeds PIN3_Floor_Limit</string>
     <string name="info_response_card_card_data">Detailed information about card contents. Format is defined by the card issuer. Cards complaint with Tangem Wallet application should have TLV format described in Personalization section.</string>
     <string name="info_response_card_issuer_data_public_key">Public key that is used by the card issuer to sign Issuer_Data field. See Security section for more details.</string>
     <string name="info_response_card_curve">Explicit text name of the elliptic curve used for all wallet key operations.</string>
@@ -106,12 +106,12 @@
     <string name="info_response_card_wallet_signed_hashes">Total number of signed single hashes returned by the card in SIGN command responses since card personalization. Sums up array elements within all SIGN commands.</string>
     <string name="info_response_card_health">Any non-zero value indicates that the card experiences some hardware problems. User should withdraw the value to other blockchain wallet as soon as possible.  Non-zero Health tag will also appear in responses of all other commands.</string>
     <string name="info_response_card_is_activated">Whether the card requires issuer’s confirmation of activation.
-    /n0 – card will require issuer’s confirmation of activation,
-    /notherwise this field will not be returned (card is activated and operational).</string>
+    \n0 – card will require issuer’s confirmation of activation,
+    \notherwise this field will not be returned (card is activated and operational).</string>
     <string name="info_response_card_activation_seed">A random challenge generated by PERSONALIZE command that should be signed and returned to COS by the issuer to confirm the card has been activated. See ACTIVATE_CARD command for more details.
-    /nThis field will not be returned if the card is activated.</string>
+    \nThis field will not be returned if the card is activated.</string>
     <string name="info_response_card_payment_flow_version">Version of POS payment scheme supported by COS ([0x02,0x01] for version 2.30)
-    /nReturned only if SigningMethod ‘6’ enabling POS transactions is supported by card.</string>
+    \nReturned only if SigningMethod ‘6’ enabling POS transactions is supported by card.</string>
     <string name="info_response_card_user_counter">This value can be initialized by App and will be increased by COS with the execution of each SIGN command. For example, this field can store blockchain “nonce” for a quick one-touch transaction on POS terminals. Returned only if SigningMethod =6.</string>
     <string name="info_response_card_user_protected_counter">This value can be initialized by App (with PIN2 confirmation) and will be increased by COS with the execution of each SIGN command. For example, this field can store blockchain “nonce” for a quick one-touch transaction on POS terminals. Returned only if SigningMethod =6.</string>
 

From 2836a99ff0d592147828169cf58fda55e1c7c20c Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 15 Apr 2020 18:19:11 +0300
Subject: [PATCH 24/24] Updated on 2026-08-14

---
 .../ucase/variants/responses/converter/CardConverter.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
index f7676fd1b4..6b3ad13430 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/converter/CardConverter.kt
@@ -57,10 +57,10 @@ class CardConverter : BaseResponseConverter<Card>() {
         group.addItem(TextItem(CardId.paymentFlowVersion, valueToString(from.paymentFlowVersion)))
         group.addItem(TextItem(CardId.userCounter, valueToString(from.userCounter)))
 
-        val settingsMask = from.settingsMask ?: return
+        val signingMethodMask = from.signingMethods ?: return
 
         group.addItem(TextHeaderItem(CardId.signingMethod, ""))
-        Settings.values().forEach { group.addItem(BoolItem(StringId(it.name), settingsMask.contains(it))) }
+        SigningMethod.values().forEach { group.addItem(BoolItem(StringId(it.name), signingMethodMask.contains(it))) }
     }
 
     private fun cardDataGroup(itemList: MutableList<Item>, cardData: CardData?) {