From 6a6d7f69478cca93aa4aa80ab9fecab5f3a1b6e6 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Wed, 27 Jul 2022 19:46:22 -0400
Subject: [PATCH] Fix friend issues

---
 src/api/friends/OpenMessengerChat.ts            |  2 +-
 .../views/messenger/FriendsMessengerView.tsx    | 17 +++++++++++------
 .../rooms/widgets/useFriendRequestWidget.ts     |  2 --
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/api/friends/OpenMessengerChat.ts b/src/api/friends/OpenMessengerChat.ts
index 7573bafb..9270981c 100644
--- a/src/api/friends/OpenMessengerChat.ts
+++ b/src/api/friends/OpenMessengerChat.ts
@@ -2,6 +2,6 @@ import { CreateLinkEvent } from '..';
 
 export function OpenMessengerChat(friendId: number = 0): void
 {
-    if(friendId === 0) CreateLinkEvent('friends-messenger/open');
+    if(friendId === 0) CreateLinkEvent('friends-messenger/toggle');
     else CreateLinkEvent(`friends-messenger/${ friendId }`);
 }
diff --git a/src/components/friends/views/messenger/FriendsMessengerView.tsx b/src/components/friends/views/messenger/FriendsMessengerView.tsx
index 10d854c1..8e3e6c69 100644
--- a/src/components/friends/views/messenger/FriendsMessengerView.tsx
+++ b/src/components/friends/views/messenger/FriendsMessengerView.tsx
@@ -49,15 +49,20 @@ export const FriendsMessengerView: FC<{}> = props =>
 
                         return;
                     }
-                    else
+
+                    if(parts[1] === 'toggle')
                     {
-                        const thread = getMessageThread(parseInt(parts[1]));
+                        setIsVisible(prevValue => !prevValue);
 
-                        if(!thread) return;
-
-                        setActiveThreadId(thread.threadId);
-                        setIsVisible(true);
+                        return;
                     }
+
+                    const thread = getMessageThread(parseInt(parts[1]));
+
+                    if(!thread) return;
+
+                    setActiveThreadId(thread.threadId);
+                    setIsVisible(true);
                 }
             },
             eventUrlPrefix: 'friends-messenger/'
diff --git a/src/hooks/rooms/widgets/useFriendRequestWidget.ts b/src/hooks/rooms/widgets/useFriendRequestWidget.ts
index f54dda5c..548cfb74 100644
--- a/src/hooks/rooms/widgets/useFriendRequestWidget.ts
+++ b/src/hooks/rooms/widgets/useFriendRequestWidget.ts
@@ -62,8 +62,6 @@ const useFriendRequestWidgetState = () =>
 
     useEffect(() =>
     {
-        if(!requests || !requests.length) return;
-
         const newDisplayedRequests: { roomIndex: number, request: MessengerRequest }[] = [];
 
         for(const request of requests)