various small fixups

2026-09-22 15:53:37 -04:00 · 2026-09-22 15:53:37 -04:00 · a2791a6717
commit a2791a6717
parent f910d87a23
4 changed files with 16 additions and 20 deletions
--- a/lib/controllers/settings_sections.dart
+++ b/lib/controllers/settings_sections.dart
@ -252,16 +252,14 @@ class SettingsSectionsController
                    final colorScheme = Theme.of(context).colorScheme;
                    return M3EButton.icon(
                      onPressed: () async {
-                        Navigator.of(context)
-                            .popUntil((route) => route.isFirst);
-                        Navigator.of(context)
-                            .popUntil((route) => route.isFirst);
-
-                        await WidgetsBinding.instance.endOfFrame;
-
+                        await ref
+                            .watch(UnifiedPushController.provider.notifier)
+                            .deregister()
+                            .onError(showError);
                        await ref
                            .watch(ClientController.provider.notifier)
-                            .logout();
+                            .logout()
+                            .onError(showError);
                      },
                      label: Text(title),
                      icon: Icon(icon),