reorganize hub token popup

Author: ComputerElite

fastlane/metadata/android/en-US/changelogs/44.txt

@@ -4,4 +4,6 @@
 - Added padding between turnstile challenge and password field
 - Made unlinking shockers also work when selecting multiple at once
 - Creating a share code (per shocker shares page) now immediately shows a new share pop up just like invites do
-- Removed 'add existing share link' option from share tab as it's redundant with the button in settings and clutters up the ui
+- Removed 'add existing share link' option from share tab as it's redundant with the button in settings and clutters up the ui
+- Reorganized order of some buttons in dialogs
+- Fixed a few spelling mistakes

lib/screens/shockers/hub_item.dart

@@ -231,14 +231,6 @@ class HubItemState extends State<HubItem> {
                     ],
                   ),
                   actions: [
-                    TextButton(
-                        onPressed: () {
-                          Navigator.of(context).pop();
-                        },
-                        child: Text("Cancel")),
-                    TextButton(
-                        onPressed: () => showCurrentToken(isCurrent: true),
-                        child: Text("Show current")),
                     TextButton(
                         onPressed: () async {
                           LoadingDialog.show("Regenerating token");
@@ -274,7 +266,15 @@ class HubItemState extends State<HubItem> {
                                 });
                           }
                         },
-                        child: Text("Regenerate"))
+                        child: Text("Regenerate")),
+                    TextButton(
+                        onPressed: () => showCurrentToken(isCurrent: true),
+                        child: Text("Show current")),
+                    TextButton(
+                        onPressed: () {
+                          Navigator.of(context).pop();
+                        },
+                        child: Text("Cancel")),
                   ]);
             }));
   }
@@ -318,7 +318,7 @@ class HubItemState extends State<HubItem> {
         builder: (builder) => AlertDialog.adaptive(
               title: Text("Captive portal"),
               content: Text(
-                  "The captive portal is the website hosted on your hub itself. It's only available in your wifi ans is used for managing the wifi connection and account linking. Here you can enable or disable it."),
+                  "The captive portal is the website hosted on your hub itself. It's only available in your wifi and is used for managing the wifi connection and account linking. Here you can enable or disable it."),
               actions: [
                 TextButton(
                     onPressed: () {