fix(android): show auth recovery while approval loads

qingminglong · qingminglong · commit 50b706103447 · 2026-06-30T21:07:36.000+08:00
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt
@@ -1221,8 +1221,6 @@ internal fun recoveryGatewayDetail(
       nodeCapabilityApprovalState == GatewayNodeApprovalState.Unapproved
     ) {
       "Gateway paired. Waiting for node capability approval."
-    } else if (nodeCapabilityApprovalState == GatewayNodeApprovalState.Loading) {
-      "Gateway paired. Checking node capability approval."
     } else if (gatewayConnectionProblem?.isPairingRequired == true && !gatewayConnectionProblem.canAutoRetry) {
       recoveryGatewayApprovalCommand(gatewayConnectionProblem)
         ?.let { "Gateway approval is pending. Run this on the gateway host:" }
@@ -1231,6 +1229,8 @@ internal fun recoveryGatewayDetail(
       "Gateway approval is in progress. OpenClaw will retry automatically."
     } else if (gatewayConnectionProblem != null) {
       recoveryGatewayAuthDetail(gatewayConnectionProblem)
+    } else if (nodeCapabilityApprovalState == GatewayNodeApprovalState.Loading) {
+      "Gateway paired. Checking node capability approval."
     } else if (statusText.contains("operator offline", ignoreCase = true)) {
       "Gateway paired. Waiting for operator access."
     } else if (gatewayStatusLooksLikePairing(statusText)) {
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/ui/OnboardingFlowLogicTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/ui/OnboardingFlowLogicTest.kt
@@ -248,6 +248,29 @@ class OnboardingFlowLogicTest {
     )
   }
 
+  @Test
+  fun recoveryGatewayDetailPrefersAuthProblemWhileNodeApprovalIsLoading() {
+    assertEquals(
+      "Saved authentication is invalid. Re-authenticate or reset this gateway connection.",
+      recoveryGatewayDetail(
+        ready = false,
+        remoteAddress = "wss://gateway.example.test",
+        statusText = "Connected (node offline)",
+        nodeCapabilityApprovalState = GatewayNodeApprovalState.Loading,
+        gatewayConnectionProblem =
+          GatewayConnectionProblem(
+            code = "AUTH_DEVICE_TOKEN_MISMATCH",
+            message = "authentication needed",
+            reason = null,
+            requestId = null,
+            recommendedNextStep = "update_auth_credentials",
+            pauseReconnect = true,
+            retryable = false,
+          ),
+      ),
+    )
+  }
+
   @Test
   fun recoveryGatewayAuthDetailShowsSpecificAuthRecoveryActions() {
     val cases =
