Fix test, correctly add new messages to private conversations

src/chat/__tests__/chatReducers-test.js

@@ -154,12 +154,13 @@ describe('chatReducers', () => {
       sender_email: '[email protected]',
       display_recipient: [
         { email: '[email protected]' },
-        { email: 'someone@example.com' },
+        { email: 'mark@example.com' },
       ],
     };
     const action = {
       type: EVENT_NEW_MESSAGE,
       message,
+      selfEmail: '[email protected]',
     };
     const expectedState = {
       messages: {
@@ -168,7 +169,7 @@ describe('chatReducers', () => {
         [streamNarrowStr]: [{ id: 2 }, { id: 3 }],
         [topicNarrowStr]: [{ id: 2 }, { id: 3 }],
         [privateNarrowStr]: [{ id: 2 }, { id: 4 }, message],
-        [groupNarrowStr]: [{ id: 2 }, { id: 4 }, message],
+        [groupNarrowStr]: [{ id: 2 }, { id: 4 }],
       },
     };
 

src/chat/chatReducers.js

@@ -56,7 +56,8 @@ export default (state = initialState, action) => {
       return {
         ...state,
         messages: Object.keys(state.messages).reduce((msg, key) => {
-          msg[key] = isMessageInNarrow(action.message, JSON.parse(key)) ? // eslint-disable-line
+          const isInNarrow = isMessageInNarrow(action.message, JSON.parse(key), action.selfEmail);
+          msg[key] = isInNarrow ? // eslint-disable-line
           [
             ...state.messages[key],
             action.message,

src/events/eventActions.js

@@ -1,5 +1,6 @@
 import { Auth } from '../types';
 import { pollForEvents, registerForEvents } from '../api';
+import { getActiveAccount } from '../account/accountSelectors';
 
 import {
   REALM_INIT,
@@ -18,6 +19,7 @@ const processEvent = (dispatch, event, getState) => {
       dispatch({
         type: EVENT_NEW_MESSAGE,
         message: event.message,
+        selfEmail: getActiveAccount(getState()).email,
       });
       break;
     case 'update_message':