From 6db45a6da80c3ad6349c9d5128e55f3036cb479c Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Sat, 20 Jun 2026 15:44:36 +0200
Subject: [PATCH] fix loader issue

---
 .../visual/views/onboarding/setup/backup.setup.dart  | 11 ++++-------
 .../views/settings/backup/backup_setup.view.dart     | 12 +++---------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/lib/src/visual/views/onboarding/setup/backup.setup.dart b/lib/src/visual/views/onboarding/setup/backup.setup.dart
index aeff4d5c..5fb49224 100644
--- a/lib/src/visual/views/onboarding/setup/backup.setup.dart
+++ b/lib/src/visual/views/onboarding/setup/backup.setup.dart
@@ -22,10 +22,6 @@ class _BackupSetupPageState extends State<BackupSetupPage> {
   final TextEditingController _repeatedPasswordCtrl = TextEditingController();
 
   Future<bool> onPressedEnableTwonlySafe() async {
-    setState(() {
-      _isLoading = true;
-    });
-
     if (!await isSecurePassword(_passwordCtrl.text)) {
       if (!mounted) return true;
       final ignore = await showAlertDialog(
@@ -37,13 +33,14 @@ class _BackupSetupPageState extends State<BackupSetupPage> {
       );
       if (!mounted) return true;
       if (ignore) {
-        setState(() {
-          _isLoading = false;
-        });
         return true;
       }
     }
 
+    setState(() {
+      _isLoading = true;
+    });
+
     await Future.delayed(const Duration(milliseconds: 100));
     await BackupService.updateBackupPassword(_passwordCtrl.text);
 
diff --git a/lib/src/visual/views/settings/backup/backup_setup.view.dart b/lib/src/visual/views/settings/backup/backup_setup.view.dart
index ff6aa9bf..bf19d729 100644
--- a/lib/src/visual/views/settings/backup/backup_setup.view.dart
+++ b/lib/src/visual/views/settings/backup/backup_setup.view.dart
@@ -30,10 +30,6 @@ class _SetupBackupViewState extends State<SetupBackupView> {
   final TextEditingController _repeatedController = TextEditingController();
 
   Future<void> _updateBackupPassword() async {
-    setState(() {
-      _isLoading = true;
-    });
-
     if (!await isSecurePassword(_passwordController.text)) {
       if (!mounted) return;
       final ignore = await showAlertDialog(
@@ -44,14 +40,12 @@ class _SetupBackupViewState extends State<SetupBackupView> {
         customOk: context.lang.backupInsecurePasswordCancel,
       );
       if (ignore) {
-        if (mounted) {
-          setState(() {
-            _isLoading = false;
-          });
-        }
         return;
       }
     }
+    setState(() {
+      _isLoading = true;
+    });
 
     if (!mounted) return;
     final verified = await authenticateUser(