From a0ce96fb2d1677fa7ccf8a4d777fe748ce278772 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Wed, 4 Mar 2026 13:12:50 +0200
Subject: [PATCH] fix up e2e tests

---
 __e2e__/flows/curate-lists.yml                 |  1 -
 __e2e__/flows/feed-reorder.yml                 | 18 ++++++++++++------
 .../flows/report-dialog/post.reason-other.yml  |  1 +
 __e2e__/setupApp.yml                           | 16 ++++++++--------
 src/Navigation.tsx                             |  1 +
 src/components/DraggableList/index.tsx         |  1 +
 src/screens/Profile/Header/GrowableBanner.tsx  | 18 +++++++++++++++++-
 src/screens/Profile/Header/Shell.tsx           | 15 ++++++++++-----
 .../ProfileList/components/MoreOptionsMenu.tsx |  2 +-
 src/view/com/util/UserBanner.tsx               |  2 --
 10 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/__e2e__/flows/curate-lists.yml b/__e2e__/flows/curate-lists.yml
index ece9a7ce87..16bad198b9 100644
--- a/__e2e__/flows/curate-lists.yml
+++ b/__e2e__/flows/curate-lists.yml
@@ -39,7 +39,6 @@ appId: xyz.blueskyweb.app
     id: "editListNameInput"
 - eraseText
 - inputText: "Bad Ppl"
-- hideKeyboard
 - tapOn:
     id: "editListDescriptionInput"
 - eraseText
diff --git a/__e2e__/flows/feed-reorder.yml b/__e2e__/flows/feed-reorder.yml
index a917344a7d..42abc3295e 100644
--- a/__e2e__/flows/feed-reorder.yml
+++ b/__e2e__/flows/feed-reorder.yml
@@ -35,9 +35,12 @@ appId: xyz.blueskyweb.app
     id: "menuItemButton-Feeds"
 - tapOn:
     id: "editFeedsBtn"
-- tapOn:
-    label: "Tap on down arrow"
-    id: "feed-timeline-moveDown"
+- swipe:
+    label: "Drag feed down"
+    from:
+      id: "feed-drag-handle"
+    direction: "DOWN"
+    duration: 1000
 - tapOn:
       label: "Save button"
       id: "saveChangesBtn"
@@ -55,9 +58,12 @@ appId: xyz.blueskyweb.app
     id: "menuItemButton-Feeds"
 - tapOn:
     id: "editFeedsBtn"
-- tapOn:
-    label: "Tap on down arrow"
-    id: "feed-feed-moveDown"
+- swipe:
+    label: "Drag feed down"
+    from:
+      id: "feed-drag-handle"
+    direction: "DOWN"
+    duration: 1000
 - tapOn:
     label: "Save button"
     id: "saveChangesBtn"
diff --git a/__e2e__/flows/report-dialog/post.reason-other.yml b/__e2e__/flows/report-dialog/post.reason-other.yml
index 72da5a9fdf..e1065ece4d 100644
--- a/__e2e__/flows/report-dialog/post.reason-other.yml
+++ b/__e2e__/flows/report-dialog/post.reason-other.yml
@@ -26,6 +26,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "report:details"
 - inputText: "This is a test report"
+- hideKeyboard
 - tapOn:
     id: "report:submit"
 - assertNotVisible:
diff --git a/__e2e__/setupApp.yml b/__e2e__/setupApp.yml
index 00f53c526e..8a90b10005 100644
--- a/__e2e__/setupApp.yml
+++ b/__e2e__/setupApp.yml
@@ -3,15 +3,15 @@ appId: xyz.blueskyweb.app
 - launchApp:
     appId: "xyz.blueskyweb.app"
     clearState: true
+    arguments:
+      "-EXDevMenuIsOnboardingFinished": true
+- openLink: "exp+bluesky://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081"
+- runFlow:
+    when:
+      visible: 'Open in "Bluesky"'
+    commands:
+      - tapOn: Open
 - waitForAnimationToEnd
-- tapOn: "http://localhost:8081"
-- waitForAnimationToEnd
-- extendedWaitUntil:
-    visible: "Continue"
-- swipe:
-    from: "Bluesky"
-    direction: DOWN
-    duration: 100
 - tapOn:
     id: e2eProxyHeaderInput
 - inputText: ${output.result}
