From 1f621377542806613b58c4f829d1dfbd29555e14 Mon Sep 17 00:00:00 2001
From: Admin <1+admin@noreply.git.dcntrlized.org>
Date: Mon, 19 Oct 2026 09:20:42 +0100
Subject: [PATCH] [fix](client): move the instance address field above the
 notice that points at it

The 'No instance configured' row said 'Set your instance address above' while
the field lived two cards further down, so a fresh install had an instruction
and no visible way to follow it. The Connection card is now the first card.
---
 src/screens/SettingsScreen.tsx | 78 +++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
index c6b7433..a23b871 100644
--- a/src/screens/SettingsScreen.tsx
+++ b/src/screens/SettingsScreen.tsx
@@ -132,6 +132,45 @@ export default function SettingsScreen() {
       {!online ? <OfflineStrip /> : null}
       <Header title="Settings & health" onBack={() => navigation.goBack()} />
       <ScrollView contentContainerStyle={styles.content}>
+        {/* ── Connection ───────────────────────────────────────────────── */}
+        <Card>
+          <View style={{ gap: space3 }}>
+            <AppText style={{ ...typeHeading, color: text }}>Connection</AppText>
+            <Row
+              icon={Server}
+              tint={online ? stateDisarmed : warn}
+              title={online ? 'Instance reachable' : 'No instance answered'}
+              detail={resolved?.baseUrl ? resolved.baseUrl : 'No instance address set yet.'}
+            />
+            <AppText style={{ ...typeMicro, color: textFaint }}>
+              Your instance exposes one address; every service is a path under it. The client
+              only ever talks to this origin — Maestro routes the alarm service.
+            </AppText>
+            <TextInput
+              value={instanceDraft}
+              onChangeText={setInstanceDraft}
+              onEndEditing={saveInstance}
+              onSubmitEditing={saveInstance}
+              placeholder="http://127.0.0.1:8080"
+              placeholderTextColor={textFaint}
+              autoCapitalize="none"
+              autoCorrect={false}
+              keyboardType="url"
+              accessibilityLabel="Instance address"
+              style={styles.instanceInput}
+            />
+            <Button label="Save instance address" variant="secondary" onPress={saveInstance} />
+            <AppText style={styles.code}>{wsUrl ?? 'ws:// — no alert selected'}</AppText>
+            <Button label={probing ? 'Checking…' : 'Check connection'} variant="secondary" onPress={reprobe} />
+            {!isRelease ? (
+              <AppText style={{ ...typeMicro, color: textFaint }}>
+                Dev build · default instance {DEFAULT_SETTINGS.instanceUrl} ·
+                `adb reverse tcp:8080 tcp:8080` on a USB phone
+              </AppText>
+            ) : null}
+          </View>
+        </Card>
+
         {/* ── Delivery ─────────────────────────────────────────────────── */}
         <Card>
           <View style={{ gap: space3 }}>
@@ -273,45 +312,6 @@ export default function SettingsScreen() {
           </View>
         </Card>
 
-        {/* ── Connection ───────────────────────────────────────────────── */}
-        <Card>
-          <View style={{ gap: space3 }}>
-            <AppText style={{ ...typeHeading, color: text }}>Connection</AppText>
-            <Row
-              icon={Server}
-              tint={online ? stateDisarmed : warn}
-              title={online ? 'Instance reachable' : 'No instance answered'}
-              detail={resolved?.baseUrl ? resolved.baseUrl : 'No instance address set yet.'}
-            />
-            <AppText style={{ ...typeMicro, color: textFaint }}>
-              Your instance exposes one address; every service is a path under it. The client
-              only ever talks to this origin — Maestro routes the alarm service.
-            </AppText>
-            <TextInput
-              value={instanceDraft}
-              onChangeText={setInstanceDraft}
-              onEndEditing={saveInstance}
-              onSubmitEditing={saveInstance}
-              placeholder="http://127.0.0.1:8080"
-              placeholderTextColor={textFaint}
-              autoCapitalize="none"
-              autoCorrect={false}
-              keyboardType="url"
-              accessibilityLabel="Instance address"
-              style={styles.instanceInput}
-            />
-            <Button label="Save instance address" variant="secondary" onPress={saveInstance} />
-            <AppText style={styles.code}>{wsUrl ?? 'ws:// — no alert selected'}</AppText>
-            <Button label={probing ? 'Checking…' : 'Check connection'} variant="secondary" onPress={reprobe} />
-            {!isRelease ? (
-              <AppText style={{ ...typeMicro, color: textFaint }}>
-                Dev build · default instance {DEFAULT_SETTINGS.instanceUrl} ·
-                `adb reverse tcp:8080 tcp:8080` on a USB phone
-              </AppText>
-            ) : null}
-          </View>
-        </Card>
-
         {/* ── Account ──────────────────────────────────────────────────── */}
         <Card>
           <View style={{ gap: space3 }}>