Minor refactoring for MessageList (#1043)

Minor refactoring of MessageList

src/message/MessageContainer.js

@@ -8,7 +8,14 @@ import MessageFull from './MessageFull';
 import MessageBrief from './MessageBrief';
 import { isUrlInAppLink, getFullUrl, getMessageIdFromLink, getNarrowFromLink } from '../utils/url';
 import openLink from '../utils/openLink';
-import { getAuth, getUsers, getFlags, getSubscriptions, getCurrentRoute } from '../selectors';
+import {
+  getAuth,
+  getUsers,
+  getFlags,
+  getSubscriptions,
+  getCurrentRoute,
+  getActiveNarrow,
+} from '../selectors';
 import boundActions from '../boundActions';
 import { constructActionButtons, executeActionSheetAction } from './messageActionSheet';
 import type { ShowActionSheetTypes } from './messageActionSheet';
@@ -110,6 +117,7 @@ class MessageContainer extends PureComponent {
 export default connect(
   state => ({
     auth: getAuth(state),
+    narrow: getActiveNarrow(state),
     currentRoute: getCurrentRoute(state),
     users: getUsers(state),
     flags: getFlags(state),

src/message/MessageList.js

@@ -22,25 +22,19 @@ type Props = {
   narrow: Narrow,
 };
 
-class MessageList extends PureComponent {
+export default class MessageList extends PureComponent {
   props: Props;
 
   static contextTypes = {
     styles: () => null,
   };
 
-  state: {
-    actionSheetButtons: [string, string],
-  };
-
   autoScrollToBottom = false;
 
   static defaultProps = {
     onScroll: nullFunction,
   };
 
-  state = { actionSheetButtons: ['', ''] };
-
   componentWillReceiveProps(nextProps: Props) {
     this.autoScrollToBottom = this.props.caughtUpNewer && nextProps.caughtUpNewer;
   }
@@ -101,5 +95,3 @@ class MessageList extends PureComponent {
     );
   }
 }
-
-export default MessageList;

src/message/MessageListFlatList.js

@@ -19,18 +19,12 @@ class MessageList extends PureComponent {
     styles: () => null,
   };
 
-  state: {
-    actionSheetButtons: [string, string],
-  };
-
   autoScrollToBottom = false;
 
   static defaultProps = {
     onScroll: nullFunction,
   };
 
-  state = { actionSheetButtons: ['', ''] };
-
   componentWillReceiveProps(nextProps) {
     this.autoScrollToBottom = this.props.caughtUpNewer && nextProps.caughtUpNewer;
   }

src/message/headers/MessageHeader.js

@@ -18,7 +18,7 @@ const styles = StyleSheet.create({
   },
 });
 
-class MessageHeader extends PureComponent {
+export default class MessageHeader extends PureComponent {
   props: {
     auth: Auth,
     actions: Actions,
@@ -111,5 +111,3 @@ class MessageHeader extends PureComponent {
     return null;
   }
 }
-
-export default MessageHeader;

src/message/headers/MessageHeaderContainer.js

@@ -4,11 +4,12 @@ import { connectActionSheet } from '@expo/react-native-action-sheet';
 
 import MessageHeader from './MessageHeader';
 import boundActions from '../../boundActions';
-import { getAuth, getSubscriptions } from '../../selectors';
+import { getAuth, getActiveNarrow, getSubscriptions } from '../../selectors';
 
 export default connect(
   state => ({
     auth: getAuth(state),
+    narrow: getActiveNarrow(state),
     subscriptions: getSubscriptions(state),
     mute: state.mute,
   }),

src/message/renderMessages.js

@@ -50,7 +50,6 @@ export default ({ messages, narrow }: Props) => {
                 }
               : item
           }
-          narrow={narrow}
         />,
       );
     }
@@ -67,7 +66,6 @@ export default ({ messages, narrow }: Props) => {
           key={item.timestamp}
           isBrief={shouldGroupWithPrev}
           message={item}
-          narrow={narrow}
         />,
       );
       prevItem = item;
@@ -80,7 +78,6 @@ export default ({ messages, narrow }: Props) => {
         key={item.id}
         isBrief={shouldGroupWithPrev}
         message={item}
-        narrow={narrow}
       />,
     );