From f2e08b5652490d3eb89996ee628c55d8e9017bf8 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 15 Jul 2026 18:15:03 +0200 Subject: [PATCH] Updated on 2026-08-14 --- .../tangempay/TangemPayDailyLimitTest.kt | 32 +++++++++++-------- .../setup/TangemPayCardLimitSetupScreenV2.kt | 2 +- .../limit/setup/TangemPayCardLimitSetupUM.kt | 11 ++++--- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/src/androidTest/kotlin/com/tangem/tests/tangempay/TangemPayDailyLimitTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/tangempay/TangemPayDailyLimitTest.kt index cfab66c32c..34350387de 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/tangempay/TangemPayDailyLimitTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/tangempay/TangemPayDailyLimitTest.kt @@ -43,20 +43,26 @@ class TangemPayDailyLimitTest : BaseTestCase() { }, ).run { step("Open daily limit setup screen") { openTangemPayDailyLimitSetup() } - step("Assert amount field, hint and 'Set limits' button are displayed") { - onTangemPayDailyLimitScreen { - amountField.assertIsDisplayed() - hint.assertIsDisplayed() - setLimitsButton.assertIsDisplayed() - } + step("Assert amount field is displayed") { + onTangemPayDailyLimitScreen { amountField.assertIsDisplayed() } } - step("Assert quick value presets are displayed") { - onTangemPayDailyLimitScreen { - presetChip("1").assertIsDisplayed() - presetChip("5000").assertIsDisplayed() - presetChip("10000").assertIsDisplayed() - presetChip("25000").assertIsDisplayed() - } + step("Assert hint is displayed") { + onTangemPayDailyLimitScreen { hint.assertIsDisplayed() } + } + step("Assert 'Set limits' button is displayed") { + onTangemPayDailyLimitScreen { setLimitsButton.assertIsDisplayed() } + } + step("Assert quick value preset '1' is displayed") { + onTangemPayDailyLimitScreen { presetChip("1").assertIsDisplayed() } + } + step("Assert quick value preset '5000' is displayed") { + onTangemPayDailyLimitScreen { presetChip("5000").assertIsDisplayed() } + } + step("Assert quick value preset '10000' is displayed") { + onTangemPayDailyLimitScreen { presetChip("10000").assertIsDisplayed() } + } + step("Assert quick value preset '25000' is displayed") { + onTangemPayDailyLimitScreen { presetChip("25000").assertIsDisplayed() } } } } diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupScreenV2.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupScreenV2.kt index deb52d67c5..533318b058 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupScreenV2.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupScreenV2.kt @@ -162,7 +162,7 @@ private fun PresetChip(preset: TangemPayCardLimitSetupUM.LimitPresetUM, modifier .clip(RoundedCornerShape(14.dp)) .background(TangemTheme.colors3.bg.tertiary) .clickable(onClick = preset.onClick) - .then(preset.testTag?.let { Modifier.testTag(it) } ?: Modifier) + .testTag(preset.testTag) .padding(horizontal = TangemTheme.dimens2.x5, vertical = TangemTheme.dimens2.x1) .wrapContentHeight(), horizontalArrangement = Arrangement.Center, diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupUM.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupUM.kt index d3b9f10ae8..674834b4c6 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupUM.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/limit/setup/TangemPayCardLimitSetupUM.kt @@ -2,6 +2,7 @@ package com.tangem.features.tangempay.limit.setup import androidx.compose.runtime.Immutable import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.test.TangemPayTestTags import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf @@ -28,7 +29,7 @@ internal data class TangemPayCardLimitSetupUM( @Immutable internal data class LimitPresetUM( val label: String, - val testTag: String?, + val testTag: String, val onClick: () -> Unit, ) @@ -43,10 +44,10 @@ internal data class TangemPayCardLimitSetupUM( subtitle: TextReference = TextReference.Str("Set a limit from $0 to $50,000"), currencyCode: String = "$", presets: ImmutableList = persistentListOf( - LimitPresetUM(label = "$0", testTag = null, onClick = {}), - LimitPresetUM(label = "$5,000", testTag = null, onClick = {}), - LimitPresetUM(label = "$10,000", testTag = null, onClick = {}), - LimitPresetUM(label = "$25,000", testTag = null, onClick = {}), + LimitPresetUM(label = "$0", testTag = TangemPayTestTags.dailyLimitPresetChip("0"), onClick = {}), + LimitPresetUM(label = "$5,000", testTag = TangemPayTestTags.dailyLimitPresetChip("5000"), onClick = {}), + LimitPresetUM(label = "$10,000", testTag = TangemPayTestTags.dailyLimitPresetChip("10000"), onClick = {}), + LimitPresetUM(label = "$25,000", testTag = TangemPayTestTags.dailyLimitPresetChip("25000"), onClick = {}), ), submitButtonEnabled: Boolean = true, submitButtonLoading: Boolean = false,