Updated on 2026-08-14

app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt

@@ -139,10 +139,10 @@ abstract class BaseTestCase : TestCase(
         return ApplicationInjectionExecutionRule(
             toggleStates = mapOf(
                 "NEW_TOKEN_RECEIVE_ENABLED" to true,
-                "WALLET_BALANCE_FETCHER_ENABLED" to true,
-                "SWAP_REDESIGN_ENABLED" to true,
+                "SWAP_REDESIGN_ENABLED" to false,
                 "NEW_ONRAMP_MAIN_ENABLED" to true,
-                "HOT_WALLET_ENABLED" to true
+                "HOT_WALLET_ENABLED" to true,
+                "YIELD_SUPPLY_FEATURE_ENABLED" to true
             )
         )
     }

app/src/androidTest/kotlin/com/tangem/common/constants/TestConstants.kt

@@ -8,6 +8,7 @@ object TestConstants {
     const val ETHEREUM_RECIPIENT_ADDRESS = "0x5aa711F440Eb6d4361148bBD89d03464628ace84"
     const val ETHEREUM_RECIPIENT_SHORTENED_ADDRESS = "0x5aa711F440Eb6d43...89d03464628ace84"
     const val BITCOIN_ADDRESS = "bc1qtg9aa6jcpqtvun0pe0uct7sxm8nq2nsxfmfxm3"
+    const val BITCOIN_RECIPIENT_ADDRESS = "bc1qt90qc0na7z05nh63kyd78tujfc8vqv6sl7e4a9"
     const val CARDANO_ADDRESS =
         "addr1q8f9499e58k4hhfd9vhawprxt3xd94x7rmlyp33ee4xkatakcl2zgkrg0p6ceqkndtkw4cumfe9enhdph8yhuswn785srksm9p"
     const val SOLANA_RECIPIENT_ADDRESS = "5fcy9woa8Di1QHcce65CsV3XKrxdB2pD4HJx5xx82ipM"
@@ -30,6 +31,7 @@ object TestConstants {
     const val XRP_ACTIVATED_RECIPIENT_ADDRESS = "rN7n7otQDd6FczFgLdSqtcsAUxDkw6fzRH"
     const val DOGECOIN_RECIPIENT_ADDRESS = "DJQR3bdhBKcFGMHX2BkMCkrMFApNWNzr6V"
     const val DOGECOIN_ADDRESS = "DJ2TaZ5vvp3mBLugUpKjVM3pRBLi4uYaqz"
+    const val TERRA_RECIPIENT_ADDRESS = "terra148dmp5ccazcwdmrcpvqz5rprnn886kemqen3tj"
 
     const val WAIT_UNTIL_TIMEOUT = 20_000L
     const val WAIT_UNTIL_TIMEOUT_LONG = 30_000L

app/src/androidTest/kotlin/com/tangem/scenarios/SendScenarios.kt

@@ -54,6 +54,10 @@ fun BaseTestCase.checkNetworkFeeBlock(currentFeeAmount: String, withFeeSelector:
         step("Assert select fee icon is displayed") {
             onSendConfirmScreen { selectFeeIcon.assertIsDisplayed() }
         }
+    } else {
+        step("Assert select fee icon is not displayed") {
+            onSendConfirmScreen { selectFeeIcon.assertIsNotDisplayed() }
+        }
     }
 }
 
@@ -139,3 +143,28 @@ fun BaseTestCase.checkRecentAddressItem(address: String, description: String?) {
         }
     }
 }
+
+fun BaseTestCase.checkCustomFeeTooltip(title: String, tooltip: String) {
+    step("Click on tooltip icon for '$title'") {
+        waitForIdle()
+        onSendSelectNetworkFeeBottomSheet { tooltipIcon(title).performClick() }
+    }
+    step("Check '$title' tooltip text") {
+        onSendSelectNetworkFeeBottomSheet { tooltipText(tooltip).assertIsDisplayed() }
+    }
+    step("Click on tooltip icon again to close tooltip") {
+        onSendSelectNetworkFeeBottomSheet { tooltipIcon(title).performClick() }
+    }
+}
+
+fun BaseTestCase.checkChangesInInputTextField(title: String, newValue: String, addition: String = "") {
+    step("Click on '$title' input text field") {
+        onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(title).performClick() }
+    }
+    step("Type '$newValue' in '$title' input text field") {
+        onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(title).performTextReplacement(newValue) }
+    }
+    step("Assert '$title' value: '$newValue + $addition'") {
+        onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(title).assertTextContains(newValue + addition) }
+    }
+}

app/src/androidTest/kotlin/com/tangem/screens/SendAddressPageObject.kt

@@ -95,10 +95,8 @@ class SendAddressPageObject(semanticsProvider: SemanticsNodeInteractionsProvider
             hasAnyDescendant(withText(description, substring = true))
         }
         if (isMyWallet) {
-            hasAnySibling(withText(getResourceString(CoreUiR.string.send_recipient_wallets_title)))
             hasAnyDescendant(withText(getResourceString(CoreUiR.string.manage_tokens_network_selector_wallet)))
         } else {
-            hasAnySibling(withText(getResourceString(CoreUiR.string.send_recent_transactions)))
             hasAnyDescendant(withTestTag(SendAddressScreenTestTags.RECENT_ADDRESS_TRANSACTION_ICON))
         }
     }
@@ -119,8 +117,7 @@ class SendAddressPageObject(semanticsProvider: SemanticsNodeInteractionsProvider
     }
 
     val destinationTagTextFieldHint: KNode = child {
-        hasParent(withTestTag(SendAddressScreenTestTags.DESTINATION_TAG_TEXT_FIELD))
-        useUnmergedTree = true
+        hasTestTag(SendAddressScreenTestTags.DESTINATION_TAG_TEXT_FIELD)
     }
 
     val destinationTagBlockText: KNode = child {

app/src/androidTest/kotlin/com/tangem/screens/SendSelectNetworkFeeBottomSheetPageObject.kt

@@ -0,0 +1,102 @@
+package com.tangem.screens
+
+import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
+import com.tangem.common.BaseTestCase
+import com.tangem.core.ui.test.BaseBottomSheetTestTags
+import com.tangem.core.ui.test.BaseButtonTestTags
+import com.tangem.core.ui.test.SendSelectNetworkFeeBottomSheetTestTags
+import com.tangem.wallet.R
+import io.github.kakaocup.compose.node.element.ComposeScreen
+import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
+import io.github.kakaocup.compose.node.element.KNode
+import io.github.kakaocup.kakao.common.utilities.getResourceString
+import androidx.compose.ui.test.hasTestTag as withTestTag
+import androidx.compose.ui.test.hasText as withText
+
+class SendSelectNetworkFeeBottomSheetPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
+    ComposeScreen<SendSelectNetworkFeeBottomSheetPageObject>(semanticsProvider = semanticsProvider) {
+
+    val title: KNode = child {
+        hasTestTag(BaseBottomSheetTestTags.TITLE)
+        hasText(getResourceString(R.string.common_network_fee_title))
+        useUnmergedTree = true
+    }
+
+    fun regularFeeSelectorItem(title: String): KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.REGULAR_FEE_ITEM)
+        hasAnyDescendant(withText(title))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.REGULAR_ITEM_ICON))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.REGULAR_ITEM_TITLE))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.TOKEN_AMOUNT))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.FIAT_AMOUNT))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.DOT_SIGN))
+        useUnmergedTree = true
+    }
+
+    val customSelectorItem: KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_FEE_ITEM)
+        hasAnyDescendant(withText(getResourceString(R.string.common_custom)))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_ITEM_ICON))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_ITEM_TITLE))
+        useUnmergedTree = true
+    }
+
+    fun customInputItem(title: String, hasFiatAmount: Boolean = false): KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM)
+        hasAnyDescendant(withText(title))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_TITLE))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_TOOLTIP_ICON))
+        hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_INPUT_TEXT_FIELD))
+        useUnmergedTree = true
+        if (hasFiatAmount) {
+            hasAnyDescendant(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_FIAT_AMOUNT))
+        }
+    }
+
+    val nonceInputItem: KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.NONCE_INPUT_ITEM)
+        hasAnyDescendant(withText(getResourceString(R.string.send_nonce)))
+        hasAnyDescendant(withText(getResourceString(R.string.send_nonce_hint)))
+        useUnmergedTree = true
+    }
+
+    fun tooltipIcon(title: String): KNode = child {
+        hasAnySibling(withText(title))
+        useUnmergedTree = true
+    }
+
+    fun tooltipText(text: String): KNode = child {
+        hasText(text)
+        useUnmergedTree = true
+    }
+
+    private fun inputTextField(title: String): KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_INPUT_TEXT_FIELD)
+        hasAnySibling(withText(title))
+        useUnmergedTree = true
+    }
+
+    fun inputTextFieldValue(title: String): KNode = inputTextField(title).child {
+        hasParent(withTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_INPUT_TEXT_FIELD))
+        useUnmergedTree = true
+    }
+
+    val nonceInputTextField: KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.NONCE_INPUT_TEXT_FIELD)
+        useUnmergedTree = true
+    }
+
+    val customInputItemFiatAmount: KNode = child {
+        hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_FIAT_AMOUNT)
+        useUnmergedTree = true
+    }
+
+    val doneButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(R.string.common_done))
+        useUnmergedTree = true
+    }
+}
+
+internal fun BaseTestCase.onSendSelectNetworkFeeBottomSheet(function: SendSelectNetworkFeeBottomSheetPageObject.() -> Unit) =
+    onComposeScreen(composeTestRule, function)

app/src/androidTest/kotlin/com/tangem/screens/SwapSelectNetworkFeeBottomSheetPageObject.kt

@@ -2,7 +2,7 @@ package com.tangem.screens
 
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
-import com.tangem.core.ui.test.SelectNetworkFeeBottomSheetTestTags
+import com.tangem.core.ui.test.SwapSelectNetworkFeeBottomSheetTestTags
 import com.tangem.core.ui.test.TopAppBarTestTags
 import com.tangem.wallet.R
 import io.github.kakaocup.compose.node.element.ComposeScreen
@@ -11,8 +11,8 @@ import io.github.kakaocup.compose.node.element.KNode
 import io.github.kakaocup.kakao.common.utilities.getResourceString
 import androidx.compose.ui.test.hasText as withText
 
-class SelectNetworkFeePageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
-    ComposeScreen<SelectNetworkFeePageObject>(semanticsProvider = semanticsProvider) {
+class SwapSelectNetworkFeeBottomSheetPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
+    ComposeScreen<SwapSelectNetworkFeeBottomSheetPageObject>(semanticsProvider = semanticsProvider) {
 
     val title: KNode = child {
         hasTestTag(TopAppBarTestTags.TITLE)
@@ -21,22 +21,22 @@ class SelectNetworkFeePageObject(semanticsProvider: SemanticsNodeInteractionsPro
     }
 
     val marketSelectorItem: KNode = child {
-        hasTestTag(SelectNetworkFeeBottomSheetTestTags.SELECTOR_ITEM)
+        hasTestTag(SwapSelectNetworkFeeBottomSheetTestTags.SELECTOR_ITEM)
         hasAnyChild(withText(getResourceString(R.string.common_fee_selector_option_market)))
         useUnmergedTree = true
     }
 
     val fastSelectorItem: KNode = child {
-        hasTestTag(SelectNetworkFeeBottomSheetTestTags.SELECTOR_ITEM)
+        hasTestTag(SwapSelectNetworkFeeBottomSheetTestTags.SELECTOR_ITEM)
         hasAnyChild(withText(getResourceString(R.string.common_fee_selector_option_fast)))
         useUnmergedTree = true
     }
 
     val readMoreTextBlock: KNode = child {
-        hasTestTag(SelectNetworkFeeBottomSheetTestTags.READ_MORE_TEXT)
+        hasTestTag(SwapSelectNetworkFeeBottomSheetTestTags.READ_MORE_TEXT)
         useUnmergedTree = true
     }
 }
 
-internal fun BaseTestCase.onSelectNetworkFeeBottomSheet(function: SelectNetworkFeePageObject.() -> Unit) =
+internal fun BaseTestCase.onSwapSelectNetworkFeeBottomSheet(function: SwapSelectNetworkFeeBottomSheetPageObject.() -> Unit) =
     onComposeScreen(composeTestRule, function)

app/src/androidTest/kotlin/com/tangem/tests/SwapTokenTest.kt

@@ -215,19 +215,19 @@ class SwapTokenTest : BaseTestCase() {
                 }
             }
             step("Assert 'Select fee' bottom sheet title is displayed") {
-                onSelectNetworkFeeBottomSheet { title.assertIsDisplayed() }
+                onSwapSelectNetworkFeeBottomSheet { title.assertIsDisplayed() }
             }
             step("Assert 'Market' item is displayed") {
-                onSelectNetworkFeeBottomSheet { marketSelectorItem.assertIsDisplayed() }
+                onSwapSelectNetworkFeeBottomSheet { marketSelectorItem.assertIsDisplayed() }
             }
             step("Assert 'Fast' item is displayed") {
-                onSelectNetworkFeeBottomSheet { fastSelectorItem.assertIsDisplayed() }
+                onSwapSelectNetworkFeeBottomSheet { fastSelectorItem.assertIsDisplayed() }
             }
             step("Assert 'Read more' text block is displayed") {
-                onSelectNetworkFeeBottomSheet { readMoreTextBlock.assertIsDisplayed() }
+                onSwapSelectNetworkFeeBottomSheet { readMoreTextBlock.assertIsDisplayed() }
             }
             step("Click on 'Fast' item") {
-                onSelectNetworkFeeBottomSheet { fastSelectorItem.assertIsDisplayed() }
+                onSwapSelectNetworkFeeBottomSheet { fastSelectorItem.assertIsDisplayed() }
             }
             step("Assert 'Network fee' block is displayed") {
                 onSwapTokenScreen {

app/src/androidTest/kotlin/com/tangem/tests/actionButtons/TokenDetailsScreenActionButtonsTest.kt

@@ -84,8 +84,8 @@ class TokenDetailsScreenActionButtonsTest : BaseTestCase() {
             step("Assert 'Buy' button is not dimmed") {
                 onTokenDetailsScreen { buyButton().assertContentDescriptionEquals(actionButtonIsNotDimmed) }
             }
-            step("Assert 'Send' button is dimmed") {
-                onTokenDetailsScreen { sendButton().assertContentDescriptionEquals(actionButtonIsDimmed) }
+            step("Assert 'Send' button is not dimmed") {
+                onTokenDetailsScreen { sendButton().assertContentDescriptionEquals(actionButtonIsNotDimmed) }
             }
             step("Assert 'Swap' button is dimmed") {
                 onTokenDetailsScreen { swapButton().assertContentDescriptionEquals(actionButtonIsDimmed) }

app/src/androidTest/kotlin/com/tangem/tests/send/feeScreen/SendFeeScreenTest.kt

@@ -0,0 +1,438 @@
+package com.tangem.tests.send.feeScreen
+
+import com.tangem.common.BaseTestCase
+import com.tangem.common.constants.TestConstants.BITCOIN_RECIPIENT_ADDRESS
+import com.tangem.common.constants.TestConstants.ETHEREUM_RECIPIENT_ADDRESS
+import com.tangem.common.constants.TestConstants.POLKADOT_RECIPIENT_ADDRESS
+import com.tangem.common.constants.TestConstants.QUOTES_API_SCENARIO
+import com.tangem.common.constants.TestConstants.TERRA_RECIPIENT_ADDRESS
+import com.tangem.common.constants.TestConstants.USER_TOKENS_API_SCENARIO
+import com.tangem.common.extensions.SwipeDirection
+import com.tangem.common.extensions.clickWithAssertion
+import com.tangem.common.extensions.swipeVertical
+import com.tangem.common.utils.resetWireMockScenarioState
+import com.tangem.common.utils.setWireMockScenarioState
+import com.tangem.core.ui.R
+import com.tangem.scenarios.*
+import com.tangem.screens.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.github.kakaocup.kakao.common.utilities.getResourceString
+import io.qameta.allure.kotlin.AllureId
+import io.qameta.allure.kotlin.junit4.DisplayName
+import org.junit.Test
+
+@HiltAndroidTest
+class SendFeeScreenTest : BaseTestCase() {
+
+    @AllureId("4906")
+    @DisplayName("Send (Fee screen): check fee block for fee in token")
+    @Test
+    fun checkFeeBlockForFeeInTokenTest() {
+        val tokenName = "TerraClassicUSD"
+        val scenarioName = "Terra"
+        val tokenAmount = "1"
+        val feeAmount = "<$0.01"
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(USER_TOKENS_API_SCENARIO)
+                resetWireMockScenarioState(QUOTES_API_SCENARIO)
+            }
+        ).run {
+            step("Open 'Send' screen") {
+                openSendScreen(tokenName, scenarioName)
+            }
+            step("Type '$tokenAmount' in input text field") {
+                onSendScreen {
+                    amountInputTextField.performClick()
+                    amountInputTextField.performTextReplacement(tokenAmount)
+                }
+            }
+            step("Click on 'Next' button") {
+                onSendAddressScreen { nextButton.clickWithAssertion() }
+            }
+            step("Type recipient address") {
+                onSendAddressScreen { addressTextField.performTextReplacement(TERRA_RECIPIENT_ADDRESS) }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert fee block is displayed without fee selector") {
+                checkNetworkFeeBlock(currentFeeAmount = feeAmount, withFeeSelector = false)
+            }
+        }
+    }
+
+    @AllureId("4868")
+    @DisplayName("Send (Fee screen): check fee block for fixed fee")
+    @Test
+    fun checkFeeBlockForFixedFeeTest() {
+        val tokenName = "Polkadot"
+        val tokenAmount = "1"
+        val feeAmount = "$0.05"
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(USER_TOKENS_API_SCENARIO)
+                resetWireMockScenarioState(QUOTES_API_SCENARIO)
+            }
+        ).run {
+            step("Open 'Send' screen") {
+                openSendScreen(tokenName)
+            }
+            step("Type '$tokenAmount' in input text field") {
+                onSendScreen {
+                    amountInputTextField.performClick()
+                    amountInputTextField.performTextReplacement(tokenAmount)
+                }
+            }
+            step("Click on 'Next' button") {
+                onSendAddressScreen { nextButton.clickWithAssertion() }
+            }
+            step("Type recipient address") {
+                onSendAddressScreen { addressTextField.performTextReplacement(POLKADOT_RECIPIENT_ADDRESS) }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert fee block is displayed without fee selector") {
+                checkNetworkFeeBlock(currentFeeAmount = feeAmount, withFeeSelector = false)
+            }
+            step("Click on 'Fee selector' block") {
+                onSendConfirmScreen { feeSelectorBlock.performClick() }
+            }
+            step("Assert 'Fee selector' bottom sheet is not displayed") {
+                onSwapSelectNetworkFeeBottomSheet { title.assertIsNotDisplayed() }
+            }
+        }
+    }
+
+    @AllureId("4869")
+    @DisplayName("Send (Fee screen): check network fee bottom sheet for EVM networks")
+    @Test
+    fun checkNetworkFeeBottomSheetForEvmTest() {
+        val tokenName = "Ethereum"
+        val tokenAmount = "0.1"
+        val feeAmount = "~$1.06"
+        val fiatFeeAmount = "$1.09"
+        val newFeeAmount = "~$1.09"
+        val marketSelectorItem = getResourceString(R.string.common_fee_selector_option_market)
+        val fastSelectorItem = getResourceString(R.string.common_fee_selector_option_fast)
+        val slowSelectorItem = getResourceString(R.string.common_fee_selector_option_slow)
+        val feeUpTo = getResourceString(R.string.send_max_fee)
+        val feeUpToTooltip = getResourceString(R.string.send_custom_amount_fee_footer)
+        val feeUpToValue = "0.00042 ETH"
+        val newFeeUpToValue = "0.00043"
+        val maxFee = getResourceString(R.string.send_custom_evm_max_fee)
+        val maxFeeTooltip = getResourceString(R.string.send_custom_evm_max_fee_footer)
+        val maxFeeValue = "20 GWEI"
+        val newMaxFeeValue = "21"
+        val priorityFee = getResourceString(R.string.send_custom_evm_priority_fee)
+        val priorityFeeTooltip = getResourceString(R.string.send_custom_evm_priority_fee_footer)
+        val priorityFeeValue = "2 GWEI"
+        val newPriorityFeeValue = "3"
+        val gasLimit = getResourceString(R.string.send_gas_limit)
+        val gasLimitTooltip = getResourceString(R.string.send_gas_limit_footer)
+        val gasLimitValue = "21,000 "
+        val newGasLimitValue = "22"
+        val nonce = getResourceString(R.string.send_nonce)
+        val nonceTooltip = getResourceString(R.string.send_nonce_footer)
+        val nonceValue = "1"
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(USER_TOKENS_API_SCENARIO)
+                resetWireMockScenarioState(QUOTES_API_SCENARIO)
+            }
+        ).run {
+            step("Open 'Send' screen") {
+                openSendScreen(tokenName)
+            }
+            step("Type '$tokenAmount' in input text field") {
+                onSendScreen {
+                    amountInputTextField.performClick()
+                    amountInputTextField.performTextReplacement(tokenAmount)
+                }
+            }
+            step("Click on 'Next' button") {
+                onSendAddressScreen { nextButton.clickWithAssertion() }
+            }
+            step("Type recipient address") {
+                onSendAddressScreen { addressTextField.performTextReplacement(ETHEREUM_RECIPIENT_ADDRESS) }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert fee block is displayed with fee selector") {
+                checkNetworkFeeBlock(currentFeeAmount = feeAmount, withFeeSelector = true)
+            }
+            step("Click on fee selector icon") {
+                onSendConfirmScreen { feeSelectorIcon.performClick() }
+            }
+            step("Assert 'Fee selector' bottom sheet title is displayed") {
+                onSendSelectNetworkFeeBottomSheet { title.assertIsDisplayed() }
+            }
+            step("Assert '$fastSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(fastSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert '$slowSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(slowSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert '$marketSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(marketSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert 'Custom' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { customSelectorItem.assertIsDisplayed() }
+            }
+            step("Click on 'Custom' selector item") {
+                onSendSelectNetworkFeeBottomSheet { customSelectorItem.performClick() }
+            }
+            step("Assert '$feeUpTo' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet {
+                    customInputItem(title = feeUpTo, hasFiatAmount = true).assertIsDisplayed()
+                }
+            }
+            step("Assert '$maxFee' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { customInputItem(maxFee).assertIsDisplayed() }
+            }
+            step("Assert '$priorityFee' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { customInputItem(priorityFee).assertIsDisplayed() }
+            }
+            step("Assert '$gasLimit' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { customInputItem(gasLimit).assertIsDisplayed() }
+            }
+            step("Swipe up") {
+                swipeVertical(SwipeDirection.UP)
+            }
+            step("Assert '$nonce' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { nonceInputItem.assertIsDisplayed() }
+            }
+            step("Check '$feeUpTo' tooltip") {
+                checkCustomFeeTooltip(title = feeUpTo, tooltip = feeUpToTooltip)
+            }
+            step("Check '$maxFee' tooltip") {
+                checkCustomFeeTooltip(title = maxFee, tooltip = maxFeeTooltip)
+            }
+            step("Check '$priorityFee' tooltip") {
+                checkCustomFeeTooltip(title = priorityFee, tooltip = priorityFeeTooltip)
+            }
+            step("Check '$gasLimit' tooltip") {
+                checkCustomFeeTooltip(title = gasLimit, tooltip = gasLimitTooltip)
+            }
+            step("Check '$nonce' tooltip") {
+                checkCustomFeeTooltip(title = nonce, tooltip = nonceTooltip)
+            }
+            step("Assert '$feeUpTo' value: '$feeUpToValue'") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(feeUpTo).assertTextContains(feeUpToValue) }
+            }
+            step("Assert '$maxFee' value: '$maxFeeValue'") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(maxFee).assertTextContains(maxFeeValue) }
+            }
+            step("Assert '$priorityFee' value: '$priorityFeeValue'") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(priorityFee).assertTextContains(priorityFeeValue) }
+            }
+            step("Assert '$gasLimit' value: '$gasLimitValue'") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(gasLimit).assertTextContains(gasLimitValue) }
+            }
+            step("Check changes in '$maxFee' input text field") {
+                checkChangesInInputTextField(title = maxFee, newValue = newMaxFeeValue, addition = " GWEI")
+            }
+            step("Check changes in '$priorityFee' input text field") {
+                checkChangesInInputTextField(title = priorityFee, newValue = newPriorityFeeValue, addition = " GWEI")
+            }
+            step("Check changes in '$gasLimit' input text field") {
+                checkChangesInInputTextField(title = gasLimit, newValue = newGasLimitValue, addition = " ")
+            }
+            step("Type '$nonceValue' in '$nonce' text field") {
+                onSendSelectNetworkFeeBottomSheet {
+                    nonceInputTextField.performClick()
+                    nonceInputTextField.performTextReplacement(nonceValue)
+                }
+            }
+            step("Assert '$nonce' value: '$nonceValue'") {
+                onSendSelectNetworkFeeBottomSheet { nonceInputTextField.assertTextContains(nonceValue) }
+            }
+            step("Check changes in '$feeUpTo' input text field") {
+                checkChangesInInputTextField(title = feeUpTo, newValue = newFeeUpToValue, addition = " ETH")
+            }
+            step("Assert new fiat fee amount: '$fiatFeeAmount'") {
+                onSendSelectNetworkFeeBottomSheet { customInputItemFiatAmount.assertTextContains(fiatFeeAmount) }
+            }
+            step("Click on 'Done' button") {
+                onSendSelectNetworkFeeBottomSheet { doneButton.performClick() }
+            }
+            step("Assert fee block is displayed with new fee amount: '$newFeeAmount'") {
+                checkNetworkFeeBlock(currentFeeAmount = newFeeAmount, withFeeSelector = true)
+            }
+        }
+    }
+
+    @AllureId("4870")
+    @DisplayName("Send (Fee screen): check network fee bottom sheet for Bitcoin")
+    @Test
+    fun checkNetworkFeeBottomSheetForBitcoinTest() {
+        val tokenName = "Bitcoin"
+        val tokenAmount = "0.00000001"
+        val feeAmount = "$2.86"
+        val fiatFeeAmount = "$0.24"
+        val marketSelectorItem = getResourceString(R.string.common_fee_selector_option_market)
+        val fastSelectorItem = getResourceString(R.string.common_fee_selector_option_fast)
+        val slowSelectorItem = getResourceString(R.string.common_fee_selector_option_slow)
+        val feeUpTo = getResourceString(R.string.send_max_fee)
+        val feeUpToValue = "0.0000264 BTC"
+        val newFeeUpToValue = "0.0000022 BTC"
+        val satoshi = getResourceString(R.string.send_satoshi_per_byte_title)
+        val satoshiValue = "2"
+        val decimalNumber = "2.11"
+        val newSatoshiValue = "1"
+        val bitcoinUtxoScenarioName = "bitcoin_utxo"
+        val bitcoinUtxoScenarioState = "Balance"
+        val feeScenarioName = "bitcoin_estimate_smart_fee"
+        val feeScenarioState = "Started"
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(USER_TOKENS_API_SCENARIO)
+                resetWireMockScenarioState(bitcoinUtxoScenarioName)
+            }
+        ).run {
+            step("Set WireMock scenario: '$bitcoinUtxoScenarioName' to state: '$bitcoinUtxoScenarioState'") {
+                setWireMockScenarioState(bitcoinUtxoScenarioName, bitcoinUtxoScenarioState)
+            }
+            step("Set WireMock scenario: '$feeScenarioName' to state: '$feeScenarioState'") {
+                setWireMockScenarioState(feeScenarioName, feeScenarioState)
+            }
+            step("Open 'Main' screen") {
+                openMainScreen()
+            }
+            step("Synchronize addresses") {
+                synchronizeAddresses()
+            }
+            step("Open 'Send address' screen") {
+                openSendAddressScreen(tokenName, tokenAmount)
+            }
+            step("Type recipient address") {
+                onSendAddressScreen { addressTextField.performTextReplacement(BITCOIN_RECIPIENT_ADDRESS) }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert fee block is displayed with fee selector") {
+                checkNetworkFeeBlock(currentFeeAmount = feeAmount, withFeeSelector = true)
+            }
+            step("Click on fee selector icon") {
+                onSendConfirmScreen { feeSelectorIcon.performClick() }
+            }
+            step("Assert 'Fee selector' bottom sheet title is displayed") {
+                onSendSelectNetworkFeeBottomSheet { title.assertIsDisplayed() }
+            }
+            step("Assert '$fastSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(fastSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert '$slowSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(slowSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert '$marketSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(marketSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert 'Custom' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { customSelectorItem.assertIsDisplayed() }
+            }
+            step("Click on 'Custom' selector item") {
+                onSendSelectNetworkFeeBottomSheet { customSelectorItem.performClick() }
+            }
+            step("Assert '$feeUpTo' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet {
+                    customInputItem(title = feeUpTo, hasFiatAmount = true).assertIsDisplayed()
+                }
+            }
+            step("Assert '$feeUpTo' value: '$feeUpToValue'") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(feeUpTo).assertTextContains(feeUpToValue) }
+            }
+            step("Assert '$satoshi' input item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { customInputItem(satoshi).assertIsDisplayed() }
+            }
+            step("Click on '$satoshi' input text field") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(satoshi).performClick() }
+            }
+            step("Type '$decimalNumber' in '$satoshi' input text field") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(satoshi).performTextReplacement(decimalNumber) }
+            }
+            step("Assert '$satoshi' value: '$satoshiValue +  '") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(satoshi).assertTextContains("$satoshiValue ") }
+            }
+            step("Check changes in '$satoshi' input text field") {
+                checkChangesInInputTextField(title = satoshi, newValue = newSatoshiValue, addition = " ")
+            }
+            step("Assert new fiat fee amount: '$fiatFeeAmount'") {
+                onSendSelectNetworkFeeBottomSheet { customInputItemFiatAmount.assertTextContains(fiatFeeAmount) }
+            }
+            step("Assert '$feeUpTo' value: '$newFeeUpToValue'") {
+                onSendSelectNetworkFeeBottomSheet { inputTextFieldValue(feeUpTo).assertTextContains(newFeeUpToValue) }
+            }
+            step("Click on 'Done' button") {
+                onSendSelectNetworkFeeBottomSheet { doneButton.performClick() }
+            }
+            step("Assert fee block is displayed with new fee amount: '$fiatFeeAmount'") {
+                checkNetworkFeeBlock(currentFeeAmount = fiatFeeAmount, withFeeSelector = true)
+            }
+        }
+    }
+
+    @AllureId("4871")
+    @DisplayName("Send (Fee screen): check network fee bottom sheet networks with fee in token")
+    @Test
+    fun checkNetworkFeeBottomSheetForVeThorTest() {
+        val tokenName = "VeThor"
+        val mockState = "Vechain"
+        val tokenAmount = "0.1"
+        val feeAmount = "<$0.01"
+        val marketSelectorItem = getResourceString(R.string.common_fee_selector_option_market)
+        val fastSelectorItem = getResourceString(R.string.common_fee_selector_option_fast)
+        val slowSelectorItem = getResourceString(R.string.common_fee_selector_option_slow)
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(USER_TOKENS_API_SCENARIO)
+                resetWireMockScenarioState(QUOTES_API_SCENARIO)
+            }
+        ).run {
+            step("Open 'Send' screen") {
+                openSendScreen(tokenName = tokenName, mockState = mockState)
+            }
+            step("Type '$tokenAmount' in input text field") {
+                onSendScreen {
+                    amountInputTextField.performClick()
+                    amountInputTextField.performTextReplacement(tokenAmount)
+                }
+            }
+            step("Click on 'Next' button") {
+                onSendAddressScreen { nextButton.clickWithAssertion() }
+            }
+            step("Type recipient address") {
+                onSendAddressScreen { addressTextField.performTextReplacement(ETHEREUM_RECIPIENT_ADDRESS) }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert fee block is displayed with fee selector") {
+                checkNetworkFeeBlock(currentFeeAmount = feeAmount, withFeeSelector = true)
+            }
+            step("Click on fee selector icon") {
+                onSendConfirmScreen { feeSelectorIcon.performClick() }
+            }
+            step("Assert 'Fee selector' bottom sheet title is displayed") {
+                onSendSelectNetworkFeeBottomSheet { title.assertIsDisplayed() }
+            }
+            step("Assert '$fastSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(fastSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert '$slowSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(slowSelectorItem).assertIsDisplayed() }
+            }
+            step("Assert '$marketSelectorItem' selector item is displayed") {
+                onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(marketSelectorItem).assertIsDisplayed() }
+            }
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -290,6 +290,17 @@
                     android:host="tangem.com"
                     android:path="/pay-app" />
             </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="tangem.com"
