feat(profile): update non-admin delete flow

sws2apps · Nov 26, 2024 · bae45b2 · bae45b2
1 parent fa78dab
commit bae45b2
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/features/my_profile/security/delete_account/useDeleteAccount.tsx b/src/features/my_profile/security/delete_account/useDeleteAccount.tsx
@@ -27,7 +27,7 @@ const useDeleteAccount = (closeDialog: VoidFunction) => {
   const [isDeleteCong, setIsDeleteCong] = useState(false);
   const [isManageAccess, setIsManageAccess] = useState(false);
 
-  const { data } = useQuery({
+  const { data, isLoading: isLoadingUsers } = useQuery({
     queryKey: ['admin-users'],
     queryFn: apiCongregationUsersGet,
     enabled: isAdmin,
@@ -84,15 +84,18 @@ const useDeleteAccount = (closeDialog: VoidFunction) => {
     navigate('/manage-access');
   };
 
+  useEffect(() => {
+    if (!isAdmin) {
+      setDesc(t('tr_deleteAccountDesc'));
+      setIsLoading(false);
+    }
+  }, [isAdmin]);
+
   useEffect(() => {
     const loadDetails = async () => {
-      try {
-        if (!isAdmin) {
-          setDesc(t('tr_deleteAccountDesc'));
-          setIsLoading(false);
-          return;
-        }
+      setIsLoading(true);
 
+      try {
         if (users.length === 1) {
           setDesc(t('tr_deleteAccountWithCongregationDesc'));
           setIsDeleteCong(true);
@@ -106,9 +109,11 @@ const useDeleteAccount = (closeDialog: VoidFunction) => {
           return;
         }
 
-        setDesc(t('tr_deleteAccountAssignAdminFirst'));
-        setIsManageAccess(true);
-        setIsLoading(false);
+        if (adminCount === 1) {
+          setDesc(t('tr_deleteAccountAssignAdminFirst'));
+          setIsManageAccess(true);
+          setIsLoading(false);
+        }
       } catch (error) {
         closeDialog();
 
@@ -120,8 +125,8 @@ const useDeleteAccount = (closeDialog: VoidFunction) => {
       }
     };
 
-    loadDetails();
-  }, [isAdmin, t, closeDialog, users, adminCount]);
+    if (isAdmin && !isLoadingUsers) loadDetails();
+  }, [isAdmin, t, closeDialog, users, adminCount, isLoadingUsers]);
 
   return {
     isProcessing,