Follow btn individual users (#1654)

* feat: follow buttons for individual users * fix: remove second follow user button * fix: user cannot follow their own testimony hit * fix: rn prettier
codeforboston · Dec 18, 2024 · fafe412 · fafe412
1 parent e29d5cb
commit fafe412
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/components/ProfilePage/ProfileButtons.tsx b/components/ProfilePage/ProfileButtons.tsx
@@ -56,12 +56,17 @@ export const EditProfileButton = ({ className }: { className?: string }) => {
 
 export function ProfileButtonsUser({
   isProfilePublic,
-  onProfilePublicityChanged
+  onProfilePublicityChanged,
+  isUser,
+  profileId
 }: {
   isProfilePublic: boolean | undefined
   onProfilePublicityChanged: (isPublic: boolean) => void
+  isUser: boolean
+  profileId: string
 }) {
   const { t } = useTranslation("editProfile")
+  const { user } = useAuth()
 
   const actions = useProfile()
 
@@ -76,16 +81,20 @@ export function ProfileButtonsUser({
     onProfilePublicityChanged(!isProfilePublic)
   }
   return (
-    <div className={`d-grid gap-2 col-12 m-3`}>
-      <EditProfileButton className={`py-1`} />
-      <ToggleButton
-        toggleState={isProfilePublic || false}
-        stateTrueLabel={t("forms.makePrivate")}
-        stateFalseLabel={t("forms.makePublic")}
-        onClick={handleSave}
-        className={`py-1`}
-      />
-    </div>
+    <>
+      {isUser ? (
+        <div className={`d-grid gap-2 col-12 m-3`}>
+          <EditProfileButton className={`py-1`} />
+          <ToggleButton
+            toggleState={isProfilePublic || false}
+            stateTrueLabel={t("forms.makePrivate")}
+            stateFalseLabel={t("forms.makePublic")}
+            onClick={handleSave}
+            className={`py-1`}
+          />
+        </div>
+      ) : null}
+    </>
   )
 }
 
@@ -100,9 +109,7 @@ export function ProfileButtonsOrg({
   const { user } = useAuth()
   return (
     <>
-      {isUser ? (
-        <EditProfileButton />
-      ) : followOrg && user ? (
+      {followOrg && user && !isUser ? (
         <FollowOrgButton profileId={profileId} />
       ) : null}
     </>

diff --git a/components/ProfilePage/ProfileHeader.tsx b/components/ProfilePage/ProfileHeader.tsx
@@ -40,12 +40,14 @@ export const ProfileHeader = ({
       <div className="col-12 col-md-2 d-flex justify-content-center justify-content-md-end align-items-center ms-md-auto ">
         {isOrg ? (
           <OrgContactInfo profile={profile} />
-        ) : isUser ? (
+        ) : (
           <ProfileButtonsUser
             isProfilePublic={isProfilePublic}
             onProfilePublicityChanged={onProfilePublicityChanged}
+            isUser={isUser}
+            profileId={profileId}
           />
-        ) : null}
+        )}
       </div>
     </Header>
   )

diff --git a/components/search/testimony/TestimonyHit.tsx b/components/search/testimony/TestimonyHit.tsx
@@ -43,6 +43,7 @@ const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
     )
   const { user } = useAuth()
   const { followOrg } = useFlags()
+  const isCurrentUser = user?.uid === hit.authorUid
 
   return (
     <div
@@ -70,7 +71,7 @@ const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
         <span style={{ flexGrow: 1 }}>
           <b>Written by {writtenBy}</b>
         </span>
-        {followOrg && isOrg && user && (
+        {!isCurrentUser && followOrg && user && (
           <FollowOrgButton profileId={hit.authorUid} />
         )}
       </div>