fix bugs related to messages (#206)

* add contactSearch for clickToSMS; fix active call color; fix message scroll; fix format phoneNumber as entityName * bump version
ringcentral · May 19, 2017 · d91b326 · d91b326
1 parent 5302df0
commit d91b326
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 11 deletions.
diff --git a/dev-server/containers/App/index.js b/dev-server/containers/App/index.js
@@ -139,6 +139,7 @@ export default function App({
                   locale={phone.locale}
                   callMonitor={phone.callMonitor}
                   contactMatcher={phone.contactMatcher}
+                  contactSearch={phone.contactSearch}
                   regionSettings={phone.regionSettings}
                   connectivityMonitor={phone.connectivityMonitor}
                   rateLimiter={phone.rateLimiter}
@@ -158,6 +159,7 @@ export default function App({
                   locale={phone.locale}
                   callHistory={phone.callHistory}
                   contactMatcher={phone.contactMatcher}
+                  contactSearch={phone.contactSearch}
                   regionSettings={phone.regionSettings}
                   connectivityMonitor={phone.connectivityMonitor}
                   rateLimiter={phone.rateLimiter}

diff --git a/package.json b/package.json
@@ -78,7 +78,7 @@
     "redux-thunk": "^2.1.0",
     "ringcentral": "3.0.0",
     "ringcentral-client": "^1.0.0-rc1",
-    "ringcentral-integration": "^0.6.6",
+    "ringcentral-integration": "^0.6.7",
     "sass-loader": "^4.1.1",
     "source-map-loader": "^0.1.5",
     "style-loader": "^0.13.1",

diff --git a/src/components/CallItem/index.js b/src/components/CallItem/index.js
@@ -165,7 +165,7 @@ export default class CallItem extends Component {
       const phoneNumber = this.getPhoneNumber();
       await this.props.onCreateContact({
         phoneNumber,
-        name: this.props.enableContactFallback ? this.getFallbackContactName() : phoneNumber,
+        name: this.props.enableContactFallback ? this.getFallbackContactName() : '',
         entityType,
       });
 
@@ -188,7 +188,7 @@ export default class CallItem extends Component {
         });
       } else {
         this.props.onClickToSms({
-          name: this.props.enableContactFallback ? this.getFallbackContactName() : phoneNumber,
+          name: this.props.enableContactFallback ? this.getFallbackContactName() : '',
           phoneNumber,
         });
       }

diff --git a/src/components/CallItem/styles.scss b/src/components/CallItem/styles.scss
@@ -71,6 +71,6 @@
 .active {
   color: $active;
   button {
-    color: $missed;
+    color: $active;
   }
 }
diff --git a/src/components/DropdownSelect/index.js b/src/components/DropdownSelect/index.js
@@ -11,7 +11,6 @@ class DropdownSelect extends Component {
     };
     this.mounted = true;
     this.toggleShowDropdown = (e) => {
-      console.debug('this.state.open', this.state.open);
       if (!this.state.open) {
         window.addEventListener('click', this._handleDocumentClick, false);
       } else {

diff --git a/src/components/MessageItem/index.js b/src/components/MessageItem/index.js
@@ -122,7 +122,7 @@ export default class MessageItem extends Component {
       const phoneNumber = this.getPhoneNumber();
       await this.props.onCreateContact({
         phoneNumber,
-        name: this.props.enableContactFallback ? this.getFallbackContactName() : phoneNumber,
+        name: this.props.enableContactFallback ? this.getFallbackContactName() : '',
         entityType,
       });
 

diff --git a/src/components/MessageList/index.js b/src/components/MessageList/index.js
@@ -83,7 +83,7 @@ export default class MessageList extends Component {
         ref={(list) => { this.messagesListBody = list; }}
       >
         {search}
-        <Panel className={styles.scroll}>
+        <Panel className={classnames(styles.content, styles.contentWithSearch)}>
           {content}
         </Panel>
       </div>

diff --git a/src/components/MessageList/styles.scss b/src/components/MessageList/styles.scss
@@ -10,10 +10,7 @@
 .root {
   @include full-size;
 }
-.scroll {
-  overflow-y: auto;
-  padding-bottom: 40px;
-}
+
 .content {
   @include full-size;
   overflow-y: auto;

diff --git a/src/containers/CallHistoryPage/index.js b/src/containers/CallHistoryPage/index.js
@@ -63,6 +63,7 @@ function mapToFunctions(_, {
   router,
   dialerRoute = '/',
   composeTextRoute = '/composeText',
+  contactSearch,
 }) {
   return {
     dateTimeFormatter,
@@ -98,6 +99,7 @@ function mapToFunctions(_, {
         if (contact.name && contact.phoneNumber &&
           contact.name === contact.phoneNumber) {
           composeText.updateTypingToNumber(contact.phoneNumber);
+          contactSearch.search({ searchString: contact.phoneNumber });
         } else {
           composeText.addToNumber(contact);
           if (composeText.typingToNumber === contact.phoneNumber) {

diff --git a/src/containers/CallMonitorPage/index.js b/src/containers/CallMonitorPage/index.js
@@ -54,6 +54,7 @@ function mapToFunctions(_, {
   }),
   callLogger,
   contactMatcher,
+  contactSearch,
   onLogCall,
   isLoggedContact,
   router,
@@ -92,6 +93,7 @@ function mapToFunctions(_, {
         if (contact.name && contact.phoneNumber &&
           contact.name === contact.phoneNumber) {
           composeText.updateTypingToNumber(contact.phoneNumber);
+          contactSearch.search({ searchString: contact.phoneNumber });
         } else {
           composeText.addToNumber(contact);
           if (composeText.typingToNumber === contact.phoneNumber) {