PR changes

pull/2222/head
warrickct 4 years ago
parent abc188e889
commit bfec321da7

@ -23,7 +23,7 @@ export const ConversationMessageRequestButtons = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const handleDeclineConversationRequest = () => { const handleDeclineConversationRequest = () => {
window.inboxStore?.dispatch( dispatch(
updateConfirmModal({ updateConfirmModal({
okText: window.i18n('decline'), okText: window.i18n('decline'),
cancelText: window.i18n('cancel'), cancelText: window.i18n('cancel'),

@ -705,6 +705,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
} }
public async sendMessageRequestResponse(isApproved: boolean) { public async sendMessageRequestResponse(isApproved: boolean) {
if (!this.isPrivate()) {
return;
}
const publicKey = getOurPubKeyStrFromCache(); const publicKey = getOurPubKeyStrFromCache();
const timestamp = Date.now(); const timestamp = Date.now();
@ -715,13 +719,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
}; };
const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams); const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams);
const pubkeyForSending = new PubKey(this.id);
if (this.isPrivate()) { await getMessageQueue()
const pubkeyForSending = new PubKey(this.id); .sendToPubKey(pubkeyForSending, messageRequestResponse)
await getMessageQueue() .catch(window?.log?.error);
.sendToPubKey(pubkeyForSending, messageRequestResponse)
.catch(window?.log?.error);
}
} }
public async sendMessage(msg: SendMessageType) { public async sendMessage(msg: SendMessageType) {

Loading…
Cancel
Save