diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/ConversationRequestButtons.tsx index f31a40338..30d975b2d 100644 --- a/ts/components/conversation/ConversationRequestButtons.tsx +++ b/ts/components/conversation/ConversationRequestButtons.tsx @@ -23,7 +23,7 @@ export const ConversationMessageRequestButtons = () => { const dispatch = useDispatch(); const handleDeclineConversationRequest = () => { - window.inboxStore?.dispatch( + dispatch( updateConfirmModal({ okText: window.i18n('decline'), cancelText: window.i18n('cancel'), diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 7df5f5e5c..9eecf7fb1 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -705,6 +705,10 @@ export class ConversationModel extends Backbone.Model { } public async sendMessageRequestResponse(isApproved: boolean) { + if (!this.isPrivate()) { + return; + } + const publicKey = getOurPubKeyStrFromCache(); const timestamp = Date.now(); @@ -715,13 +719,10 @@ export class ConversationModel extends Backbone.Model { }; const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams); - - if (this.isPrivate()) { - const pubkeyForSending = new PubKey(this.id); - await getMessageQueue() - .sendToPubKey(pubkeyForSending, messageRequestResponse) - .catch(window?.log?.error); - } + const pubkeyForSending = new PubKey(this.id); + await getMessageQueue() + .sendToPubKey(pubkeyForSending, messageRequestResponse) + .catch(window?.log?.error); } public async sendMessage(msg: SendMessageType) {