From 2acce326b78c690ef12d5940ce4437fc530a4a5c Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Sat, 31 Oct 2026 16:49:40 +0100
Subject: [PATCH] test: open and select messages by their list row, not the
 avatar checkbox, in the ios flows

---
 .maestro/features/07-move-delete-tag.yaml |  9 +++++++--
 .maestro/subflows/open-message.yaml       | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.maestro/features/07-move-delete-tag.yaml b/.maestro/features/07-move-delete-tag.yaml
index 38dfc5d9..bb4ffbbd 100644
--- a/.maestro/features/07-move-delete-tag.yaml
+++ b/.maestro/features/07-move-delete-tag.yaml
@@ -63,7 +63,10 @@ tags:
     direction: DOWN
     centerElement: true
     timeout: 20000
-- longPressOn: ".*Grüße aus München.*"
+# The row, not its avatar checkbox (whose label has the subject too).
+- longPressOn:
+    id: email-row
+    text: ".*Grüße aus München.*"
 - extendedWaitUntil:
     visible: "Clear selection"
     timeout: 10000
@@ -76,7 +79,9 @@ tags:
       visible: "Clear selection"
     commands:
       - tapOn: "Clear selection"
-- longPressOn: ".*Grüße aus München.*"
+- longPressOn:
+    id: email-row
+    text: ".*Grüße aus München.*"
 - tapOn: "Unstar|Star"
 - runFlow:
     when:
diff --git a/.maestro/subflows/open-message.yaml b/.maestro/subflows/open-message.yaml
index e61ad435..c66b492d 100644
--- a/.maestro/subflows/open-message.yaml
+++ b/.maestro/subflows/open-message.yaml
@@ -3,6 +3,9 @@
 # covers it (the tap then opens another tab): on the phone, scroll it to the
 # middle. The iPad's list is a column Maestro's scroll (in the middle of the
 # screen) doesn't reach; its rows fit on screen.
+# The avatar's "Select <sender>: <subject>" checkbox mentions the subject
+# too, and a tap on it selects the row instead of opening it (#91): match
+# the row itself by its id.
 appId: org.bulwarkmail.mobile
 ---
 - runFlow:
@@ -10,7 +13,9 @@ appId: org.bulwarkmail.mobile
       true: ${DEVICE != 'tablet'}
     commands:
       - scrollUntilVisible:
-          element: ".*${SUBJECT}.*"
+          element:
+            id: email-row
+            text: ".*${SUBJECT}.*"
           direction: DOWN
           centerElement: true
           visibilityPercentage: 100
@@ -20,13 +25,17 @@ appId: org.bulwarkmail.mobile
       true: ${DEVICE == 'tablet'}
     commands:
       - scrollUntilVisible:
-          element: ".*${SUBJECT}.*"
+          element:
+            id: email-row
+            text: ".*${SUBJECT}.*"
           direction: DOWN
           timeout: 30000
 # A tap while the list still moves lands on another row.
 - waitForAnimationToEnd:
     timeout: 5000
-- tapOn: ".*${SUBJECT}.*"
+- tapOn:
+    id: email-row
+    text: ".*${SUBJECT}.*"
 # The message toolbar's "more" button: "Reply All" shows on the phone, but
 # the iPad pane has a quick reply box instead for mail to one recipient.
 - extendedWaitUntil: