Sort by inbox position to match phone after link

ts/test/state/selectors/conversations_test.ts

@@ -17,6 +17,7 @@ describe('state/selectors/conversations', () => {
           activeAt: Date.now(),
           name: 'No timestamp',
           timestamp: 0,
+          inboxPosition: 0,
           phoneNumber: 'notused',
           isArchived: false,
 
@@ -36,6 +37,7 @@ describe('state/selectors/conversations', () => {
           activeAt: Date.now(),
           name: 'B',
           timestamp: 20,
+          inboxPosition: 21,
           phoneNumber: 'notused',
           isArchived: false,
 
@@ -55,6 +57,7 @@ describe('state/selectors/conversations', () => {
           activeAt: Date.now(),
           name: 'C',
           timestamp: 20,
+          inboxPosition: 22,
           phoneNumber: 'notused',
           isArchived: false,
 
@@ -74,6 +77,7 @@ describe('state/selectors/conversations', () => {
           activeAt: Date.now(),
           name: 'Á',
           timestamp: 20,
+          inboxPosition: 20,
           phoneNumber: 'notused',
           isArchived: false,
 
@@ -93,6 +97,7 @@ describe('state/selectors/conversations', () => {
           activeAt: Date.now(),
           name: 'First!',
           timestamp: 30,
+          inboxPosition: 30,
           phoneNumber: 'notused',
           isArchived: false,
 

ts/test/types/Conversation_test.ts

@@ -3,6 +3,7 @@ import { assert } from 'chai';
 import * as Conversation from '../../types/Conversation';
 import {
   IncomingMessage,
+  MessageHistoryUnsyncedMessage,
   OutgoingMessage,
   VerifiedChangeMessage,
 } from '../../types/Message';
@@ -44,6 +45,30 @@ describe('Conversation', () => {
         assert.deepEqual(actual, expected);
       });
     });
+
+    context('for message history unsynced message', () => {
+      it('should skip update', () => {
+        const input = {
+          currentTimestamp: 555,
+          lastMessage: {
+            type: 'message-history-unsynced',
+            conversationId: 'foo',
+            sent_at: 666,
+            timestamp: 666,
+          } as MessageHistoryUnsyncedMessage,
+          lastMessageNotificationText: 'xoxoxoxo',
+        };
+        const expected = {
+          lastMessage: 'xoxoxoxo',
+          lastMessageStatus: null,
+          timestamp: 555,
+        };
+
+        const actual = Conversation.createLastMessageUpdate(input);
+        assert.deepEqual(actual, expected);
+      });
+    });
+
     context('for verified change message', () => {
       it('should skip update', () => {
         const input = {