Fix: Resolve Author Data Visibility and Follow Button Functionality on Tutorial Page

src/components/Dashboard/index.jsx

@@ -215,7 +215,6 @@ const Dashboard = ({ background = "white", textColor = "black" }) => {
     validateHandle(
       checkUserHandleExists,
       firebase,
-      dispatch,
       handle,
       setHandleValidateError,
       setHandleValidateErrorMessage,

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);

src/components/TutorialPage/components/PostDetails.jsx

@@ -100,11 +100,7 @@ const PostDetails = ({ details }) => {
             </Box>
             <Box sx={{ width: "100%", marginTop: "10px" }}>
               <Grid container justifyContent="space-between" alignItems="end">
-                <User
-                  id={details?.user}
-                  timestamp={details?.published_on}
-                  showFollowButton={true}
-                />
+                <User id={details?.user} timestamp={details?.published_on} />
 
                 <Grid item sx={{ width: "fit-content" }}>
                   <CardActions className={classes.settings} disableSpacing>

src/components/TutorialPage/components/UserDetails.jsx

@@ -7,6 +7,7 @@ import { useFirebase, useFirestore } from "react-redux-firebase";
 import { getUserProfileData } from "../../../store/actions";
 import { isUserFollower } from "../../../store/actions/profileActions";
 import { addUserFollower } from "../../../store/actions";
+
 const useStyles = makeStyles(() => ({
   container: {
     padding: "20px",
@@ -19,7 +20,8 @@ const useStyles = makeStyles(() => ({
     fontWeight: "600"
   }
 }));
-const User = ({ id, timestamp, showFollowButton, size }) => {
+
+const User = ({ id, timestamp, size }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
   const firebase = useFirebase();
@@ -55,13 +57,16 @@ const User = ({ id, timestamp, showFollowButton, size }) => {
     return () => {};
   }, [profileData, user]);
 
-  const followUser = () => {
-    addUserFollower(profileData, user, firestore);
+  const followUser = async () => {
+    await addUserFollower(profileData, user, firestore);
   };
 
   const getTime = timestamp => {
     return timestamp.toDate().toDateString();
   };
+
+  const showFollowButton = profileData?.uid !== user?.uid;
+
   return (
     <>
       <Grid
@@ -117,7 +122,7 @@ const User = ({ id, timestamp, showFollowButton, size }) => {
                 padding: "1px 10px"
               }}
             >
-              Follow +
+              {isFollowed ? "Following" : "Follow +"}
             </Button>
           )}
         </Grid>

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);

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({

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 = await checkUserHandleExists(handle)(firestore);
+      const isUserExists = checkUserHandleExists(handle)(firebase);
       if (isUserExists) {
         const docs = await firestore
           .collection("cl_user")