From e6cad355dd493c4c1de30123cf625d80607b34a7 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 30 Nov 2020 14:38:13 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                                    |  2 +-
 .../tangem/tap/features/wallet/ui/WalletFragment.kt | 13 ++++++++-----
 app/src/main/res/layout/layout_address.xml          | 10 +++++-----
 app/src/main/res/values/dimens.xml                  |  1 +
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7e0c76304..9aefaa4431 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
 
-    implementation 'com.tangem:blockchain:1.113.0'
+    implementation 'com.tangem:blockchain:1.114.0'
     implementation 'com.tangem:core:1.80.0'
     implementation 'com.tangem:sdk:1.80.0'
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index 34057a0f6f..7575838e78 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -2,11 +2,8 @@ package com.tangem.tap.features.wallet.ui
 
 import android.app.Dialog
 import android.os.Bundle
-import android.view.Menu
+import android.view.*
 import android.view.Menu.NONE
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -16,6 +13,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.squareup.picasso.Picasso
 import com.tangem.blockchain.blockchains.bitcoin.BitcoinAddressType
 import com.tangem.blockchain.common.address.AddressType
+import com.tangem.tap.common.extensions.beginDelayedTransition
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -211,7 +209,11 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     private fun setupAddressCard(state: WalletState) {
         if (state.walletAddresses != null) {
             l_address?.show()
+            val tvAddressPaddingTop = tv_address.resources.getDimension(R.dimen.dimen16).toInt()
             if (state.showSegwitAddress) {
+                (l_address as? ViewGroup)?.beginDelayedTransition()
+                tv_address.setPadding(tv_address.paddingStart, tvAddressPaddingTop / 2,
+                        tv_address.paddingEnd, tv_address.paddingBottom)
                 chip_group_segwit.show()
                 val checkedId = SegwitUiHelper.typeToId(state.walletAddresses.selectedAddress.type)
                 if (checkedId != View.NO_ID) chip_group_segwit.check(checkedId)
@@ -224,7 +226,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
                     }
                 }
             } else {
-                chip_group_segwit.setOnCheckedChangeListener(null)
+                tv_address.setPadding(tv_address.paddingStart, tvAddressPaddingTop,
+                        tv_address.paddingEnd, tv_address.paddingBottom)
                 chip_group_segwit.hide()
             }
             tv_address.text = state.walletAddresses.selectedAddress.address
diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml
index ecad7ebcaa..6c16a5f716 100644
--- a/app/src/main/res/layout/layout_address.xml
+++ b/app/src/main/res/layout/layout_address.xml
@@ -27,9 +27,9 @@
                 android:id="@+id/chip_group_segwit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginEnd="8dp"
                 android:visibility="visible"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -60,9 +60,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:ellipsize="middle"
-                android:paddingStart="16dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="16dp"
+                android:paddingStart="@dimen/dimen16"
+                android:paddingTop="@dimen/dimen16"
+                android:paddingEnd="@dimen/dimen16"
                 android:singleLine="true"
                 android:textColor="@color/darkGray1"
                 android:textSize="13sp"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 49798d893b..fd2c18a380 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -33,5 +33,6 @@
     <dimen name="btn_rounded_size">44dp</dimen>
 
     <dimen name="text_size_amount_to_send">32sp</dimen>
+    <dimen name="dimen16">16dp</dimen>
 
 </resources>