Fix/maestro e2e flows for ios

.github/scripts/e2e.sh

@@ -4,30 +4,23 @@ set -e
 PLATFORM=$1  # "ios" or "android"
 shift  # Remove first argument so $@ contains only the additional options
 
-# Require test credentials to be supplied via env (CI secrets or local .env.local).
-# Never fall back to baked-in defaults.
-if [ -z "${TEST_EMAIL:-}" ] || [ -z "${TEST_PASSWORD:-}" ]; then
-  echo "ERROR: TEST_EMAIL and TEST_PASSWORD must be set (via CI secrets or a gitignored .env.local)" >&2
-  exit 1
-fi
-
 # Generate unique ID for this test run
 UNIQUE_ID=$(date +%s)
 
 if [ "$PLATFORM" = "ios" ]; then
   START_DATE=$(date -j -v+7d +"%Y-%m-%d")
   END_DATE=$(date -j -v+14d +"%Y-%m-%d")
-
+  TODAY_DATE=$(date -j +"%b %-d, %Y")   # e.g. "Apr 16, 2026"
   get_month() { date -j -f "%Y-%m-%d" "$1" +"%B"; }
   get_day()   { date -j -f "%Y-%m-%d" "$1" +"%-d"; }
   get_year()  { date -j -f "%Y-%m-%d" "$1" +"%Y"; }
   get_month_num() { date -j -f "%Y-%m-%d" "$1" +"%-m"; }
 else
   START_DATE=$(date -d "+7 days" +"%Y-%m-%d")
   END_DATE=$(date -d "+14 days" +"%Y-%m-%d")
-
+  TODAY_DATE=$(date +"%-d %b %Y")
   get_month() { date -d "$1" +"%B"; }
-  get_day()   { date -d "$1" +"%-d"; }
+  get_day()   { date -d "$1" +"%d"; }
   get_year()  { date -d "$1" +"%Y"; }
   get_month_num() { date -d "$1" +"%-m"; }
 fi
