Updated on 2026-08-14

common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt

@@ -191,9 +191,6 @@ sealed class AppRoute(val path: String) : Route {
         }
     }
 
-    @Serializable
-    data object AddCustomToken : AppRoute(path = "/add_custom_token")
-
     @Serializable
     data object WalletConnectSessions : AppRoute(path = "/wallet_connect_sessions")
 
@@ -227,13 +224,16 @@ sealed class AppRoute(val path: String) : Route {
     data class Swap(
         val currency: CryptoCurrency,
         val userWalletId: UserWalletId,
-    ) : AppRoute(path = "/swap/${currency.id.value}/${userWalletId.stringValue}"), RouteBundleParams {
+        val isInitialReverseOrder: Boolean = false,
+    ) : AppRoute(path = "/swap/${currency.id.value}/${userWalletId.stringValue}/$isInitialReverseOrder"),
+        RouteBundleParams {
 
         override fun getBundle(): Bundle = bundle(serializer())
 
         companion object {
             const val CURRENCY_BUNDLE_KEY = "currency"
             const val USER_WALLET_ID_KEY = "userWalletId"
+            const val IS_INITIAL_REVERSE_ORDER = "isInitialReverseOrder"
         }
     }
 

common/ui/src/main/java/com/tangem/common/ui/alerts/TransactionErrorAlertConverter.kt

@@ -8,7 +8,7 @@ import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.domain.transaction.error.SendTransactionError
 import com.tangem.utils.converter.Converter
 
-class SendTransactionAlertConverter(
+class TransactionErrorAlertConverter(
     private val popBackStack: () -> Unit,
     private val onFailedTxEmailClick: (String) -> Unit,
 ) : Converter<SendTransactionError, AlertUM?> {

common/ui/src/main/java/com/tangem/common/ui/alerts/models/AlertTransactionErrorUM.kt

@@ -9,7 +9,7 @@ data class AlertTransactionErrorUM(
     val code: String,
     val cause: String?,
     val causeTextReference: TextReference? = null,
-    override val onConfirmClick: (() -> Unit)? = null,
+    override val onConfirmClick: () -> Unit,
 ) : AlertUM {
     override val title: TextReference = resourceReference(id = R.string.send_alert_transaction_failed_title)
     override val message: TextReference = resourceReference(

common/ui/src/main/java/com/tangem/common/ui/alerts/models/AlertUM.kt

@@ -8,5 +8,5 @@ interface AlertUM {
     val title: TextReference?
     val message: TextReference
     val confirmButtonText: TextReference
-    val onConfirmClick: (() -> Unit)?
+    val onConfirmClick: () -> Unit
 }

common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt

@@ -21,7 +21,7 @@ import java.math.BigDecimal
 object NotificationsFactory {
 
     fun MutableList<NotificationUM>.addFeeUnreachableNotification(
-        feeError: GetFeeError,
+        feeError: GetFeeError?,
         tokenName: String,
         onReload: () -> Unit,
     ) {

common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt

@@ -69,7 +69,7 @@ class TokenItemStateConverter(
                 text = getFormattedFiatAmount(),
                 hasStaked = !getStakedBalance().isZero(),
             ),
-            cryptoAmountState = TokenItemState.CryptoAmountState.Content(text = getFormattedAmount()),
+            subtitle2State = TokenItemState.Subtitle2State.TextContent(text = getFormattedAmount()),
             onItemClick = { onItemClick(this) },
             onItemLongClick = onItemLongClick?.let {
                 { it(this) }