Fixes isAccepted logic when calling it for the first time

This commit is contained in:
Josh Perez
2022-04-07 22:12:35 -04:00
committed by GitHub
parent c3fa6b87fe
commit d8e6516fb9
2 changed files with 11 additions and 8 deletions

View File

@@ -11,7 +11,8 @@ import { isInSystemContacts } from './isInSystemContacts';
* of message requests
*/
export function isConversationAccepted(
conversationAttrs: ConversationAttributesType
conversationAttrs: ConversationAttributesType,
{ ignoreEmptyConvo = false } = {}
): boolean {
const messageRequestsEnabled = window.Signal.RemoteConfig.isEnabled(
'desktop.messageRequests'
@@ -40,7 +41,9 @@ export function isConversationAccepted(
const hasNoMessages = (conversationAttrs.messageCount || 0) === 0;
const isEmptyPrivateConvo =
hasNoMessages && isDirectConversation(conversationAttrs);
hasNoMessages &&
isDirectConversation(conversationAttrs) &&
!ignoreEmptyConvo;
const isEmptyWhitelistedGroup =
hasNoMessages &&
!isDirectConversation(conversationAttrs) &&