Updated on 2026-08-14

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

@@ -22,7 +22,7 @@ fun Activity.sendEmail(
     subject: String,
     message: String,
     file: File? = null,
-    onFail: ((Exception) -> Unit)? = null
+    onFail: ((Exception) -> Unit)? = null,
 ) {
     fun createEmailShareIntent(recipient: String, subject: String, text: String, file: File? = null): Intent {
         val builder = ShareCompat.IntentBuilder.from(this)

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

@@ -8,8 +8,7 @@ import android.net.Uri
 import androidx.annotation.AnyRes
 import androidx.core.content.ContextCompat
 
-fun Context.readFile(fileName: String): String =
-    this.openFileInput(fileName).bufferedReader().readText()
+fun Context.readFile(fileName: String): String = this.openFileInput(fileName).bufferedReader().readText()
 
 fun Context.rewriteFile(content: String, fileName: String) {
     this.openFileOutput(fileName, Context.MODE_PRIVATE).use {

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

@@ -1,4 +1,3 @@
 package com.tangem.tap.common.extensions
 
-fun <K, V> Map<out K?, V?>.filterNotNull(): Map<K, V> =
-    filter { it.key != null && it.value != null } as Map<K, V>
+fun <K, V> Map<out K?, V?>.filterNotNull(): Map<K, V> = filter { it.key != null && it.value != null } as Map<K, V>

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

@@ -27,10 +27,13 @@ import com.tangem.tap.features.send.ui.SendFragment
 import com.tangem.tap.features.shop.ui.ShopFragment
 import com.tangem.tap.features.tokens.addCustomToken.AddCustomTokenFragment
 import com.tangem.tap.features.tokens.presentation.AddTokensFragment
+import com.tangem.tap.features.tokens.presentation.TokensListFragment
 import com.tangem.tap.features.wallet.ui.WalletDetailsFragment
 import com.tangem.tap.features.wallet.ui.WalletFragment
 import com.tangem.tap.features.walletSelector.ui.WalletSelectorBottomSheetFragment
 import com.tangem.tap.features.welcome.ui.WelcomeFragment
+import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.tap.store
 import com.tangem.wallet.R
 import timber.log.Timber
 
@@ -107,7 +110,12 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.AppSettings -> AppSettingsFragment()
         AppScreen.ResetToFactory -> ResetCardFragment()
         AppScreen.Disclaimer -> DisclaimerFragment()
-        AppScreen.AddTokens -> AddTokensFragment()
+        AppScreen.AddTokens -> {
+            val featureToggles = store.state.daggerGraphState.get(
+                getDependency = DaggerGraphState::tokensListFeatureToggles,
+            )
+            if (featureToggles.isRedesignedScreenEnabled) TokensListFragment() else AddTokensFragment()
+        }
         AppScreen.AddCustomToken -> AddCustomTokenFragment()
         AppScreen.WalletDetails -> WalletDetailsFragment()
         AppScreen.WalletConnectSessions -> WalletConnectFragment()

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

@@ -46,9 +46,7 @@ fun BigDecimal.toFormattedCurrencyString(
     return "$formattedAmount $currency"
 }
 
-fun BigDecimal.toFiatRateString(
-    fiatCurrencyName: String,
-): String {
+fun BigDecimal.toFiatRateString(fiatCurrencyName: String): String {
     val value = this
         .setScale(2, RoundingMode.HALF_UP)
         .formatWithSpaces()
@@ -69,10 +67,7 @@ fun BigDecimal.toFiatValue(rateValue: BigDecimal): BigDecimal {
     return fiatValue.setScale(2, RoundingMode.HALF_UP)
 }
 
-fun BigDecimal.toFormattedFiatValue(
-    fiatCurrencyName: String,
-    formatWithSpaces: Boolean = false,
-): String {
+fun BigDecimal.toFormattedFiatValue(fiatCurrencyName: String, formatWithSpaces: Boolean = false): String {
     val fiatValue = this.setScale(2, RoundingMode.HALF_UP)
         .let { if (formatWithSpaces) it.formatWithSpaces() else it }
     return " $fiatValue $fiatCurrencyName"

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

@@ -25,12 +25,7 @@ fun String?.ellipsizeBeforeSpace(allowedSize: Int): String {
         newString.substring(startIndex until newString.length)
 }
 
-fun String.colorSegment(
-    context: Context,
-    color: Int,
-    startIndex: Int = 0,
-    endIndex: Int = this.length,
-): Spannable {
+fun String.colorSegment(context: Context, color: Int, startIndex: Int = 0, endIndex: Int = this.length): Spannable {
     return this.toSpannable()
         .also { spannable ->
             spannable.setSpan(

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

@@ -10,7 +10,7 @@ inline fun Transition.addListener(
     crossinline onEnd: (animator: Transition) -> Unit = {},
     crossinline onCancel: (animator: Transition) -> Unit = {},
     crossinline onPause: (animator: Transition) -> Unit = {},
-    crossinline onRepeat: (animator: Transition) -> Unit = {}
+    crossinline onRepeat: (animator: Transition) -> Unit = {},
 ): Transition.TransitionListener {
     val listener = object : Transition.TransitionListener {
         override fun onTransitionStart(transition: Transition) = onStart(transition)

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

@@ -83,12 +83,11 @@ fun View.invisible(invisible: Boolean = true, invokeBeforeStateChanged: (() -> U
     }
 }
 
-fun Context.dpToPixels(dp: Int): Int =
-    TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP,
-        dp.toFloat(),
-        this.resources.displayMetrics,
-    ).toInt()
+fun Context.dpToPixels(dp: Int): Int = TypedValue.applyDimension(
+    TypedValue.COMPLEX_UNIT_DIP,
+    dp.toFloat(),
+    this.resources.displayMetrics,
+).toInt()
 
 tailrec fun Context?.getActivity(): Activity? = this as? Activity
     ?: (this as? ContextWrapper)?.baseContext?.getActivity()