Merge pull request #220 from u9520107/rcint-4310

Use lastMatchedCorrespondentEntity in MessageItem and ConversationPanel

Author: u9520107

package.json

@@ -31,7 +31,7 @@
     "react-router": "^3.0.0",
     "ringcentral": "3.0.0",
     "ringcentral-client": "^1.0.0-rc1",
-    "ringcentral-integration": "^0.6.6",
+    "ringcentral-integration": "^0.6.14",
     "whatwg-fetch": "^2.0.1"
   },
   "devDependencies": {
@@ -78,7 +78,7 @@
     "redux-thunk": "^2.1.0",
     "ringcentral": "3.0.0",
     "ringcentral-client": "^1.0.0-rc1",
-    "ringcentral-integration": "^0.6.10",
+    "ringcentral-integration": "^0.6.14",
     "sass-loader": "^4.1.1",
     "source-map-loader": "^0.1.5",
     "style-loader": "^0.13.1",

src/components/ConversationPanel/index.js

@@ -87,11 +87,11 @@ class ConversationPanel extends Component {
   getInitialContactIndex(nextProps = this.props) {
     const {
       correspondentMatches,
-      conversationMatches,
+      lastMatchedCorrespondentEntity,
     } = nextProps.conversation;
-    for (const conversation of conversationMatches) {
+    if (lastMatchedCorrespondentEntity) {
       const index = correspondentMatches.findIndex(contact => (
-        this.props.isLoggedContact(nextProps.conversation, conversation, contact)
+        contact.id === lastMatchedCorrespondentEntity.id
       ));
       if (index > -1) return index;
     }

src/components/MessageItem/index.js

@@ -74,11 +74,11 @@ export default class MessageItem extends Component {
   getInitialContactIndex(nextProps = this.props) {
     const {
       correspondentMatches,
-      conversationMatches,
+      lastMatchedCorrespondentEntity,
     } = nextProps.conversation;
-    for (const conversation of conversationMatches) {
+    if (lastMatchedCorrespondentEntity) {
       const index = correspondentMatches.findIndex(contact => (
-        this.props.isLoggedContact(nextProps.conversation, conversation, contact)
+        contact.id === lastMatchedCorrespondentEntity.id
       ));
       if (index > -1) return index;
     }

yarn.lock

@@ -6432,9 +6432,9 @@ ringcentral-client@^1.0.0-rc1:
     form-data "^2.1.2"
     isomorphic-fetch "^2.2.1"
 
-ringcentral-integration@^0.6.10:
-  version "0.6.10"
-  resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.6.10.tgz#9c6d2eb008ba30c8a87743a559456790d0454a5a"
+ringcentral-integration@^0.6.14:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.6.14.tgz#e05df2891e4c0729690eb5d7eee0cdb5953a9031"
   dependencies:
     file-loader "^0.10.1"
     json-mask "^0.3.8"