+                    android:pathPrefix="/news" />
+            </intent-filter>
         </activity>
 
         <!-- Disable android.startup completely. Used for Worker according doc -->

app/src/main/java/com/tangem/tap/di/domain/NewsDomainModule.kt

@@ -6,39 +6,43 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 internal object NewsDomainModule {
 
     @Provides
-    @Singleton
     fun provideGetNewsCategoriesUseCase(repository: NewsRepository): GetNewsCategoriesUseCase {
         return GetNewsCategoriesUseCase(repository)
     }
 
     @Provides
-    @Singleton
     fun provideObserveNewsDetailsUseCase(repository: NewsRepository): ObserveNewsDetailsUseCase {
         return ObserveNewsDetailsUseCase(repository)
     }
 
     @Provides
-    @Singleton
     fun provideObserveTrendingNewsUseCase(repository: NewsRepository): ManageTrendingNewsUseCase {
         return ManageTrendingNewsUseCase(repository)
     }
 
     @Provides
-    @Singleton
     fun provideGetNewsListBatchFlowUseCase(repository: NewsRepository): GetNewsListBatchFlowUseCase {
         return GetNewsListBatchFlowUseCase(repository)
     }
 
     @Provides
-    @Singleton
     fun provideFetchTrendingNewsUseCase(repository: NewsRepository): FetchTrendingNewsUseCase {
         return FetchTrendingNewsUseCase(repository)
     }
+
+    @Provides
+    fun provideMarkArticleAsViewedUseCase(repository: NewsRepository): MarkArticleAsViewedUseCase {
+        return MarkArticleAsViewedUseCase(repository)
+    }
+
+    @Provides
+    fun provideGetNewsUseCase(repository: NewsRepository): GetNewsUseCase {
+        return GetNewsUseCase(repository)
+    }
 }

app/src/main/java/com/tangem/tap/di/domain/StakingDomainModule.kt

@@ -94,12 +94,12 @@ internal object StakingDomainModule {
     @Singleton
     fun provideFetchStakingOptionsUseCase(
         stakeKitRepository: StakeKitRepository,
-        p2pRepository: P2PEthPoolRepository,
+        p2pEthPoolRepository: P2PEthPoolRepository,
         stakingErrorResolver: StakingErrorResolver,
     ): FetchStakingOptionsUseCase {
         return FetchStakingOptionsUseCase(
             stakeKitRepository = stakeKitRepository,
-            p2pRepository = p2pRepository,
+            p2pEthPoolRepository = p2pEthPoolRepository,
             stakingErrorResolver = stakingErrorResolver,
         )
     }

app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/WalletMockContent.kt

@@ -141,6 +141,14 @@ object WalletMockContent : MockContent {
                         publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
                         chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
                     ),
+                    DerivationPath("m/44'/330'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                    DerivationPath("m/44'/818'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
                 ),
                 extendedPublicKey = ExtendedPublicKey(
                     publicKey = byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
@@ -261,6 +269,20 @@ object WalletMockContent : MockContent {
                             parentFingerprint = byteArrayOf(0, 0, 0, 0),
                             childNumber = 0,
                         ),
+                        DerivationPath("m/44'/330'/0'/0/0") to ExtendedPublicKey( // Terra
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/818'/0'/0/0") to ExtendedPublicKey( // Vechain
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
                     ),
                 ),
             ByteArrayKey(
@@ -318,6 +340,20 @@ object WalletMockContent : MockContent {
                             parentFingerprint = byteArrayOf(0, 0, 0, 0),
                             childNumber = 0,
                         ),
+                        DerivationPath("m/44'/330'/0'/0/0") to ExtendedPublicKey( // Terra
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/818'/0'/0/0") to ExtendedPublicKey( // Vechain
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
                     ),
                 ),
 
@@ -371,6 +407,13 @@ object WalletMockContent : MockContent {
                             parentFingerprint = byteArrayOf(0, 0, 0, 0),
                             childNumber = 0,
                         ),
+                        DerivationPath("m/44'/818'/0'/0/0") to ExtendedPublicKey( // Vechain
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
                     ),
                 ),
             ByteArrayKey(

app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt

@@ -1,7 +1,7 @@
 package com.tangem.tap.network.auth
 
 import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
-import com.tangem.domain.staking.model.ethpool.P2PStakingConfig
+import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
 import com.tangem.lib.auth.P2PEthPoolAuthProvider
 
 internal class DefaultP2PEthPoolAuthProvider(
@@ -12,6 +12,6 @@ internal class DefaultP2PEthPoolAuthProvider(
         val keys = environmentConfigStorage.getConfigSync().p2pApiKey
             ?: error("No P2P api keys provided")
 
-        return if (P2PStakingConfig.USE_TESTNET) keys.hoodi else keys.mainnet
+        return if (P2PEthPoolStakingConfig.USE_TESTNET) keys.hoodi else keys.mainnet
     }
 }

app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt

@@ -16,6 +16,9 @@ import com.tangem.features.createwalletselection.CreateWalletSelectionComponent
 import com.tangem.features.createwalletstart.CreateWalletStartComponent
 import com.tangem.features.details.component.DetailsComponent
 import com.tangem.features.disclaimer.api.components.DisclaimerComponent
+import com.tangem.features.feed.entry.components.FeedEntryComponent
+import com.tangem.features.feed.entry.components.FeedEntryRoute
+import com.tangem.features.feed.entry.featuretoggle.FeedFeatureToggle
 import com.tangem.features.home.api.HomeComponent
 import com.tangem.features.hotwallet.*
 import com.tangem.features.kyc.KycComponent
@@ -38,10 +41,7 @@ import com.tangem.features.staking.api.StakingComponent
 import com.tangem.features.swap.SwapComponent
 import com.tangem.features.tangempay.components.TangemPayDetailsContainerComponent
 import com.tangem.features.tangempay.components.TangemPayOnboardingComponent
-import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.ContinueOnboarding
-import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.Deeplink
-import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.FromBannerOnMain
-import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.FromBannerInSettings
+import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.*
 import com.tangem.features.tokendetails.TokenDetailsComponent
 import com.tangem.features.wallet.WalletEntryComponent
 import com.tangem.features.walletconnect.components.WalletConnectEntryComponent
@@ -121,6 +121,8 @@ internal class ChildFactory @Inject constructor(
     private val yieldSupplyPromoComponentFactory: YieldSupplyPromoComponent.Factory,
     private val yieldSupplyActiveComponentFactory: YieldSupplyActiveComponent.Factory,
     private val hotWalletFeatureToggles: HotWalletFeatureToggles,
+    private val feedEntryComponentFactory: FeedEntryComponent.Factory,
+    private val feedFeatureToggle: FeedFeatureToggle,
 ) {
 
     @Suppress("LongMethod", "CyclomaticComplexMethod")
@@ -204,21 +206,39 @@ internal class ChildFactory @Inject constructor(
                 )
             }
             is AppRoute.MarketsTokenDetails -> {
-                createComponentChild(
-                    context = context,
-                    params = MarketsTokenDetailsComponent.Params(
-                        token = route.token,
-                        appCurrency = route.appCurrency,
-                        shouldShowPortfolio = route.shouldShowPortfolio,
-                        analyticsParams = route.analyticsParams?.let { params ->
-                            MarketsTokenDetailsComponent.AnalyticsParams(
-                                blockchain = params.blockchain,
-                                source = params.source,
-                            )
-                        },
-                    ),
-                    componentFactory = marketsTokenDetailsComponentFactory,
-                )
+                if (feedFeatureToggle.isFeedEnabled) {
+                    createComponentChild(
+                        context = context,
+                        params = FeedEntryRoute.MarketTokenDetails(
+                            token = route.token,
+                            appCurrency = route.appCurrency,
+                            shouldShowPortfolio = route.shouldShowPortfolio,
+                            analyticsParams = route.analyticsParams?.let { params ->
+                                FeedEntryRoute.MarketTokenDetails.AnalyticsParams(
+                                    blockchain = params.blockchain,
+                                    source = params.source,
+                                )
+                            },
+                        ),
+                        componentFactory = feedEntryComponentFactory,
+                    )
+                } else {
+                    createComponentChild(
+                        context = context,
+                        params = MarketsTokenDetailsComponent.Params(
+                            token = route.token,
+                            appCurrency = route.appCurrency,
+                            shouldShowPortfolio = route.shouldShowPortfolio,
+                            analyticsParams = route.analyticsParams?.let { params ->
+                                MarketsTokenDetailsComponent.AnalyticsParams(
+                                    blockchain = params.blockchain,
+                                    source = params.source,
+                                )
+                            },
+                        ),
+                        componentFactory = marketsTokenDetailsComponentFactory,
+                    )
+                }
             }
             is AppRoute.Onramp -> {
                 createComponentChild(
@@ -311,7 +331,7 @@ internal class ChildFactory @Inject constructor(
                     params = StakingComponent.Params(
                         userWalletId = route.userWalletId,
                         cryptoCurrency = route.cryptoCurrency,
-                        yieldId = route.yieldId,
+                        integrationId = route.integrationId,
                     ),
                     componentFactory = stakingComponentFactory,
                 )
@@ -707,6 +727,16 @@ internal class ChildFactory @Inject constructor(
                     componentFactory = yieldSupplyActiveComponentFactory,
                 )
             }
+            is AppRoute.NewsDetails -> {
+                createComponentChild(
+                    context = context,
+                    params = FeedEntryRoute.NewsDetail(
+                        articleId = route.newsId,
+                        preselectedArticlesId = listOf(route.newsId),
+                    ),
+                    componentFactory = feedEntryComponentFactory,
+                )
+            }
         }
     }
 }

app/src/main/java/com/tangem/tap/routing/utils/DeepLinkFactory.kt

@@ -6,6 +6,8 @@ import com.tangem.common.routing.DeepLinkRoute
 import com.tangem.common.routing.DeepLinkScheme
 import com.tangem.data.card.sdk.CardSdkProvider
 import com.tangem.feature.referral.api.deeplink.ReferralDeepLinkHandler
+import com.tangem.features.feed.entry.deeplink.NewsDetailsDeepLinkHandler
+import com.tangem.features.feed.entry.featuretoggle.FeedFeatureToggle
 import com.tangem.features.markets.deeplink.MarketsDeepLinkHandler
 import com.tangem.features.markets.deeplink.MarketsTokenDetailDeepLinkHandler
 import com.tangem.features.onramp.deeplink.BuyDeepLinkHandler