diff --git a/src/Navigation.tsx b/src/Navigation.tsx
index 4d05b95dc0..03ff43d739 100644
--- a/src/Navigation.tsx
+++ b/src/Navigation.tsx
@@ -690,6 +690,7 @@ function HomeTabNavigator() {
         headerShown: true,
         headerTransparent: true,
         headerTitle: '',
+        headerBackVisible: false,
         scrollEdgeEffects: {
           top: 'soft',
         },
diff --git a/src/components/DraggableList/index.tsx b/src/components/DraggableList/index.tsx
index 86076c20ae..08676bd172 100644
--- a/src/components/DraggableList/index.tsx
+++ b/src/components/DraggableList/index.tsx
@@ -454,6 +454,7 @@ function SortableItem<T>({
   const dragHandle = (
     <GestureDetector gesture={gesture}>
       <Animated.View
+        testID="feed-drag-handle"
         style={[
           a.justify_center,
           a.align_center,
diff --git a/src/screens/Profile/Header/GrowableBanner.tsx b/src/screens/Profile/Header/GrowableBanner.tsx
index ea6941d166..f0f9c71a38 100644
--- a/src/screens/Profile/Header/GrowableBanner.tsx
+++ b/src/screens/Profile/Header/GrowableBanner.tsx
@@ -30,11 +30,15 @@ export function GrowableBanner({
   children,
   onPress,
   bannerRef,
+  testID,
+  label,
 }: {
   backButton?: React.ReactNode
   children: React.ReactNode
   onPress?: () => void
   bannerRef?: AnimatedRef<Animated.View>
+  testID?: string
+  label?: string
 }) {
   const pagerContext = usePagerHeaderContext()
 
@@ -42,8 +46,11 @@ export function GrowableBanner({
   if (!pagerContext || !IS_IOS) {
     return (
       <Pressable
+        testID={testID}
         onPress={onPress}
         accessibilityRole="image"
+        accessibilityLabel={label}
+        accessibilityHint=""
         style={[a.w_full, a.h_full]}>
         <Animated.View ref={bannerRef} style={[a.w_full, a.h_full]}>
           {children}
@@ -60,7 +67,9 @@ export function GrowableBanner({
       scrollY={scrollY}
       backButton={backButton}
       onPress={onPress}
-      bannerRef={bannerRef}>
+      bannerRef={bannerRef}
+      testID={testID}
+      label={label}>
       {children}
     </GrowableBannerInner>
   )
@@ -72,12 +81,16 @@ function GrowableBannerInner({
   children,
   onPress,
   bannerRef,
+  testID,
+  label,
 }: {
   scrollY: SharedValue<number>
   backButton?: React.ReactNode
   children: React.ReactNode
   onPress?: () => void
   bannerRef?: AnimatedRef<Animated.View>
+  testID?: string
+  label?: string
 }) {
   const {top: topInset} = useSafeAreaInsets()
   const isFetching = useIsProfileFetching()
@@ -142,8 +155,11 @@ function GrowableBannerInner({
           animatedStyle,
         ]}>
         <Pressable
+          testID={testID}
           onPress={onPress}
           accessibilityRole="image"
+          accessibilityLabel={label}
+          accessibilityHint=""
           style={[a.w_full, a.h_full]}>
           <Animated.View
             ref={bannerRef}
diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx
index bb4965f602..b050ea9ef8 100644
--- a/src/screens/Profile/Header/Shell.tsx
+++ b/src/screens/Profile/Header/Shell.tsx
@@ -10,8 +10,7 @@ import Animated, {
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {type AppBskyActorDefs, type ModerationDecision} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {BACK_HITSLOP} from '#/lib/constants'
@@ -56,7 +55,7 @@ let ProfileHeaderShell = ({
   const t = useTheme()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {openLightbox} = useLightboxControls()
   const navigation = useNavigation<NavigationProp>()
   const {top: topInset} = useSafeAreaInsets()
@@ -168,6 +167,12 @@ let ProfileHeaderShell = ({
         style={[a.relative, {height: 150}]}>
         <StatusBarShadow />
         <GrowableBanner
+          testID={profile.banner ? 'userBannerImage' : 'userBannerFallback'}
+          label={
+            profile.banner
+              ? l`View profile banner`
+              : l`Profile banner placeholder`
+          }
           onPress={isPlaceholderProfile ? undefined : onPressBanner}
           bannerRef={bannerRef}
           backButton={
@@ -176,7 +181,7 @@ let ProfileHeaderShell = ({
                 testID="profileHeaderBackBtn"
                 onPress={onPressBack}
                 hitSlop={BACK_HITSLOP}
-                label={_(msg`Back`)}
+                label={l`Back`}
                 style={[
                   a.absolute,
                   a.pointer,
@@ -259,7 +264,7 @@ let ProfileHeaderShell = ({
           testID="profileHeaderAviButton"
           onPress={onPressAvi}
           accessibilityRole="image"
-          accessibilityLabel={_(msg`View ${profile.handle}'s avatar`)}
+          accessibilityLabel={l`View ${profile.handle}'s avatar`}
           accessibilityHint="">
           <View
             style={[
diff --git a/src/screens/ProfileList/components/MoreOptionsMenu.tsx b/src/screens/ProfileList/components/MoreOptionsMenu.tsx
index d15664618c..8bc40682d1 100644
--- a/src/screens/ProfileList/components/MoreOptionsMenu.tsx
+++ b/src/screens/ProfileList/components/MoreOptionsMenu.tsx
@@ -154,7 +154,7 @@ export function MoreOptionsMenu({
             </Button>
           )}
         </Menu.Trigger>
-        <Menu.Outer>
+        <Menu.Outer showCancel>
           <Menu.Group>
             <Menu.Item
               label={IS_WEB ? _(msg`Copy link to list`) : _(msg`Share via...`)}
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index dc61e78272..8146b7ad9d 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -210,7 +210,6 @@ export function UserBanner({
   ) : banner &&
     !((moderation?.blur && IS_ANDROID) /* android crashes with blur */) ? (
     <Image
-      testID="userBannerImage"
       style={[styles.bannerImage, t.atoms.bg_contrast_25]}
       contentFit="cover"
       source={{uri: banner}}
@@ -220,7 +219,6 @@ export function UserBanner({
     />
   ) : (
     <View
-      testID="userBannerFallback"
       style={[
         styles.bannerImage,
         type === 'labeler' ? styles.labelerBanner : t.atoms.bg_contrast_25,