Merge branch 'pangeachat:main' into 218-improve-interactive-translator

lib/pages/homeserver_picker/homeserver_picker.dart

@@ -191,7 +191,10 @@ class HomeserverPickerController extends State<HomeserverPicker> {
     } finally {
       if (mounted) {
         setState(() {
-          isLoading = isLoggingIn = false;
+          // #Pangea
+          // isLoading = isLoggingIn = false;
+          isLoggingIn = false;
+          // Pangea#
         });
       }
     }

lib/pages/homeserver_picker/homeserver_picker_view.dart

@@ -70,7 +70,14 @@ class HomeserverPickerView extends StatelessWidget {
           // Pangea#
           Expanded(
             child: controller.isLoading
-                ? const Center(child: CircularProgressIndicator.adaptive())
+                // #Pangea
+                // ? const Center(child: CircularProgressIndicator.adaptive())
+                ? const Center(
+                    child: CircularProgressIndicator(
+                      valueColor: AlwaysStoppedAnimation<Color>(Colors.black),
+                    ),
+                  )
+                // Pangea#
                 : ListView(
                     children: [
                       if (errorText != null) ...[

lib/pages/login/login.dart

@@ -120,7 +120,9 @@ class LoginController extends State<Login> {
       return setState(() => loading = false);
     }
 
-    if (mounted) setState(() => loading = false);
+    // #Pangea
+    // if (mounted) setState(() => loading = false);
+    // Pangea#
   }
 
   Timer? _coolDown;