From 56faa035619c276d9f73c7b87365b4e7e6f9491b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 31 Mar 2021 12:57:45 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../redux/middlewares/WalletMiddleware.kt     |  8 +++++
 .../redux/reducers/OnWalletLoadedReducer.kt   |  2 +-
 .../main/res/layout/item_currency_wallet.xml  | 32 +++++++++++--------
 .../main/res/layout/layout_wallet_details.xml | 13 ++++++--
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index af6ceb3d2d..6cd4f9da3a 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat
 import com.tangem.TangemSdkError
 import com.tangem.blockchain.common.*
 import com.tangem.common.CompletionResult
+import com.tangem.common.extensions.isZero
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.FirebaseAnalyticsHandler
 import com.tangem.tap.common.extensions.copyToClipboard
@@ -59,6 +60,13 @@ class WalletMiddleware {
                         }
                     }
                     is WalletAction.LoadWallet.Success -> {
+                        val coinAmount = action.wallet.amounts[AmountType.Coin]?.value
+                        if (coinAmount != null && !coinAmount.isZero()) {
+                            if (walletState?.getWalletData(action.wallet.blockchain.currency) == null) {
+                                store.dispatch(WalletAction.MultiWallet.AddBlockchain(action.wallet.blockchain))
+                                store.dispatch(WalletAction.LoadWallet.Success(action.wallet))
+                            }
+                        }
                         store.dispatch(WalletAction.Warnings.CheckHashesCount.CheckHashesCountOnline)
                         warningsMiddleware.tryToShowAppRatingWarning(action.wallet)
                     }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
index 59edbdd896..6941106a0c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
@@ -27,7 +27,7 @@ class OnWalletLoadedReducer {
         } else {
             val fiatCurrencySymbol = store.state.globalState.appCurrency
             val amount = wallet.amounts[AmountType.Coin]?.value
-            if (walletState.getWalletData(wallet.blockchain.currency) == null && amount?.isZero() != false) {
+            if (walletState.getWalletData(wallet.blockchain.currency) == null) {
                 return walletState
             }
             if (wallet.blockchain != Blockchain.Ethereum) {
diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml
index be3b049566..576619305c 100644
--- a/app/src/main/res/layout/item_currency_wallet.xml
+++ b/app/src/main/res/layout/item_currency_wallet.xml
@@ -17,7 +17,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="76dp">
 
             <ImageView
                 android:id="@+id/iv_currency"
@@ -49,44 +49,48 @@
             <TextView
                 android:id="@+id/tv_currency"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="24dp"
+                android:layout_marginTop="16dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="2dp"
                 android:textColor="@color/darkGray6"
                 android:textSize="17sp"
                 android:textStyle="bold"
                 app:layout_constraintStart_toEndOf="@id/iv_currency"
-                app:layout_constraintTop_toTopOf="@id/iv_currency"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:text="Bitcoin" />
 
             <TextView
                 android:id="@+id/tv_exchange_rate"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
+                android:layout_marginBottom="16dp"
                 android:textColor="@color/darkGray2"
                 android:textSize="14sp"
-                app:layout_constraintBottom_toBottomOf="@id/iv_currency"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/iv_currency"
                 tools:text="USD 3 588" />
 
             <TextView
                 android:id="@+id/tv_status_error_message"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
+                android:layout_marginBottom="16dp"
                 android:textColor="@color/warning"
                 android:textSize="14sp"
                 android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/iv_currency"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/iv_currency" />
 
             <TextView
                 android:id="@+id/tv_status_loading"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginBottom="16dp"
                 android:drawablePadding="5dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
@@ -94,37 +98,39 @@
                 android:textColor="@color/darkGray6"
                 android:textSize="13sp"
                 android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/iv_currency"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/tv_amount"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="24dp"
                 android:ellipsize="end"
                 android:gravity="end"
                 android:maxLines="1"
                 android:paddingStart="2dp"
                 android:paddingEnd="16dp"
+                android:layout_marginTop="16dp"
                 android:textColor="@color/darkGray6"
                 android:textSize="17sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_weight="1"
                 app:layout_constraintStart_toEndOf="@id/tv_currency"
-                app:layout_constraintTop_toTopOf="@id/tv_currency"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:text="3 588 BTC" />
 
             <TextView
                 android:id="@+id/tv_amount_fiat"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginBottom="16dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:textColor="@color/darkGray2"
                 android:textSize="14sp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="@id/iv_currency"
                 tools:text="0.43 USD" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_wallet_details.xml b/app/src/main/res/layout/layout_wallet_details.xml
index d276934193..f8ac54763e 100644
--- a/app/src/main/res/layout/layout_wallet_details.xml
+++ b/app/src/main/res/layout/layout_wallet_details.xml
@@ -83,7 +83,7 @@
                 app:layout_constraintEnd_toEndOf="@id/guideline"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/chip_group_address_type"
-                app:layout_constraintBottom_toBottomOf="@id/btn_copy"
+                app:layout_constraintBottom_toBottomOf="@id/v_qr_lower_end"
                 tools:src="@drawable/ic_qr_code_show" />
 
             <androidx.constraintlayout.widget.Guideline
@@ -98,7 +98,7 @@
                 android:id="@+id/tv_address"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginEnd="14dp"
                 android:ellipsize="middle"
                 android:maxLines="2"
@@ -148,6 +148,15 @@
                 app:layout_constraintEnd_toStartOf="@id/btn_share"
                 app:layout_constraintStart_toEndOf="@id/iv_qr_code" />
 
+            <View
+                android:id="@+id/v_qr_lower_end"
+                android:layout_width="1dp"
+                android:layout_height="1dp"
+                app:layout_constraintTop_toBottomOf="@id/btn_copy"
+                app:layout_constraintStart_toStartOf="@id/btn_copy"
+                android:layout_marginTop="5dp"
+            />
+
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/btn_share"