Reset the values after loading is finished

agama-project · May 2, 2024 · db04da1 · db04da1
1 parent bc2cd45
commit db04da1
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/web/src/components/storage/EncryptionSettingsDialog.jsx b/web/src/components/storage/EncryptionSettingsDialog.jsx
@@ -73,13 +73,19 @@ export default function EncryptionSettingsDialog({
   const [method, setMethod] = useState(methodProp);
   const [passwordsMatch, setPasswordsMatch] = useState(true);
   const [validSettings, setValidSettings] = useState(true);
+  const [wasLoading, setWasLoading] = useState(isLoading);
   const formId = "encryptionSettingsForm";
 
-  // refresh the state when the real values are loaded
-  if (method === "" && methodProp !== "") { setMethod(methodProp) }
-  if (password === "" && passwordProp !== "") {
-    setPassword(passwordProp);
-    setIsEnabled(true);
+  // reset the settings only after loading is finished
+  if (isLoading && !wasLoading) { setWasLoading(true) }
+  if (!isLoading && wasLoading) {
+    setWasLoading(false);
+    // refresh the state when the real values are loaded
+    if (method !== methodProp) { setMethod(methodProp) }
+    if (password !== passwordProp) {
+      setPassword(passwordProp);
+      setIsEnabled(passwordProp?.length > 0);
+    }
   }
 
   useEffect(() => {