Skip to content

fix: Display requested friend's name in pending partner requests #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JustinhSE merged 2 commits into from
Feb 25, 2026
Merged

fix: Display requested friend's name in pending partner requests #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa93ed8
Initial plan
Copilot Feb 25, 2026
9128daa
fix: display requested friend's name in pending partner requests
Copilot Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 25 additions & 29 deletions src/components/FriendsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const FriendsList: React.FC = () => {
const filteredUsernames = usernamesData.filter((user: any) => {
return user.id !== auth.currentUser?.uid &&
!friends.some(friend => friend.id === user.id) &&
!friendRequests.outgoing.includes(user.id);
!friendRequests.outgoing.some((u: any) => u.id === user.id);
});
setAllUsernames(filteredUsernames);
} catch (error) {
Expand Down Expand Up @@ -541,37 +541,33 @@ const FriendsList: React.FC = () => {
<div className="mb-4">
<h4 className="text-sm font-medium mb-2">Pending Requests</h4>
<div className="space-y-2">
{friendRequests.outgoing.map((userId) => {
// Find the user details from allUsernames array
const user = allUsernames.find(u => u.id === userId);
return (
<div key={userId} className="flex items-center justify-between p-2 border rounded bg-muted/10">
<div className="flex items-center">
<Avatar className="h-8 w-8 mr-2">
<AvatarFallback>{user ? getInitials(user) : 'U'}</AvatarFallback>
</Avatar>
<div>
<div className="flex items-center">
<p className="font-medium">{user ? `${user.firstName} ${user.lastName}` : 'User'}</p>
<span className="ml-2 px-1.5 py-0.5 text-xs bg-yellow-500/20 text-yellow-700 dark:text-yellow-400 rounded">
Pending
</span>
</div>
<p className="text-xs text-muted-foreground">{user ? `@${user.username}` : ''}</p>
{friendRequests.outgoing.map((outgoingUser) => (
<div key={outgoingUser.id} className="flex items-center justify-between p-2 border rounded bg-muted/10">
<div className="flex items-center">
<Avatar className="h-8 w-8 mr-2">
<AvatarFallback>{getInitials(outgoingUser)}</AvatarFallback>
</Avatar>
<div>
<div className="flex items-center">
<p className="font-medium">{outgoingUser.firstName} {outgoingUser.lastName}</p>
<span className="ml-2 px-1.5 py-0.5 text-xs bg-yellow-500/20 text-yellow-700 dark:text-yellow-400 rounded">
Pending
</span>
</div>
<p className="text-xs text-muted-foreground">@{outgoingUser.username}</p>
</div>
<Button
size="sm"
variant="outline"
onClick={() => handleCancelFriendRequest(userId)}
title="Cancel request"
className="h-8 w-8 p-0"
>
<X className="h-4 w-4" />
</Button>
</div>
);
})}
<Button
size="sm"
variant="outline"
onClick={() => handleCancelFriendRequest(outgoingUser.id)}
title="Cancel request"
className="h-8 w-8 p-0"
>
<X className="h-4 w-4" />
</Button>
</div>
))}
</div>
</div>
)}
Expand Down
16 changes: 13 additions & 3 deletions src/utils/auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface AuthContextType {
firebaseInitialized: boolean;
friendRequests: {
incoming: UserProfile[];
outgoing: string[];
outgoing: UserProfile[];
};
friends: UserProfile[];
accountabilityPartners: UserProfile[];
Expand Down Expand Up @@ -47,7 +47,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
const [isLoading, setIsLoading] = useState(true);
const [firebaseInitialized, setFirebaseInitialized] = useState(!!auth);
const [isAdmin, setIsAdmin] = useState(false);
const [friendRequests, setFriendRequests] = useState<{ incoming: UserProfile[], outgoing: string[] }>({
const [friendRequests, setFriendRequests] = useState<{ incoming: UserProfile[], outgoing: UserProfile[] }>({
incoming: [],
outgoing: []
});
Expand Down Expand Up @@ -80,10 +80,20 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
}
}
}

const outgoingRequests: UserProfile[] = [];
if (profile.friendRequests?.outgoing?.length) {
for (const recipientId of profile.friendRequests.outgoing) {
const recipientProfile = await getUserProfile(recipientId);
if (recipientProfile) {
outgoingRequests.push(recipientProfile);
}
}
}

setFriendRequests({
incoming: incomingRequests,
outgoing: profile.friendRequests?.outgoing || []
outgoing: outgoingRequests
});

const friendsList: UserProfile[] = [];
Expand Down
Loading