Refactor: Remove unused dispatch parameter and ensure correct usage o…

…f firebase and firestore parameters
c2siorg · Aug 24, 2024 · 0ab17e3 · 0ab17e3
1 parent 7bb38fe
commit 0ab17e3
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 168 deletions.
diff --git a/src/components/Dashboard/index.jsx b/src/components/Dashboard/index.jsx
@@ -215,7 +215,6 @@ const Dashboard = ({ background = "white", textColor = "black" }) => {
     validateHandle(
       checkUserHandleExists,
       firebase,
-      dispatch,
       handle,
       setHandleValidateError,
       setHandleValidateErrorMessage,

diff --git a/src/components/Organization/OrgUsersCard/addOrgUserModal.jsx b/src/components/Organization/OrgUsersCard/addOrgUserModal.jsx
@@ -74,10 +74,7 @@ const AddOrgUserModal = ({ currentOrgHandle }) => {
   }, [userProps]);
 
   const onFinish = async () => {
-    const handleExists = await checkUserHandleExists(handle)(
-      firebase,
-      dispatch
-    );
+    const handleExists = await checkUserHandleExists(handle)(firebase);
 
     if (handle.length < 1) {
       setHandleValidateError(true);

diff --git a/src/helpers/validations.jsx b/src/helpers/validations.jsx
@@ -25,7 +25,6 @@ export const validateName = (
 export const validateHandle = async (
   checkUserHandleExists,
   firebase,
-  dispatch,
   handle,
   setHandleValidateError,
   setHandleValidateErrorMessage,
@@ -34,7 +33,7 @@ export const validateHandle = async (
   lengthMsg,
   takenMsg
 ) => {
-  const handleExists = await checkUserHandleExists(handle)(firebase, dispatch);
+  const handleExists = await checkUserHandleExists(handle)(firebase);
   if (validator.isEmpty(handle)) {
     setHandleValidateError(true);
     setHandleValidateErrorMessage(emptyMsg);

diff --git a/src/store/actions/authActions.js b/src/store/actions/authActions.js
@@ -187,10 +187,9 @@ export const checkUserHandleExists = userHandle => async firebase => {
   }
 };
 
-export const checkOrgHandleExists = orgHandle => async firebase => {
+export const checkOrgHandleExists = orgHandle => async firestore => {
   try {
-    const organizationHandle = await firebase
-      .firestore()
+    const organizationHandle = await firestore
       .collection("cl_org_general")
       .doc(orgHandle)
       .get();
@@ -229,9 +228,8 @@ export const setUpInitialData =
       }
 
       if (orgData) {
-        const isOrgHandleExists = await checkOrgHandleExists(org_handle)(
-          firebase
-        );
+        const isOrgHandleExists =
+          await checkOrgHandleExists(org_handle)(firestore);
 
         if (isOrgHandleExists) {
           dispatch({

diff --git a/src/store/actions/profileActions.js b/src/store/actions/profileActions.js
@@ -61,9 +61,8 @@ export const createOrganization =
       dispatch({ type: actions.PROFILE_EDIT_START });
       const userData = firebase.auth().currentUser;
       const { org_name, org_handle, org_country, org_website } = orgData;
-      const isOrgHandleExists = await checkOrgHandleExists(org_handle)(
-        firebase
-      );
+      const isOrgHandleExists =
+        await checkOrgHandleExists(org_handle)(firestore);
 
       if (isOrgHandleExists) {
         dispatch({
@@ -161,7 +160,7 @@ export const getUserProfileData =
   handle => async (firebase, firestore, dispatch) => {
     try {
       dispatch({ type: actions.GET_USER_DATA_START });
-      const isUserExists = checkUserHandleExists(handle)(firestore);
+      const isUserExists = checkUserHandleExists(handle)(firebase);
       if (isUserExists) {
         const docs = await firestore
           .collection("cl_user")