From 851bf1a2f99edeacc9ec53d9516e8cf64f77b372 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Fri, 17 Jul 2026 20:21:43 +0300
Subject: [PATCH] Fix nightly E2E startup synchronization

---
 .github/workflows/nightly-e2e.yml      |  6 ++++++
 __e2e__/setupApp.yml                   |  1 +
 src/view/com/testing/TestCtrls.e2e.tsx | 30 +++++++++++++++-----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
index 0df9f12b15..a7c16975b1 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -218,6 +218,12 @@ jobs:
       - name: Mark Android emulator phase
         run: echo "Booting the Android emulator" > artifacts/android/phase.txt
 
+      - name: Ensure KVM is accessible
+        run: |
+          if [ -e /dev/kvm ] && [ ! -w /dev/kvm ]; then
+            sudo chmod 666 /dev/kvm
+          fi
+
       - name: Boot Android emulator and run Maestro suite
         uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # v2.34.0
         with:
diff --git a/__e2e__/setupApp.yml b/__e2e__/setupApp.yml
index 36794d6197..ab9623ffba 100644
--- a/__e2e__/setupApp.yml
+++ b/__e2e__/setupApp.yml
@@ -25,6 +25,7 @@ appId: xyz.blueskyweb.app
           visible: "Continue"
           timeout: 180000
       - tapOn: "Continue"
+      - back
 - extendedWaitUntil:
     visible:
       id: e2eProxyHeaderInput
diff --git a/src/view/com/testing/TestCtrls.e2e.tsx b/src/view/com/testing/TestCtrls.e2e.tsx
index 2110c9540e..5eda574fdb 100644
--- a/src/view/com/testing/TestCtrls.e2e.tsx
+++ b/src/view/com/testing/TestCtrls.e2e.tsx
@@ -24,6 +24,7 @@ export function TestCtrls() {
   const {logoutEveryAccount, login} = useSessionApi()
   const onboardingDispatch = useOnboardingDispatch()
   const {setShowLoggedOut} = useLoggedOutViewControls()
+  const [isProxyConfigured, setIsProxyConfigured] = useState(false)
   const onPressSignInAlice = async () => {
     console.info('[E2E] Signing in as Alice')
     await login(
@@ -63,21 +64,26 @@ export function TestCtrls() {
           const header = `${proxyHeader}#bsky_appview`
           BLUESKY_PROXY_HEADER.set(header)
           agent.configureProxy(header as any)
+          setIsProxyConfigured(true)
         }}
         style={BTN}
       />
-      <Pressable
-        testID="e2eSignInAlice"
-        onPress={onPressSignInAlice}
-        accessibilityRole="button"
-        style={BTN}
-      />
-      <Pressable
-        testID="e2eSignInBob"
-        onPress={onPressSignInBob}
-        accessibilityRole="button"
-        style={BTN}
-      />
+      {isProxyConfigured && (
+        <>
+          <Pressable
+            testID="e2eSignInAlice"
+            onPress={onPressSignInAlice}
+            accessibilityRole="button"
+            style={BTN}
+          />
+          <Pressable
+            testID="e2eSignInBob"
+            onPress={onPressSignInBob}
+            accessibilityRole="button"
+            style={BTN}
+          />
+        </>
+      )}
       <Pressable
         testID="e2eSignOut"
         onPress={() => logoutEveryAccount('Settings')}