From d55166393ee7c9c9fb2cb773f40e0cb0c724fa71 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 12 Feb 2026 12:46:41 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/common/extensions/KNode.kt     | 11 ++++++
 .../kotlin/com/tangem/tests/BuyTokenTest.kt   |  5 ++-
 .../tangem/tests/swap/SwapTokenScreenTest.kt  | 37 ++++++++++++++++---
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/kotlin/com/tangem/common/extensions/KNode.kt b/app/src/androidTest/kotlin/com/tangem/common/extensions/KNode.kt
index 7c275607c9..004e367549 100644
--- a/app/src/androidTest/kotlin/com/tangem/common/extensions/KNode.kt
+++ b/app/src/androidTest/kotlin/com/tangem/common/extensions/KNode.kt
@@ -1,5 +1,6 @@
 package com.tangem.common.extensions
 
+import androidx.compose.ui.test.hasText
 import io.github.kakaocup.compose.node.element.KNode
 
 fun KNode.clickWithAssertion() {
@@ -7,3 +8,13 @@ fun KNode.clickWithAssertion() {
     performClick()
 }
 
+fun KNode.assertTextContainsSafe(
+    text: String,
+    substring: Boolean = false,
+    ignoreCase: Boolean = false,
+) {
+    assert(
+        hasText(text = text, substring = substring, ignoreCase = ignoreCase)
+    )
+}
+
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
index a618a5b1dc..3c44cb4154 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
@@ -1,6 +1,7 @@
 package com.tangem.tests
 
 import com.tangem.common.BaseTestCase
+import com.tangem.common.extensions.assertTextContainsSafe
 import com.tangem.common.extensions.clickWithAssertion
 import com.tangem.common.utils.resetWireMockScenarioState
 import com.tangem.common.utils.setWireMockScenarioState
@@ -374,7 +375,9 @@ class BuyTokenTest : BaseTestCase() {
                 onSelectProviderBottomSheet { paymentMethodIcon.assertIsDisplayed() }
             }
             step("Assert provider name: '$providerNameMercuryo'") {
-                onSelectProviderBottomSheet { providerName.assertTextContains(providerNameMercuryo) }
+                onSelectProviderBottomSheet {
+                    providerName.assertTextContainsSafe(text = providerNameMercuryo, substring = true)
+                }
             }
         }
     }
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/swap/SwapTokenScreenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/swap/SwapTokenScreenTest.kt
index 60ec5a8154..2048e0fa7e 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/swap/SwapTokenScreenTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/swap/SwapTokenScreenTest.kt
@@ -30,7 +30,7 @@ class SwapTokenScreenTest : BaseTestCase() {
     @DisplayName("Swap: network fee")
     @Test
     fun networkFeeTest() {
-        val inputAmount = "100"
+        val inputAmount = "400"
         val tokenTitle = "Polygon"
 
         setupHooks().run {
@@ -99,22 +99,31 @@ class SwapTokenScreenTest : BaseTestCase() {
                 }
             }
             step("Assert receive amount is not equal to '0'") {
-                onSwapTokenScreen { receiveAmount.assert(!hasText("0")) }
+                onSwapTokenScreen {
+                    flakySafely(WAIT_UNTIL_TIMEOUT_LONG) {
+                        waitForIdle()
+                        receiveAmount.assert(!hasText("0"))
+                    }
+                }
             }
         }
     }
 
+    @ApiEnv(
+        ApiEnvConfig(ApiConfig.ID.Express, ApiEnvironment.PROD)
+    )
     @AllureId("3549")
     @DisplayName("Swap: network error test")
     @Test
     fun networkErrorSwapTest() {
+        val tokenTitle = "Polygon"
+
         setupHooks(
             additionalAfterSection = {
                 enableWiFi()
                 enableMobileData()
             }
         ).run {
-            val tokenTitle = "Polygon"
 
             step("Open 'Main Screen'") {
                 openMainScreen()
@@ -142,7 +151,12 @@ class SwapTokenScreenTest : BaseTestCase() {
                 onSwapTokenScreen { title.assertIsDisplayed() }
             }
             step("Assert error notification title is displayed") {
-                onSwapTokenScreen { errorNotificationTitle.assertIsDisplayed() }
+                onSwapTokenScreen {
+                    waitForIdle()
+                    flakySafely(WAIT_UNTIL_TIMEOUT_LONG) {
+                        errorNotificationTitle.assertIsDisplayed()
+                    }
+                }
             }
             step("Assert error notification text is displayed") {
                 onSwapTokenScreen { errorNotificationText.assertIsDisplayed() }
@@ -160,7 +174,8 @@ class SwapTokenScreenTest : BaseTestCase() {
     @DisplayName("Swap: change network fee")
     @Test
     fun changeNetworkFeeTest() {
-        val inputAmount = "100"
+        val inputAmount = "400"
+
         setupHooks().run {
             val tokenTitle = "Polygon"
 
@@ -209,10 +224,20 @@ class SwapTokenScreenTest : BaseTestCase() {
             step("Assert input amount = '$inputAmount'") {
                 onSwapTokenScreen { textInput.assertTextEquals(inputAmount) }
             }
+            step("Assert 'Network fee' block is displayed") {
+                onSwapTokenScreen {
+                    flakySafely(WAIT_UNTIL_TIMEOUT_LONG) {
+                        networkFeeBlock.assertIsDisplayed()
+                    }
+                }
+            }
+            step("Assert 'Swap' button is enabled") {
+                onSwapTokenScreen { swapButton.assertIsEnabled() }
+            }
             step("Click on 'Network fee' block") {
                 onSwapTokenScreen {
                     flakySafely(WAIT_UNTIL_TIMEOUT_LONG) {
-                        selectFeeIcon.clickWithAssertion()
+                        selectFeeIcon.performClick()
                     }
                 }
             }