@@ -50,6 +52,8 @@ internal class DeepLinkFactory @Inject constructor(
     private val swapDeepLink: SwapDeepLinkHandler.Factory,
     private val promoDeepLink: PromoDeeplinkHandler.Factory,
     private val onboardVisaDeepLink: OnboardVisaDeepLinkHandler.Factory,
+    private val newsDetailsDeepLink: NewsDetailsDeepLinkHandler.Factory,
+    private val feedFeatureToggle: FeedFeatureToggle,
 ) {
     private val permittedAppRoute = MutableStateFlow(false)
 
@@ -102,7 +106,7 @@ internal class DeepLinkFactory @Inject constructor(
 
     private fun launchDeepLink(deeplinkUri: Uri, coroutineScope: CoroutineScope, isFromOnNewIntent: Boolean) {
         when (deeplinkUri.scheme) {
-            DeepLinkScheme.Https.scheme -> handleHttpDeepLinks(deeplinkUri)
+            DeepLinkScheme.Https.scheme -> handleHttpDeepLinks(deeplinkUri, coroutineScope)
             DeepLinkScheme.Tangem.scheme -> handleTangemDeepLinks(deeplinkUri, coroutineScope, isFromOnNewIntent)
             DeepLinkScheme.WalletConnect.scheme -> walletConnectDeepLink.create(deeplinkUri)
             else -> {
@@ -116,10 +120,18 @@ internal class DeepLinkFactory @Inject constructor(
         }
     }
 
-    private fun handleHttpDeepLinks(deeplinkUri: Uri) {
-        if (deeplinkUri.host == DeepLinkRoute.PayApp.host && deeplinkUri.path?.startsWith("/pay-app") == true) {
-            onboardVisaDeepLink.create(deeplinkUri)
-            return
+    private fun handleHttpDeepLinks(deeplinkUri: Uri, coroutineScope: CoroutineScope) {
+        if (deeplinkUri.host == DeepLinkRoute.PayApp.host) {
+            when {
+                deeplinkUri.path?.startsWith("/pay-app") == true -> {
+                    onboardVisaDeepLink.create(deeplinkUri)
+                    return
+                }
+                deeplinkUri.path?.startsWith("/news") == true && feedFeatureToggle.isFeedEnabled -> {
+                    newsDetailsDeepLink.create(coroutineScope, deeplinkUri)
+                    return
+                }
+            }
         }
     }
 

app/src/test/kotlin/com/tangem/tap/routing/utils/DeepLinkFactoryTest.kt

@@ -4,6 +4,8 @@ import android.net.Uri
 import com.tangem.common.routing.AppRoute
 import com.tangem.data.card.sdk.CardSdkProvider
 import com.tangem.feature.referral.api.deeplink.ReferralDeepLinkHandler
+import com.tangem.features.feed.entry.deeplink.NewsDetailsDeepLinkHandler
+import com.tangem.features.feed.entry.featuretoggle.FeedFeatureToggle
 import com.tangem.features.markets.deeplink.MarketsDeepLinkHandler
 import com.tangem.features.markets.deeplink.MarketsTokenDetailDeepLinkHandler
 import com.tangem.features.onramp.deeplink.BuyDeepLinkHandler
@@ -81,6 +83,12 @@ class DeepLinkFactoryTest {
     private val cardSdkProvider = mockk<CardSdkProvider>(relaxed = true) {
         every { sdk.uiVisibility() } returns MutableStateFlow(false)
     }
+
+    private val newsDeeplink = mockk<NewsDetailsDeepLinkHandler.Factory>(relaxed = true) {
+        every { create(any(), any()) } returns mockk()
+    }
+    private val feedFeatureToggle = mockk<FeedFeatureToggle>()
+
     private val mockedUri = mockk<Uri>(relaxed = true)
     private val isFromOnNewIntent: Boolean = false
 
@@ -103,6 +111,8 @@ class DeepLinkFactoryTest {
         swapDeepLink = swapDeepLinkFactory,
         promoDeepLink = promoDeepLinkFactory,
         onboardVisaDeepLink = onboardVisaDeepLink,
+        newsDetailsDeepLink = newsDeeplink,
+        feedFeatureToggle = feedFeatureToggle,
     )
 
     @OptIn(ExperimentalCoroutinesApi::class)

common/routing/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     implementation(projects.domain.models)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.wallets.models)
-    implementation(projects.domain.staking.models)
+    implementation(projects.domain.staking)
     implementation(projects.domain.markets.models)
     implementation(projects.domain.onramp.models)
     implementation(projects.domain.appCurrency.models)

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

@@ -7,6 +7,7 @@ import android.os.Bundle
 import com.tangem.common.routing.bundle.RouteBundleParams
 import com.tangem.common.routing.bundle.bundle
 import com.tangem.common.routing.entity.InitScreenLaunchMode
+import com.tangem.domain.staking.model.StakingIntegrationID
 import com.tangem.core.decompose.navigation.Route
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.feedback.models.WalletMetaInfo
@@ -209,8 +210,8 @@ sealed class AppRoute(val path: String) : Route {
     data class Staking(
         val userWalletId: UserWalletId,
         val cryptoCurrency: CryptoCurrency,
-        val yieldId: String,
-    ) : AppRoute(path = "/staking/${userWalletId.stringValue}/${cryptoCurrency.id.value}/$yieldId")
+        val integrationId: StakingIntegrationID,
+    ) : AppRoute(path = "/staking/${userWalletId.stringValue}/${cryptoCurrency.id.value}/${integrationId.value}")
 
     @Serializable
     data class PushNotification(
@@ -467,4 +468,7 @@ sealed class AppRoute(val path: String) : Route {
         val cryptoCurrency: CryptoCurrency,
         val apy: String,
     ) : AppRoute(path = "/yield_supply_active/${userWalletId.stringValue}/${cryptoCurrency.symbol}")
+
+    @Serializable
+    data class NewsDetails(val newsId: Int) : AppRoute(path = "/news_details/$newsId")
 }

common/test/src/main/java/com/tangem/common/test/data/staking/MockP2PEthPoolAccountResponseFactory.kt

@@ -8,7 +8,7 @@ import com.tangem.domain.staking.model.ethpool.P2PEthPoolVault
 import java.math.BigDecimal
 
 /**
- * Factory for creating mock P2P ETH Pool account responses for testing
+ * Factory for creating mock P2PEthPool account responses for testing
  */
 object MockP2PEthPoolAccountResponseFactory {
 
@@ -35,7 +35,7 @@ object MockP2PEthPoolAccountResponseFactory {
             availableToUnstake = stakedAmount,
             availableToWithdraw = BigDecimal.ZERO,
             exitQueue = P2PEthPoolExitQueueDTO(
-                total = 0.0,
+                total = BigDecimal.ZERO,
                 requests = emptyList(),
             ),
         )
@@ -55,7 +55,7 @@ object MockP2PEthPoolAccountResponseFactory {
             availableToUnstake = BigDecimal.ZERO,
             availableToWithdraw = BigDecimal.ZERO,
             exitQueue = P2PEthPoolExitQueueDTO(
-                total = 0.0,
+                total = BigDecimal.ZERO,
                 requests = emptyList(),
             ),
         )

common/ui/src/main/java/com/tangem/common/ui/account/AccountCryptoPortfolioItemStateConverter.kt

@@ -19,7 +19,6 @@ import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.quote.PriceChange
 import com.tangem.utils.converter.Converter
-import com.tangem.utils.extensions.isZero
 import java.math.BigDecimal
 
 class AccountCryptoPortfolioItemStateConverter(
@@ -41,14 +40,11 @@ class AccountCryptoPortfolioItemStateConverter(
     private fun Account.CryptoPortfolio.mapToContentState(
         fiatBalance: TotalFiatBalance.Loaded,
     ): TokenItemState.Content {
-        val subtitle2State = when (fiatBalance.amount.isZero()) {
-            true -> null
-            false -> priceChangeLce?.fold(
-                ifLoading = { priceChange -> priceChange?.toSubtitle2State() ?: Subtitle2State.Loading },
-                ifError = { null },
-                ifContent = { priceChange -> priceChange.toSubtitle2State() },
-            )
-        }
+        val subtitle2State = priceChangeLce?.fold(
+            ifLoading = { priceChange -> priceChange?.toSubtitle2State() ?: Subtitle2State.Loading },
+            ifError = { null },
+            ifContent = { priceChange -> priceChange.toSubtitle2State() },
+        )
         return TokenItemState.Content(
             id = account.accountId.toItemId(),
             iconState = AccountIconItemStateConverter.convert(this),

common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.TextAutoSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -19,7 +20,6 @@ import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.account.AccountTitle
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
-import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.format.bigdecimal.crypto
@@ -66,11 +66,14 @@ fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDis
             state = amountState.tokenIconState,
             iconSize = 40.dp,
         )
-        ResizableText(
+        Text(
             text = firstAmount,
             style = TangemTheme.typography.h2,
             color = TangemTheme.colors.text.primary1,
             textAlign = TextAlign.Center,
+            autoSize = TextAutoSize.StepBased(
+                maxFontSize = TangemTheme.typography.h2.fontSize,
+            ),
             maxLines = 1,
             modifier = Modifier
                 .fillMaxWidth()

common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt

@@ -4,6 +4,7 @@ import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.TextAutoSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -18,7 +19,6 @@ import com.tangem.common.ui.account.AccountTitle
 import com.tangem.common.ui.account.AccountTitleUM
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
-import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.SpacerWMax
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
@@ -128,21 +128,23 @@ private fun AmountBlockV2(
                     .padding(top = 8.dp)
                     .weight(1f),
             ) {
-                ResizableText(
+                Text(
                     text = firstAmount,
                     style = TangemTheme.typography.h2,
                     color = TangemTheme.colors.text.primary1,
                     maxLines = 1,
+                    autoSize = TextAutoSize.StepBased(maxFontSize = TangemTheme.typography.h2.fontSize),
                     modifier = Modifier.testTag(BaseAmountBlockTestTags.PRIMARY_AMOUNT),
                 )
                 Row(
                     horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
-                    ResizableText(
+                    Text(
                         text = secondAmount,
                         style = TangemTheme.typography.body2,
                         color = TangemTheme.colors.text.tertiary,
                         maxLines = 1,
+                        autoSize = TextAutoSize.StepBased(maxFontSize = TangemTheme.typography.body2.fontSize),
                         modifier = Modifier.testTag(BaseAmountBlockTestTags.SECONDARY_AMOUNT),
                     )
                     extraContent()

common/ui/src/main/java/com/tangem/common/ui/news/ArticleCard.kt

@@ -1,6 +1,7 @@
 package com.tangem.common.ui.news
 
 import android.content.res.Configuration
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -12,6 +13,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -82,6 +86,7 @@ private fun TrendingArticle(articleConfigUM: ArticleConfigUM) {
             style = TangemTheme.typography.h3,
             maxLines = 3,
             overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.Center,
         )
 
         SpacerH(8.dp)
@@ -100,6 +105,41 @@ private fun TrendingArticle(articleConfigUM: ArticleConfigUM) {
     }
 }
 
+@Composable
+fun ShowMoreArticlesCard(modifier: Modifier = Modifier, onClick: () -> Unit) {
+    BlockCard(
+        modifier = modifier,
+        onClick = onClick,
+        colors = TangemBlockCardColors.copy(containerColor = TangemTheme.colors.background.action),
+    ) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(vertical = 31.dp, horizontal = 12.dp),
+        ) {
+            Image(
+                imageVector = ImageVector.vectorResource(R.drawable.ic_show_more_news_48),
+                contentDescription = stringResourceSafe(R.string.common_show_more),
+            )
+
+            SpacerH(16.dp)
+
+            Text(
+                text = stringResourceSafe(R.string.news_all_news),
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+            )
+
+            Text(
+                text = stringResourceSafe(R.string.news_stay_in_the_loop),
+                style = TangemTheme.typography.caption2,
+                color = TangemTheme.colors.text.tertiary,
+            )
+        }
+    }
+}
+
 @Composable
 private fun DefaultArticle(articleConfigUM: ArticleConfigUM) {
     Column(modifier = Modifier.padding(12.dp)) {

common/ui/src/main/java/com/tangem/common/ui/news/ArticleInfo.kt

@@ -1,7 +1,10 @@
 package com.tangem.common.ui.news
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -9,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
 import com.tangem.core.ui.res.TangemTheme
@@ -49,6 +53,8 @@ internal fun ArticleInfo(score: Float, createdAt: String, modifier: Modifier = M
         Text(
             text = createdAt,
             style = TangemTheme.typography.subtitle2,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
             color = TangemTheme.colors.text.secondary,
         )
     }

common/ui/src/main/java/com/tangem/common/ui/news/ArticleLoadingCard.kt

@@ -41,8 +41,9 @@ fun TrendingLoadingArticle(modifier: Modifier = Modifier) {
 }
 
 @Composable
-fun DefaultLoadingArticle() {
+fun DefaultLoadingArticle(modifier: Modifier = Modifier) {
     BlockCard(
+        modifier = modifier,
         colors = TangemBlockCardColors.copy(containerColor = TangemTheme.colors.background.action),
     ) {
         Column(modifier = Modifier.padding(12.dp)) {

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

@@ -23,7 +23,8 @@ import com.tangem.domain.models.currency.yieldSupplyKey
 import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.model.StakingAvailability
 import com.tangem.domain.staking.model.StakingOption
-import com.tangem.domain.staking.model.stakekit.Yield
+import com.tangem.domain.staking.model.common.RewardInfo
+import com.tangem.domain.staking.model.common.RewardType
 import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
 import com.tangem.lib.crypto.BlockchainUtils
 import com.tangem.utils.StringsSigns.DASH_SIGN
@@ -251,9 +252,9 @@ class TokenItemStateConverter(
                     stakingApyMap = stakingApyMap,
                 )
                 val rewardTypeRes = when (stakingInfo.rewardType) {
-                    Yield.RewardType.APR -> R.string.staking_apr_earn_badge
-                    Yield.RewardType.UNKNOWN,
-                    Yield.RewardType.APY,
+                    RewardType.APR -> R.string.staking_apr_earn_badge
+                    RewardType.UNKNOWN,
+                    RewardType.APY,
                     null,
                     -> R.string.yield_module_earn_badge
                 }
@@ -285,10 +286,11 @@ class TokenItemStateConverter(
             val stakeKitBalance = stakingBalance as? StakingBalance.Data.StakeKit
 
             val rateInfo = when (val stakingOptions = stakingAvailability.option) {
-                is StakingOption.P2P -> {
-                    // P2P or no balance: use preferred validators
-                    // TODO add p2p logic
-                    null
+                is StakingOption.P2PEthPool -> {
+                    RewardInfo(
+                        rate = stakingOptions.apy,
+                        type = RewardType.APY,
+                    )
                 }
                 is StakingOption.StakeKit -> if (stakeKitBalance != null) {
                     val validatorsByAddress = stakingOptions.yield.validators.associateBy { it.address }
@@ -469,7 +471,7 @@ class TokenItemStateConverter(
     private data class StakingLocalInfo(
         val rate: BigDecimal?,
         val isActive: Boolean,
-        val rewardType: Yield.RewardType?,
+        val rewardType: RewardType?,
     )
 
     private data class EarnApyInfo(

core/datasource/src/main/java/com/tangem/datasource/api/common/config/P2PEthPool.kt

@@ -1,7 +1,7 @@
 package com.tangem.datasource.api.common.config
 
 import com.tangem.datasource.BuildConfig
-import com.tangem.domain.staking.model.ethpool.P2PStakingConfig
+import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
 import com.tangem.lib.auth.P2PEthPoolAuthProvider
 import com.tangem.utils.ProviderSuspend
 
@@ -23,7 +23,7 @@ internal class P2PEthPool(
     private fun getInitialEnvironment(): ApiEnvironment {
         return when (BuildConfig.BUILD_TYPE) {
             MOCKED_BUILD_TYPE -> ApiEnvironment.MOCK
-            else -> if (P2PStakingConfig.USE_TESTNET) ApiEnvironment.DEV else ApiEnvironment.PROD
+            else -> if (P2PEthPoolStakingConfig.USE_TESTNET) ApiEnvironment.DEV else ApiEnvironment.PROD
         }
     }
 

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/P2PEthPoolApi.kt

@@ -2,9 +2,7 @@ package com.tangem.datasource.api.ethpool
 
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.ethpool.models.request.P2PEthPoolBroadcastRequest
-import com.tangem.datasource.api.ethpool.models.request.P2PEthPoolDepositRequest
-import com.tangem.datasource.api.ethpool.models.request.P2PEthPoolUnstakeRequest
-import com.tangem.datasource.api.ethpool.models.request.P2PEthPoolWithdrawRequest
+import com.tangem.datasource.api.ethpool.models.request.P2PEthPoolTransactionRequest
 import com.tangem.datasource.api.ethpool.models.response.*
 import retrofit2.http.*
 
@@ -31,13 +29,13 @@ interface P2PEthPoolApi {
      * Create unsigned transaction for depositing ETH into a vault.
      *
      * @param network Ethereum pool network: "mainnet" or "hoodi"
-     * @param body Deposit parameters (delegator address, vault address, amount)
+     * @param body Transaction parameters (delegator address, vault address, amount)
      */
     @POST("api/v1/staking/pool/{network}/staking/deposit")
     suspend fun createDepositTransaction(
         @Path("network") network: String,
-        @Body body: P2PEthPoolDepositRequest,
-    ): ApiResponse<P2PEthPoolResponse<P2PEthPoolDepositResponse>>
+        @Body body: P2PEthPoolTransactionRequest,
+    ): ApiResponse<P2PEthPoolResponse<P2PEthPoolTransactionResponse>>
 
     /**
      * Prepare unstake transaction
@@ -45,13 +43,13 @@ interface P2PEthPoolApi {
      * Create unsigned transaction to initiate unstaking process.
      *
      * @param network Ethereum pool network: "mainnet" or "hoodi"
-     * @param body Unstake parameters (staker public key, stake transaction hash)
+     * @param body Transaction parameters (delegator address, vault address, amount)
      */
     @POST("api/v1/staking/pool/{network}/staking/unstake")
     suspend fun createUnstakeTransaction(
         @Path("network") network: String,
-        @Body body: P2PEthPoolUnstakeRequest,
-    ): ApiResponse<P2PEthPoolResponse<P2PEthPoolUnstakeResponse>>
+        @Body body: P2PEthPoolTransactionRequest,
+    ): ApiResponse<P2PEthPoolResponse<P2PEthPoolTransactionResponse>>
 
     /**
      * Prepare withdrawal transaction
@@ -59,13 +57,13 @@ interface P2PEthPoolApi {
      * Create unsigned transaction to withdraw available funds from exit queue.
      *
      * @param network Ethereum pool network: "mainnet" or "hoodi"
-     * @param body Withdrawal parameters (staker address)
+     * @param body Transaction parameters (delegator address, vault address, amount)
      */
     @POST("api/v1/staking/pool/{network}/staking/withdraw")
     suspend fun createWithdrawTransaction(
         @Path("network") network: String,
-        @Body body: P2PEthPoolWithdrawRequest,
-    ): ApiResponse<P2PEthPoolResponse<P2PEthPoolWithdrawResponse>>
+        @Body body: P2PEthPoolTransactionRequest,
+    ): ApiResponse<P2PEthPoolResponse<P2PEthPoolTransactionResponse>>
 
     /**
      * Broadcast signed transaction
@@ -107,6 +105,7 @@ interface P2PEthPoolApi {
      * @param vaultAddress Ethereum address of the vault
      * @param period Optional period filter (30, 60, or 90 days)
      */
+    // TODO p2p not used, consider removing this method
     @GET("api/v1/staking/pool/{network}/account/{delegatorAddress}/vault/{vaultAddress}/rewards")
     suspend fun getRewards(
         @Path("network") network: String,

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/request/P2PEthPoolDepositRequest.kt

@@ -1,19 +0,0 @@
-package com.tangem.datasource.api.ethpool.models.request
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * Request body for creating deposit transaction
- *
- * Used in: POST /api/v1/staking/pool/{network}/staking/deposit
- */
-@JsonClass(generateAdapter = true)
-data class P2PEthPoolDepositRequest(
-    @Json(name = "delegatorAddress")
-    val delegatorAddress: String,
-    @Json(name = "vaultAddress")
-    val vaultAddress: String,
-    @Json(name = "amount")
-    val amount: Double,
-)

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/request/P2PEthPoolTransactionRequest.kt

@@ -0,0 +1,23 @@
+package com.tangem.datasource.api.ethpool.models.request
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
+
+/**
+ * Unified request body for creating staking transactions (deposit, unstake, withdraw)
+ *
+ * Used in:
+ * - POST /api/v1/staking/pool/{network}/staking/deposit
+ * - POST /api/v1/staking/pool/{network}/staking/unstake
+ * - POST /api/v1/staking/pool/{network}/staking/withdraw
+ */
+@JsonClass(generateAdapter = true)
+data class P2PEthPoolTransactionRequest(
+    @Json(name = "delegatorAddress")
+    val delegatorAddress: String,
+    @Json(name = "vaultAddress")
+    val vaultAddress: String,
+    @Json(name = "amount")
+    val amount: BigDecimal,
+)

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/request/P2PEthPoolUnstakeRequest.kt

@@ -1,20 +0,0 @@
-package com.tangem.datasource.api.ethpool.models.request
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * Request body for creating unstake transaction
- *
- * Used in: POST /api/v1/staking/pool/{network}/staking/unstake
- *
- * Note: Documentation seems to contain Bitcoin-related fields (possibly copy-paste error).
- * Using as-is per specification.
- */
-@JsonClass(generateAdapter = true)
-data class P2PEthPoolUnstakeRequest(
-    @Json(name = "stakerPublicKey")
-    val stakerPublicKey: String,
-    @Json(name = "stakeTransactionHash")
-    val stakeTransactionHash: String,
-)

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/request/P2PEthPoolWithdrawRequest.kt

@@ -1,15 +0,0 @@
-package com.tangem.datasource.api.ethpool.models.request
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * Request body for creating withdrawal transaction
- *
- * Used in: POST /api/v1/staking/pool/{network}/staking/withdraw
- */
-@JsonClass(generateAdapter = true)
-data class P2PEthPoolWithdrawRequest(
-    @Json(name = "stakerAddress")
-    val stakerAddress: String,
-)

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolAccountResponse.kt

@@ -34,7 +34,7 @@ data class P2PEthPoolStakeDTO(
 @JsonClass(generateAdapter = true)
 data class P2PEthPoolExitQueueDTO(
     @Json(name = "total")
-    val total: Double,
+    val total: BigDecimal,
     @Json(name = "requests")
     val requests: List<P2PEthPoolExitRequestDTO>,
 )
@@ -44,11 +44,11 @@ data class P2PEthPoolExitRequestDTO(
     @Json(name = "ticket")
     val ticket: String,
     @Json(name = "totalAssets")
-    val totalAssets: Double,
+    val totalAssets: BigDecimal,
     @Json(name = "timestamp")
     val timestamp: Long,
     @Json(name = "withdrawalTimestamp")
-    val withdrawalTimestamp: Long,
+    val withdrawalTimestamp: Long?,
     @Json(name = "isClaimable")
     val isClaimable: Boolean,
 )

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolBroadcastResponse.kt

@@ -29,7 +29,7 @@ data class P2PEthPoolBroadcastResponse(
 )
 
 /**
- * Transaction status from P2P API
+ * Transaction status from P2PEthPool API
  */
 @JsonClass(generateAdapter = false)
 enum class P2PEthPoolTxStatusDTO {

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolDepositResponse.kt

@@ -1,22 +0,0 @@
-package com.tangem.datasource.api.ethpool.models.response
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import org.joda.time.DateTime
-
-/**
- * Response for POST /api/v1/staking/pool/{network}/staking/deposit
- */
-@JsonClass(generateAdapter = true)
-data class P2PEthPoolDepositResponse(
-    @Json(name = "amount")
-    val amount: Double,
-    @Json(name = "vaultAddress")
-    val vaultAddress: String,
-    @Json(name = "delegatorAddress")
-    val delegatorAddress: String,
-    @Json(name = "unsignedTransaction")
-    val unsignedTransaction: P2PEthPoolUnsignedTxDTO,
-    @Json(name = "createdAt")
-    val createdAt: DateTime,
-)

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolErrorResponse.kt

@@ -4,9 +4,9 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
- * Error response structure for P2P.org API
+ * Error response structure for P2P.org eth pooled API
  *
- * All P2P API endpoints return errors in this format
+ * All P2PEthPool API endpoints return errors in this format
  */
 @JsonClass(generateAdapter = true)
 data class P2PEthPoolErrorResponse(

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolResponse.kt

@@ -6,7 +6,7 @@ import com.squareup.moshi.JsonClass
 /**
  * Unified response wrapper for all P2P.org API responses
  *
- * All P2P API endpoints return responses in this format:
+ * All P2PEthPool API endpoints return responses in this format:
  * ```json
  * {
  *   "error": null | { code, message, name, errors },

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolTransactionResponse.kt

@@ -3,14 +3,20 @@ package com.tangem.datasource.api.ethpool.models.response
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.joda.time.DateTime
+import java.math.BigDecimal
 
 /**
- * Response for POST /api/v1/staking/pool/{network}/staking/withdraw
+ * Unified response for staking transactions (deposit, unstake, withdraw)
+ *
+ * Response for:
+ * - POST /api/v1/staking/pool/{network}/staking/deposit
+ * - POST /api/v1/staking/pool/{network}/staking/unstake
+ * - POST /api/v1/staking/pool/{network}/staking/withdraw
  */
 @JsonClass(generateAdapter = true)
-data class P2PEthPoolWithdrawResponse(
+data class P2PEthPoolTransactionResponse(
     @Json(name = "amount")
-    val amount: Double,
+    val amount: BigDecimal,
     @Json(name = "vaultAddress")
     val vaultAddress: String,
     @Json(name = "delegatorAddress")
@@ -20,5 +26,5 @@ data class P2PEthPoolWithdrawResponse(
     @Json(name = "createdAt")
     val createdAt: DateTime,
     @Json(name = "tickets")
-    val tickets: List<String>,
+    val tickets: List<String>? = null,
 )

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolUnstakeResponse.kt

@@ -1,22 +0,0 @@
-package com.tangem.datasource.api.ethpool.models.response
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * Response for POST /api/v1/staking/pool/{network}/staking/unstake
- *
- * Note: Contains Bitcoin-related fields (likely documentation error).
- * Using as-is per specification.
- */
-@JsonClass(generateAdapter = true)
-data class P2PEthPoolUnstakeResponse(
-    @Json(name = "stakerPublicKey")
-    val stakerPublicKey: String,
-    @Json(name = "stakeTransactionHash")
-    val stakeTransactionHash: String,
-    @Json(name = "unstakeTransactionHex")
-    val unstakeTransactionHex: String, // unsigned
-    @Json(name = "unstakeFee")
-    val unstakeFee: Double,
-)

core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolVaultsResponse.kt

@@ -2,6 +2,7 @@ package com.tangem.datasource.api.ethpool.models.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
 
 /**
  * Response for GET /api/v1/staking/pool/{network}/vaults
@@ -15,7 +16,7 @@ data class P2PEthPoolVaultsResponse(
 )
 
 /**
- * Network identifier in P2P API
+ * Network identifier in P2PEthPool API
  */
 @JsonClass(generateAdapter = false)
 enum class P2PEthPoolNetworkDTO {
@@ -33,15 +34,15 @@ data class P2PEthPoolVaultDTO(
     @Json(name = "displayName")
     val displayName: String,
     @Json(name = "apy")
-    val apy: Double,
+    val apy: BigDecimal,
     @Json(name = "baseApy")
-    val baseApy: Double,
+    val baseApy: BigDecimal,
     @Json(name = "capacity")
-    val capacity: Double,
+    val capacity: BigDecimal,
     @Json(name = "totalAssets")
-    val totalAssets: Double,
+    val totalAssets: BigDecimal,
     @Json(name = "feePercent")
-    val feePercent: Double,
+    val feePercent: BigDecimal,
     @Json(name = "isPrivate")
     val isPrivate: Boolean,
     @Json(name = "isGenesis")

core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt

@@ -32,6 +32,9 @@ data class ExchangeProvider(
 
     @Json(name = "slippage")
     val slippage: BigDecimal?,
+
+    @Json(name = "exchangeOnlyWithinSingleAddress")
+    val isExchangeOnlyWithinSingleAddress: Boolean = false,
 )
 
 @JsonClass(generateAdapter = false)

core/datasource/src/main/java/com/tangem/datasource/api/news/models/response/NewsArticleDto.kt

@@ -28,14 +28,3 @@ data class NewsRelatedTokenDto(
     @Json(name = "symbol") val symbol: String,
     @Json(name = "name") val name: String,
 )
-
-@JsonClass(generateAdapter = true)
-data class NewsOriginalArticleDto(
-    @Json(name = "id") val id: Int,
-    @Json(name = "title") val title: String,
-    @Json(name = "sourceName") val sourceName: String,
-    @Json(name = "language") val language: String,
-    @Json(name = "publishedAt") val publishedAt: String,
-    @Json(name = "url") val url: String,
-    @Json(name = "imageUrl") val imageUrl: String? = null,
-)

core/datasource/src/main/java/com/tangem/datasource/api/news/models/response/NewsDetailsResponse.kt

@@ -18,3 +18,20 @@ data class NewsDetailsResponse(
     @Json(name = "content") val content: String,
     @Json(name = "originalArticles") val originalArticles: List<NewsOriginalArticleDto>,
 )
+
+@JsonClass(generateAdapter = true)
+data class NewsOriginalArticleDto(
+    @Json(name = "id") val id: Int,
+    @Json(name = "title") val title: String,
+    @Json(name = "source") val source: Source,
+    @Json(name = "language") val language: String,
+    @Json(name = "publishedAt") val publishedAt: String,
+    @Json(name = "url") val url: String,
+    @Json(name = "imageUrl") val imageUrl: String? = null,
+)
+
+@JsonClass(generateAdapter = true)
+data class Source(
+    @Json(name = "id") val id: Int,
+    @Json(name = "name") val name: String,
+)

core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt

@@ -38,6 +38,8 @@ internal object NetworkModule {
     private const val TANGEM_TECH_MARKETS_SERVICE_TIMEOUT_SECONDS = 60L
     private const val STAKE_KIT_API_TIMEOUT_SECONDS = 60L
 
+    private const val P2P_ETH_POOL_API_TIMEOUT_SECONDS = 60L
+
     @Provides
     @Singleton
     fun provideApiConfigManager(
@@ -82,6 +84,12 @@ internal object NetworkModule {
         return retrofitApiBuilder.build(
             apiConfigId = ApiConfig.ID.P2PEthPool,
             applyTimeoutAnnotations = false,
+            timeouts = Timeouts(
+                callTimeoutSeconds = P2P_ETH_POOL_API_TIMEOUT_SECONDS,
+                connectTimeoutSeconds = P2P_ETH_POOL_API_TIMEOUT_SECONDS,
+                readTimeoutSeconds = P2P_ETH_POOL_API_TIMEOUT_SECONDS,
+                writeTimeoutSeconds = P2P_ETH_POOL_API_TIMEOUT_SECONDS,
+            ),
         )
     }
 

core/datasource/src/main/java/com/tangem/datasource/di/NewsStoreModule.kt

@@ -5,6 +5,8 @@ import com.tangem.datasource.local.news.details.DefaultNewsDetailsStore
 import com.tangem.datasource.local.news.details.NewsDetailsStore
 import com.tangem.datasource.local.news.trending.DefaultTrendingNewsStore
 import com.tangem.datasource.local.news.trending.TrendingNewsStore
+import com.tangem.datasource.local.news.viewed.DefaultNewsViewedStore
+import com.tangem.datasource.local.news.viewed.NewsViewedStore
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -26,4 +28,10 @@ internal object NewsStoreModule {
     fun provideTrendingNewsStore(): TrendingNewsStore {
         return DefaultTrendingNewsStore(store = RuntimeSharedStore())
     }
+
+    @Provides
+    @Singleton
+    fun provideNewsViewedStore(): NewsViewedStore {
+        return DefaultNewsViewedStore(store = RuntimeSharedStore())
+    }
 }

core/datasource/src/main/java/com/tangem/datasource/di/StakingStoreModule.kt

@@ -80,7 +80,7 @@ internal object StakingStoreModule {
 
     @Provides
     @Singleton
-    fun provideP2PBalancesPersistenceStore(
+    fun provideP2PEthPoolBalancesPersistenceStore(
         @NetworkMoshi moshi: Moshi,
         @ApplicationContext context: Context,
         dispatchers: CoroutineDispatcherProvider,
@@ -91,7 +91,7 @@ internal object StakingStoreModule {
                 types = mapWithStringKeyTypes(valueTypes = setTypes<P2PEthPoolAccountResponse>()),
                 defaultValue = emptyMap(),
             ),
-            produceFile = { context.dataStoreFile(fileName = "p2p_balances") },
+            produceFile = { context.dataStoreFile(fileName = "p2p_eth_pool_balances") },
             scope = CoroutineScope(context = dispatchers.io + SupervisorJob()),
         )
     }

core/datasource/src/main/java/com/tangem/datasource/local/news/viewed/DefaultNewsViewedStore.kt

@@ -0,0 +1,32 @@
+package com.tangem.datasource.local.news.viewed
+
+import com.tangem.datasource.local.datastore.RuntimeSharedStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.onStart
+
+private typealias NewsViewedCache = Map<Int, Boolean>
+
+internal class DefaultNewsViewedStore(
+    private val store: RuntimeSharedStore<NewsViewedCache>,
+) : NewsViewedStore {
+
+    override fun getAll(): Flow<Map<Int, Boolean>> {
+        return store.get().onStart { emit(emptyMap()) }
+    }
+
+    override suspend fun getSync(): Map<Int, Boolean> {
+        return store.getSyncOrNull().orEmpty()
+    }
+
+    override suspend fun updateViewed(articleIds: Collection<Int>, viewed: Boolean) {
+        if (articleIds.isEmpty()) return
+
+        store.update(emptyMap()) { current ->
+            val updated = current.toMutableMap()
+            articleIds.forEach { id ->
+                updated[id] = viewed
+            }
+            updated
+        }
+    }
+}

core/datasource/src/main/java/com/tangem/datasource/local/news/viewed/NewsViewedStore.kt

@@ -0,0 +1,24 @@
+package com.tangem.datasource.local.news.viewed
+
+import kotlinx.coroutines.flow.Flow
+
+/**
+ * Store for news viewed flags (runtime only).
+ */
+interface NewsViewedStore {
+
+    /**
+     * Observes all viewed flags.
+     */
+    fun getAll(): Flow<Map<Int, Boolean>>
+
+    /**
+     * Gets viewed flags synchronously (returns empty map if no data).
+     */
+    suspend fun getSync(): Map<Int, Boolean>
+
+    /**
+     * Updates viewed flags for provided article ids.
+     */
+    suspend fun updateViewed(articleIds: Collection<Int>, viewed: Boolean)
+}

core/datasource/src/main/java/com/tangem/datasource/local/token/P2PEthPoolVaultsStore.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
  * (similar to StakingYieldsStore for StakeKit yields)
  *
  * Vault is ETH-specific concept for pooled staking.
- * For other blockchains, P2P may use different structures.
+ * For other blockchains, P2PEthPool may use different structures.
  */
 interface P2PEthPoolVaultsStore {
 
@@ -23,7 +23,7 @@ interface P2PEthPoolVaultsStore {
     suspend fun getSync(): List<P2PEthPoolVault>
 
     /**
-     * Store vaults from P2P API
+     * Store vaults from P2PEthPool API
      */
     suspend fun store(vaults: List<P2PEthPoolVault>)
 }

core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt

@@ -12,7 +12,7 @@ import com.tangem.datasource.api.common.config.ApiConfig.Companion.MOCKED_BUILD_
 import com.tangem.datasource.api.common.config.ApiConfig.Companion.RELEASE_BUILD_TYPE
 import com.tangem.datasource.api.common.config.managers.MockEnvironmentConfigStorage.Companion.BLOCK_AID_API_KEY
 import com.tangem.datasource.api.common.config.managers.MockEnvironmentConfigStorage.Companion.TANGEM_API_KEY
-import com.tangem.domain.staking.model.ethpool.P2PStakingConfig
+import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
 import com.tangem.lib.auth.ExpressAuthProvider
 import com.tangem.lib.auth.P2PEthPoolAuthProvider
 import com.tangem.lib.auth.StakeKitAuthProvider
@@ -300,7 +300,7 @@ internal class ProdApiConfigsManagerTest {
     }
 
     private fun createP2PModel(): TestModel {
-        val (environment, baseUrl) = if (P2PStakingConfig.USE_TESTNET) {
+        val (environment, baseUrl) = if (P2PEthPoolStakingConfig.USE_TESTNET) {
             ApiEnvironment.DEV to "https://api-test.p2p.org/"
         } else {
             ApiEnvironment.PROD to "https://api.p2p.org/"

core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt

@@ -1,184 +0,0 @@
-package com.tangem.core.ui.components
-
-import androidx.annotation.FloatRange
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.sp
-
-private const val COEFFICIENT = 0.8f
-
-@Suppress("MagicNumber")
-@Composable
-fun ResizableText(
-    text: String,
-    fontSizeRange: FontSizeRange,
-    modifier: Modifier = Modifier,
-    color: Color = Color.Unspecified,
-    overflow: TextOverflow = TextOverflow.Clip,
-    maxLines: Int = Int.MAX_VALUE,
-    style: TextStyle = LocalTextStyle.current,
-) {
-    val fontSizeValue = remember { mutableFloatStateOf(fontSizeRange.max.value) }
-    val readyToDraw = remember { mutableStateOf(false) }
-
-    val textState = remember { mutableStateOf(text) }
-    if (textState.value != text) {
-        readyToDraw.value = false
-        fontSizeValue.floatValue = fontSizeRange.max.value
-        textState.value = text
-    }
-
-    Text(
-        text = text,
-        modifier = modifier.drawWithContent { if (readyToDraw.value) drawContent() },
-        color = color,
-        fontSize = fontSizeValue.floatValue.sp,
-        overflow = overflow,
-        softWrap = false,
-        maxLines = maxLines,
-        onTextLayout = { textLayoutResult ->
-            if (textLayoutResult.hasVisualOverflow) {
-                val nextFontSizeValue = fontSizeValue.floatValue - fontSizeRange.step.value
-                if (nextFontSizeValue <= fontSizeRange.min.value) {
-                    fontSizeValue.floatValue = fontSizeRange.min.value
-                    readyToDraw.value = true
-                } else {
-                    fontSizeValue.floatValue = nextFontSizeValue * COEFFICIENT
-                }
-            } else {
-                readyToDraw.value = true
-            }
-        },
-        style = style,
-    )
-}
-
-/**
- * A Composable function that displays text which can be resized based on its content's overflow.
- *
- * This function draws text on the screen and checks if it overflows. If the text overflows,
- * its font size is reduced recursively until it either fits the available space or reaches a
- * specified minimum font size.
- */
-@Composable
-fun ResizableText(
-    text: String,
-    modifier: Modifier = Modifier,
-    color: Color = Color.Unspecified,
-    textAlign: TextAlign? = null,
-    overflow: TextOverflow = TextOverflow.Clip,
-    softWrap: Boolean = true,
-    maxLines: Int = Int.MAX_VALUE,
-    style: TextStyle = LocalTextStyle.current,
-    minFontSize: TextUnit = TextUnit.Unspecified,
-    @FloatRange(from = 0.0, to = 1.0, fromInclusive = false, toInclusive = false)
-    reduceFactor: Double = 0.9,
-) {
-    var fontSize by remember { mutableStateOf(style.fontSize) }
-    var isReadyToDraw by remember { mutableStateOf(value = false) }
-
-    Text(
-        modifier = modifier
-            .drawWithContent {
-                if (isReadyToDraw) drawContent()
-            }
-            .wrapContentHeight(),
-        text = text,
-        color = color,
-        fontSize = fontSize,
-        textAlign = textAlign,
-        overflow = overflow,
-        softWrap = softWrap,
-        maxLines = maxLines,
-        style = style,
-        onTextLayout = { result ->
-            fun reduceFontSize() {
-                val reducedFontSize = fontSize * reduceFactor
-
-                if (minFontSize != TextUnit.Unspecified && reducedFontSize <= minFontSize) {
-                    fontSize = minFontSize
-                    isReadyToDraw = true
-                } else {
-                    fontSize = reducedFontSize
-                }
-            }
-
-            if (result.hasVisualOverflow) {
-                reduceFontSize()
-            } else {
-                isReadyToDraw = true
-            }
-        },
-    )
-}
-
-@Composable
-fun ResizableText(
-    text: String,
-    fontSizeValue: TextUnit,
-    fontSizeRange: FontSizeRange,
-    onFontSizeChange: (Float) -> Unit,
-    modifier: Modifier = Modifier,
-    color: Color = Color.Unspecified,
-    overflow: TextOverflow = TextOverflow.Clip,
-    maxLines: Int = Int.MAX_VALUE,
-    style: TextStyle = LocalTextStyle.current,
-) {
-    val readyToDraw = remember { mutableStateOf(false) }
-
-    val textState = remember { mutableStateOf(text) }
-    if (textState.value != text) {
-        readyToDraw.value = false
-        onFontSizeChange(fontSizeRange.max.value)
-        textState.value = text
-    }
-
-    Text(
-        text = text,
-        modifier = modifier.drawWithContent { if (readyToDraw.value) drawContent() },
-        color = color,
-        fontSize = fontSizeValue.value.sp,
-        overflow = overflow,
-        softWrap = false,
-        maxLines = maxLines,
-        onTextLayout = { result ->
-            if (result.hasVisualOverflow) {
-                val nextFontSizeValue = fontSizeValue.value - fontSizeRange.step.value
-                if (nextFontSizeValue <= fontSizeRange.min.value) {
-                    onFontSizeChange(fontSizeRange.min.value)
-                    readyToDraw.value = true
-                } else {
-                    val newSizeValue = nextFontSizeValue * COEFFICIENT
-                    onFontSizeChange(newSizeValue)
-                }
-            } else {
-                readyToDraw.value = true
-            }
-        },
-        style = style,
-    )
-}
-
-data class FontSizeRange(
-    val min: TextUnit,
-    val max: TextUnit,
-    val step: TextUnit = DEFAULT_TEXT_STEP,
-) {
-    init {
-        require(min < max) { "min should be less than max, $this" }
-        require(step.value > 0) { "step should be greater than 0, $this" }
-    }
-
-    companion object {
-        private val DEFAULT_TEXT_STEP = 1.sp
-    }
-}

core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButtonAndIcon.kt

@@ -15,6 +15,8 @@ import com.tangem.core.ui.res.TangemThemePreview
 fun AppBarWithBackButtonAndIcon(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
+    backButtonEnabled: Boolean = true,
+    endButtonEnabled: Boolean = true,
     text: String? = null,
     subtitle: String? = null,
     @DrawableRes backIconRes: Int? = null,
@@ -30,11 +32,13 @@ fun AppBarWithBackButtonAndIcon(
         startButton = TopAppBarButtonUM.Icon(
             iconRes = backIconRes ?: R.drawable.ic_back_24,
             onClicked = onBackClick,
+            isEnabled = backButtonEnabled,
         ),
         endButton = if (iconRes != null && onIconClick != null) {
             TopAppBarButtonUM.Icon(
                 iconRes = iconRes,
                 onClicked = onIconClick,
+                isEnabled = endButtonEnabled,
             )
         } else {
             null

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt

@@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -146,7 +145,8 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewModalBottomSheet(
         sheetState = SheetState(
             skipPartiallyExpanded = skipPartiallyExpanded,
             initialValue = Expanded,
-            density = LocalDensity.current,
+            positionalThreshold = { 0f },
+            velocityThreshold = { 0f },
         ),
         onBack = null,
         bsContent = {

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt

@@ -18,7 +18,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -141,7 +140,8 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewModalBottomSheetW
         sheetState = SheetState(
             skipPartiallyExpanded = skipPartiallyExpanded,
             initialValue = Expanded,
-            density = LocalDensity.current,
+            positionalThreshold = { 0f },
+            velocityThreshold = { 0f },
         ),
         onBack = null,
         containerColor = containerColor,

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/sheet/TangemBottomSheet.kt

@@ -134,7 +134,8 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewBottomSheet(
         sheetState = SheetState(
             skipPartiallyExpanded = skipPartiallyExpanded,
             initialValue = Expanded,
-            density = LocalDensity.current,
+            positionalThreshold = { 0f },
+            velocityThreshold = { 0f },
         ),
         onBack = null,
         containerColor = containerColor,

core/ui/src/main/java/com/tangem/core/ui/components/buttons/common/TangemButton.kt

@@ -6,6 +6,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.TextAutoSize
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
@@ -23,7 +24,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.test.BaseButtonTestTags
 import com.tangem.core.ui.utils.MultipleClickPreventer
@@ -75,7 +75,7 @@ fun TangemButton(
                 )
             },
             text = {
-                ResizableText(
+                Text(
                     modifier = Modifier
                         .weight(1f, fill = false)
                         .heightIn(MinButtonContentSize, maxContentSize)
@@ -86,7 +86,10 @@ fun TangemButton(
                     textAlign = TextAlign.Center,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    minFontSize = 12.sp,
+                    autoSize = TextAutoSize.StepBased(
+                        minFontSize = 12.sp,
+                        maxFontSize = textStyle.fontSize,
+                    ),
                 )
             },
             icon = { iconResId ->

core/ui/src/main/java/com/tangem/core/ui/components/chip/Chip.kt

@@ -0,0 +1,122 @@
+package com.tangem.core.ui.components.chip
+
+import android.content.res.Configuration
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.chip.entity.ChipUM
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+
+@Composable
+fun Chip(state: ChipUM, modifier: Modifier = Modifier) {
+    val backgroundColor by animateColorAsState(
+        targetValue = if (state.isSelected) {
+            TangemTheme.colors.button.primary
+        } else {
+            TangemTheme.colors.button.secondary
+        },
+    )
+
+    val textColor by animateColorAsState(
+        targetValue = if (state.isSelected) {
+            TangemTheme.colors.text.primary2
+        } else {
+            TangemTheme.colors.text.primary1
+        },
+    )
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+        modifier = modifier
+            .clip(RoundedCornerShape(12.dp))
+            .background(color = backgroundColor)
+            .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = ripple(),
+                onClick = state.onClick,
+            )
+            .padding(PaddingValues(horizontal = 24.dp, vertical = 8.dp)),
+    ) {
+        Text(
+            text = state.text.resolveReference(),
+            style = TangemTheme.typography.button,
+            color = textColor,
+        )
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun ChipPreview() {
+    TangemThemePreview {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors.background.primary)
+                .padding(16.dp),
+        ) {
+            FlowRow(
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                Chip(
+                    state = ChipUM(
+                        id = 0,
+                        text = TextReference.Str("All News"),
+                        isSelected = true,
+                        onClick = {},
+                    ),
+                )
+                Chip(
+                    state = ChipUM(
+                        id = 1,
+                        text = TextReference.Str("Regulation"),
+                        isSelected = false,
+                        onClick = {},
+                    ),
+                )
+                Chip(
+                    state = ChipUM(
+                        id = 2,
+                        text = TextReference.Str("ETFs"),
+                        isSelected = false,
+                        onClick = {},
+                    ),
+                )
+                Chip(
+                    state = ChipUM(
+                        id = 3,
+                        text = TextReference.Str("Institutions"),
+                        isSelected = false,
+                        onClick = {},
+                    ),
+                )
+            }
+        }
+    }
+}

core/ui/src/main/java/com/tangem/core/ui/components/chip/entity/ChipUM.kt

@@ -0,0 +1,10 @@
+package com.tangem.core.ui.components.chip.entity
+
+import com.tangem.core.ui.extensions.TextReference
+
+data class ChipUM(
+    val id: Int,
+    val text: TextReference,
+    val isSelected: Boolean = false,
+    val onClick: () -> Unit,
+)

core/ui/src/main/java/com/tangem/core/ui/components/fields/SearchBar.kt

@@ -10,9 +10,8 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusManager
 import androidx.compose.ui.focus.FocusRequester
@@ -51,16 +50,22 @@ fun SearchBar(
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
     val interactionSource = remember { MutableInteractionSource() }
+    var isInitialComposition by rememberSaveable { mutableStateOf(true) }
+    LaunchedEffect(Unit) {
+        isInitialComposition = false
+    }
 
     BasicTextField(
         modifier = modifier
             .fillMaxWidth()
             .heightIn(min = TangemTheme.dimens.size48)
             .onFocusChanged { focusState ->
-                if (focusState.isFocused) {
-                    state.onActiveChange(true)
-                } else {
-                    state.onActiveChange(false)
+                if (!isInitialComposition) {
+                    if (focusState.isFocused) {
+                        state.onActiveChange(true)
+                    } else {
+                        state.onActiveChange(false)
+                    }
                 }
             }
             .focusRequester(focusRequester)
@@ -163,6 +168,7 @@ private fun ClearButton(
                 focusManager.clearFocus()
                 keyboardController?.hide()
                 state.onActiveChange(false)
+                state.onClearClick()
             },
         ) {
             Icon(

core/ui/src/main/java/com/tangem/core/ui/components/fields/entity/SearchBarUM.kt

@@ -8,4 +8,5 @@ data class SearchBarUM(
     val onQueryChange: (String) -> Unit,
     val isActive: Boolean,
     val onActiveChange: (Boolean) -> Unit,
+    val onClearClick: () -> Unit = {},
 )

core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
@@ -31,6 +32,7 @@ import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.test.SendSelectNetworkFeeBottomSheetTestTags
 
 /**
  * [InputRowEnter](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?type=design&node-id=2100-799&mode=design&t=IQ5lBJEkFGU4WSvi-4)
@@ -92,7 +94,7 @@ fun InputRowEnter(
                             modifier = Modifier
                                 .size(16.dp)
                                 .clip(CircleShape),
-                            text = description.resolveReference(),
+                            text = description,
                             content = { contentModifier ->
                                 Icon(
                                     modifier = contentModifier.size(16.dp),
@@ -113,7 +115,8 @@ fun InputRowEnter(
                     visualTransformation = visualTransformation,
                     keyboardOptions = keyboardOptions,
                     modifier = Modifier
-                        .padding(top = TangemTheme.dimens.spacing8),
+                        .padding(top = TangemTheme.dimens.spacing8)
+                        .testTag(SendSelectNetworkFeeBottomSheetTestTags.NONCE_INPUT_TEXT_FIELD),
                 )
             }
             iconRes?.let { iconRes ->

core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
@@ -21,6 +22,7 @@ import com.tangem.core.ui.components.tooltip.TangemTooltip
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.test.SendSelectNetworkFeeBottomSheetTestTags
 import com.tangem.core.ui.utils.rememberDecimalFormat
 
 /**
@@ -112,6 +114,7 @@ fun InputRowEnterInfoAmount(
     }
 }
 
+@Suppress("LongMethod")
 @Composable
 fun InputRowEnterInfoAmountV2(
     title: TextReference,
@@ -139,20 +142,23 @@ fun InputRowEnterInfoAmountV2(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(16.dp),
+                .padding(16.dp)
+                .testTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM),
         ) {
             Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp)) {
                 Text(
                     text = title.resolveReference(),
                     style = TangemTheme.typography.subtitle2,
                     color = titleColor,
+                    modifier = Modifier.testTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_TITLE),
                 )
                 if (description != null) {
                     TangemTooltip(
                         modifier = Modifier
                             .size(16.dp)
-                            .clip(CircleShape),
-                        text = description.resolveReference(),
+                            .clip(CircleShape)
+                            .testTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_TOOLTIP_ICON),
+                        text = description,
                         content = { contentModifier ->
                             Icon(
                                 modifier = contentModifier.size(16.dp),
@@ -183,7 +189,8 @@ fun InputRowEnterInfoAmountV2(
                     backgroundColor = Color.Transparent,
                     modifier = Modifier
                         .padding(top = TangemTheme.dimens.spacing8)
-                        .weight(1f),
+                        .weight(1f)
+                        .testTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_INPUT_TEXT_FIELD),
                 )
                 info?.let { info ->
                     Text(
@@ -192,7 +199,8 @@ fun InputRowEnterInfoAmountV2(
                         color = infoColor,
                         modifier = Modifier
                             .padding(start = TangemTheme.dimens.spacing8)
-                            .align(Alignment.Bottom),
+                            .align(Alignment.Bottom)
+                            .testTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_FIAT_AMOUNT),
                     )
                 }
             }

core/ui/src/main/java/com/tangem/core/ui/components/label/Label.kt

@@ -168,7 +168,9 @@ private fun LabelPreview() {
     TangemThemePreview {
         Column(
             verticalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier.padding(16.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors.background.primary)
+                .padding(16.dp),
         ) {
             FlowRow(
                 horizontalArrangement = Arrangement.spacedBy(8.dp),

core/ui/src/main/java/com/tangem/core/ui/components/pager/PagerIndicator.kt

@@ -1,5 +1,6 @@
 package com.tangem.core.ui.components.pager
 
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyListScope
@@ -8,18 +9,24 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.*
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import kotlin.math.abs
+import kotlin.math.min
+
+// six - cause the central indicator has width multiplied twice
+private const val TOTAL_MAX_INDICATORS = 6
+private const val SPACER_COUNT_BETWEEN_INDICATORS = 4
 
 /**
  * Horizontal pager indicator
@@ -29,82 +36,163 @@ import com.tangem.core.ui.res.TangemThemePreview
  */
 @Composable
 fun PagerIndicator(pagerState: PagerState, modifier: Modifier = Modifier, indicatorCount: Int = 5) {
+    if (pagerState.pageCount == 0) return
+
     val listState = rememberLazyListState()
 
     val indicatorColor = TangemTheme.colors.control.key
     val overlayColor = TangemTheme.colors.overlay.secondary
-    val indicatorSize = 8.dp
+
+    val inactiveIndicatorColor = remember(indicatorColor) {
+        indicatorColor.copy(alpha = 0.5f)
+    }
+
+    val baseIndicatorSize = 8.dp
     val spacing = 4.dp
 
-    val totalWidth: Dp = indicatorSize * indicatorCount + spacing * (indicatorCount - 1)
-    val widthInPx = LocalDensity.current.run { indicatorSize.toPx() }
-
-    val currentItem by remember {
+    val indicatorState by remember(pagerState, indicatorCount) {
         derivedStateOf {
-            pagerState.currentPage
+            val count = pagerState.pageCount
+            val current = pagerState.currentPage
+
+            val winSize = min(indicatorCount, count)
+            val centerPosition = winSize / 2
+
+            val start = when {
+                count <= winSize -> 0
+                current <= centerPosition -> 0
+                current >= count - centerPosition - 1 -> count - winSize
+                else -> current - centerPosition
+            }
+            Triple(count, winSize, start)
         }
     }
 
-    val itemCount = pagerState.pageCount
+    val (itemCount, windowSize, windowStart) = indicatorState
+    val currentItem by remember { derivedStateOf { pagerState.currentPage } }
 
-    LaunchedEffect(key1 = currentItem) {
-        val viewportSize = listState.layoutInfo.viewportSize
-        listState.animateScrollToItem(
-            currentItem,
-            (widthInPx / 2 - viewportSize.width / 2).toInt(),
-        )
+    LaunchedEffect(currentItem, windowStart) {
+        if (itemCount > windowSize) {
+            listState.animateScrollToItem(windowStart.coerceIn(0, itemCount - 1))
+        }
+    }
+
+    val maxContainerWidth = remember(baseIndicatorSize, spacing) {
+        baseIndicatorSize * TOTAL_MAX_INDICATORS + spacing * SPACER_COUNT_BETWEEN_INDICATORS
     }
 
     Box(
         modifier = modifier
             .height(32.dp)
+            .width(maxContainerWidth + 32.dp)
             .background(
                 color = overlayColor,
                 shape = CircleShape,
             )
-            .padding(horizontal = 16.dp, vertical = 12.dp),
+            .padding(horizontal = 16.dp, vertical = 12.dp)
+            .clip(CircleShape),
         contentAlignment = Alignment.Center,
     ) {
         LazyRow(
-            modifier = Modifier
-                .width(totalWidth),
+            modifier = Modifier.wrapContentWidth(),
             state = listState,
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            horizontalArrangement = Arrangement.spacedBy(spacing),
             userScrollEnabled = false,
         ) {
             indicatorItems(
                 itemCount = itemCount,
                 currentItem = currentItem,
-                indicatorShape = CircleShape,
                 activeColor = indicatorColor,
-                inActiveColor = indicatorColor.copy(alpha = 0.5f),
-                indicatorSize = indicatorSize,
+                inActiveColor = inactiveIndicatorColor,
+                baseSize = baseIndicatorSize,
+                windowSize = windowSize,
+                windowStart = windowStart,
             )
         }
     }
 }
 
+@Suppress("MagicNumber", "CyclomaticComplexMethod")
+private fun calculateIndicatorHeight(position: Int, currentPosition: Int, baseSize: Dp, windowSize: Int): Dp {
+    val distance = abs(position - currentPosition)
+    val mediumSize = 6.dp
+    val smallSize = 4.dp
+
+    if (windowSize < 5) {
+        return when {
+            distance <= 1 -> baseSize
+            distance == 2 -> mediumSize
+            else -> smallSize
+        }
+    }
+
+    val isEdgeFocus = currentPosition == 0 || currentPosition == windowSize - 1
+    val isNearEdgeFocus = currentPosition == 1 || currentPosition == windowSize - 2
+    return when {
+        isEdgeFocus -> when {
+            distance <= 2 -> baseSize
+            distance == 3 -> mediumSize
+            else -> smallSize
+        }
+        isNearEdgeFocus -> when {
+            distance <= 1 -> baseSize
+            distance == 2 -> mediumSize
+            else -> smallSize
+        }
+        else -> when {
+            distance <= 1 -> baseSize
+            else -> mediumSize
+        }
+    }
+}
+
 @Suppress("LongParameterList")
 private fun LazyListScope.indicatorItems(
     itemCount: Int,
     currentItem: Int,
-    indicatorShape: Shape,
     activeColor: Color,
     inActiveColor: Color,
-    indicatorSize: Dp,
+    baseSize: Dp,
+    windowSize: Int,
+    windowStart: Int,
 ) {
-    items(itemCount) { index ->
+    val safeWindowSize = min(windowSize, itemCount)
+    if (safeWindowSize <= 0) return
 
-        val isSelected = index == currentItem
+    val windowEnd = windowStart + safeWindowSize
+    val currentPosInWindow = (currentItem - windowStart).coerceIn(0, safeWindowSize - 1)
+
+    items(itemCount) { pageIndex ->
+        val isInWindow = pageIndex in windowStart until windowEnd
+        val positionInWindow = (pageIndex - windowStart).coerceIn(0, safeWindowSize - 1)
+
+        val isSelected = pageIndex == currentItem
+
+        val refinedHeight = if (isInWindow) {
+            calculateIndicatorHeight(
+                position = positionInWindow,
+                currentPosition = currentPosInWindow,
+                baseSize = baseSize,
+                windowSize = safeWindowSize,
+            )
+        } else {
+            0.dp
+        }
+        val targetWidth = if (isSelected) refinedHeight * 2 else refinedHeight
+        val targetShape = if (isSelected) RoundedCornerShape(16.dp) else CircleShape
+        val animatedWidth by animateDpAsState(targetValue = targetWidth, label = "width")
+        val animatedHeight by animateDpAsState(targetValue = refinedHeight, label = "height")
 
         Box(
             modifier = Modifier
-                .clip(indicatorShape)
-                .size(indicatorSize)
+                .padding(vertical = (baseSize - animatedHeight) / 2)
+                .clip(targetShape)
+                .width(animatedWidth)
+                .height(animatedHeight)
                 .background(
                     if (isSelected) activeColor else inActiveColor,
-                    indicatorShape,
+                    targetShape,
                 ),
         )
     }
@@ -112,19 +200,31 @@ private fun LazyListScope.indicatorItems(
 
 @Preview(showBackground = true)
 @Composable
-private fun PagerIndicatorPreviewFirstPage() {
+private fun PagerIndicatorPreview() {
     TangemThemePreview {
-        Box(
+        Column(
             modifier = Modifier
                 .background(TangemTheme.colors.background.primary)
-                .padding(),
-            contentAlignment = Alignment.Center,
+                .padding(20.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp),
         ) {
             val pagerState = rememberPagerState(
-                initialPage = 0,
+                initialPage = 2,
                 pageCount = { 10 },
             )
             PagerIndicator(pagerState = pagerState)
+
+            val pagerState1 = rememberPagerState(
+                initialPage = 0,
+                pageCount = { 3 },
+            )
+            PagerIndicator(pagerState = pagerState1)
+
+            val pagerState2 = rememberPagerState(
+                initialPage = 0,
+                pageCount = { 1 },
+            )
+            PagerIndicator(pagerState = pagerState2)
         }
     }
 }

core/ui/src/main/java/com/tangem/core/ui/components/rows/SelectorRowItem.kt

@@ -25,7 +25,7 @@ import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.test.SelectNetworkFeeBottomSheetTestTags
+import com.tangem.core.ui.test.SwapSelectNetworkFeeBottomSheetTestTags
 import com.tangem.utils.StringsSigns
 
 @Composable
@@ -70,7 +70,7 @@ fun SelectorRowItem(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(paddingValues)
-                .testTag(SelectNetworkFeeBottomSheetTestTags.SELECTOR_ITEM),
+                .testTag(SwapSelectNetworkFeeBottomSheetTestTags.SELECTOR_ITEM),
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(

core/ui/src/main/java/com/tangem/core/ui/components/sheetscaffold/TangemBottomSheetScaffold.kt

@@ -239,19 +239,19 @@ private fun StandardBottomSheet(
                     }
                     val newTarget =
                         when (val oldTarget = state.anchoredDraggableState.targetValue) {
-                            Hidden -> if (newAnchors.hasAnchorFor(Hidden)) Hidden else oldTarget
+                            Hidden -> if (newAnchors.hasPositionFor(Hidden)) Hidden else oldTarget
                             PartiallyExpanded ->
                                 when {
-                                    newAnchors.hasAnchorFor(PartiallyExpanded) -> PartiallyExpanded
-                                    newAnchors.hasAnchorFor(Expanded) -> Expanded
-                                    newAnchors.hasAnchorFor(Hidden) -> Hidden
+                                    newAnchors.hasPositionFor(PartiallyExpanded) -> PartiallyExpanded
+                                    newAnchors.hasPositionFor(Expanded) -> Expanded
+                                    newAnchors.hasPositionFor(Hidden) -> Hidden
                                     else -> oldTarget
                                 }
                             Expanded ->
                                 when {
-                                    newAnchors.hasAnchorFor(Expanded) -> Expanded
-                                    newAnchors.hasAnchorFor(PartiallyExpanded) -> PartiallyExpanded
-                                    newAnchors.hasAnchorFor(Hidden) -> Hidden
+                                    newAnchors.hasPositionFor(Expanded) -> Expanded
+                                    newAnchors.hasPositionFor(PartiallyExpanded) -> PartiallyExpanded
+                                    newAnchors.hasPositionFor(Hidden) -> Hidden
                                     else -> oldTarget
                                 }
                         }

core/ui/src/main/java/com/tangem/core/ui/components/sheetscaffold/TangemSheetState.kt

@@ -102,11 +102,11 @@ class TangemSheetState(
 
     /** Whether the sheet has an expanded state defined. */
     val hasExpandedState: Boolean
-        get() = anchoredDraggableState.anchors.hasAnchorFor(Expanded)
+        get() = anchoredDraggableState.anchors.hasPositionFor(Expanded)
 
     /** Whether the modal bottom sheet has a partially expanded state defined. */
     val hasPartiallyExpandedState: Boolean
-        get() = anchoredDraggableState.anchors.hasAnchorFor(PartiallyExpanded)
+        get() = anchoredDraggableState.anchors.hasPositionFor(PartiallyExpanded)
 
     /**
      * Fully expand the bottom sheet with animation and suspend until it is fully expanded or
@@ -274,8 +274,8 @@ internal fun consumeSwipeWithinBottomSheetBoundsNestedScrollConnection(
     override suspend fun onPreFling(available: Velocity): Velocity {
         val toFling = available.toFloat()
         val currentOffset = sheetState.requireOffset()
-        val minAnchor = sheetState.anchoredDraggableState.anchors.minAnchor()
-        return if (toFling < 0 && currentOffset > minAnchor) {
+        val minPosition = sheetState.anchoredDraggableState.anchors.minPosition()
+        return if (toFling < 0 && currentOffset > minPosition) {
             onFling(toFling)
             // since we go to the anchor with tween settling, consume all for the best UX
             available

core/ui/src/main/java/com/tangem/core/ui/components/tooltip/TangemTooltip.kt

@@ -1,29 +1,39 @@
 package com.tangem.core.ui.components.tooltip
 
+import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.clickableSingle
+import com.tangem.core.ui.extensions.resolveAnnotatedReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.LocalWindowSize
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import kotlinx.coroutines.launch
 
+/**
+ * A Tangem-themed tooltip component that displays a tooltip with the provided text when the content is clicked.
+ *
+ * @param text The text to be displayed inside the tooltip.
+ * @param modifier The modifier to be applied to the tooltip component.
+ * @param enabled If false, the tooltip will not be shown when the content is clicked.
+ * @param content The content that triggers the tooltip when clicked.
+ */
 @Composable
 fun TangemTooltip(
-    text: String,
+    text: TextReference,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     content: @Composable (Modifier) -> Unit,
@@ -33,30 +43,10 @@ fun TangemTooltip(
         enabled = enabled,
         tooltipContent = {
             Text(
-                modifier = Modifier.background(TangemTheme.colors.icon.secondary),
-                text = text,
-                style = TangemTheme.typography.body2,
-                color = TangemTheme.colors.text.primary2,
-            )
-        },
-        content = content,
-    )
-}
-
-@Composable
-fun TangemTooltip(
-    text: AnnotatedString,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    content: @Composable (Modifier) -> Unit,
-) {
-    InternalTangemTooltip(
-        modifier = modifier,
-        enabled = enabled,
-        tooltipContent = {
-            Text(
-                modifier = Modifier.background(TangemTheme.colors.icon.secondary),
-                text = text,
+                modifier = Modifier
+                    .background(TangemTheme.colors.icon.secondary)
+                    .padding(horizontal = 6.dp, vertical = 8.dp),
+                text = text.resolveAnnotatedReference(),
                 style = TangemTheme.typography.body2,
                 color = TangemTheme.colors.text.primary2,
             )
@@ -75,16 +65,22 @@ private fun InternalTangemTooltip(
 ) {
     val tooltipState = rememberTooltipState(isPersistent = true)
     val coroutineScope = rememberCoroutineScope()
+
+    val windowSize = LocalWindowSize.current.width
+
     TooltipBox(
-        positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(spacingBetweenTooltipAndAnchor = 8.dp),
+        positionProvider = TooltipDefaults.rememberTooltipPositionProvider(
+            positioning = TooltipAnchorPosition.Above,
+            spacingBetweenTooltipAndAnchor = 8.dp,
+        ),
         state = tooltipState,
         modifier = modifier,
         tooltip = {
             PlainTooltip(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 12.dp),
-                caretSize = DpSize(width = 14.dp, height = 8.dp),
+                modifier = Modifier.padding(end = 12.dp),
+                shape = RoundedCornerShape(14.dp),
+                caretShape = TooltipDefaults.caretShape(),
+                maxWidth = windowSize - 24.dp,
                 contentColor = TangemTheme.colors.text.primary2,
                 containerColor = TangemTheme.colors.icon.secondary,
                 content = { tooltipContent() },
@@ -103,24 +99,23 @@ private fun InternalTangemTooltip(
     )
 }
 
-@Preview
+// region Preview
 @Composable
+@Preview(showBackground = true, widthDp = 360, heightDp = 720)
+@Preview(showBackground = true, widthDp = 360, heightDp = 720, uiMode = Configuration.UI_MODE_NIGHT_YES)
 private fun TangemTooltip_Preview() {
     TangemThemePreview {
         Box(
             modifier = Modifier
-                .size(500.dp)
-                .background(TangemTheme.colors.background.secondary),
-            contentAlignment = Alignment.Center,
+                .fillMaxSize()
+                .background(TangemTheme.colors.background.tertiary),
         ) {
             TangemTooltip(
-                modifier = Modifier
-                    .background(TangemTheme.colors.background.secondary)
-                    .size(64.dp),
-                text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed venenatis.",
+                modifier = Modifier,
+                text = stringReference("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed venenatis."),
                 content = { contentModifier ->
                     Icon(
-                        modifier = contentModifier.size(64.dp),
+                        modifier = contentModifier,
                         painter = painterResource(R.drawable.ic_token_info_24),
                         tint = TangemTheme.colors.icon.informative,
                         contentDescription = null,

core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularBottomSheetContentComponent.kt

@@ -0,0 +1,33 @@
+package com.tangem.core.ui.decompose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.components.bottomsheets.state.BottomSheetState
+
+/**
+ * An interface describing the UI part of a component for a modular BottomSheet.
+ *
+ * Designed for use in Decompose components. It separates the UI into a title and content,
+ * providing access to the [BottomSheetState] to react to changes in the sheet's state (collapsed/expanded).
+ */
+@Stable
+interface ComposableModularBottomSheetContentComponent {
+
+    /**
+     * Renders the title of the bottom sheet.
+     * @param bottomSheetState The current state of the bottom sheet. This can be used, for example,
+     * to change navigation buttons (e.g., hiding the "Back" button when collapsed).
+     */
+    @Composable
+    fun Title(bottomSheetState: State<BottomSheetState>)
+
+    /**
+     * Renders the main content of the bottom sheet.
+     * @param bottomSheetState The current state of the bottom sheet. Useful for tracking visibility
+     * (e.g., for analytics or lifecycle effects when the sheet is [BottomSheetState.EXPANDED]).
+     */
+    @Composable
+    fun Content(bottomSheetState: State<BottomSheetState>, modifier: Modifier)
+}

core/ui/src/main/java/com/tangem/core/ui/ds/badge/TangemBadge.kt

@@ -0,0 +1,321 @@
+package com.tangem.core.ui.ds.badge
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.ds.badge.TangemBadgeSize.*
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * Tangem badge component to display a small piece of information with optional icon.
+ * [Figma](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=8441-83535&m=dev)
+ *
+ * @param text          TextReference for the badge label.
+ * @param modifier      Modifier to be applied to the badge.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the badge.
+ * @param size          [TangemBadgeSize] defining the size of the badge.
+ * @param shape         [TangemBadgeShape] defining the shape of the badge.
+ * @param color         [TangemBadgeColor] defining the color scheme of the badge.
+ * @param type          [TangemBadgeType] defining the style of the badge.
+ * @param iconPosition  [TangemBadgeIconPosition] defining icon position of the badge.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun TangemBadge(
+    text: TextReference,
+    modifier: Modifier = Modifier,
+    @DrawableRes iconRes: Int? = null,
+    size: TangemBadgeSize = X9,
+    shape: TangemBadgeShape = TangemBadgeShape.Default,
+    color: TangemBadgeColor = TangemBadgeColor.Gray,
+    type: TangemBadgeType = TangemBadgeType.Solid,
+    iconPosition: TangemBadgeIconPosition = TangemBadgeIconPosition.Start,
+) {
+    val iconColor = getIconColor(type = type, color = color)
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(size.toContentPadding()),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+            .heightIn(min = size.toHeightDp())
+            .clip(shape.toShape(size))
+            .getBackgroundColor(type = type, color = color, shape = shape.toShape(size))
+            .padding(size.toPaddingDp(position = iconPosition)),
+    ) {
+        AnimatedVisibility(
+            visible = iconRes != null && iconPosition == TangemBadgeIconPosition.Start,
+            modifier = Modifier.size(size = size.toContentSize()),
+            label = "Start Icon Visibility",
+        ) {
+            val wrappedIconRes = remember(this) { requireNotNull(iconRes) }
+            Icon(
+                painter = painterResource(id = wrappedIconRes),
+                contentDescription = null,
+                tint = iconColor,
+            )
+        }
+        Text(
+            text = text.resolveReference(),
+            style = size.toTextStyle(),
+            maxLines = 1,
+            color = getTextColor(type = type, color = color),
+        )
+
+        AnimatedVisibility(
+            visible = iconRes != null && iconPosition == TangemBadgeIconPosition.End,
+            modifier = Modifier.size(size = size.toContentSize()),
+            label = "End Icon Visibility",
+        ) {
+            val wrappedIconRes = remember(this) { requireNotNull(iconRes) }
+            Icon(
+                painter = painterResource(id = wrappedIconRes),
+                contentDescription = null,
+                tint = iconColor,
+            )
+        }
+    }
+}
+
+/**
+ * Tangem badge shape options.
+ */
+enum class TangemBadgeShape {
+    Default,
+    Rounded,
+    ;
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toShape(size: TangemBadgeSize) = RoundedCornerShape(
+        when (this) {
+            Rounded -> when (size) {
+                X4,
+                X6,
+                -> TangemTheme.dimens2.x4
+                X9 -> TangemTheme.dimens2.x25
+            }
+            Default -> when (size) {
+                X4 -> TangemTheme.dimens2.x1
+                X6,
+                X9,
+                -> 6.dp
+            }
+        },
+    )
+}
+
+/**
+ * Tangem badge size options.
+ */
+enum class TangemBadgeSize {
+    X4,
+    X6,
+    X9,
+    ;
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toHeightDp() = when (this) {
+        X4 -> TangemTheme.dimens2.x4
+        X6 -> TangemTheme.dimens2.x6
+        X9 -> TangemTheme.dimens2.x9
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toPaddingDp(position: TangemBadgeIconPosition) = when (this) {
+        X4 -> when (position) {
+            TangemBadgeIconPosition.Start -> PaddingValues(start = 4.dp, end = 6.dp)
+            TangemBadgeIconPosition.End -> PaddingValues(start = 6.dp, end = 4.dp)
+        }
+        X6 -> when (position) {
+            TangemBadgeIconPosition.Start -> PaddingValues(start = 8.dp, end = 12.dp)
+            TangemBadgeIconPosition.End -> PaddingValues(start = 12.dp, end = 8.dp)
+        }
+        X9 -> when (position) {
+            TangemBadgeIconPosition.Start -> PaddingValues(start = 12.dp, end = 16.dp)
+            TangemBadgeIconPosition.End -> PaddingValues(start = 16.dp, end = 12.dp)
+        }
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toContentSize() = when (this) {
+        X4 -> TangemTheme.dimens2.x3
+        X6,
+        X9,
+        -> TangemTheme.dimens2.x4
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toContentPadding() = when (this) {
+        X4 -> TangemTheme.dimens2.x0_5
+        X6,
+        X9,
+        -> TangemTheme.dimens2.x1
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toTextStyle() = when (this) {
+        X4 -> TangemTheme.typography2.captionSemibold11
+        X6 -> TangemTheme.typography2.captionSemibold12
+        X9 -> TangemTheme.typography2.bodySemibold16
+    }
+}
+
+/**
+ * Position of the icon in the Tangem badge.
+ */
+enum class TangemBadgeIconPosition {
+    Start,
+    End,
+}
+
+/**
+ * Tangem badge type options.
+ */
+enum class TangemBadgeType {
+    Solid,
+    Tinted,
+    Outline,
+}
+
+/**
+ * Tangem badge color options.
+ */
+enum class TangemBadgeColor {
+    Blue,
+    Red,
+    Gray,
+}
+
+@ReadOnlyComposable
+@Composable
+private fun getIconColor(type: TangemBadgeType, color: TangemBadgeColor) = when (color) {
+    TangemBadgeColor.Gray -> TangemTheme.colors2.markers.iconGray
+    TangemBadgeColor.Blue -> when (type) {
+        TangemBadgeType.Outline,
+        TangemBadgeType.Tinted,
+        -> TangemTheme.colors2.markers.iconBlue
+        TangemBadgeType.Solid -> TangemTheme.colors2.graphic.neutral.primaryInvertedConstant
+    }
+    TangemBadgeColor.Red -> when (type) {
+        TangemBadgeType.Outline,
+        TangemBadgeType.Tinted,
+        -> TangemTheme.colors2.markers.iconRed
+        TangemBadgeType.Solid -> TangemTheme.colors2.graphic.neutral.primaryInvertedConstant
+    }
+}
+
+@ReadOnlyComposable
+@Composable
+private fun getTextColor(type: TangemBadgeType, color: TangemBadgeColor) = when (color) {
+    TangemBadgeColor.Gray -> TangemTheme.colors2.markers.textGray
+    TangemBadgeColor.Blue -> when (type) {
+        TangemBadgeType.Outline,
+        TangemBadgeType.Tinted,
+        -> TangemTheme.colors2.markers.textBlue
+        TangemBadgeType.Solid -> TangemTheme.colors2.text.neutral.primaryInvertedConstant
+    }
+    TangemBadgeColor.Red -> when (type) {
+        TangemBadgeType.Outline,
+        TangemBadgeType.Tinted,
+        -> TangemTheme.colors2.markers.textRed
+        TangemBadgeType.Solid -> TangemTheme.colors2.text.neutral.primaryInvertedConstant
+    }
+}
+
+@ReadOnlyComposable
+@Composable
+private fun Modifier.getBackgroundColor(type: TangemBadgeType, color: TangemBadgeColor, shape: Shape) = when (type) {
+    TangemBadgeType.Solid -> background(
+        when (color) {
+            TangemBadgeColor.Gray -> TangemTheme.colors2.markers.backgroundSolidGray
+            TangemBadgeColor.Blue -> TangemTheme.colors2.markers.backgroundSolidBlue
+            TangemBadgeColor.Red -> TangemTheme.colors2.markers.backgroundSolidRed
+        },
+    )
+    TangemBadgeType.Tinted -> background(
+        when (color) {
+            TangemBadgeColor.Gray -> TangemTheme.colors2.markers.backgroundTintedGray
+            TangemBadgeColor.Blue -> TangemTheme.colors2.markers.backgroundTintedBlue
+            TangemBadgeColor.Red -> TangemTheme.colors2.markers.backgroundTintedRed
+        },
+    )
+    TangemBadgeType.Outline -> {
+        border(
+            color = when (color) {
+                TangemBadgeColor.Gray -> TangemTheme.colors2.markers.borderGray
+                TangemBadgeColor.Blue -> TangemTheme.colors2.markers.borderTintedBlue
+                TangemBadgeColor.Red -> TangemTheme.colors2.markers.borderTintedRed
+            },
+            shape = shape,
+            width = 1.dp,
+        )
+    }
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun TangemBadge_Preview(@PreviewParameter(TangemBadgePreviewProvider::class) params: TangemBadgeColor) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(8.dp),
+        ) {
+            repeat(2) { yIndex ->
+                Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+                    repeat(TangemBadgeType.entries.size) { index ->
+                        TangemBadge(
+                            text = stringReference("Title"),
+                            iconRes = R.drawable.ic_information_24,
+                            type = TangemBadgeType.entries[index],
+                            color = params,
+                            shape = TangemBadgeShape.entries[yIndex % 2],
+                            iconPosition = TangemBadgeIconPosition.entries[yIndex % 2],
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class TangemBadgePreviewProvider : PreviewParameterProvider<TangemBadgeColor> {
+    override val values: Sequence<TangemBadgeColor>
+        get() = sequenceOf(
+            TangemBadgeColor.Gray,
+            TangemBadgeColor.Blue,
+            TangemBadgeColor.Red,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/AccentTangemButton.kt

@@ -0,0 +1,125 @@
+package com.tangem.core.ui.ds.button
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * [Accent Tangem button](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=8004-26798)
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ * @param shape         TangemButtonShape defining the shape of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun AccentTangemButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+    enabled: Boolean = true,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+    shape: TangemButtonShape = TangemButtonShape.Default,
+) {
+    TangemButtonInternal(
+        onClick = onClick,
+        modifier = modifier
+            .clip(shape.toShape(size))
+            .then(
+                when (state) {
+                    TangemButtonState.Disabled,
+                    TangemButtonState.Default,
+                    -> Modifier.background(TangemTheme.colors2.button.backgroundPositive)
+                    TangemButtonState.Loading,
+                    TangemButtonState.Pressed,
+                    -> Modifier
+                        .background(TangemTheme.colors2.button.backgroundPositive)
+                        .background(TangemTheme.colors2.overlay.overlaySecondary)
+                },
+            ),
+        text = text,
+        contentColor = TangemTheme.colors2.text.neutral.primaryInvertedConstant,
+        iconRes = iconRes,
+        enabled = enabled,
+        size = size,
+        state = state,
+        iconPosition = iconPosition,
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 480)
+@Preview(showBackground = true, widthDp = 480, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun AccentTangemButton_Preview(
+    @PreviewParameter(AccentTangemButtonPreviewProvider::class) params: TangemButtonState,
+) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(21.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(8.dp),
+        ) {
+            repeat(4) { yIndex ->
+                val shape = if (yIndex < 2) TangemButtonShape.Default else TangemButtonShape.Rounded
+                val text = if (yIndex % 2 == 1) null else stringReference("Button")
+                Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    repeat(2) { xIndex ->
+                        val iconPosition = if (xIndex == 1) {
+                            TangemButtonIconPosition.Start
+                        } else {
+                            TangemButtonIconPosition.End
+                        }
+                        AccentTangemButton(
+                            onClick = {},
+                            text = text,
+                            size = TangemButtonSize.X15,
+                            shape = shape,
+                            iconPosition = iconPosition,
+                            iconRes = R.drawable.ic_tangem_24,
+                            state = params,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class AccentTangemButtonPreviewProvider : PreviewParameterProvider<TangemButtonState> {
+    override val values: Sequence<TangemButtonState>
+        get() = sequenceOf(
+            TangemButtonState.Default,
+            TangemButtonState.Pressed,
+            TangemButtonState.Loading,
+            TangemButtonState.Disabled,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/GhostTangemButton.kt

@@ -0,0 +1,111 @@
+package com.tangem.core.ui.ds.button
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * [Ghost Tangem button](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=5854-4804)
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun GhostTangemButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    enabled: Boolean = true,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+) {
+    val contentColor = when (state) {
+        TangemButtonState.Disabled -> TangemTheme.colors2.text.status.disabled
+        else -> TangemTheme.colors2.text.neutral.primary
+    }
+    TangemButtonInternal(
+        onClick = onClick,
+        modifier = modifier,
+        text = text,
+        contentColor = contentColor,
+        enabled = enabled,
+        size = size,
+        state = state,
+        iconPosition = iconPosition,
+        iconRes = iconRes,
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 480)
+@Preview(showBackground = true, widthDp = 480, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun GhostTangemButton_Preview(
+    @PreviewParameter(GhostTangemButtonPreviewProvider::class) params: TangemButtonState,
+) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(21.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(8.dp),
+        ) {
+            repeat(4) { yIndex ->
+                val text = if (yIndex % 2 == 1) null else stringReference("Button")
+                Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    repeat(2) { xIndex ->
+                        val iconPosition = if (xIndex == 1) {
+                            TangemButtonIconPosition.Start
+                        } else {
+                            TangemButtonIconPosition.End
+                        }
+                        GhostTangemButton(
+                            onClick = {},
+                            text = text,
+                            size = TangemButtonSize.X15,
+                            iconPosition = iconPosition,
+                            iconRes = R.drawable.ic_tangem_24,
+                            state = params,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class GhostTangemButtonPreviewProvider : PreviewParameterProvider<TangemButtonState> {
+    override val values: Sequence<TangemButtonState>
+        get() = sequenceOf(
+            TangemButtonState.Default,
+            TangemButtonState.Pressed,
+            TangemButtonState.Loading,
+            TangemButtonState.Disabled,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/OutlineTangemButton.kt

@@ -0,0 +1,132 @@
+package com.tangem.core.ui.ds.button
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * [Outline Tangem button](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=5854-4800)
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ * @param shape         TangemButtonShape defining the shape of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun OutlineTangemButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+    enabled: Boolean = true,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+    shape: TangemButtonShape = TangemButtonShape.Default,
+) {
+    val backgroundModifier = when (state) {
+        TangemButtonState.Loading,
+        TangemButtonState.Pressed,
+        TangemButtonState.Disabled,
+        TangemButtonState.Default,
+        -> Modifier
+            .background(TangemTheme.colors2.surface.level1)
+            .border(
+                width = 1.dp,
+                color = TangemTheme.colors2.border.neutral.primary,
+                shape = shape.toShape(size),
+            )
+    }
+    val contentColor = when (state) {
+        TangemButtonState.Disabled -> TangemTheme.colors2.text.status.disabled
+        else -> TangemTheme.colors2.text.neutral.primary
+    }
+    TangemButtonInternal(
+        onClick = onClick,
+        modifier = modifier
+            .clip(shape.toShape(size))
+            .then(backgroundModifier),
+        text = text,
+        contentColor = contentColor,
+        iconRes = iconRes,
+        enabled = enabled,
+        size = size,
+        state = state,
+        iconPosition = iconPosition,
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 480)
+@Preview(showBackground = true, widthDp = 480, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun OutlineTangemButton_Preview(
+    @PreviewParameter(OutlineTangemButtonPreviewProvider::class) params: TangemButtonState,
+) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(21.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(8.dp),
+        ) {
+            repeat(4) { yIndex ->
+                val shape = if (yIndex < 2) TangemButtonShape.Default else TangemButtonShape.Rounded
+                val text = if (yIndex % 2 == 1) null else stringReference("Button")
+                Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    repeat(2) { xIndex ->
+                        val iconPosition = if (xIndex == 0) {
+                            TangemButtonIconPosition.Start
+                        } else {
+                            TangemButtonIconPosition.End
+                        }
+                        OutlineTangemButton(
+                            onClick = {},
+                            text = text,
+                            size = TangemButtonSize.X15,
+                            shape = shape,
+                            iconPosition = iconPosition,
+                            iconRes = R.drawable.ic_tangem_24,
+                            state = params,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class OutlineTangemButtonPreviewProvider : PreviewParameterProvider<TangemButtonState> {
+    override val values: Sequence<TangemButtonState>
+        get() = sequenceOf(
+            TangemButtonState.Default,
+            TangemButtonState.Pressed,
+            TangemButtonState.Loading,
+            TangemButtonState.Disabled,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/PrimaryInverseTangemButton.kt

@@ -0,0 +1,127 @@
+package com.tangem.core.ui.ds.button
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * [Primary Inverse Tangem button](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=7545-78314)
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ * @param shape         TangemButtonShape defining the shape of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun PrimaryInverseTangemButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+    enabled: Boolean = true,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+    shape: TangemButtonShape = TangemButtonShape.Default,
+) {
+    val backgroundModifier = when (state) {
+        TangemButtonState.Default -> Modifier.background(TangemTheme.colors2.button.backgroundPrimaryInverse)
+        TangemButtonState.Disabled -> Modifier.background(TangemTheme.colors2.button.backgroundDisabled)
+        TangemButtonState.Loading,
+        TangemButtonState.Pressed,
+        -> Modifier
+            .background(TangemTheme.colors2.button.backgroundPrimaryInverse)
+            .background(TangemTheme.colors2.overlay.overlayPrimary)
+    }
+    val contentColor = when (state) {
+        TangemButtonState.Disabled -> TangemTheme.colors2.text.status.disabled
+        else -> TangemTheme.colors2.text.neutral.primary
+    }
+    TangemButtonInternal(
+        onClick = onClick,
+        modifier = modifier
+            .clip(shape.toShape(size))
+            .then(backgroundModifier),
+        text = text,
+        contentColor = contentColor,
+        enabled = enabled,
+        size = size,
+        state = state,
+        iconPosition = iconPosition,
+        iconRes = iconRes,
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 480)
+@Preview(showBackground = true, widthDp = 480, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun PrimaryInverseTangemButton_Preview(
+    @PreviewParameter(PrimaryInverseTangemButtonPreviewProvider::class) params: TangemButtonState,
+) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(21.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level2)
+                .padding(8.dp),
+        ) {
+            repeat(4) { yIndex ->
+                val shape = if (yIndex < 2) TangemButtonShape.Default else TangemButtonShape.Rounded
+                val text = if (yIndex % 2 == 1) null else stringReference("Button")
+                Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    repeat(2) { xIndex ->
+                        val iconPosition = if (xIndex == 0) {
+                            TangemButtonIconPosition.Start
+                        } else {
+                            TangemButtonIconPosition.End
+                        }
+                        PrimaryInverseTangemButton(
+                            onClick = {},
+                            text = text,
+                            size = TangemButtonSize.X15,
+                            shape = shape,
+                            iconPosition = iconPosition,
+                            iconRes = R.drawable.ic_tangem_24,
+                            state = params,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class PrimaryInverseTangemButtonPreviewProvider : PreviewParameterProvider<TangemButtonState> {
+    override val values: Sequence<TangemButtonState>
+        get() = sequenceOf(
+            TangemButtonState.Default,
+            TangemButtonState.Pressed,
+            TangemButtonState.Loading,
+            TangemButtonState.Disabled,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/PrimaryTangemButton.kt

@@ -0,0 +1,122 @@
+package com.tangem.core.ui.ds.button
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * [Primary Tangem button](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=5854-4732&t=euYo1qCxPlQl3Fa6-4)
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ * @param shape         TangemButtonShape defining the shape of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun PrimaryTangemButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+    enabled: Boolean = true,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+    shape: TangemButtonShape = TangemButtonShape.Default,
+) {
+    val backgroundModifier = when (state) {
+        TangemButtonState.Loading,
+        TangemButtonState.Default,
+        -> Modifier.background(TangemTheme.colors2.button.backgroundPrimary)
+        TangemButtonState.Disabled -> Modifier.background(TangemTheme.colors2.button.backgroundDisabled)
+        TangemButtonState.Pressed -> Modifier
+            .background(TangemTheme.colors2.button.backgroundPrimary)
+            .background(TangemTheme.colors2.overlay.overlaySecondary)
+    }
+    val contentColor = when (state) {
+        TangemButtonState.Disabled -> TangemTheme.colors2.text.status.disabled
+        else -> TangemTheme.colors2.text.neutral.primaryInverted
+    }
+    TangemButtonInternal(
+        onClick = onClick,
+        modifier = modifier
+            .clip(shape.toShape(size))
+            .then(backgroundModifier),
+        text = text,
+        contentColor = contentColor,
+        enabled = enabled,
+        size = size,
+        state = state,
+        iconPosition = iconPosition,
+        iconRes = iconRes,
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 480)
+@Preview(showBackground = true, widthDp = 480, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun PrimaryTangemButton_Preview(
+    @PreviewParameter(PrimaryTangemButtonPreviewProvider::class) params: TangemButtonState,
+) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(21.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(8.dp),
+        ) {
+            repeat(4) { yIndex ->
+                val shape = if (yIndex < 2) TangemButtonShape.Default else TangemButtonShape.Rounded
+                val text = if (yIndex % 2 == 1) null else stringReference("Button")
+                Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    repeat(TangemButtonIconPosition.entries.size) { xIndex ->
+                        PrimaryTangemButton(
+                            onClick = {},
+                            text = text,
+                            size = TangemButtonSize.X15,
+                            shape = shape,
+                            iconPosition = TangemButtonIconPosition.entries[xIndex],
+                            iconRes = R.drawable.ic_tangem_24,
+                            state = params,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class PrimaryTangemButtonPreviewProvider : PreviewParameterProvider<TangemButtonState> {
+    override val values: Sequence<TangemButtonState>
+        get() = sequenceOf(
+            TangemButtonState.Default,
+            TangemButtonState.Pressed,
+            TangemButtonState.Loading,
+            TangemButtonState.Disabled,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/SecondaryTangemButton.kt

@@ -0,0 +1,125 @@
+package com.tangem.core.ui.ds.button
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * [Secondary Tangem button](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=5854-4796)
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ * @param shape         TangemButtonShape defining the shape of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun SecondaryTangemButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+    enabled: Boolean = true,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+    shape: TangemButtonShape = TangemButtonShape.Default,
+) {
+    val backgroundModifier = when (state) {
+        TangemButtonState.Loading,
+        TangemButtonState.Default,
+        -> Modifier.background(TangemTheme.colors2.button.backgroundSecondary)
+        TangemButtonState.Disabled -> Modifier.background(TangemTheme.colors2.button.backgroundDisabled)
+        TangemButtonState.Pressed -> Modifier.background(TangemTheme.colors2.overlay.overlayPrimary)
+    }
+    val contentColor = when (state) {
+        TangemButtonState.Disabled -> TangemTheme.colors2.text.status.disabled
+        else -> TangemTheme.colors2.text.neutral.primary
+    }
+    TangemButtonInternal(
+        onClick = onClick,
+        modifier = modifier
+            .clip(shape.toShape(size))
+            .then(backgroundModifier),
+        text = text,
+        contentColor = contentColor,
+        iconRes = iconRes,
+        enabled = enabled,
+        size = size,
+        state = state,
+        iconPosition = iconPosition,
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 480)
+@Preview(showBackground = true, widthDp = 480, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun SecondaryTangemButton_Preview(
+    @PreviewParameter(SecondaryTangemButtonPreviewProvider::class) params: TangemButtonState,
+) {
+    TangemThemePreviewRedesign {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(21.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(8.dp),
+        ) {
+            repeat(4) { yIndex ->
+                val shape = if (yIndex < 2) TangemButtonShape.Default else TangemButtonShape.Rounded
+                val text = if (yIndex % 2 == 1) null else stringReference("Button")
+                Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                    repeat(2) { xIndex ->
+                        val iconPosition = if (xIndex == 0) {
+                            TangemButtonIconPosition.Start
+                        } else {
+                            TangemButtonIconPosition.End
+                        }
+                        SecondaryTangemButton(
+                            onClick = {},
+                            text = text,
+                            size = TangemButtonSize.X15,
+                            shape = shape,
+                            iconPosition = iconPosition,
+                            iconRes = R.drawable.ic_tangem_24,
+                            state = params,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+private class SecondaryTangemButtonPreviewProvider : PreviewParameterProvider<TangemButtonState> {
+    override val values: Sequence<TangemButtonState>
+        get() = sequenceOf(
+            TangemButtonState.Default,
+            TangemButtonState.Pressed,
+            TangemButtonState.Loading,
+            TangemButtonState.Disabled,
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/button/TangemButtonInternal.kt

@@ -0,0 +1,256 @@
+package com.tangem.core.ui.ds.button
+
+import androidx.annotation.DrawableRes
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.TextAutoSize
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.clickableSingle
+import com.tangem.core.ui.extensions.conditionalCompose
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.test.BaseButtonTestTags
+
+/**
+ * A customizable button component that supports text, icons, and different states.
+ *
+ * @param onClick       Lambda to be invoked when the button is clicked.
+ * @param modifier      Modifier to be applied to the button.
+ * @param text          TextReference for the button label.
+ * @param iconRes       Drawable resource ID for the icon to be displayed in the button.
+ * @param iconPosition  Position of the icon (Start or End).
+ * @param enabled       Boolean indicating whether the button is enabled.
+ * @param contentColor  Color of the button content (text and icon).
+ * @param size          TangemButtonSize defining the size of the button.
+ * @param state         TangemButtonState defining the current state of the button.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+internal fun TangemButtonInternal(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: TextReference? = null,
+    @DrawableRes iconRes: Int? = null,
+    iconPosition: TangemButtonIconPosition = TangemButtonIconPosition.Start,
+    enabled: Boolean = true,
+    contentColor: Color = TangemTheme.colors2.text.neutral.primary,
+    size: TangemButtonSize = TangemButtonSize.X15,
+    state: TangemButtonState = TangemButtonState.Default,
+) {
+    Row(
+        modifier = modifier
+            .testTag(BaseButtonTestTags.BUTTON)
+            .height(size.toHeightDp())
+            .conditionalCompose(text == null) {
+                width(size.toHeightDp())
+            }
+            .clickableSingle(enabled = enabled, onClick = onClick, role = Role.Button)
+            .conditionalCompose(text != null) {
+                padding(horizontal = size.toPaddingDp())
+            }
+            .animateContentSize(),
+        horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        AnimatedVisibility(
+            visible = iconRes != null && iconPosition == TangemButtonIconPosition.Start,
+            modifier = Modifier.size(size = size.toContentSize()),
+        ) {
+            val wrappedIconRes = remember(this) { requireNotNull(iconRes) }
+            TangemButtonIcon(iconRes = wrappedIconRes, state = state, iconColor = contentColor, size = size)
+        }
+
+        AnimatedVisibility(text != null && state != TangemButtonState.Loading) {
+            val wrappedText = remember(this) { requireNotNull(text) }
+            val textStyle = size.toTextStyle()
+            Text(
+                text = wrappedText.resolveReference(),
+                style = textStyle,
+                color = contentColor,
+                textAlign = TextAlign.Center,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                autoSize = TextAutoSize.StepBased(
+                    minFontSize = 12.sp,
+                    maxFontSize = textStyle.fontSize,
+                ),
+                modifier = Modifier.testTag(BaseButtonTestTags.TEXT),
+            )
+        }
+
+        AnimatedVisibility(
+            visible = iconRes != null && iconPosition == TangemButtonIconPosition.End,
+            modifier = Modifier.size(size = size.toContentSize()),
+        ) {
+            val wrappedIconRes = remember(this) { requireNotNull(iconRes) }
+            TangemButtonIcon(iconRes = wrappedIconRes, state = state, iconColor = contentColor, size = size)
+        }
+    }
+}
+
+@Composable
+private fun TangemButtonIcon(
+    @DrawableRes iconRes: Int,
+    iconColor: Color,
+    state: TangemButtonState,
+    size: TangemButtonSize,
+) {
+    AnimatedContent(state) { targetState ->
+        when (targetState) {
+            TangemButtonState.Loading -> CircularProgressIndicator(
+                color = iconColor,
+                strokeWidth = 2.dp,
+                strokeCap = StrokeCap.Round,
+                modifier = Modifier.padding(
+                    when (size) {
+                        TangemButtonSize.X7,
+                        TangemButtonSize.X8,
+                        TangemButtonSize.X9,
+                        TangemButtonSize.X10,
+                        -> 0.5.dp
+                        TangemButtonSize.X12,
+                        TangemButtonSize.X15,
+                        -> 4.5.dp
+                    },
+                ),
+            )
+            else -> Icon(
+                painter = painterResource(id = iconRes),
+                contentDescription = null,
+                tint = iconColor,
+            )
+        }
+    }
+}
+
+/**
+ * Defines the shape of the Tangem button.
+ */
+enum class TangemButtonShape {
+    Default,
+    Rounded,
+    ;
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toShape(size: TangemButtonSize) = RoundedCornerShape(
+        when (this) {
+            Default -> size.toShapeRadius()
+            Rounded -> 100.dp
+        },
+    )
+}
+
+/**
+ * Defines the size of the Tangem button.
+ */
+enum class TangemButtonSize {
+    X7,
+    X8,
+    X9,
+    X10,
+    X12,
+    X15,
+    ;
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toHeightDp() = when (this) {
+        X7 -> TangemTheme.dimens2.x7
+        X8 -> TangemTheme.dimens2.x8
+        X9 -> TangemTheme.dimens2.x9
+        X10 -> TangemTheme.dimens2.x10
+        X12 -> TangemTheme.dimens2.x12
+        X15 -> TangemTheme.dimens2.x15
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toPaddingDp() = when (this) {
+        X7 -> TangemTheme.dimens2.x2
+        X8,
+        X9,
+        X10,
+        -> TangemTheme.dimens2.x3
+        X12,
+        X15,
+        -> TangemTheme.dimens2.x6
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toContentSize() = when (this) {
+        X7,
+        X8,
+        X9,
+        X10,
+        -> TangemTheme.dimens2.x5
+        X12,
+        X15,
+        -> TangemTheme.dimens2.x7
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toShapeRadius() = when (this) {
+        X7,
+        X8,
+        X9,
+        X10,
+        -> TangemTheme.dimens2.x2
+        X12 -> TangemTheme.dimens2.x3
+        X15 -> TangemTheme.dimens2.x4
+    }
+
+    @ReadOnlyComposable
+    @Composable
+    internal fun toTextStyle(): TextStyle = when (this) {
+        X7 -> TangemTheme.typography2.bodyRegular14
+        X8,
+        X9,
+        X10,
+        X12,
+        X15,
+        -> TangemTheme.typography2.bodySemibold16
+    }
+}
+
+/**
+ * Defines the state of the Tangem button.
+ */
+enum class TangemButtonState {
+    Default,
+    Disabled,
+    Pressed,
+    Loading,
+}
+
+/**
+ * Defines the position of the icon in the Tangem button.
+ */
+enum class TangemButtonIconPosition {
+    Start,
+    End,
+}

core/ui/src/main/java/com/tangem/core/ui/ds/topbar/TangemTopBar.kt

@@ -0,0 +1,239 @@
+package com.tangem.core.ui.ds.topbar
+
+import android.content.res.Configuration
+import androidx.annotation.DrawableRes
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.*
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreviewRedesign
+
+/**
+ * A top bar composable that displays a title and optional start and end icons.
+ * [Figma](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=8435-74860&m=dev)
+ *
+ * @param title                 The title text to be displayed in the center of the top bar.
+ * @param modifier              Modifier to be applied to the top bar.
+ * @param subtitle              Optional subtitle text to be displayed below the title.
+ * @param startIconRes          Optional drawable resource ID for the start icon.
+ * @param onStartContentClick   Optional click action for the start icon.
+ * @param endIconRes            Optional drawable resource ID for the end icon.
+ * @param onEndContentClick     Optional click action for the end icon.
+ * @param isGhostButtons        Flag to determine if ghost button styling should be applied.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+fun TangemTopBar(
+    modifier: Modifier = Modifier,
+    title: TextReference? = null,
+    subtitle: TextReference? = null,
+    @DrawableRes startIconRes: Int? = null,
+    onStartContentClick: (() -> Unit)? = null,
+    @DrawableRes endIconRes: Int? = null,
+    onEndContentClick: (() -> Unit)? = null,
+    @DrawableRes titleIconRes: Int? = null,
+    titleStyle: TextStyle = TangemTheme.typography2.headingSemibold17,
+    isGhostButtons: Boolean = false,
+) {
+    TangemTopBarInner(
+        modifier = modifier,
+        content = {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens2.x0_5),
+            ) {
+                TangemTopBarTitle(title = title, titleIconRes = titleIconRes, titleStyle = titleStyle)
+                AnimatedVisibility(
+                    visible = subtitle != null,
+                    label = "Subtitle Visibility",
+                ) {
+                    val wrappedSubtitle = remember(this) { requireNotNull(subtitle) }
+                    Text(
+                        text = wrappedSubtitle.resolveAnnotatedReference(),
+                        color = TangemTheme.colors2.text.neutral.secondary,
+                        style = TangemTheme.typography2.bodyRegular15,
+                        textAlign = TextAlign.Center,
+                        maxLines = 1,
+                    )
+                }
+            }
+        },
+        startContent = if (startIconRes != null) {
+            { TangemTopBarIcon(iconRes = startIconRes) }
+        } else {
+            null
+        },
+        onStartContentClick = onStartContentClick,
+        endContent = if (endIconRes != null) {
+            { TangemTopBarIcon(iconRes = endIconRes) }
+        } else {
+            null
+        },
+        onEndContentClick = onEndContentClick,
+        isGhostButtons = isGhostButtons,
+    )
+}
+
+@Composable
+private fun TangemTopBarTitle(title: TextReference?, @DrawableRes titleIconRes: Int?, titleStyle: TextStyle) {
+    AnimatedVisibility(
+        visible = title != null,
+        label = "Title Visibility",
+    ) {
+        val wrappedTitle = remember(this) { requireNotNull(title) }
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens2.x1),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            AnimatedVisibility(
+                visible = titleIconRes != null,
+                label = "Title Icon Visibility",
+            ) {
+                val wrappedTitleIconRes = remember(this) {
+                    requireNotNull(titleIconRes)
+                }
+                Icon(
+                    imageVector = ImageVector.vectorResource(id = wrappedTitleIconRes),
+                    contentDescription = null,
+                    tint = TangemTheme.colors2.graphic.neutral.primary,
+                    modifier = Modifier.size(TangemTheme.dimens2.x4),
+                )
+            }
+
+            Text(
+                text = wrappedTitle.resolveAnnotatedReference(),
+                color = TangemTheme.colors2.text.neutral.primary,
+                style = titleStyle,
+                textAlign = TextAlign.Center,
+                maxLines = 1,
+            )
+        }
+    }
+}
+
+@Composable
+private fun TangemTopBarIcon(@DrawableRes iconRes: Int) {
+    Icon(
+        imageVector = ImageVector.vectorResource(id = iconRes),
+        contentDescription = null,
+        tint = TangemTheme.colors2.graphic.neutral.primary,
+        modifier = Modifier.fillMaxSize(),
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 375)
+@Preview(showBackground = true, widthDp = 375, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun TangemTopBar_Preview(@PreviewParameter(PreviewProvider::class) params: TangemTopBarPreviewData) {
+    TangemThemePreviewRedesign {
+        TangemTopBar(
+            title = params.title,
+            subtitle = params.subtitle,
+            startIconRes = params.startIconRes,
+            endIconRes = params.endIconRes,
+            titleIconRes = params.titleIconRes,
+            isGhostButtons = params.isGhostButtons,
+            onStartContentClick = {},
+            onEndContentClick = {},
+            modifier = Modifier.background(TangemTheme.colors2.surface.level1),
+        )
+    }
+}
+
+private class TangemTopBarPreviewData(
+    val title: TextReference? = null,
+    val subtitle: TextReference? = null,
+    val isGhostButtons: Boolean = false,
+    val titleIconRes: Int? = null,
+    val startIconRes: Int? = null,
+    val endIconRes: Int? = null,
+)
+
+private class PreviewProvider : PreviewParameterProvider<TangemTopBarPreviewData> {
+    override val values: Sequence<TangemTopBarPreviewData>
+        get() = sequenceOf(
+            TangemTopBarPreviewData(
+                title = stringReference("Title"),
+                startIconRes = R.drawable.ic_tangem_24,
+                endIconRes = R.drawable.ic_more_vertical_24,
+                isGhostButtons = true,
+            ),
+            TangemTopBarPreviewData(
+                title = stringReference("Title"),
+                subtitle = stringReference("Subtitle"),
+                startIconRes = R.drawable.ic_tangem_24,
+                endIconRes = R.drawable.ic_more_vertical_24,
+                isGhostButtons = true,
+            ),
+            TangemTopBarPreviewData(
+                title = stringReference("Title"),
+                subtitle = stringReference("Subtitle"),
+                titleIconRes = R.drawable.ic_tangem_24,
+                startIconRes = R.drawable.ic_tangem_24,
+                endIconRes = R.drawable.ic_more_vertical_24,
+                isGhostButtons = true,
+            ),
+            TangemTopBarPreviewData(
+                subtitle = stringReference("Subtitle"),
+                titleIconRes = R.drawable.ic_tangem_24,
+                startIconRes = R.drawable.ic_tangem_24,
+                endIconRes = R.drawable.ic_more_vertical_24,
+                isGhostButtons = true,
+            ),
+            TangemTopBarPreviewData(
+                title = stringReference("Title"),
+                endIconRes = R.drawable.ic_more_vertical_24,
+                isGhostButtons = true,
+            ),
+            TangemTopBarPreviewData(
+                title = stringReference("Title"),
+                startIconRes = R.drawable.ic_tangem_24,
+                isGhostButtons = true,
+            ),
+            TangemTopBarPreviewData(
+                title = combinedReference(
+                    stringReference("$ 46,112"),
+                    styledStringReference(
+                        value = ".30",
+                        spanStyleReference = {
+                            TangemTheme.typography.caption1.copy(TangemTheme.colors2.text.neutral.secondary)
+                                .toSpanStyle()
+                        },
+                    ),
+                ),
+            ),
+            TangemTopBarPreviewData(
+                title = combinedReference(
+                    stringReference("$ 46,112"),
+                    styledStringReference(
+                        value = ".30",
+                        spanStyleReference = {
+                            TangemTheme.typography.caption1.copy(TangemTheme.colors2.text.neutral.secondary)
+                                .toSpanStyle()
+                        },
+                    ),
+                ),
+                startIconRes = R.drawable.ic_tangem_24,
+                endIconRes = R.drawable.ic_more_vertical_24,
+            ),
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/ds/topbar/TangemTopBarInner.kt

@@ -0,0 +1,90 @@
+package com.tangem.core.ui.ds.topbar
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import com.tangem.core.ui.extensions.clickableSingle
+import com.tangem.core.ui.extensions.conditional
+import com.tangem.core.ui.extensions.conditionalCompose
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * Internal top bar composable that arranges optional start, center, and end content.
+ * [Figma](https://www.figma.com/design/RU7AIgwHtGdMfy83T5UOoR/Core-Library?node-id=8435-74860&m=dev)
+ *
+ * @param modifier              Modifier to be applied to the top bar.
+ * @param content               Center content of the top bar.
+ * @param startContent          Optional start content of the top bar.
+ * @param onStartContentClick   Optional click action for the start content.
+ * @param endContent            Optional end content of the top bar.
+ * @param onEndContentClick     Optional click action for the end content.
+ * @param isGhostButtons        Flag to determine if ghost button styling should be applied.
+ *
+[REDACTED_AUTHOR]
+ */
+@Composable
+internal fun TangemTopBarInner(
+    modifier: Modifier = Modifier,
+    content: (@Composable () -> Unit)? = null,
+    startContent: (@Composable () -> Unit)? = null,
+    onStartContentClick: (() -> Unit)? = null,
+    endContent: (@Composable () -> Unit)? = null,
+    onEndContentClick: (() -> Unit)? = null,
+    isGhostButtons: Boolean = false,
+) {
+    Box(
+        modifier = modifier
+            .height(TangemTheme.dimens2.x16)
+            .fillMaxWidth()
+            .padding(TangemTheme.dimens2.x4, TangemTheme.dimens2.x3),
+    ) {
+        val iconModifier = Modifier
+            .size(TangemTheme.dimens2.x10)
+            .clip(RoundedCornerShape(TangemTheme.dimens2.x25))
+            .background(TangemTheme.colors2.button.backgroundSecondary)
+
+        AnimatedVisibility(
+            visible = startContent != null,
+            modifier = Modifier.align(Alignment.CenterStart),
+            label = "Start Content Visibility",
+        ) {
+            Box(
+                modifier = iconModifier
+                    .conditional(onStartContentClick != null) {
+                        clickableSingle { onStartContentClick?.invoke() }
+                    }
+                    .conditionalCompose(isGhostButtons) { padding(TangemTheme.dimens2.x1) },
+            ) {
+                startContent?.invoke()
+            }
+        }
+
+        AnimatedVisibility(
+            visible = content != null,
+            modifier = Modifier.align(Alignment.Center),
+        ) {
+            content?.invoke()
+        }
+
+        AnimatedVisibility(
+            visible = endContent != null,
+            modifier = Modifier.align(Alignment.CenterEnd),
+            label = "End Content Visibility",
+        ) {
+            Box(
+                modifier = iconModifier
+                    .conditional(onEndContentClick != null) {
+                        clickableSingle { onEndContentClick?.invoke() }
+                    }
+                    .conditionalCompose(isGhostButtons) { padding(TangemTheme.dimens2.x1) },
+            ) {
+                endContent?.invoke()
+            }
+        }
+    }
+}

core/ui/src/main/java/com/tangem/core/ui/extensions/AnnotatedStringExt.kt

@@ -56,12 +56,31 @@ fun AnnotatedString.Builder.appendMarkdown(markdownText: String, node: ASTNode):
     return this
 }
 
+/**
+ * Appends a single space character to the [AnnotatedString.Builder].
+ */
 fun AnnotatedString.Builder.appendSpace() = append(" ")
 
+/**
+ * Appends text with the specified [Color] to the [AnnotatedString.Builder].
+ *
+ * @param text The text to append.
+ * @param color The [Color] to apply to the appended text.
+ */
 fun AnnotatedString.Builder.appendColored(text: String, color: Color) = withStyle(SpanStyle(color = color)) {
     append(text)
 }
 
+/**
+ * Appends text with the specified [SpanStyle] to the [AnnotatedString.Builder].
+ *
+ * @param text The text to append.
+ * @param spanStyle The [SpanStyle] to apply to the appended text.
+ */
+fun AnnotatedString.Builder.appendStyled(text: String, spanStyle: SpanStyle) = withStyle(spanStyle) {
+    append(text)
+}
+
 /**
  * Appends text from a template string to the AnnotatedString.Builder, replacing a placeholder (default "%s")
  * with custom styled content provided by a lambda. The lambda allows you to insert styled or complex content

core/ui/src/main/java/com/tangem/core/ui/extensions/ColorReference.kt

@@ -7,10 +7,11 @@ import androidx.compose.ui.graphics.Color
 /**
  * Utility class for keeping themed color reference from app theme.
  *
- * It necessary to use [Immutable] annotation for runtime stability.
+ * It is necessary to use [Immutable] annotation for runtime stability.
  *
  * @property value color provider from theme
  */
+@Deprecated("Use TextReference with applied SpanStyleReference for colored text.")
 @Immutable
 data class ColorReference(val value: @Composable () -> Color)
 

core/ui/src/main/java/com/tangem/core/ui/extensions/ModifierExt.kt

@@ -54,8 +54,8 @@ fun Modifier.conditional(condition: Boolean, modifier: Modifier.() -> Modifier):
 @Composable
 fun Modifier.conditionalCompose(
     condition: Boolean,
-    modifier: @Composable Modifier.() -> Modifier = { Modifier },
     otherModifier: @Composable Modifier.() -> Modifier = { this },
+    modifier: @Composable Modifier.() -> Modifier = { Modifier },
 ): Modifier {
     return if (condition) {
         then(modifier(Modifier))

core/ui/src/main/java/com/tangem/core/ui/extensions/SpanStyleReference.kt

@@ -0,0 +1,19 @@
+package com.tangem.core.ui.extensions
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.text.SpanStyle
+
+/**
+ * Utility functional interface for keeping themed [SpanStyle] reference from app theme.
+ * It is necessary to use [Stable] annotation for runtime stability.
+ */
+@Stable
+@FunctionalInterface
+fun interface SpanStyleReference {
+
+    @ReadOnlyComposable
+    @Composable
+    operator fun invoke(): SpanStyle
+}

core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt

@@ -1,16 +1,33 @@
 package com.tangem.core.ui.extensions
 
+import android.content.res.Configuration
 import android.content.res.Resources
 import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.AnnotatedString.Builder
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withLink
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
 import com.tangem.core.res.getPluralStringSafe
 import com.tangem.core.res.getStringSafe
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.utils.StringsSigns.THREE_STARS
 import org.intellij.markdown.MarkdownElementTypes
 import kotlin.contracts.ExperimentalContracts
@@ -69,6 +86,35 @@ sealed interface TextReference {
      */
     data class Combined(val refs: WrappedList<TextReference>) : TextReference
 
+    /**
+     * Styled string value
+     *
+     * @property value                string value
+     * @property spanStyleReference   text style reference
+     * @property onClick              optional click action
+     */
+    data class StyledStr(
+        val value: String,
+        val spanStyleReference: SpanStyleReference,
+        val onClick: (() -> Unit)? = null,
+    ) : TextReference
+
+    /**
+     * Styled string resource
+     *
+     * @property id                  resource id
+     * @property formatArgs          arguments. Impossible to use [kotlinx.collections.immutable.ImmutableList] because
+     *                               [Any] is unstable.
+     * @property spanStyleReference  text style reference
+     * @property onClick             optional click action
+     */
+    data class StyledRes(
+        @StringRes val id: Int,
+        val formatArgs: WrappedList<Any> = WrappedList(emptyList()),
+        val spanStyleReference: SpanStyleReference,
+        val onClick: (() -> Unit)? = null,
+    ) : TextReference
+
     companion object {
 
         /** Empty string as [TextReference] */
@@ -139,6 +185,42 @@ fun pluralReference(
     return TextReference.PluralRes(id, count, formatArgs)
 }
 
+/**
+ * Creates a [TextReference] using a plain string value with optional span style and click action.
+ *
+ * @param value The plain string value.
+ * @param spanStyleReference A [SpanStyleReference] representing the text style to be applied.
+ * @param onClick An optional lambda function to be invoked when the text is clicked.
+ * @return A [TextReference] representing the styled string with click action.
+ */
+fun styledStringReference(value: String, spanStyleReference: SpanStyleReference, onClick: (() -> Unit)? = null) =
+    TextReference.StyledStr(
+        value = value,
+        onClick = onClick,
+        spanStyleReference = spanStyleReference,
+    )
+
+/**
+ * Creates a [TextReference] using a string resource ID with optional format arguments, span style, and click action.
+ *
+ * @param id The resource ID of the string.
+ * @param formatArgs A list of format arguments to be applied to the string resource.
+ * @param spanStyleReference A [SpanStyleReference] representing the text style to be applied.
+ * @param onClick An optional lambda function to be invoked when the text is clicked.
+ * @return A [TextReference] representing the styled string with click action.
+ */
+fun styledResourceReference(
+    @StringRes id: Int,
+    formatArgs: WrappedList<Any> = WrappedList(emptyList()),
+    spanStyleReference: SpanStyleReference,
+    onClick: (() -> Unit)? = null,
+) = TextReference.StyledRes(
+    id = id,
+    formatArgs = formatArgs,
+    spanStyleReference = spanStyleReference,
+    onClick = onClick,
+)
+
 /**
  * Combines multiple [TextReference] instances into a single [TextReference].
  *
@@ -165,9 +247,7 @@ fun combinedReference(vararg refs: TextReference): TextReference {
 fun TextReference.resolveReference(): String {
     return when (this) {
         is TextReference.Res -> {
-            val args = formatArgs
-                .map { if (it is TextReference) it.resolveReference() else it }
-                .toTypedArray()
+            val args = formatArgs.map { if (it is TextReference) it.resolveReference() else it }.toTypedArray()
 
             val resolvedReference = stringResourceSafe(id = id, *args)
 
@@ -187,6 +267,12 @@ fun TextReference.resolveReference(): String {
                 }
             }
         }
+        is TextReference.StyledRes -> {
+            val args = formatArgs.map { if (it is TextReference) it.resolveReference() else it }.toTypedArray()
+
+            stringResourceSafe(id = id, *args)
+        }
+        is TextReference.StyledStr -> value
     }
 }
 
@@ -194,9 +280,7 @@ fun TextReference.resolveReference(): String {
 fun TextReference.resolveReference(resources: Resources): String {
     return when (this) {
         is TextReference.Res -> {
-            val args = formatArgs
-                .map { if (it is TextReference) it.resolveReference(resources) else it }
-                .toTypedArray()
+            val args = formatArgs.map { if (it is TextReference) it.resolveReference(resources) else it }.toTypedArray()
 
             resources.getStringSafe(id, *args)
         }
@@ -210,6 +294,12 @@ fun TextReference.resolveReference(resources: Resources): String {
                 }
             }
         }
+        is TextReference.StyledRes -> {
+            val args = formatArgs.map { if (it is TextReference) it.resolveReference(resources) else it }.toTypedArray()
+
+            resources.getStringSafe(id, *args)
+        }
+        is TextReference.StyledStr -> value
     }
 }
 
@@ -218,9 +308,7 @@ fun TextReference.resolveReference(resources: Resources): String {
 fun TextReference.resolveAnnotatedReference(): AnnotatedString {
     return when (this) {
         is TextReference.Res -> {
-            val args = formatArgs
-                .map { if (it is TextReference) it.resolveReference() else it }
-                .toTypedArray()
+            val args = formatArgs.map { if (it is TextReference) it.resolveReference() else it }.toTypedArray()
 
             formatAnnotated(stringResourceSafe(id = id, *args))
         }
@@ -234,6 +322,21 @@ fun TextReference.resolveAnnotatedReference(): AnnotatedString {
                 append(it.resolveAnnotatedReference())
             }
         }
+        is TextReference.StyledRes -> {
+            val args = formatArgs.map { if (it is TextReference) it.resolveReference() else it }.toTypedArray()
+            val text = stringResourceSafe(id = id, *args)
+
+            createStyledText(
+                text = text,
+                spanStyleReference = spanStyleReference,
+                onClick = onClick,
+            )
+        }
+        is TextReference.StyledStr -> createStyledText(
+            text = value,
+            spanStyleReference = spanStyleReference,
+            onClick = onClick,
+        )
     }
 }
 
@@ -245,6 +348,8 @@ operator fun TextReference.plus(ref: TextReference): TextReference {
         is TextReference.Res,
         is TextReference.Str,
         is TextReference.Annotated,
+        is TextReference.StyledRes,
+        is TextReference.StyledStr,
         -> TextReference.Combined(refs = wrappedList(this, ref))
     }
 }
@@ -281,3 +386,119 @@ private fun formatAnnotated(rawString: String): AnnotatedString {
 fun TextReference.orMaskWithStars(maskWithStars: Boolean): TextReference {
     return if (maskWithStars) stringReference(THREE_STARS) else this
 }
+
+@ReadOnlyComposable
+@Composable
+private fun createStyledText(
+    text: String,
+    spanStyleReference: SpanStyleReference,
+    onClick: (() -> Unit)?,
+): AnnotatedString = buildAnnotatedString {
+    if (onClick != null) {
+        withLink(
+            link = LinkAnnotation.Clickable(
+                tag = text,
+                linkInteractionListener = { onClick() },
+            ),
+            block = {
+                appendStyled(
+                    text = text,
+                    spanStyle = spanStyleReference(),
+                )
+            },
+        )
+    } else {
+        appendStyled(
+            text = text,
+            spanStyle = spanStyleReference(),
+        )
+    }
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun TextReference_Preview(@PreviewParameter(TextReferencePreviewProvider::class) params: TextReference) {
+    TangemThemePreview {
+        val uriHandler = LocalUriHandler.current
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(TangemTheme.colors.background.primary)
+                .padding(4.dp),
+        ) {
+            Text(
+                text = params.resolveAnnotatedReference(),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.primary1,
+            )
+            Text(
+                text = styledResourceReference(
+                    id = R.string.common_read_more,
+                    spanStyleReference = {
+                        TangemTheme.typography.body1.copy(TangemTheme.colors.text.accent).toSpanStyle()
+                    },
+                    onClick = {
+                        uriHandler.openUri("https://tangem.com")
+                    },
+                ).resolveAnnotatedReference(),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.primary1,
+            )
+            Text(
+                text = stringReference("To be masked").orMaskWithStars(true).resolveAnnotatedReference(),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.primary1,
+            )
+        }
+    }
+}
+
+private class TextReferencePreviewProvider : PreviewParameterProvider<TextReference> {
+    override val values: Sequence<TextReference>
+        get() = sequenceOf(
+            stringReference("Simple string"),
+            resourceReference(R.string.common_tangem),
+            pluralReference(
+                id = R.plurals.common_days,
+                count = 5,
+                formatArgs = wrappedList(5),
+            ),
+            styledStringReference(
+                value = "Styled string",
+                spanStyleReference = {
+                    TangemTheme.typography.subtitle2.copy(TangemTheme.colors.text.accent).toSpanStyle()
+                },
+            ),
+            styledResourceReference(
+                id = R.string.common_tangem,
+                spanStyleReference = {
+                    TangemTheme.typography.caption1.copy(TangemTheme.colors.text.accent).toSpanStyle()
+                },
+            ),
+            combinedReference(
+                stringReference("Simple string"),
+                resourceReference(R.string.common_tangem),
+                pluralReference(
+                    id = R.plurals.common_days,
+                    count = 5,
+                    formatArgs = wrappedList(5),
+                ),
+                styledStringReference(
+                    value = "Styled string",
+                    spanStyleReference = {
+                        TangemTheme.typography.subtitle2.copy(TangemTheme.colors.text.accent).toSpanStyle()
+                    },
+                ),
+                styledResourceReference(
+                    id = R.string.common_tangem,
+                    spanStyleReference = {
+                        TangemTheme.typography.caption1.copy(TangemTheme.colors.text.warning).toSpanStyle()
+                    },
+                ),
+            ),
+        )
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt

@@ -18,6 +18,18 @@ object TangemColorPalette {
     val Dark6 = Color(0xFF1E1E1E)
     // endregion Dark
 
+    // region Dark Alpha
+    val Dark_10 = Color(0x1A1E1E1E)
+    val Dark_20 = Color(0x331E1E1E)
+    val Dark_30 = Color(0x4D1E1E1E)
+    val Dark_40 = Color(0x661E1E1E)
+    val Dark_50 = Color(0x801E1E1E)
+    val Dark_60 = Color(0x991E1E1E)
+    val Dark_70 = Color(0xB31E1E1E)
+    val Dark_80 = Color(0xCC1E1E1E)
+    val Dark_90 = Color(0xE61E1E1E)
+    // endregion Dark Alpha
+
     // region Light
     val Light1 = Color(0xFFF5F5F5)
     val Light1V2 = Color(0xFFF4F4F4)
@@ -27,6 +39,18 @@ object TangemColorPalette {
     val Light5 = Color(0xFFB0B0B0)
     // endregion Light
 
+    // region Light Alpha
+    val Light_10 = Color(0x1AFFFFFF)
+    val Light_20 = Color(0x33FFFFFF)
+    val Light_30 = Color(0x4DFFFFFF)
+    val Light_40 = Color(0x66FFFFFF)
+    val Light_50 = Color(0x80FFFFFF)
+    val Light_60 = Color(0x99FFFFFF)
+    val Light_70 = Color(0xB3FFFFFF)
+    val Light_80 = Color(0xCCFFFFFF)
+    val Light_90 = Color(0xE6FFFFFF)
+    // endregion Light Alpha
+
     // region Green
     val Green = Color(0xFF0C9F3D)
     val Meadow = Color(0xFF1ACE80)

core/ui/src/main/java/com/tangem/core/ui/res/TangemColors2.kt

@@ -162,6 +162,7 @@ class TangemColors2 internal constructor(
         backgroundSecondary: Color,
         backgroundDisabled: Color,
         backgroundPositive: Color,
+        backgroundPrimaryInverse: Color,
         textPrimary: Color,
         textSecondary: Color,
         textDisabled: Color,
@@ -178,6 +179,8 @@ class TangemColors2 internal constructor(
             private set
         var backgroundPositive by mutableStateOf(backgroundPositive)
             private set
+        var backgroundPrimaryInverse by mutableStateOf(backgroundPrimaryInverse)
+            private set
         var textPrimary by mutableStateOf(textPrimary)
             private set
         var textSecondary by mutableStateOf(textSecondary)
@@ -198,6 +201,7 @@ class TangemColors2 internal constructor(
             backgroundSecondary = other.backgroundSecondary
             backgroundDisabled = other.backgroundDisabled
             backgroundPositive = other.backgroundPositive
+            backgroundPrimaryInverse = other.backgroundPrimaryInverse
             textPrimary = other.textPrimary
             textSecondary = other.textSecondary
             textDisabled = other.textDisabled

core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens2.kt

@@ -0,0 +1,39 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Suppress("ConstructorParameterNaming")
+@ConsistentCopyVisibility
+@Immutable
+data class TangemDimens2 internal constructor(
+    val x0: Dp = 0.dp,
+    val x0_5: Dp = 2.dp,
+    val x1: Dp = 4.dp,
+    val x2: Dp = 8.dp,
+    val x2_5: Dp = 10.dp,
+    val x3: Dp = 12.dp,
+    val x4: Dp = 16.dp,
+    val x5: Dp = 20.dp,
+    val x6: Dp = 24.dp,
+    val x7: Dp = 28.dp,
+    val x8: Dp = 32.dp,
+    val x9: Dp = 36.dp,
+    val x10: Dp = 40.dp,
+    val x11: Dp = 44.dp,
+    val x12: Dp = 48.dp,
+    val x13: Dp = 52.dp,
+    val x14: Dp = 56.dp,
+    val x15: Dp = 60.dp,
+    val x16: Dp = 64.dp,
+    val x17: Dp = 68.dp,
+    val x18: Dp = 72.dp,
+    val x19: Dp = 76.dp,
+    val x20: Dp = 80.dp,
+    val x21: Dp = 84.dp,
+    val x22: Dp = 88.dp,
+    val x23: Dp = 92.dp,
+    val x24: Dp = 96.dp,
+    val x25: Dp = 100.dp,
+)

core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt

@@ -1,6 +1,8 @@
 package com.tangem.core.ui.res
 
 import android.app.Activity
+import androidx.compose.foundation.ComposeFoundationFlags
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.text.selection.LocalTextSelectionColors
 import androidx.compose.foundation.text.selection.TextSelectionColors
@@ -27,6 +29,7 @@ import com.tangem.core.ui.windowsize.rememberWindowSize
 import com.tangem.domain.apptheme.model.AppThemeMode
 import com.valentinilk.shimmer.Shimmer
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun TangemTheme(
     activity: Activity,
@@ -36,6 +39,9 @@ fun TangemTheme(
     overrideSystemBarColors: Boolean = true,
     content: @Composable () -> Unit,
 ) {
+    // TODO Research and implement in redesign [REDACTED_TASK_KEY]
+    ComposeFoundationFlags.isPausableCompositionInPrefetchEnabled = false
+
     val appThemeMode by uiDependencies.appThemeModeHolder.appThemeMode
     val windowSize = rememberWindowSize(activity = activity)
 
@@ -148,11 +154,21 @@ object TangemTheme {
         @ReadOnlyComposable
         get() = LocalTangemTypography.current
 
+    val typography2: TangemTypography2
+        @Composable
+        @ReadOnlyComposable
+        get() = TangemTypography2(InterFamily)
+
     val dimens: TangemDimens
         @Composable
         @ReadOnlyComposable
         get() = LocalTangemDimens.current
 
+    val dimens2: TangemDimens2
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalTangemDimens2.current
+
     val shapes: TangemShapes
         @Composable
         @ReadOnlyComposable
@@ -337,10 +353,18 @@ internal val LocalTangemTypography = staticCompositionLocalOf {
     TangemTypography(RobotoFamily)
 }
 
+internal val LocalTangemTypography2 = staticCompositionLocalOf {
+    TangemTypography2(InterFamily)
+}
+
 private val LocalTangemDimens = staticCompositionLocalOf {
     TangemDimens()
 }
 
+private val LocalTangemDimens2 = staticCompositionLocalOf {
+    TangemDimens2()
+}
+
 private val LocalTangemShapes = staticCompositionLocalOf<TangemShapes> {
     error("No TangemShapes provided")
 }

core/ui/src/main/java/com/tangem/core/ui/res/TangemThemePreview.kt

@@ -37,6 +37,32 @@ fun TangemThemePreview(
     }
 }
 
+@Composable
+fun TangemThemePreviewRedesign(
+    isDark: Boolean? = null,
+    alwaysShowBottomSheets: Boolean = true,
+    rtl: Boolean = false,
+    content: @Composable () -> Unit,
+) {
+    val isDarkTheme = isDark ?: isSystemInDarkTheme()
+
+    CompositionLocalProvider(
+        LocalBottomSheetAlwaysVisible provides alwaysShowBottomSheets,
+        LocalLayoutDirection provides if (rtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
+    ) {
+        BoxWithConstraints {
+            TangemTheme(
+                isDark = isDarkTheme,
+                windowSize = rememberWindowSizePreview(maxWidth, maxHeight),
+            ) {
+                TangemThemeRedesign(
+                    content = content,
+                )
+            }
+        }
+    }
+}
+
 /**
  * This is used to make the bottom sheet always visible in the Preview and should be `true` only in the Preview.
  * */

core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt

@@ -1,4 +1,5 @@
 @file:Suppress("LongMethod")
+
 package com.tangem.core.ui.res
 
 import androidx.compose.material3.MaterialTheme
@@ -22,7 +23,7 @@ fun TangemThemeRedesign(content: @Composable () -> Unit) {
         CompositionLocalProvider(
             LocalTangemColors provides themeColors,
             LocalTangemColors2 provides if (LocalIsInDarkTheme.current) darkThemeColors2() else lightThemeColors2(),
-            LocalTangemTypography provides TangemTypography(InterFamily),
+            LocalTangemTypography2 provides TangemTypography2(InterFamily),
             LocalRootBackgroundColor provides remember(rootBackgroundColor) { mutableStateOf(rootBackgroundColor) },
         ) {
             content()
@@ -97,9 +98,10 @@ private fun lightThemeColors2(): TangemColors2 {
     )
     val button = TangemColors2.Button(
         backgroundPrimary = TangemColorPalette.Dark6,
-        backgroundSecondary = TangemColorPalette.Dark6.copy(alpha = 0.1f),
+        backgroundSecondary = TangemColorPalette.Dark_10,
         backgroundDisabled = TangemColorPalette.Light3,
         backgroundPositive = TangemColorPalette.Azure,
+        backgroundPrimaryInverse = TangemColorPalette.White,
         textSecondary = TangemColorPalette.Dark6,
         textPrimary = TangemColorPalette.Light2,
         textDisabled = text.neutral.tertiary,
@@ -236,9 +238,10 @@ private fun darkThemeColors2(): TangemColors2 {
     )
     val button = TangemColors2.Button(
         backgroundPrimary = TangemColorPalette.Light1V2,
-        backgroundSecondary = TangemColorPalette.White.copy(alpha = 0.1f),
+        backgroundSecondary = TangemColorPalette.Light_10,
         backgroundDisabled = TangemColorPalette.Dark5,
         backgroundPositive = TangemColorPalette.Azure,
+        backgroundPrimaryInverse = TangemColorPalette.Light_10,
         textSecondary = TangemColorPalette.Light4,
         textPrimary = TangemColorPalette.Dark4,
         textDisabled = text.neutral.secondary,

core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.unit.TextUnit
@@ -17,11 +16,6 @@ internal val RobotoFamily = FontFamily(
     Font(R.font.roboto_medium, FontWeight.Medium),
 )
 
-internal val InterFamily = FontFamily(
-    Font(R.font.inter_regular),
-    Font(R.font.inter_italic, style = FontStyle.Italic),
-)
-
 @Immutable
 class TangemTypography internal constructor(
     fontFamily: FontFamily,

core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography2.kt

@@ -0,0 +1,348 @@
+package com.tangem.core.ui.res
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.LineHeightStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.R
+
+internal val InterFamily = FontFamily(
+    Font(R.font.inter_regular),
+    Font(R.font.inter_italic, style = FontStyle.Italic),
+)
+
+@Stable
+class TangemTypography2 internal constructor(
+    fontFamily: FontFamily,
+) {
+    val titleRegular44: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 44.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = 0.37f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 48f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingRegular34: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 34.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = 0.37f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 40f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingBold34: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 34.sp,
+        fontWeight = FontWeight.Bold,
+        letterSpacing = TextUnit(value = 0.37f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 40f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingRegular28: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 28.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = 0.36f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 36f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingBold28: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 28.sp,
+        fontWeight = FontWeight.Bold,
+        letterSpacing = TextUnit(value = 0.36f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 36f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingRegular22: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 22.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = 0.35f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 28f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingBold22: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 22.sp,
+        fontWeight = FontWeight.Bold,
+        letterSpacing = TextUnit(value = 0.35f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 28f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingRegular20: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 20.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = 0.38f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingSemibold20: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 20.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = 0.38f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingRegular17: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 17.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = -0.41f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val headingSemibold17: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 17.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = -0.2f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val bodyRegular16: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 16.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = -0.32f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val bodySemibold16: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 16.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = -0.32f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val bodyRegular15: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 15.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = -0.24f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val bodySemibold15: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 15.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(value = -0.1f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val bodyRegular14: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 14.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(value = -0.1f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val captionRegular13: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 13.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = -0.08f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val captionSemibold13: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 13.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = 0.1f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val captionRegular12: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 12.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = 0f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val captionSemibold12: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 12.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(value = 0.1f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val captionRegular11: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 11.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(value = 0.07f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 12f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+
+    val captionSemibold11: TextStyle = TextStyle(
+        fontFamily = fontFamily,
+        fontSize = 11.sp,
+        fontWeight = FontWeight.SemiBold,
+        letterSpacing = TextUnit(value = 0.15f, type = TextUnitType.Sp),
+        lineHeight = TextUnit(value = 12f, type = TextUnitType.Sp),
+        lineHeightStyle = LineHeightStyle(
+            alignment = LineHeightStyle.Alignment.Center,
+            trim = LineHeightStyle.Trim.None,
+        ),
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 360, heightDp = 1500)
+@Preview(showBackground = true, widthDp = 360, heightDp = 1500, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun TangemTypography2_Preview() {
+    TangemThemePreviewRedesign {
+        val typographyList = sequenceOf(
+            TangemTheme.typography2.titleRegular44,
+            TangemTheme.typography2.headingRegular34,
+            TangemTheme.typography2.headingBold34,
+            TangemTheme.typography2.headingRegular28,
+            TangemTheme.typography2.headingBold28,
+            TangemTheme.typography2.headingRegular22,
+            TangemTheme.typography2.headingBold22,
+            TangemTheme.typography2.headingRegular20,
+            TangemTheme.typography2.headingSemibold20,
+            TangemTheme.typography2.headingRegular17,
+            TangemTheme.typography2.headingSemibold17,
+            TangemTheme.typography2.bodyRegular16,
+            TangemTheme.typography2.bodySemibold16,
+            TangemTheme.typography2.bodyRegular15,
+            TangemTheme.typography2.bodySemibold15,
+            TangemTheme.typography2.bodyRegular14,
+            TangemTheme.typography2.captionRegular13,
+            TangemTheme.typography2.captionSemibold13,
+            TangemTheme.typography2.captionRegular12,
+            TangemTheme.typography2.captionSemibold12,
+            TangemTheme.typography2.captionRegular11,
+            TangemTheme.typography2.captionSemibold11,
+        )
+
+        Column(
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier
+                .background(TangemTheme.colors2.surface.level1)
+                .padding(4.dp),
+        ) {
+            typographyList.forEach { textStyle ->
+                Box(modifier = Modifier.heightIn(min = 60.dp)) {
+                    Text(
+                        text = "Lorem ipsum",
+                        style = textStyle,
+                        color = TangemTheme.colors2.text.neutral.primary,
+                        modifier = Modifier.align(Alignment.Center),
+                    )
+                }
+            }
+        }
+    }
+}
+// endregion

core/ui/src/main/java/com/tangem/core/ui/test/SelectNetworkFeeBottomSheetTestTags.kt

@@ -1,6 +0,0 @@
-package com.tangem.core.ui.test
-
-object SelectNetworkFeeBottomSheetTestTags {
-    const val READ_MORE_TEXT = "SELECT_NETWORK_FEE_READ_MORE_TEXT"
-    const val SELECTOR_ITEM = "SELECT_NETWORK_FEE_SELECTOR_ITEM"
-}

core/ui/src/main/java/com/tangem/core/ui/test/SendSelectNetworkFeeBottomSheetTestTags.kt

@@ -0,0 +1,22 @@
+package com.tangem.core.ui.test
+
+object SendSelectNetworkFeeBottomSheetTestTags {
+    const val REGULAR_FEE_ITEM = "SEND_SELECT_NETWORK_FEE_REGULAR_FEE_ITEM"
+    const val REGULAR_ITEM_ICON = "SEND_SELECT_NETWORK_FEE_REGULAR_ITEM_ICON"
+    const val REGULAR_ITEM_TITLE = "SEND_SELECT_NETWORK_FEE_REGULAR_ITEM_TITLE"
+    const val DOT_SIGN = "SEND_SELECT_NETWORK_FEE_DOT_SIGN"
+    const val TOKEN_AMOUNT = "SEND_SELECT_NETWORK_FEE_TOKEN_AMOUNT"
+    const val FIAT_AMOUNT = "SEND_SELECT_NETWORK_FEE_FIAT_AMOUNT"
+
+    const val CUSTOM_FEE_ITEM = "SEND_SELECT_NETWORK_FEE_CUSTOM_FEE_ITEM"
+    const val CUSTOM_ITEM_ICON = "SEND_SELECT_NETWORK_FEE_CUSTOM_ITEM_ICON"
+    const val CUSTOM_ITEM_TITLE = "SEND_SELECT_NETWORK_FEE_CUSTOM_ITEM_TITLE"
+
+    const val CUSTOM_INPUT_ITEM = "SEND_SELECT_NETWORK_FEE_CUSTOM_INPUT_ITEM"
+    const val NONCE_INPUT_ITEM = "SEND_SELECT_NETWORK_FEE_NONCE_INPUT_ITEM"
+    const val NONCE_INPUT_TEXT_FIELD = "SEND_SELECT_NETWORK_FEE_NONCE_INPUT_TEXT_FIELD"
+    const val CUSTOM_INPUT_ITEM_TITLE = "SEND_SELECT_NETWORK_FEE_CUSTOM_INPUT_ITEM_TITLE"
+    const val CUSTOM_INPUT_ITEM_TOOLTIP_ICON = "SEND_SELECT_NETWORK_FEE_CUSTOM_INPUT_ITEM_TOOLTIP_ICON"
+    const val CUSTOM_INPUT_ITEM_INPUT_TEXT_FIELD = "SEND_SELECT_NETWORK_FEE_CUSTOM_INPUT_ITEM_INPUT_TEXT_FIELD"
+    const val CUSTOM_INPUT_ITEM_FIAT_AMOUNT = "SEND_SELECT_NETWORK_FEE_CUSTOM_INPUT_ITEM_FIAT_AMOUNT"
+}

core/ui/src/main/java/com/tangem/core/ui/test/SwapSelectNetworkFeeBottomSheetTestTags.kt

@@ -0,0 +1,6 @@
+package com.tangem.core.ui.test
+
+object SwapSelectNetworkFeeBottomSheetTestTags {
+    const val READ_MORE_TEXT = "SWAP_SELECT_NETWORK_FEE_READ_MORE_TEXT"
+    const val SELECTOR_ITEM = "SWAP_SELECT_NETWORK_FEE_SELECTOR_ITEM"
+}

core/ui/src/main/res/drawable/ic_show_more_news_48.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <group>
+    <clip-path
+        android:pathData="M24,0L24,0A24,24 0,0 1,48 24L48,24A24,24 0,0 1,24 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"/>
+    <path
+        android:pathData="M24,0L24,0A24,24 0,0 1,48 24L48,24A24,24 0,0 1,24 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"
+        android:strokeAlpha="0.1"
+        android:fillColor="#0099FF"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="M15.782,24.005C15.781,23.508 16.184,23.105 16.681,23.104L29.128,23.099L23.92,17.891C23.569,17.539 23.569,16.97 23.92,16.618C24.272,16.267 24.842,16.267 25.193,16.618L31.943,23.368C32.295,23.72 32.295,24.289 31.943,24.641L25.193,31.391C24.842,31.742 24.272,31.742 23.92,31.391C23.569,31.039 23.569,30.47 23.92,30.118L29.139,24.899L16.682,24.904C16.185,24.905 15.782,24.502 15.782,24.005Z"
+        android:fillColor="#0099FF"/>
+  </group>
+</vector>

data/express/src/main/java/com/tangem/data/express/converter/ExpressProviderConverter.kt

@@ -19,6 +19,7 @@ internal class ExpressProviderConverter : Converter<ExchangeProvider, ExpressPro
             privacyPolicy = value.privacyPolicy,
             isRecommended = value.isRecommended,
             slippage = value.slippage,
+            isExchangeOnlyWithinSingleAddress = value.isExchangeOnlyWithinSingleAddress,
         )
     }
 

data/news/src/main/java/com/tangem/data/news/di/NewsDataModule.kt

@@ -4,6 +4,7 @@ import com.tangem.data.news.repository.DefaultNewsRepository
 import com.tangem.datasource.api.news.NewsApi
 import com.tangem.datasource.local.news.details.NewsDetailsStore
 import com.tangem.datasource.local.news.trending.TrendingNewsStore
+import com.tangem.datasource.local.news.viewed.NewsViewedStore
 import com.tangem.domain.news.repository.NewsRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -23,12 +24,14 @@ internal object NewsDataModule {
         dispatchers: CoroutineDispatcherProvider,
         newsDetailsStore: NewsDetailsStore,
         trendingNewsStore: TrendingNewsStore,
+        newsViewedStore: NewsViewedStore,
     ): NewsRepository {
         return DefaultNewsRepository(
             newsApi = newsApi,
             dispatchers = dispatchers,
             newsDetailsStore = newsDetailsStore,
             trendingNewsStore = trendingNewsStore,
+            newsViewedStore = newsViewedStore,
         )
     }
 }

data/news/src/main/java/com/tangem/data/news/repository/DefaultNewsRepository.kt

@@ -7,24 +7,19 @@ import com.tangem.datasource.api.news.NewsApi
 import com.tangem.datasource.api.news.models.response.NewsTrendingResponse
 import com.tangem.datasource.local.news.details.NewsDetailsStore
 import com.tangem.datasource.local.news.trending.TrendingNewsStore
+import com.tangem.datasource.local.news.viewed.NewsViewedStore
 import com.tangem.domain.models.news.*
 import com.tangem.domain.news.model.NewsListBatchFlow
 import com.tangem.domain.news.model.NewsListBatchingContext
 import com.tangem.domain.news.model.NewsListConfig
 import com.tangem.domain.news.repository.NewsRepository
-import com.tangem.pagination.BatchFetchResult
-import com.tangem.pagination.BatchListSource
+import com.tangem.pagination.*
 import com.tangem.pagination.exception.EndOfPaginationException
 import com.tangem.pagination.fetcher.BatchFetcher
-import com.tangem.pagination.toBatchFlow
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.runSuspendCatching
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
 import timber.log.Timber
 
 /**
@@ -36,15 +31,39 @@ internal class DefaultNewsRepository(
     private val dispatchers: CoroutineDispatcherProvider,
     private val newsDetailsStore: NewsDetailsStore,
     private val trendingNewsStore: TrendingNewsStore,
+    private val newsViewedStore: NewsViewedStore,
 ) : NewsRepository {
 
     override fun getNewsListBatchFlow(context: NewsListBatchingContext, batchSize: Int): NewsListBatchFlow {
-        return BatchListSource(
+        val newsBatchFlow = BatchListSource(
             fetchDispatcher = dispatchers.io,
             context = context,
             generateNewKey = { keys -> keys.lastOrNull()?.inc() ?: INITIAL_BATCH_KEY },
             batchFetcher = createBatchFetcher(batchSize),
         ).toBatchFlow()
+
+        return updateViewedStatusForNewsBatch(newsBatchFlow, context.coroutineScope)
+    }
+
+    override suspend fun getNews(config: NewsListConfig, limit: Int): List<ShortArticle> {
+        return withContext(dispatchers.io) {
+            val response = newsApi.getNews(
+                page = FIRST_PAGE,
+                limit = limit,
+                language = config.language,
+                snapshot = config.snapshot,
+                tokenIds = config.tokenIds.takeIf { it.isNotEmpty() },
+                categoryIds = config.categoryIds.takeIf { it.isNotEmpty() },
+            ).getOrThrow()
+
+            val articles = response.items.map { it.toDomainShortArticle() }
+            val viewedFlags = newsViewedStore.getSync()
+
+            articles.map { article ->
+                val isViewed = viewedFlags[article.id] == true
+                article.copy(viewed = isViewed)
+            }
+        }
     }
 
     override suspend fun getDetailedArticle(newsId: Int, language: String?): DetailedArticle {
@@ -73,37 +92,67 @@ internal class DefaultNewsRepository(
     }
 
     override fun observeTrendingNews(): Flow<TrendingNews> {
-        return trendingNewsStore.get(TRENDING_NEWS_KEY)
-    }
-
-    override suspend fun updateTrendingNewsViewed(articleIds: Collection<Int>, viewed: Boolean) {
-        if (articleIds.isEmpty()) return
-
-        val currentResult = trendingNewsStore.getSyncOrNull(TRENDING_NEWS_KEY) ?: return
-        val currentArticles = when (currentResult) {
-            is TrendingNews.Data -> currentResult.articles
-            is TrendingNews.Error -> return
-        }
-        if (currentArticles.isEmpty()) return
-
-        val ids = articleIds.toSet()
-        val updated = currentArticles.map { article ->
-            if (article.id in ids) {
-                article.copy(viewed = viewed)
-            } else {
-                article
+        return combine(
+            trendingNewsStore.get(TRENDING_NEWS_KEY),
+            newsViewedStore.getAll(),
+        ) { trendingNews, viewedFlags ->
+            when (trendingNews) {
+                is TrendingNews.Data -> {
+                    val articlesWithViewedFlags = trendingNews.articles.map { article ->
+                        val isViewed = viewedFlags[article.id] == true
+                        article.copy(viewed = isViewed)
+                    }
+                    TrendingNews.Data(articlesWithViewedFlags)
+                }
+                is TrendingNews.Error -> trendingNews
             }
         }
-
-        trendingNewsStore.store(TRENDING_NEWS_KEY, TrendingNews.Data(updated))
     }
 
     override suspend fun getCategories(): List<ArticleCategory> {
-        return newsApi.getCategories().getOrThrow().items.map { dto ->
-            ArticleCategory(
-                id = dto.id,
-                name = dto.name,
-            )
+        return withContext(dispatchers.io) {
+            newsApi.getCategories().getOrThrow().items.map { dto ->
+                ArticleCategory(
+                    id = dto.id,
+                    name = dto.name,
+                )
+            }
+        }
+    }
+
+    override suspend fun updateNewsViewed(articleIds: Collection<Int>, viewed: Boolean) {
+        newsViewedStore.updateViewed(articleIds, viewed)
+    }
+
+    private fun updateViewedStatusForNewsBatch(
+        newsBatchFlow: NewsListBatchFlow,
+        scope: CoroutineScope,
+    ): NewsListBatchFlow {
+        return object : NewsListBatchFlow {
+            override val state: StateFlow<BatchListState<Int, List<ShortArticle>>> =
+                combine(
+                    newsBatchFlow.state,
+                    newsViewedStore.getAll(),
+                ) { batchListState, viewedFlags ->
+                    val updatedBatches = batchListState.data.map { batch ->
+                        val updatedArticles = batch.data.map { article ->
+                            val isViewed = viewedFlags[article.id] == true
+                            article.copy(viewed = isViewed)
+                        }
+                        Batch(key = batch.key, data = updatedArticles)
+                    }
+                    BatchListState(
+                        data = updatedBatches,
+                        status = batchListState.status,
+                    )
+                }.stateIn(
+                    scope = scope,
+                    started = SharingStarted.Eagerly,
+                    initialValue = BatchListState(emptyList(), newsBatchFlow.state.value.status),
+                )
+
+            override val updateResults: SharedFlow<Pair<Nothing, BatchUpdateResult<Int, List<ShortArticle>>>> =
+                newsBatchFlow.updateResults
         }
     }
 
@@ -121,7 +170,7 @@ internal class DefaultNewsRepository(
 
             if (idsToFetch.isEmpty()) return@withContext
 
-            val fetchedArticles = coroutineScope {
+            val fetchedArticles = supervisorScope {
                 idsToFetch.map { newsId ->
                     async {
                         newsApi.getNewsDetails(newsId = newsId, language = language)
@@ -140,13 +189,12 @@ internal class DefaultNewsRepository(
 
     private suspend fun fetchAndStoreTrendingNews(limit: Int, language: String?) {
         return withContext(dispatchers.io) {
-            val apiResponse = newsApi.getTrendingNews(limit = limit, language = language)
-            when (val result = apiResponse) {
+            when (val apiResponse = newsApi.getTrendingNews(limit = limit, language = language)) {
                 is ApiResponse.Error -> {
                     Timber.e(
-                        result.cause.cause,
+                        apiResponse.cause.cause,
                         "Trending news fetch failed cause: ${
-                            when (val error = result.cause) {
+                            when (val error = apiResponse.cause) {
                                 is ApiResponseError.HttpException -> error.code
                                 is ApiResponseError.NetworkException -> "NetworkException"
                                 is ApiResponseError.TimeoutException -> "TimeoutException"
@@ -159,49 +207,34 @@ internal class DefaultNewsRepository(
                         key = TRENDING_NEWS_KEY,
                         value = TrendingNews.Error(
                             NewsError.Unknown(
-                                message = result.cause.message,
+                                message = apiResponse.cause.message,
                                 code = null,
                             ),
                         ),
                     )
                 }
                 is ApiResponse.Success<NewsTrendingResponse> -> {
-                    val freshArticles = result.data.items.map { it.toDomainShortArticle() }
-                    val cachedArticles = trendingNewsStore.getSyncOrNull(TRENDING_NEWS_KEY)
-                    val currentArticles = when (cachedArticles) {
-                        is TrendingNews.Data -> cachedArticles.articles
-                        is TrendingNews.Error -> emptyList()
-                        null -> emptyList()
-                    }
-                    val merged = mergeTrendingArticles(current = currentArticles, fresh = freshArticles).take(limit)
-                    trendingNewsStore.store(TRENDING_NEWS_KEY, TrendingNews.Data(merged))
-                    TrendingNews.Data(merged)
+                    val freshArticles = apiResponse.data.items.map { it.toDomainShortArticle() }
+                    val articles = freshArticles.take(limit)
+                    trendingNewsStore.store(TRENDING_NEWS_KEY, TrendingNews.Data(articles))
+                    TrendingNews.Data(articles)
                 }
             }
         }
     }
 
-    private fun mergeTrendingArticles(current: List<ShortArticle>, fresh: List<ShortArticle>): List<ShortArticle> {
-        if (current.isEmpty()) return fresh
-
-        val currentById = current.associateBy(ShortArticle::id)
-
-        return fresh.map { article ->
-            val stored = currentById[article.id] ?: return@map article
-            article.copy(viewed = stored.viewed)
-        }
-    }
-
     private fun createBatchFetcher(batchSize: Int): BatchFetcher<NewsListConfig, List<ShortArticle>> {
         return NewsBatchFetcher(
             newsApi = newsApi,
             batchSize = batchSize,
+            newsViewedStore = newsViewedStore,
         )
     }
 
     private class NewsBatchFetcher(
         private val newsApi: NewsApi,
         private val batchSize: Int,
+        private val newsViewedStore: NewsViewedStore,
     ) : BatchFetcher<NewsListConfig, List<ShortArticle>> {
 
         private var state: NewsPaginationState? = null
@@ -266,12 +299,18 @@ internal class DefaultNewsRepository(
                 page = page,
                 limit = limit,
                 language = params.language,
-                snapshot = snapshotOverride,
+                snapshot = snapshotOverride?.takeIf { it.isNotEmpty() },
                 tokenIds = params.tokenIds.takeIf { it.isNotEmpty() },
                 categoryIds = params.categoryIds.takeIf { it.isNotEmpty() },
             ).getOrThrow()
 
-            val items = response.items.map { it.toDomainShortArticle() }
+            val articles = response.items.map { it.toDomainShortArticle() }
+            val viewedFlags = newsViewedStore.getSync()
+
+            val items = articles.map { article ->
+                val isViewed = viewedFlags[article.id] == true
+                article.copy(viewed = isViewed)
+            }
 
             val batchResult = BatchFetchResult.Success(
                 data = items,