fix: PR fixes

silverlogic · Jan 6, 2025 · 861efb4 · 861efb4
1 parent 123baf8
commit 861efb4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 35 deletions.
diff --git a/packages/components/modules/profiles/ProfileComponent/FollowToggleButton/index.tsx b/packages/components/modules/profiles/ProfileComponent/FollowToggleButton/index.tsx
@@ -24,7 +24,7 @@ const FollowToggleButton: FC<FollowToggleButtonProps> = ({
   const environment = useRelayEnvironment()
 
   const toggleFollow = () => {
-    if (isMutationInFlight || !currentProfileId) {
+    if (isMutationInFlight || !currentProfileId || !targetId) {
       return
     }
 

diff --git a/packages/components/modules/profiles/ProfileComponent/FollowToggleButton/types.ts b/packages/components/modules/profiles/ProfileComponent/FollowToggleButton/types.ts
@@ -1,5 +1,5 @@
 export interface FollowToggleButtonProps {
-  targetId: string
+  targetId?: string
   isFollowedByMe: boolean | null | undefined
   currentProfileId?: string
   profileRef?: any

diff --git a/packages/components/modules/profiles/ProfileComponent/index.tsx b/packages/components/modules/profiles/ProfileComponent/index.tsx
@@ -69,42 +69,39 @@ const ProfileComponent: FC<ProfileComponentProps> = ({ profile: profileRef }) =>
   }
 
   const renderProfileUpdatesButtons = () => {
-    if (profile && currentProfile) {
-      if (profile.id === currentProfile.id) {
-        return (
-          <Button
-            variant="soft"
-            size="medium"
-            color="inherit"
-            startIcon={<OutlinedEditIcon />}
-            sx={{ maxWidth: smDown ? '100%' : 'fit-content' }}
-            onClick={() => router.push('/user/settings')}
-          >
-            Edit Profile
-          </Button>
-        )
-      }
+    if (profile?.id === currentProfile?.id) {
       return (
-        <div className="flex flex-row gap-2">
-          {!profile?.isBlockedByMe && (
-            <FollowToggleButton
-              targetId={profile?.id}
-              isFollowedByMe={profile?.isFollowedByMe}
-              currentProfileId={currentProfile?.id}
-              profileRef={profile}
-            />
-          )}
-          {profile?.isBlockedByMe && (
-            <BlockButtonWithDialog
-              target={profile}
-              handleCloseMenu={handleClose}
-              currentProfileId={currentProfile?.id}
-            />
-          )}
-        </div>
+        <Button
+          variant="soft"
+          size="medium"
+          color="inherit"
+          startIcon={<OutlinedEditIcon />}
+          sx={{ maxWidth: smDown ? '100%' : 'fit-content' }}
+          onClick={() => router.push('/user/settings')}
+        >
+          Edit Profile
+        </Button>
       )
     }
-    return <div />
+    return (
+      <div className="flex flex-row gap-2">
+        {!profile?.isBlockedByMe && (
+          <FollowToggleButton
+            targetId={profile?.id}
+            isFollowedByMe={profile?.isFollowedByMe}
+            currentProfileId={currentProfile?.id}
+            profileRef={profile}
+          />
+        )}
+        {profile?.isBlockedByMe && (
+          <BlockButtonWithDialog
+            target={profile}
+            handleCloseMenu={handleClose}
+            currentProfileId={currentProfile?.id}
+          />
+        )}
+      </div>
+    )
   }
 
   return (