Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/DialogManager.kt

@@ -5,7 +5,12 @@ import android.content.Context
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.global.GlobalState
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectDialog
-import com.tangem.tap.features.details.ui.walletconnect.dialogs.*
+import com.tangem.tap.features.details.ui.walletconnect.dialogs.ApproveWcSessionDialog
+import com.tangem.tap.features.details.ui.walletconnect.dialogs.BnbTransactionDialog
+import com.tangem.tap.features.details.ui.walletconnect.dialogs.ClipboardOrScanQrDialog
+import com.tangem.tap.features.details.ui.walletconnect.dialogs.PersonalSignDialog
+import com.tangem.tap.features.details.ui.walletconnect.dialogs.SimpleAlertDialog
+import com.tangem.tap.features.details.ui.walletconnect.dialogs.TransactionDialog
 import com.tangem.tap.features.onboarding.AddressInfoBottomSheetDialog
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.onboarding.products.twins.ui.dialog.CreateWalletInterruptDialog
@@ -16,6 +21,7 @@ import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.ConfirmDisc
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.UnfinishedBackupFoundDialog
 import com.tangem.tap.features.wallet.ui.dialogs.ScanFailsDialog
 import com.tangem.tap.features.wallet.ui.dialogs.SimpleOkDialog
+import com.tangem.tap.features.wallet.ui.wallet.CurrencySelectionDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import org.rekotlin.StoreSubscriber
@@ -54,7 +60,10 @@ class DialogManager : StoreSubscriber<GlobalState> {
             is AppDialog.ScanFailsDialog -> ScanFailsDialog.create(context)
             is AppDialog.AddressInfoDialog -> AddressInfoBottomSheetDialog(state.dialog, context)
             is AppDialog.TestActionsDialog -> TestActionsBottomSheetDialog(state.dialog, context)
-            is TwinCardsAction.Wallet.ShowInterruptDialog -> CreateWalletInterruptDialog.create(state.dialog, context)
+            is AppDialog.CurrencySelectionDialog ->
+                CurrencySelectionDialog.create(state.dialog, context)
+            is TwinCardsAction.Wallet.ShowInterruptDialog ->
+                CreateWalletInterruptDialog.create(state.dialog, context)
             is WalletConnectDialog.UnsupportedCard ->
                 SimpleAlertDialog.create(
                     titleRes = R.string.wallet_connect,

app/src/main/java/com/tangem/tap/common/extensions/Specific.kt

@@ -39,10 +39,23 @@ fun BigDecimal.toFormattedCurrencyString(
     return "$formattedAmount $currency"
 }
 
-fun BigDecimal.toFiatString(rateValue: BigDecimal, fiatCurrencyName: String): String {
+fun BigDecimal.toFiatRateString(
+    fiatCurrencyName: String
+): String {
+    val value = this
+        .setScale(2, RoundingMode.HALF_UP)
+        .formatWithSpaces()
+    return "$value $fiatCurrencyName"
+}
+
+fun BigDecimal.toFiatString(
+    rateValue: BigDecimal,
+    fiatCurrencyName: String,
+    formatWithSpaces: Boolean = false
+): String {
     var fiatValue = rateValue.multiply(this)
     fiatValue = fiatValue.setScale(2, RoundingMode.HALF_UP)
-    return "≈ ${fiatCurrencyName}  $fiatValue"
+    return fiatValue.toFormattedFiatValue(fiatCurrencyName, formatWithSpaces)
 }
 
 fun BigDecimal.toFiatValue(rateValue: BigDecimal): BigDecimal {
@@ -50,8 +63,12 @@ fun BigDecimal.toFiatValue(rateValue: BigDecimal): BigDecimal {
     return fiatValue.setScale(2, RoundingMode.HALF_UP)
 }
 
-fun BigDecimal.toFormattedFiatValue(fiatCurrencyName: String): String {
-    return "≈ ${fiatCurrencyName}  $this"
+fun BigDecimal.toFormattedFiatValue(
+    fiatCurrencyName: String,
+    formatWithSpaces: Boolean = false
+): String {
+    val fiatValue = if (formatWithSpaces) this.formatWithSpaces() else this
+    return " ${fiatValue}  $fiatCurrencyName"
 }
 
 fun BigDecimal.stripZeroPlainString(): String = this.stripTrailingZeros().toPlainString()
@@ -111,4 +128,33 @@ fun BigDecimal.formatAmountAsSpannedString(
         append(' ')
         append(currencySymbol)
     }
+}
+
+fun BigDecimal.formatWithSpaces(): String {
+    val str = this.toString()
+    var integerStr = str.substringBefore('.')
+    val reminderStr = str.substringAfter('.')
+    val packets = arrayListOf<String>()
+
+    var index: Int = integerStr.length
+    while (0 < index) {
+        if (index <= 3) {
+            packets.add(0, integerStr)
+            break
+        }
+        index -= 3
+        packets.add(integerStr.substring(startIndex = index))
+        integerStr = integerStr.substring(startIndex = 0, endIndex = index)
+    }
+
+    return buildString {
+        packets.forEachIndexed { index, packet ->
+            append(packet)
+            if (index != packets.lastIndex) append(' ')
+        }
+        if (reminderStr.isNotBlank()) {
+            append('.')
+            append(reminderStr)
+        }
+    }
 }

app/src/main/java/com/tangem/tap/common/extensions/UI.kt

@@ -1,7 +1,5 @@
 package com.tangem.tap.common.extensions
 
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
 import android.app.Activity
 import android.content.*
 import android.content.res.Resources
@@ -192,45 +190,27 @@ fun View.getString(resId: Int, vararg formatArgs: Any?): String {
     return context.getString(resId, formatArgs)
 }
 
-fun View.showAnimated(durationMillis: Long = 300) {
-    this.animateVisibility(
-        show = true,
-        durationMillis = durationMillis
-    )
-}
-
-fun View.hideAnimated(
-    durationMillis: Long = 300,
-    hiddenVisibility: Int = View.GONE
-) {
-    this.animateVisibility(
-        show = false,
-        durationMillis = durationMillis,
-        hiddenVisibility = hiddenVisibility
-    )
-}
-
-private fun View.animateVisibility(
+fun View.animateVisibility(
     show: Boolean,
-    durationMillis: Long = 300,
+    durationMillis: Long = SHORT_ANIMATION_DURATION,
     hiddenVisibility: Int = View.GONE
 ) {
-    if (this.isVisible == show) return
     if (show) {
-        this.alpha = 0f
-        this.isVisible = true
         this.animate()
             .alpha(1f)
             .setDuration(durationMillis)
-            .setListener(null)
+            .withStartAction {
+                this.alpha = 0f
+                this.isVisible = true
+            }
     } else {
         this.animate()
             .alpha(0f)
             .setDuration(durationMillis)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator?) {
-                    this@animateVisibility.visibility = hiddenVisibility
-                }
-            })
+            .withStartAction {
+                this.visibility = hiddenVisibility
+            }
     }
-}
+}
+
+private const val SHORT_ANIMATION_DURATION = 80L

app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt

@@ -2,6 +2,7 @@ package com.tangem.tap.common.redux
 
 import com.tangem.common.extensions.VoidCallback
 import com.tangem.tap.common.TestAction
+import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.features.wallet.redux.AddressData
 import com.tangem.tap.features.wallet.redux.Currency
 
@@ -12,7 +13,12 @@ interface StateDialog
 
 sealed class AppDialog : StateDialog {
     data class SimpleOkDialog(val header: String, val message: String, val onOk: VoidCallback? = null) : AppDialog()
-    data class SimpleOkDialogRes(val headerId: Int, val messageId: Int, val onOk: VoidCallback? = null) : AppDialog()
+    data class SimpleOkDialogRes(
+        val headerId: Int,
+        val messageId: Int,
+        val onOk: VoidCallback? = null
+    ) : AppDialog()
+
     object ScanFailsDialog : AppDialog()
     data class AddressInfoDialog(
         val currency: Currency,
@@ -22,4 +28,9 @@ sealed class AppDialog : StateDialog {
     data class TestActionsDialog(
         val actionsList: List<TestAction>
     ) : AppDialog()
+
+    data class CurrencySelectionDialog(
+        val currenciesList: List<FiatCurrency>,
+        val currentAppCurrency: FiatCurrency,
+    ) : AppDialog()
 }