From 1f9b3ce5ea5a50ec6d352be8afeb5e8b745ea396 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 27 May 2020 10:25:24 +1000
Subject: [PATCH] Updated comments
---
js/models/conversations.js | 3 ++-
js/models/messages.js | 2 +-
package.json | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 08e9058e2..11a209730 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -246,7 +246,8 @@
this.messageCollection.forEach(m => m.trigger('change'));
},
async acceptFriendRequest() {
- // Friend request messages are always send to primary device conversation
+ // Friend request message conmfirmations (Accept / Decline) are always
+ // sent to the primary device conversation
const messages = await window.Signal.Data.getMessagesByConversation(
this.id,
{
diff --git a/js/models/messages.js b/js/models/messages.js
index c78537161..4fe21e55a 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -2561,7 +2561,7 @@
}
if (source !== ourNumber) {
- message.set({ primarySource });
+ message.set({ source: primarySource });
}
const id = await window.Signal.Data.saveMessage(message.attributes, {
diff --git a/package.json b/package.json
index a75ced0ce..4603dedd2 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"start-multi2": "cross-env NODE_APP_INSTANCE=2 electron .",
"start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod electron .",
"start-prod-multi": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod1 electron .",
- "start-prod-multi1": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .",
+ "start-prod-multi-2": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .",
"start-swarm-test": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=1 electron .",
"start-swarm-test-2": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=2 electron .",
"start-swarm-test-3": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=3 electron .",