From f488da890b57c94f4ba6492f1f21d9b12289d300 Mon Sep 17 00:00:00 2001
From: Jenna Vassar <jenna.vassar@toptal.com>
Date: Fri, 14 Aug 2026 08:57:37 -0700
Subject: [PATCH] Update the maestro sign-in flow for the consolidated account
 provider screen

---
 .maestro/tests/account/changeServer.yaml      | 21 -------------------
 .maestro/tests/account/login.yaml             |  3 +--
 .../assertions/assertLoginDisplayed.yaml      |  2 +-
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 .maestro/tests/account/changeServer.yaml

diff --git a/.maestro/tests/account/changeServer.yaml b/.maestro/tests/account/changeServer.yaml
deleted file mode 100644
index b07fa5cc09..0000000000
--- a/.maestro/tests/account/changeServer.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-appId: ${MAESTRO_APP_ID}
----
-- tapOn:
-    id: "login-change_server"
-- takeScreenshot: build/maestro/200-ChangeServer
-- tapOn: "matrix.org"
-- tapOn:
-    id: "login-change_server"
-- tapOn: "Other"
-- tapOn:
-    id: "change_server-server"
-- inputText: "element"
-- hideKeyboard
-- extendedWaitUntil:
-    visible: "element.io"
-    timeout: 10000
-- tapOn: "element.io"
-# Revert to matrix.org
-- tapOn:
-    id: "login-change_server"
-- tapOn: "matrix.org"
diff --git a/.maestro/tests/account/login.yaml b/.maestro/tests/account/login.yaml
index 873843b22d..81922c7f38 100644
--- a/.maestro/tests/account/login.yaml
+++ b/.maestro/tests/account/login.yaml
@@ -3,8 +3,7 @@ appId: ${MAESTRO_APP_ID}
 - tapOn: "Sign in manually"
 - runFlow: ../assertions/assertLoginDisplayed.yaml
 - takeScreenshot: build/maestro/100-SignIn
-- runFlow: changeServer.yaml
-- runFlow: ../assertions/assertLoginDisplayed.yaml
+# The account provider field defaults to matrix.org, so continue straight to the MAS login.
 - tapOn:
     id: "login-continue"
 ## MAS page
diff --git a/.maestro/tests/assertions/assertLoginDisplayed.yaml b/.maestro/tests/assertions/assertLoginDisplayed.yaml
index 6d8558c38e..c32f23c323 100644
--- a/.maestro/tests/assertions/assertLoginDisplayed.yaml
+++ b/.maestro/tests/assertions/assertLoginDisplayed.yaml
@@ -1,5 +1,5 @@
 appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
-    visible: "Change account provider"
+    visible: "Enter your account provider"
     timeout: 10000