From bd185824f9127e8dbd572820c61e1b019672091d Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sat, 8 Aug 2026 16:18:54 -0400
Subject: [PATCH] set loading when waiting for token exchange

---
 lib/pages/select_server.dart | 41 ++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/lib/pages/select_server.dart b/lib/pages/select_server.dart
index f7cefb8..853e5fc 100644
--- a/lib/pages/select_server.dart
+++ b/lib/pages/select_server.dart
@@ -60,27 +60,32 @@ class SelectServerPage extends HookConsumerWidget {
             AppLinks().uriLinkStream.listen((encodedUri) async {
               final state = encodedUri.queryParameters["state"];
               if (state != codeResponse.state) return;
+              isLoading.value = true;
 
-              final code = encodedUri.queryParameters["code"];
+              try {
+                final code = encodedUri.queryParameters["code"];
 
-              if (code != null) {
-                await ref
-                    .watch(ClientController.provider.notifier)
-                    .exchangeToken(
-                      .new(
-                        homeserverUrl: newUrl,
-                        codeVerifier: codeResponse.codeVerifier,
-                        redirectUri: .new(
-                          scheme: "nexus.federated.nexus",
-                          path: "/",
+                if (code != null) {
+                  await ref
+                      .watch(ClientController.provider.notifier)
+                      .exchangeToken(
+                        .new(
+                          homeserverUrl: newUrl,
+                          codeVerifier: codeResponse.codeVerifier,
+                          redirectUri: .new(
+                            scheme: "nexus.federated.nexus",
+                            path: "/",
+                          ),
+                          code: code,
+                          clientId: await ref.watch(
+                            ClientIdController.provider(newUrl).future,
+                          ),
                         ),
-                        code: code,
-                        clientId: await ref.watch(
-                          ClientIdController.provider(newUrl).future,
-                        ),
-                      ),
-                    )
-                    .onError(showError);
+                      )
+                      .onError(showError);
+                }
+              } finally {
+                isLoading.value = false;
               }
             });
           }