diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 6a1f0d0db..573757359 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -242,6 +242,24 @@ export class ConversationModel extends Backbone.Model { ); } + /** + * Method to evalute if a convo contains the right values + * @param values Required properties to evaluate if this is a message request + */ + public static hasValidRequestValues({ + isMe, + isApproved, + isBlocked, + isPrivate, + }: { + isMe?: boolean; + isApproved?: boolean; + isBlocked?: boolean; + isPrivate?: boolean; + }): boolean { + return Boolean(!isMe && !isApproved && isPrivate && !isBlocked); + } + public idForLogging() { if (this.isPrivate()) { return this.id; @@ -753,25 +771,6 @@ export class ConversationModel extends Backbone.Model { this.updateLastMessage(); } - /** - * Method to evalute if a convo contains the right values - * @param values Required properties to evaluate if this is a message request - * @returns - */ - public static hasValidRequestValues({ - isMe, - isApproved, - isBlocked, - isPrivate, - }: { - isMe?: boolean; - isApproved?: boolean; - isBlocked?: boolean; - isPrivate?: boolean; - }): boolean { - return Boolean(!isMe && !isApproved && isPrivate && !isBlocked); - } - public async sendMessageRequestResponse(isApproved: boolean) { if (!this.isPrivate()) { return; diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index b1b4dd6a5..efb52e6a6 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -169,7 +169,7 @@ const handleContactReceived = async ( if (contactReceived.isBlocked === true) { if (contactConvo.isRequest()) { // handling case where restored device's declined message requests were getting restored - ConversationInteraction.deleteAllMessagesByConvoIdNoConfirmation(contactConvo.id); + await ConversationInteraction.deleteAllMessagesByConvoIdNoConfirmation(contactConvo.id); } await BlockedNumberController.block(contactConvo.id); } else if (contactReceived.isBlocked === false) {