From cfd33e9bd1d01dab2bdd8edbd32e9e6b814d2fa9 Mon Sep 17 00:00:00 2001
From: daniel31x13 <daniel31x13@gmail.com>
Date: Sat, 26 Oct 2024 10:58:27 -0400
Subject: [PATCH] bug fixed

---
 components/ModalContent/BulkEditLinksModal.tsx         | 3 +--
 components/ModalContent/DeleteCollectionModal.tsx      | 3 +--
 components/ModalContent/DeleteUserModal.tsx            | 5 +++--
 components/ModalContent/EditCollectionModal.tsx        | 3 +--
 components/ModalContent/EditCollectionSharingModal.tsx | 3 +--
 components/ModalContent/InviteModal.tsx                | 3 +--
 components/ModalContent/NewCollectionModal.tsx         | 3 +--
 components/ModalContent/NewLinkModal.tsx               | 3 +--
 components/ModalContent/NewTokenModal.tsx              | 3 +--
 components/ModalContent/NewUserModal.tsx               | 5 +++--
 components/ModalContent/UploadFileModal.tsx            | 3 +--
 pages/member-onboarding.tsx                            | 3 +--
 pages/settings/account.tsx                             | 3 +--
 pages/settings/password.tsx                            | 3 +--
 pages/settings/preference.tsx                          | 3 +--
 pages/tags/[id].tsx                                    | 2 +-
 16 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/components/ModalContent/BulkEditLinksModal.tsx b/components/ModalContent/BulkEditLinksModal.tsx
