fix multi device fr

5 years ago · 13a783bd4a
parent 03757ba2ca
commit 13a783bd4a
2 changed files with 2 additions and 2 deletions
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@ -250,7 +250,7 @@
      // Friend request message conmfirmations (Accept / Decline) are always
      // sent to the primary device conversation
      const messages = await window.Signal.Data.getMessagesByConversation(
-        this.id,
+        this.getPrimaryDevicePubKey(),
        {
          limit: 1,
          MessageCollection: Whisper.MessageCollection,
--- a/js/models/messages.js
+++ b/js/models/messages.js
@ -2508,7 +2508,7 @@
          }

          const sendingDeviceConversation = await ConversationController.getOrCreateAndWait(
-            source,
+            primarySource,
            'private'
          );
          if (dataMessage.profileKey) {