diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
index 664a299ed..906607900 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
@@ -32,6 +32,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
@@ -247,7 +249,9 @@ private fun Content(
                     onEvent(SendEvent.DismissAmountWarning)
                     onBack()
                 },
-                modifier = Modifier.testTag(dialog.testTag),
+                modifier = Modifier
+                    .semantics { testTagsAsResourceId = true }
+                    .testTag(dialog.testTag),
             )
         }
     }
diff --git a/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt
index 3cd9415cd..55a3f2c0a 100644
--- a/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt
+++ b/app/src/main/java/to/bitkit/ui/sheets/NewTransactionSheet.kt
@@ -21,6 +21,8 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
@@ -84,6 +86,7 @@ fun NewTransactionSheetView(
 ) {
     Box(
         modifier = Modifier
+            .semantics { testTagsAsResourceId = true }
             .sheetHeight(isModal = true)
             .gradientBackground()
             .testTag("new_transaction_sheet")
@@ -155,7 +158,13 @@ fun NewTransactionSheetView(
                 onClick = { onDetailClick },
                 modifier = Modifier
                     .fillMaxWidth()
-                    .testTag("ReceivedTransaction")
+                    .testTag(
+                        if (details.direction == NewTransactionSheetDirection.SENT) {
+                            "SendSuccess"
+                        } else {
+                            "ReceivedTransaction"
+                        }
+                    )
             )
 
             Spacer(modifier = Modifier.weight(1f))
@@ -172,14 +181,14 @@ fun NewTransactionSheetView(
                         onClick = onDetailClick,
                         modifier = Modifier
                             .weight(1f)
-                            .testTag("details_button")
+                            .testTag("Details")
                     )
                     PrimaryButton(
                         text = stringResource(R.string.common__close),
                         onClick = onCloseClick,
                         modifier = Modifier
                             .weight(1f)
-                            .testTag("close_button")
+                            .testTag("Close")
                     )
                 }
             } else {