Friend request fixes

_locales/en/messages.json

@@ -1590,6 +1590,10 @@
     "message": "Friend request declined",
     "description": "Shown in the conversation history when the user declines a friend request"
   },
+  "friendRequestExpired": {
+    "message": "Friend request expired",
+    "description": "Shown in the conversation history when the users friend request expires"
+  },
   "friendRequestNotificationTitle": {
     "message": "Friend request",
     "description": "Shown in a notification title when receiving a friend request"

js/background.js

@@ -570,12 +570,6 @@
       }
     });
 
-    Whisper.events.on('showFriendRequest', friendRequest => {
-      if (appView) {
-        appView.showFriendRequest(friendRequest);
-      }
-    });
-
     Whisper.events.on('calculatingPoW', ({ pubKey, timestamp }) => {
       try {
         const conversation = ConversationController.get(pubKey);
@@ -1259,7 +1253,7 @@
   async function initIncomingMessage(data, options = {}) {
     const { isError } = options;
 
-    const message = new Whisper.Message({
+    let messageData = {
       source: data.source,
       sourceDevice: data.sourceDevice,
       sent_at: data.timestamp,
@@ -1268,7 +1262,19 @@
       unidentifiedDeliveryReceived: data.unidentifiedDeliveryReceived,
       type: 'incoming',
       unread: 1,
-    });
+      preKeyBundle: data.preKeyBundle || null,
+    };
+
+    if (data.type === 'friend-request') {
+      messageData = {
+        ...messageData,
+        type: 'friend-request',
+        friendStatus: 'pending',
+        direction: 'incoming',
+      }
+    }
+
+    const message = new Whisper.Message(messageData);
 
     // If we don't return early here, we can get into infinite error loops. So, no
     //   delivery receipts for sealed sender errors.