From 021c427ee572da984653f7f4fe575c5498ef7ec7 Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Mon, 3 Aug 2015 17:24:31 -0700
Subject: [PATCH] fix(message-list): fix type and change variable name

---
 .../message-list/lib/message-item-container.cjsx       | 10 +++++-----
 internal_packages/message-list/lib/message-list.cjsx   |  7 +++----
 .../message-list/spec/message-item-container-spec.cjsx |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/internal_packages/message-list/lib/message-item-container.cjsx b/internal_packages/message-list/lib/message-item-container.cjsx
index 4802cdb8d..2872b2a72 100644
--- a/internal_packages/message-list/lib/message-item-container.cjsx
+++ b/internal_packages/message-list/lib/message-item-container.cjsx
@@ -16,9 +16,9 @@ class MessageItemContainer extends React.Component
     thread: React.PropTypes.object.isRequired
     message: React.PropTypes.object.isRequired
 
-    # The messageId (in the case of draft's local ID) is a derived
+    # The localId (in the case of draft's local ID) is a derived
     # property that only the parent MessageList knows about.
-    messageId: React.PropTypes.string
+    localId: React.PropTypes.string
 
     collapsed: React.PropTypes.bool
     isLastMsg: React.PropTypes.bool
@@ -60,7 +60,7 @@ class MessageItemContainer extends React.Component
   _renderComposer: =>
     props =
       mode: "inline"
-      localId: @props.messageId
+      localId: @props.localId
       threadId: @props.thread.id
       onRequestScrollTo: @props.onRequestScrollTo
 
@@ -77,9 +77,9 @@ class MessageItemContainer extends React.Component
     "before-reply-area": @props.isBeforeReplyArea
 
   _onSendingStateChanged: (draftLocalId) =>
-    @setState(@_getStateFromStores()) if draftLocalId is @props.messageId
+    @setState(@_getStateFromStores()) if draftLocalId is @props.localId
 
   _getStateFromStores: ->
-    isSending: DraftStore.isSendingDraft(@props.messageId)
+    isSending: DraftStore.isSendingDraft(@props.localId)
 
 module.exports = MessageItemContainer
diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index 218e06e03..8a7171757 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -286,15 +286,14 @@ class MessageList extends React.Component
       isLastMsg = (messages.length - 1 is idx)
       isBeforeReplyArea = isLastMsg and @_hasReplyArea()
 
-      messageId = @state.messageLocalIds[message.id]
-      messageId ?= message.id
+      localId = @state.messageLocalIds[message.id]
 
       elements.push(
         <MessageItemContainer key={idx}
                               ref={"message-container-#{message.id}"}
                               thread={@state.currentThread}
                               message={message}
-                              messageId={messageId}
+                              localId={localId}
                               collapsed={collapsed}
                               isLastMsg={isLastMsg}
                               isBeforeReplyArea={isBeforeReplyArea}
@@ -302,7 +301,7 @@ class MessageList extends React.Component
       )
 
     if @_hasReplyArea()
-      components.push @_renderReplyArea()
+      elements.push @_renderReplyArea()
 
     return elements
 
diff --git a/internal_packages/message-list/spec/message-item-container-spec.cjsx b/internal_packages/message-list/spec/message-item-container-spec.cjsx
index 0a4a57231..ff23b62cb 100644
--- a/internal_packages/message-list/spec/message-item-container-spec.cjsx
+++ b/internal_packages/message-list/spec/message-item-container-spec.cjsx
@@ -19,7 +19,7 @@ MessageItemContainer = proxyquire '../lib/message-item-container',
 {InjectedComponent} = require 'nylas-component-kit'
 
 testThread = new Thread(id: "t1")
-testMessageId = "m1"
+testLocalId = "local-id"
 testMessage = new Message(id: "m1", draft: false, unread: true)
 testDraft = new Message(id: "d1", draft: true, unread: true)
 
@@ -33,7 +33,7 @@ describe 'MessageItemContainer', ->
     ReactTestUtils.renderIntoDocument(
       <MessageItemContainer thread={testThread}
                             message={message}
-                            messageId={testMessageId} />
+                            localId={testLocalId} />
     )
 
   it "shows composer if it's a draft", ->