From dd0aa4ea92abefc50af25fb07bd36b04f673ca3c Mon Sep 17 00:00:00 2001 From: warrickct Date: Wed, 2 Mar 2022 12:39:10 +1100 Subject: [PATCH] Fixed hook for evaluating menu item rendering. --- ts/components/menu/Menu.tsx | 6 ++---- ts/hooks/useParamSelector.ts | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 11cbea2eb..74b9fd596 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -626,11 +626,9 @@ export const AcceptMenuItem = () => { export const DeclineMenuItem = () => { const convoId = useContext(ContextConversationId); - const showMenuItem = getConversationController() - .get(convoId) - .isRequest(); + const isRequest = useIsRequest(convoId); - if (showMenuItem) { + if (isRequest) { return ( { diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index efe5e3246..0b69ded65 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -130,7 +130,7 @@ export function useIsRequest(convoId: string) { convoProps && ConversationModel.hasValidRequestValues({ isMe: convoProps.isMe, - isApproved: convoProps.isMe, + isApproved: convoProps.isApproved, isPrivate: convoProps.isPrivate, isBlocked: convoProps.isBlocked, })