Merge pull request #137 from Mikunj/fix/friend-display

Fix contact display

js/conversation_controller.js

@@ -82,7 +82,7 @@
     initialize() {
       this.on('change:timestamp change:name change:number change:profileName', this.sort);
 
-      this.listenTo(conversations, 'add change:active_at', this.addActive);
+      this.listenTo(conversations, 'add change:active_at change:friendRequestStatus', this.addActive);
       this.listenTo(conversations, 'reset', () => this.reset([]));
 
       this.collator = new Intl.Collator();

js/models/conversations.js

@@ -2166,6 +2166,7 @@
         messageSentAt: Date.now(),
         title: i18n(title),
         isFriendRequest: true,
+        friendRequestType: type,
       });
     },
 

js/notifications.js

@@ -100,8 +100,15 @@
       const last = this.last().toJSON();
       switch (userSetting) {
         case SettingNames.COUNT:
-          title = 'Signal';
+          title = 'Loki Messenger';
-          message = newMessageCountLabel;
+
+          if (last.isFriendRequest) {
+            message = `Friend request ${last.friendRequestType}`;
+          } else if (messagesNotificationCount > 0) {
+            message = newMessageCountLabel;
+          } else {
+            return;
+          }
           break;
         case SettingNames.NAME: {
           const lastMessageTitle = last.title;