Fix convo screen request UI appearing when creating a new convo while having another convo active with incoming messages.

pull/2222/head
warrickct 3 years ago
parent 5cc7ccbfa8
commit 2d9679315c

@ -16,8 +16,8 @@ import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/S
export const ConversationMessageRequestButtons = () => {
const selectedConversation = useSelector(getSelectedConversation);
const [hasIncoming, setHasIncomingMsg] = useState(false);
const [hasIncoming, setHasIncomingMsgs] = useState(false);
const [incomingChecked, setIncomingChecked] = useState(false);
useEffect(() => {
async function getIncomingMessages() {
@ -28,15 +28,18 @@ export const ConversationMessageRequestButtons = () => {
MessageDirection.incoming
);
if (msgCount > 0) {
setHasIncomingMsg(true);
setHasIncomingMsgs(true);
} else {
setHasIncomingMsgs(false);
}
setIncomingChecked(true);
}
}
// tslint:disable-next-line: no-floating-promises
getIncomingMessages();
});
if (!selectedConversation || !hasIncoming) {
if (!selectedConversation || !hasIncoming || !incomingChecked) {
return null;
}

@ -9,8 +9,8 @@ export const ConversationRequestinfo = () => {
const selectedConversation = useSelector(getSelectedConversation);
const showMsgRequestUI =
!selectedConversation?.isApproved && selectedConversation?.type === 'private';
const [hasIncomingMessages, setHasIncomingMessages] = useState(false);
const [incomingChecked, setIncomingChecked] = useState(false);
useEffect(() => {
async function getIncomingMessages() {
@ -22,14 +22,17 @@ export const ConversationRequestinfo = () => {
);
if (msgCount > 0) {
setHasIncomingMessages(true);
} else {
setHasIncomingMessages(false);
}
setIncomingChecked(true);
}
}
// tslint:disable-next-line: no-floating-promises
getIncomingMessages();
});
if (!showMsgRequestUI || !hasIncomingMessages) {
if (!showMsgRequestUI || !hasIncomingMessages || !incomingChecked) {
return null;
}

Loading…
Cancel
Save