index c2eab0f..3c78424 100644
--- a/components/ModalContent/BulkEditLinksModal.tsx
+++ b/components/ModalContent/BulkEditLinksModal.tsx
@@ -46,6 +46,7 @@ export default function BulkEditLinksModal({ onClose }: Props) {
         },
         {
           onSettled: (data, error) => {
+            setSubmitLoader(false);
             toast.dismiss(load);
 
             if (error) {
@@ -58,8 +59,6 @@ export default function BulkEditLinksModal({ onClose }: Props) {
           },
         }
       );
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/DeleteCollectionModal.tsx b/components/ModalContent/DeleteCollectionModal.tsx
index 0aae298..5e738b7 100644
--- a/components/ModalContent/DeleteCollectionModal.tsx
+++ b/components/ModalContent/DeleteCollectionModal.tsx
@@ -44,6 +44,7 @@ export default function DeleteCollectionModal({
 
       deleteCollection.mutateAsync(collection.id as number, {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -55,8 +56,6 @@ export default function DeleteCollectionModal({
           }
         },
       });
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/DeleteUserModal.tsx b/components/ModalContent/DeleteUserModal.tsx
index 7323373..77931c6 100644
--- a/components/ModalContent/DeleteUserModal.tsx
+++ b/components/ModalContent/DeleteUserModal.tsx
@@ -23,9 +23,10 @@ export default function DeleteUserModal({ onClose, userId }: Props) {
         onSuccess: () => {
           onClose();
         },
+        onSettled: (data, error) => {
+          setSubmitLoader(false);
+        },
       });
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/EditCollectionModal.tsx b/components/ModalContent/EditCollectionModal.tsx
index 2c9ac8f..e76456a 100644
--- a/components/ModalContent/EditCollectionModal.tsx
+++ b/components/ModalContent/EditCollectionModal.tsx
@@ -35,6 +35,7 @@ export default function EditCollectionModal({
 
       await updateCollection.mutateAsync(collection, {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -45,8 +46,6 @@ export default function EditCollectionModal({
           }
         },
       });
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/EditCollectionSharingModal.tsx b/components/ModalContent/EditCollectionSharingModal.tsx
index 921c3bb..16c61be 100644
--- a/components/ModalContent/EditCollectionSharingModal.tsx
+++ b/components/ModalContent/EditCollectionSharingModal.tsx
@@ -45,6 +45,7 @@ export default function EditCollectionSharingModal({
 
       await updateCollection.mutateAsync(collection, {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -55,8 +56,6 @@ export default function EditCollectionSharingModal({
           }
         },
       });
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/InviteModal.tsx b/components/ModalContent/InviteModal.tsx
index 7f4ee09..1cb92d2 100644
--- a/components/ModalContent/InviteModal.tsx
+++ b/components/ModalContent/InviteModal.tsx
@@ -48,6 +48,7 @@ export default function InviteModal({ onClose }: Props) {
 
         await addUser.mutateAsync(form, {
           onSettled: () => {
+            setSubmitLoader(false);
             signIn("invite", {
               email: form.email,
               callbackUrl: "/member-onboarding",
@@ -58,8 +59,6 @@ export default function InviteModal({ onClose }: Props) {
             onClose();
           },
         });
-
-        setSubmitLoader(false);
       } else {
         toast.error(t("fill_all_fields_error"));
       }
diff --git a/components/ModalContent/NewCollectionModal.tsx b/components/ModalContent/NewCollectionModal.tsx
index 191086a..b407c50 100644
--- a/components/ModalContent/NewCollectionModal.tsx
+++ b/components/ModalContent/NewCollectionModal.tsx
@@ -43,6 +43,7 @@ export default function NewCollectionModal({ onClose, parent }: Props) {
 
     await createCollection.mutateAsync(collection, {
       onSettled: (data, error) => {
+        setSubmitLoader(false);
         toast.dismiss(load);
 
         if (error) {
@@ -53,8 +54,6 @@ export default function NewCollectionModal({ onClose, parent }: Props) {
         }
       },
     });
-
-    setSubmitLoader(false);
   };
 
   return (
diff --git a/components/ModalContent/NewLinkModal.tsx b/components/ModalContent/NewLinkModal.tsx
index e5394c9..7bb5444 100644
--- a/components/ModalContent/NewLinkModal.tsx
+++ b/components/ModalContent/NewLinkModal.tsx
@@ -80,6 +80,7 @@ export default function NewLinkModal({ onClose }: Props) {
 
       await addLink.mutateAsync(link, {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -90,8 +91,6 @@ export default function NewLinkModal({ onClose }: Props) {
           }
         },
       });
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/NewTokenModal.tsx b/components/ModalContent/NewTokenModal.tsx
index 5c57012..7845fb7 100644
--- a/components/ModalContent/NewTokenModal.tsx
+++ b/components/ModalContent/NewTokenModal.tsx
@@ -34,6 +34,7 @@ export default function NewTokenModal({ onClose }: Props) {
 
       await addToken.mutateAsync(token, {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -43,8 +44,6 @@ export default function NewTokenModal({ onClose }: Props) {
           }
         },
       });
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/components/ModalContent/NewUserModal.tsx b/components/ModalContent/NewUserModal.tsx
index ac8b4dc..29aa6a9 100644
--- a/components/ModalContent/NewUserModal.tsx
+++ b/components/ModalContent/NewUserModal.tsx
@@ -55,9 +55,10 @@ export default function NewUserModal({ onClose }: Props) {
           onSuccess: () => {
             onClose();
           },
+          onSettled: () => {
+            setSubmitLoader(false);
+          },
         });
-
-        setSubmitLoader(false);
       } else {
         toast.error(t("fill_all_fields_error"));
       }
diff --git a/components/ModalContent/UploadFileModal.tsx b/components/ModalContent/UploadFileModal.tsx
index 219dabe..20f4b26 100644
--- a/components/ModalContent/UploadFileModal.tsx
+++ b/components/ModalContent/UploadFileModal.tsx
@@ -115,6 +115,7 @@ export default function UploadFileModal({ onClose }: Props) {
         { link, file },
         {
           onSettled: (data, error) => {
+            setSubmitLoader(false);
             toast.dismiss(load);
 
             if (error) {
@@ -126,8 +127,6 @@ export default function UploadFileModal({ onClose }: Props) {
           },
         }
       );
-
-      setSubmitLoader(false);
     }
   };
 
diff --git a/pages/member-onboarding.tsx b/pages/member-onboarding.tsx
index 6d69a7c..7e76d10 100644
--- a/pages/member-onboarding.tsx
+++ b/pages/member-onboarding.tsx
@@ -53,6 +53,7 @@ export default function MemberOnboarding() {
             router.push("/dashboard");
           },
           onSettled: (data, error) => {
+            setSubmitLoader(false);
             toast.dismiss(load);
 
             if (error) {
@@ -63,8 +64,6 @@ export default function MemberOnboarding() {
           },
         }
       );
-
-      setSubmitLoader(false);
     } else {
       toast.error(t("please_fill_all_fields"));
     }
diff --git a/pages/settings/account.tsx b/pages/settings/account.tsx
index 5a6e4f9..3a15b20 100644
--- a/pages/settings/account.tsx
+++ b/pages/settings/account.tsx
@@ -108,6 +108,7 @@ export default function Account() {
           }
         },
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -129,8 +130,6 @@ export default function Account() {
         location.reload();
       }, 1000);
     }
-
-    setSubmitLoader(false);
   };
 
   const importBookmarks = async (
diff --git a/pages/settings/password.tsx b/pages/settings/password.tsx
index 808be7a..dfe5245 100644
--- a/pages/settings/password.tsx
+++ b/pages/settings/password.tsx
@@ -34,6 +34,7 @@ export default function Password() {
       },
       {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -47,8 +48,6 @@ export default function Password() {
         },
       }
     );
-
-    setSubmitLoader(false);
   };
 
   return (
diff --git a/pages/settings/preference.tsx b/pages/settings/preference.tsx
index 4d93d02..13e0497 100644
--- a/pages/settings/preference.tsx
+++ b/pages/settings/preference.tsx
@@ -80,6 +80,7 @@ export default function Appearance() {
       { ...user },
       {
         onSettled: (data, error) => {
+          setSubmitLoader(false);
           toast.dismiss(load);
 
           if (error) {
@@ -90,8 +91,6 @@ export default function Appearance() {
         },
       }
     );
-
-    setSubmitLoader(false);
   };
 
   return (
diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsx
index 14196a1..689517f 100644
--- a/pages/tags/[id].tsx
+++ b/pages/tags/[id].tsx
@@ -85,6 +85,7 @@ export default function Index() {
         },
         {
           onSettled: (data, error) => {
+            setSubmitLoader(false);
             toast.dismiss(load);
 
             if (error) {
@@ -97,7 +98,6 @@ export default function Index() {
       );
     }
 
-    setSubmitLoader(false);
     setRenameTag(false);
   };