@@ -40,8 +33,8 @@ END_TAPS=$(( ($(get_year "$END_DATE") - CURRENT_YEAR) * 12 + ($(get_month_num "$
 
 if [ "$PLATFORM" = "ios" ]; then
   maestro test --config .maestro/config.yaml "$@" \
-    -e TEST_EMAIL="$TEST_EMAIL" \
-    -e TEST_PASSWORD="$TEST_PASSWORD" \
+    -e TEST_EMAIL="${TEST_EMAIL}" \
+    -e TEST_PASSWORD="${TEST_PASSWORD}" \
     -e TRIP_NAME="${TRIP_NAME:-E2E-Trip-$UNIQUE_ID}" \
     -e PACK_NAME="${PACK_NAME:-E2E-Pack-$UNIQUE_ID}" \
     -e APP_ID="${APP_ID:-com.andrewbierman.packrat.preview}" \
@@ -53,11 +46,12 @@ if [ "$PLATFORM" = "ios" ]; then
     -e END_MONTH="$(get_month "$END_DATE")" \
     -e END_DAY="$(get_day "$END_DATE")" \
     -e END_TAPS="$END_TAPS" \
+    -e TODAY_DATE="$TODAY_DATE" \
     .maestro/master-flow.yaml
 else
   maestro test --config .maestro/config-android.yaml "$@" \
-    -e TEST_EMAIL="$TEST_EMAIL" \
-    -e TEST_PASSWORD="$TEST_PASSWORD" \
+    -e TEST_EMAIL="${TEST_EMAIL}" \
+    -e TEST_PASSWORD="${TEST_PASSWORD}" \
     -e TRIP_NAME="${TRIP_NAME:-E2E-Trip-$UNIQUE_ID}" \
     -e PACK_NAME="${PACK_NAME:-E2E-Pack-$UNIQUE_ID}" \
     -e APP_ID="${APP_ID:-com.packratai.mobile.preview}" \

.maestro/flows/auth/login-flow.yaml

@@ -28,10 +28,6 @@ appId: ${APP_ID}
     id: "sign-in-email-button"
 
 # Wait for login form to appear.
-# auth/(login) is presented as a modal; waitForAnimationToEnd alone is not
-# sufficient — the XCTest accessibility tree may not include the modal until
-# the presentation animation fully settles. extendedWaitUntil polls until
-# the field is accessible, giving the modal time to fully render.
 # iOS 26 / slow CI: the app startup takes ~10s before sign-in-button appears;
 # by the time the modal opens we may have little budget left. Use 35s here.
 - runFlow:
@@ -44,10 +40,7 @@ appId: ${APP_ID}
           timeout: 35000
 - waitForAnimationToEnd
 
-# Fill in the email field.
-# iOS: NativeWindUI's TextField inside accessible={false} FormSection doesn't expose
-#      testID to Maestro's XCTest snapshot, so we match the placeholder text instead.
-# Android: testID maps reliably to resource-id.
+# Fill in the email field
 - runFlow:
     when:
       platform: iOS
@@ -89,8 +82,7 @@ appId: ${APP_ID}
 # Wait for navigation to complete — login can take a few seconds
 - waitForAnimationToEnd
 
-# Handle transient network error: if the API call failed (e.g. "Network request
-# failed" dialog), dismiss the alert and retry once with the same credentials.
+# Handle transient network error: if the API call failed, dismiss the alert and retry once.
 - runFlow:
     when:
       visible:
@@ -125,4 +117,4 @@ appId: ${APP_ID}
 - extendedWaitUntil:
     visible:
       text: "Packs"
-    timeout: 35000
+    timeout: 35000

.maestro/flows/auth/logout-flow.yaml

@@ -9,53 +9,29 @@ appId: ${APP_ID}
 
 - waitForAnimationToEnd
 
-# Scroll down to find the sign-out button.
-# iOS: use testID (id:) to avoid UITextView accessibilityValue issues with text-based matching.
-# Android: use text: which works reliably (UITextView issue is iOS-only).
-- runFlow:
-    when:
-      platform: iOS
-    commands:
-      - scrollUntilVisible:
-          element:
-            id: "sign-out-button"
-          direction: DOWN
-      - tapOn:
-          id: "sign-out-button"
-- runFlow:
-    when:
-      platform: Android
-    commands:
-      - scrollUntilVisible:
-          element:
-            text: "Log Out"
-          direction: DOWN
-      - tapOn:
-          text: "Log Out"
+# Scroll down to find the log out button if needed
+- scrollUntilVisible:
+    element:
+      text: "Log Out"
+    direction: DOWN
+
+# Tap Log Out
+- tapOn:
+    text: "Log Out"
 
 - waitForAnimationToEnd
 
-# Handle sync-conflict confirmation dialog if present (only appears when there are unsynced changes).
-# Both platforms use native Alert.alert(). With snapshotKeyHonorModalViews:false the main-window
-# elements appear first in the snapshot tree, so tapOn:text:"Log Out" (any index) hits the
-# profile list button (resource-id=sign-out-button, y=706) instead of the alert action.
-# Fix: use rightOf:text:"Cancel" to uniquely identify the dialog "Log Out" — "Cancel" only
-# exists inside the dialog, so this selector picks the adjacent alert action button.
-# waitForAnimationToEnd ensures the native alert is fully settled before we interact.
 - runFlow:
     when:
       visible:
         text: "Sync in progress"
     commands:
-      - waitForAnimationToEnd
       - tapOn:
-          text: "Log Out"
-          rightOf:
-            text: "Cancel"
+          text: "Proceed"
 
 - waitForAnimationToEnd
 
-# Handle post-logout dialog if it appears - choose to Sign-in again
+# Handle post-logout dialog - choose to Sign-in again
 - runFlow:
     when:
       visible:
@@ -66,22 +42,6 @@ appId: ${APP_ID}
 
 - waitForAnimationToEnd
 
-# Assert we are back on the auth screen (allow up to 30s for app reload).
-# iOS: use testID to avoid UITextView text-matching issues on the Sign In button.
-# Android: use text: which works reliably.
-- runFlow:
-    when:
-      platform: iOS
-    commands:
-      - extendedWaitUntil:
-          visible:
-            id: "sign-in-email-button"
-          timeout: 30000
-- runFlow:
-    when:
-      platform: Android
-    commands:
-      - extendedWaitUntil:
-          visible:
-            text: "Sign In"
-          timeout: 30000
+# Assert we are back on the auth screen
+- assertVisible:
+    text: "Sign In"

.maestro/flows/catalog/catalog-browse-flow.yaml

@@ -2,29 +2,21 @@ appId: ${APP_ID}
 ---
 # Catalog Browse Flow: Verify catalog tab loads items and categories
 - waitForAnimationToEnd
-
-# Navigate to Catalog tab
 - tapOn:
     text: "Catalog"
 - waitForAnimationToEnd
-
-# Assert catalog header loaded
 - assertVisible:
     text: "Catalog"
-
-# Wait for actual catalog items to load via testID.
-# Previous text-based check (".*items.*") matched "0 items" during loading
-# state without verifying data actually arrived. Use id: for reliability.
-- extendedWaitUntil:
-    visible:
-      id: "catalog-item-card"
-    timeout: 30000
-
-# Assert category filters render
 - assertVisible:
     text: "All"
-
-# Intentionally stay on Catalog tab.
-# catalog-item-detail-flow runs next and starts with tapOn:"Catalog" which
-# is a scroll-to-top on the already-active tab — items remain loaded and
-# no fresh API call is needed.
+- assertVisible:
+    text: ".*items.*"
+- scrollUntilVisible:
+    element:
+      text: "Showing.*items"
+    direction: DOWN
+    timeout: 10000
+    speed: 20
+- tapOn:
+    text: "Packs"
+- waitForAnimationToEnd

.maestro/flows/catalog/catalog-item-detail-flow.yaml

@@ -2,77 +2,43 @@ appId: ${APP_ID}
 ---
 # Catalog Item Detail Flow: Tap a catalog item and verify detail page
 - waitForAnimationToEnd
-
-# Navigate to Catalog tab (scroll-to-top if already active; normal tab tap otherwise)
 - tapOn:
     text: "Catalog"
 - waitForAnimationToEnd
-
-# iOS: returning to the Catalog tab can restore the search bar as first responder,
-# overlaying the screen and suppressing the FlatList items from the accessibility tree.
-# Dismiss it if visible.
-- runFlow:
-    when:
-      platform: iOS
-    commands:
-      - runFlow:
-          when:
-            visible:
-              text: "Cancel"
-          commands:
-            - tapOn:
-                text: "Cancel"
-            - waitForAnimationToEnd
-
-# Wait for catalog items to load via testID.
-# catalog-browse-flow already loaded items (30s wait) so these should appear
-# quickly. Use a generous timeout to handle the case where this flow is run
-# standalone (fresh load).
-- extendedWaitUntil:
-    visible:
-      id: "catalog-item-card"
-    timeout: 30000
-
-# Tap the first visible catalog item by testID.
+# Wait for items to load
+- assertVisible:
+    text: ".*items.*"
+# Tap first visible item using index
 - tapOn:
-    id: "catalog-item-card"
+    id: "catalog:item-.*"
+    index: 0
 - waitForAnimationToEnd
-
-# Wait for the detail screen container to confirm navigation happened.
-# The add-to-pack button is below the fold in a ScrollView; on iOS XCTest
-# does not expose off-screen ScrollView children in the accessibility tree
-# until they are scrolled into view.
-# Use 30s: CI network latency can delay initial data load past 15s.
-- extendedWaitUntil:
-    visible:
-      id: "catalog-detail-content"
-    timeout: 30000
-
-# Scroll the detail screen to bring the action buttons into view.
+# Scroll down to find action buttons
 - scrollUntilVisible:
     element:
       id: "add-to-pack-button"
     direction: DOWN
     timeout: 15000
-
 - assertVisible:
     id: "add-to-pack-button"
+- scrollUntilVisible:
+    element:
+      id: "view-retailer-button"
+    direction: DOWN
+    speed: 10
+    timeout: 10000
 - assertVisible:
     id: "view-retailer-button"
-
-# Go back
-# iOS: XCTest synthetic swipes do not trigger UIScreenEdgePanGestureRecognizer.
-# Tap the native navigation bar back button instead (accessibility label "Back").
+# Go back - platform specific
 - runFlow:
     when:
-      platform: iOS
+      platform: Android
     commands:
-      - tapOn:
-          text: "Back"
-      - waitForAnimationToEnd
+      - back
 - runFlow:
     when:
-      platform: Android
+      platform: iOS
     commands:
-      - back
-      - waitForAnimationToEnd
+      - tapOn:
+          text: ".*Back.*"
+- waitForAnimationToEnd

.maestro/flows/dashboard/dashboard-tiles-flow.yaml

@@ -1,18 +1,26 @@
 appId: ${APP_ID}
 ---
-# Dashboard Tiles Flow: Verify dashboard tab loads
+# Dashboard Tiles Flow: Verify dashboard loads with key tiles
 - waitForAnimationToEnd
 
-# Navigate to Dashboard tab
+# Navigate to Dashboard (home tab)
 - tapOn:
     text: "Dashboard"
 - waitForAnimationToEnd
 
-# Verify we landed on the Dashboard screen (large-title header).
-# NativeWindUI ListItem tile titles are not exposed as individual nodes in
-# the iOS accessibility tree, so we only assert on the screen header here.
+# Verify key dashboard tiles are present
+- scrollUntilVisible:
+    element:
+      id: "dashboard-tile-packrat-ai"
+    direction: DOWN
 - assertVisible:
-    text: "Dashboard"
+    id: "dashboard-tile-packrat-ai"
+
+# Scroll to check more tiles
+- scrollUntilVisible:
+    element:
+      text: ".*Pack.*"
+    direction: DOWN
 
 # Return to stable state
 - tapOn: