Skip to content

Commit 88abb71

Browse files
committed
better message for cancel/confirm + accept ctxmenu
1 parent aa11cf3 commit 88abb71

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

components/home/MessageHeader.tsx

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { MiniProfile } from '../forms/MiniProfile';
44
import UserIcon from '../icons/UserIcon';
55
import * as ContextMenu from '@radix-ui/react-context-menu';
66
import { useSupabaseClient, useUser } from '@supabase/auth-helpers-react';
7-
import { removeFriendOrRequest, sendFriendRequest } from '@/services/friends.service';
7+
import { acceptFriendRequest, removeFriendOrRequest, sendFriendRequest } from '@/services/friends.service';
88
import { useRelations } from '@/lib/store';
99

1010
export function MessageHeader({
@@ -76,6 +76,16 @@ export function MessageHeader({
7676
>
7777
Send friend request
7878
</ContextMenu.Item>
79+
<ContextMenu.Item
80+
className='ContextMenuItem'
81+
onClick={() => {
82+
// NOTE: Since this is only shown if a relation exists, therefore we can assume relation is not undefined
83+
acceptFriendRequest(supabase, relation!.id);
84+
}}
85+
hidden={!relation || relation.relationship !== 'friend_requested' || relation.initiator_profile_id === currentUser?.id}
86+
>
87+
Accept friend request
88+
</ContextMenu.Item>
7989
<ContextMenu.Item
8090
className='ContextMenuItem'
8191
onClick={() => {
@@ -84,7 +94,11 @@ export function MessageHeader({
8494
}}
8595
hidden={!relation}
8696
>
87-
{ relation && relation.relationship === 'friend_requested' ? 'Cancel friend request' : 'Remove friend' }
97+
{
98+
relation && relation.relationship === 'friend_requested' ?
99+
(relation.initiator_profile_id === currentUser?.id ? 'Cancel friend request' : 'Reject friend request')
100+
: 'Remove friend'
101+
}
88102
</ContextMenu.Item>
89103
</ContextMenu.Content>
90104
)}

0 commit comments

Comments
 (0)