From b971e1a746459107a9ad74b903c49bb3afbd37a5 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 28 Jan 2022 12:21:14 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/tap/features/details/ui/DetailsFragment.kt   | 5 ++++-
 .../send/ui/stateSubscribers/SendStateSubscriber.kt         | 5 +++++
 .../tangem/tap/features/tokens/redux/TokensMiddleware.kt    | 6 +++---
 app/src/main/res/values/strings_untranslated.xml            | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
index 74d3f40fd9..acb76789ba 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
@@ -73,7 +73,10 @@ class DetailsFragment : Fragment(R.layout.fragment_details), StoreSubscriber<Det
             }
             tv_card_id.text = cardId
             tv_issuer.text = state.cardInfo.issuer
-            tv_signed_hashes.text = state.cardInfo.signedHashes.toString()
+            tv_signed_hashes.text = getString(
+                R.string.details_row_subtitle_signed_hashes_format,
+                state.cardInfo.signedHashes.toString()
+            )
         }
 
         tv_signed_hashes.show(!state.isTangemTwins)
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
index b90c53e080..894d9809ba 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@@ -137,6 +137,11 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
 
         adapter.submitList(state.sendWarningsList)
         rv.show(state.sendWarningsList.isNotEmpty())
+
+        fg.toolbar.title = fg.getString(
+            R.string.send_title_currency_format,
+            state.amountState.mainCurrency.currencySymbol
+        )
     }
 
     private fun handleAddressPayIdState(fg: BaseStoreFragment, state: AddressPayIdState) {
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
index 636638df13..30cec235f8 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
@@ -32,7 +32,7 @@ class TokensMiddleware {
         { next ->
             { action ->
                 when (action) {
-                    is TokensAction.LoadCurrencies -> handleLoadCurrencies(action)
+                    is TokensAction.LoadCurrencies -> handleLoadCurrencies()
                     is TokensAction.SaveChanges -> handleSaveChanges(action)
                 }
                 next(action)
@@ -40,7 +40,7 @@ class TokensMiddleware {
         }
     }
 
-    private fun handleLoadCurrencies(action: TokensAction.LoadCurrencies) {
+    private fun handleLoadCurrencies() {
         val scanResponse = store.state.globalState.scanResponse ?: return
         val isTestcard = scanResponse.card.isTestCard
 
@@ -48,7 +48,7 @@ class TokensMiddleware {
         val blockchains = currenciesRepository.getBlockchains(
             cardFirmware = scanResponse.card.firmwareVersion,
             isTestNet = isTestcard
-        )
+        ).sortedBy { it.fullName }
         val currencies =
             CurrencyListItem.createListOfCurrencies(blockchains, tokens).toMutableList()
         store.dispatch(TokensAction.LoadCurrencies.Success(currencies))
diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml
index ce001133db..32f666e20c 100644
--- a/app/src/main/res/values/strings_untranslated.xml
+++ b/app/src/main/res/values/strings_untranslated.xml
@@ -27,7 +27,7 @@
     <string name="twins_recreate_title_preparing" translatable="false">Preparing card</string>
     <string name="twins_recreate_title_creating_wallet" translatable="false">Creating wallet</string>
     <string name="twins_recreate_subtitle" translatable="false">The wallet creation procedure consists of three steps. You must complete it to the end, otherwise you will have to start from the beginning.</string>
-    <string name="twins_recreate_button_format" translatable="false">Tap the card #%s</string>
+    <string name="twins_recreate_button_format" translatable="false">Scan the card #%s</string>
     <string name="twins_recreate_alert" translatable="false">You have already started the process of recreating twin wallet. If you interrupt it, you won\'t be able to use your twin cards until you start it again and complete recreating the wallet.</string>
     <string name="twins_wrong_card_error" translatable="false">You\'ve tapped the same card. To create twin wallet you need to tap a second twin card.</string>