From 4f948dcfc1a1a1a6213459aa1b014af955385468 Mon Sep 17 00:00:00 2001
From: Eric Huang <ele828@gmail.com>
Date: Tue, 27 Mar 2018 10:55:56 +0800
Subject: [PATCH 01/14] merge GA regression commits back to master (#860)

* add options guide to whats new (#826)

* fix bug in c2d detect hyperlink incorrectly && dial pad title incorrect && meeting discription is  not right && white screen when update contact source filter (#831)

* Fix c2d detect hyperlink incorrectly && app name error && dial pad title incorrect && meeting content not right && white screen when update contact source filter && lose source icon when contact name is null

* fix  meeting discription is not right

* check value this.listelem not null before use

* await hangup func in answerAndEnd and update googleclientid in bt brand (#838)

* fix bug in login panel that currentlocale is sync after initialize proxy (#836)

* fix bug in login panel that currentlocale is sync after initialize proxy

* update currentLocale

* remove unuserd code

* chore: add sample rate to sentry in prod env (#841)

* add sample rate to sentry in prod env

* fix syntax error

* update sentry configuration

* [RCINIT-6839]Remove failed fax message in call history list (#827)

* fix bug Presence icon is not displayed correctly when changing status (#837)

* fix bug Presence icon is not displayed correctly when changing status in SW

* update presencestatus in headerview

* Revert "update presencestatus in headerview"

This reverts commit fe37a21baa44222657f5270186eecc66b1dbd0e4.

* Revert "fix bug Presence icon is not displayed correctly when changing status in SW"

This reverts commit 285cbef463b3c1d6316c323d27961f8baec87e7d.

* when dndstatus is do not disturb status should be do not disturb

* update presence status

* bugfix answer call then direct to blank page & prod build hash (#843)

* should not open conversation page when click actionmenulist (#842)

* feat: add extra webrtc warning (#835)

* add extra webrtc warning

* add rebranding to webphone alert

* add calling mode condition to disable check in non-webphone mode

* update webphone to support reconnect from webphone badge

* update i18n

* add tests for webphone badge

* update locale for audio settings alert

* remove errcode -1 to make error msg more generic

* support audio auto prompted

* in meeting description replace /r/n with <br> (#847)

* Bugfix: do not launch sign in flow when unauthorized & lock authorize process (#828)

* Bugfix: do not launch sign in flow when unauthorized & lock authorize process

* fix google signin flow

* chore: implement localStorage migration process (#846)

* empty localStorage when upgrading from lower version

* enable migration in all env

* extract migrationLocalStorage & add tests

* update unit tests

* minor: update navigation UI (#850)

* update navigation UI

* update styles

* update user guide to support locales (#844)

* update user guide to support locales

* remove unnecessary comments

* update user guide module

* Fix user guide & update webphone error handling & hide area code check for non-rc app (#853)

* fix user guide add error handling for 403 in webphone & update call button color

* hide area code check for non-rc app & add webphone error msg

* fix dependencies name

* change the order of code

* workaround: fixed width and height of options page

* should hide what's new when c2d or c2sms (#854)

* hide feedback in other brands (#852)

* fix bug show blank page when answer fail (#851)

* Import user guides for RC (#859)

* import what's new guides images

* replace image 2
---
 dev-server/containers/AppView/index.js |   3 -
 src/components/ContactDisplay/index.js | 507 +++++++++++++------------
 2 files changed, 254 insertions(+), 256 deletions(-)

diff --git a/dev-server/containers/AppView/index.js b/dev-server/containers/AppView/index.js
index f50aab3a8d..343ad1e73f 100644
--- a/dev-server/containers/AppView/index.js
+++ b/dev-server/containers/AppView/index.js
@@ -53,7 +53,6 @@ AppView.propTypes = {
   offline: PropTypes.bool.isRequired,
   showOfflineAlert: PropTypes.func.isRequired,
   webphoneUnavailable: PropTypes.bool.isRequired,
-  onWebphoneBadgeClicked: PropTypes.func.isRequired,
 };
 
 AppView.defaultProps = {
@@ -122,8 +121,6 @@ export default withPhone(connect((state, {
       audioSettings.getUserMedia();
     }
     if (webphone && webphone.ready) {
-      // Trigger reconnect
-      // webphone.connect();
       webphone.showAlert();
     }
   },
diff --git a/src/components/ContactDisplay/index.js b/src/components/ContactDisplay/index.js
index 1b581a2eb5..9c6dcadafb 100644
--- a/src/components/ContactDisplay/index.js
+++ b/src/components/ContactDisplay/index.js
@@ -1,253 +1,254 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import formatNumber from 'ringcentral-integration/lib/formatNumber';
-import formatMessage from 'format-message';
-import DropdownSelect from '../DropdownSelect';
-import i18n from './i18n';
-import styles from './styles.scss';
-import phoneSourceNames from '../../lib/phoneSourceNames';
-import phoneSources from '../../enums/phoneSources';
-
-const displayFormatter = ({
-  entityName,
-  entityType,
-  phoneNumber,
-  currentLocale,
-  brand,
-}) => {
-  let typeName;
-  if (entityType) {
-    typeName = formatMessage(
-      phoneSourceNames.getString(entityType, currentLocale),
-      { brand }
-    );
-  }
-  if (phoneNumber && entityName && entityType) {
-    return `${entityName} | ${typeName} ${phoneNumber}`;
-  } else if (entityName && entityType) {
-    return `${entityName} | ${typeName}`;
-  } else if (entityName) {
-    return entityName;
-  } else if (phoneNumber) {
-    return `${phoneNumber}`;
-  }
-  return '';
-};
-
-function ContactDisplayItem({
-  entityName,
-  entityType,
-  phoneNumber,
-  sourceIcons
-}) {
-  let SourceIcon = null;
-  if (entityType) {
-    if (entityType === phoneSources.rcContact) {
-      SourceIcon = sourceIcons.brandIcon;
-    } else {
-      SourceIcon = sourceIcons[entityType];
-    }
-  }
-  if (phoneNumber && entityName !== undefined && SourceIcon) {
-    return (
-      <span>
-        <SourceIcon className={styles.typeIcon} width={10} height={10} />
-        <span className={styles.typeName}>{entityName}</span>
-      </span>
-    );
-  } else if (entityName !== undefined && SourceIcon) {
-    return (
-      <span>
-        <SourceIcon className={styles.typeIcon} width={10} height={10} />
-        <span className={styles.typeName}>{entityName}</span>
-      </span>
-    );
-  } else if (entityName !== undefined) {
-    return <span>{entityName}</span>;
-  } else if (phoneNumber) {
-    return <span>{phoneNumber}</span>;
-  }
-  return null;
-}
-
-ContactDisplayItem.propTypes = {
-  entityName: PropTypes.string.isRequired,
-  entityType: PropTypes.string.isRequired,
-  phoneNumber: PropTypes.string.isRequired,
-  sourceIcons: PropTypes.object.isRequired,
-};
-
-export default function ContactDisplay({
-  reference,
-  className,
-  contactMatches,
-  selected,
-  onSelectContact,
-  disabled,
-  isLogging,
-  fallBackName,
-  enableContactFallback,
-  areaCode,
-  countryCode,
-  phoneNumber,
-  currentLocale,
-  groupNumbers,
-  showType,
-  selectClassName,
-  showPlaceholder,
-  brand,
-  stopPropagation,
-  sourceIcons = {},
-  showGroupNumberName,
-}) {
-  let contentEl;
-  if (groupNumbers && showGroupNumberName) {
-    const groupNames = groupNumbers.map((groupNumber) => {
-      const groupContact = contactMatches.find(match => match.extensionNumber === groupNumber);
-      return (groupContact && groupContact.name) || groupNumber;
-    });
-    const display = groupNames.join(', ');
-    contentEl = (
-      <div title={display} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (groupNumbers) {
-    const display = groupNumbers.join(', ');
-    contentEl = (
-      <div title={display} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (contactMatches.length === 0) {
-    const display = (enableContactFallback && fallBackName) ||
-      (phoneNumber && formatNumber({
-        phoneNumber,
-        countryCode,
-        areaCode,
-      })) ||
-      i18n.getString('unknownNumber', currentLocale);
-    const title = (enableContactFallback && fallBackName) ||
-      phoneNumber || '';
-    contentEl = (
-      <div title={title} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (contactMatches.length === 1) {
-    const display = contactMatches[0].name;
-    const title = displayFormatter({
-      entityName: display,
-      entityType: contactMatches[0].entityType,
-      phoneNumber,
-      brand,
-      currentLocale
-    });
-    contentEl = (
-      <div title={title} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (contactMatches.length > 1) {
-    const options = [
-      ...contactMatches,
-    ];
-    let placeholder;
-    let _selected = selected;
-    if (showPlaceholder) {
-      placeholder = i18n.getString('select', currentLocale);
-    } else {
-      _selected = _selected < 0 ? 0 : _selected;
-    }
-    contentEl = (
-      <DropdownSelect
-        reference={reference}
-        className={classnames(styles.select, selectClassName)}
-        value={`${_selected}`}
-        onChange={onSelectContact}
-        disabled={disabled || isLogging}
-        options={options}
-        placeholder={placeholder}
-        renderFunction={entity => (
-          ContactDisplayItem({
-            entityName: entity.name,
-            entityType: entity.entityType,
-            brand,
-            currentLocale,
-            sourceIcons
-          })
-        )}
-        renderValue={value => (
-          displayFormatter({
-            entityName: options[value].name,
-            entityType: showType && options[value].entityType,
-            brand,
-            currentLocale,
-          })
-        )}
-        renderTitle={entity => (
-          entity ? displayFormatter({
-            entityName: entity.name,
-            entityType: entity.entityType,
-            phoneNumber,
-            brand,
-            currentLocale,
-          }) : phoneNumber)
-        }
-        dropdownAlign="left"
-        titleEnabled
-        noPadding
-        stopPropagation={stopPropagation}
-      />
-    );
-  }
-  return (
-    <div
-      className={classnames(
-        styles.root,
-        className,
-      )} >
-      {contentEl}
-    </div>
-  );
-}
-ContactDisplay.propTypes = {
-  reference: PropTypes.func,
-  className: PropTypes.string,
-  contactMatches: PropTypes.arrayOf(PropTypes.any).isRequired,
-  selected: PropTypes.number.isRequired,
-  onSelectContact: PropTypes.func,
-  disabled: PropTypes.bool.isRequired,
-  isLogging: PropTypes.bool.isRequired,
-  fallBackName: PropTypes.string,
-  enableContactFallback: PropTypes.bool,
-  areaCode: PropTypes.string.isRequired,
-  countryCode: PropTypes.string.isRequired,
-  phoneNumber: PropTypes.string,
-  currentLocale: PropTypes.string.isRequired,
-  groupNumbers: PropTypes.arrayOf(PropTypes.string),
-  showType: PropTypes.bool,
-  selectClassName: PropTypes.string,
-  showPlaceholder: PropTypes.bool,
-  brand: PropTypes.string,
-  stopPropagation: PropTypes.bool,
-  sourceIcons: PropTypes.object,
-  showGroupNumberName: PropTypes.bool,
-};
-ContactDisplay.defaultProps = {
-  reference: undefined,
-  className: undefined,
-  onSelectContact: undefined,
-  fallBackName: '',
-  phoneNumber: undefined,
-  groupNumbers: undefined,
-  enableContactFallback: undefined,
-  showType: true,
-  selectClassName: undefined,
-  showPlaceholder: true,
-  brand: undefined,
-  stopPropagation: true,
-  sourceIcons: undefined,
-  showGroupNumberName: false,
-};
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import formatNumber from 'ringcentral-integration/lib/formatNumber';
+import formatMessage from 'format-message';
+import DropdownSelect from '../DropdownSelect';
+import i18n from './i18n';
+import styles from './styles.scss';
+import phoneSourceNames from '../../lib/phoneSourceNames';
+import phoneSources from '../../enums/phoneSources';
+
+const displayFormatter = ({
+  entityName,
+  entityType,
+  phoneNumber,
+  currentLocale,
+  brand,
+}) => {
+  let typeName;
+  if (entityType) {
+    typeName = formatMessage(
+      phoneSourceNames.getString(entityType, currentLocale),
+      { brand }
+    );
+  }
+  if (phoneNumber && entityName && entityType) {
+    return `${entityName} | ${typeName} ${phoneNumber}`;
+  } else if (entityName && entityType) {
+    return `${entityName} | ${typeName}`;
+  } else if (entityName) {
+    return entityName;
+  } else if (phoneNumber) {
+    return `${phoneNumber}`;
+  }
+  return '';
+};
+
+function ContactDisplayItem({
+  entityName,
+  entityType,
+  phoneNumber,
+  sourceIcons
+}) {
+  let SourceIcon = null;
+  if (entityType) {
+    if (entityType === phoneSources.rcContact) {
+      SourceIcon = sourceIcons.brandIcon;
+    } else {
+      SourceIcon = sourceIcons[entityType];
+    }
+  }
+  if (phoneNumber && entityName !== undefined && SourceIcon) {
+    return (
+      <span>
+        <SourceIcon className={styles.typeIcon} width={10} height={10} />
+        <span className={styles.typeName}>{entityName}</span>
+      </span>
+    );
+  } else if (entityName !== undefined && SourceIcon) {
+    return (
+      <span>
+        <SourceIcon className={styles.typeIcon} width={10} height={10} />
+        <span className={styles.typeName}>{entityName}</span>
+      </span>
+    );
+  } else if (entityName !== undefined) {
+    return <span>{entityName}</span>;
+  } else if (phoneNumber) {
+    return <span>{phoneNumber}</span>;
+  }
+  return null;
+}
+
+ContactDisplayItem.propTypes = {
+  entityName: PropTypes.string.isRequired,
+  entityType: PropTypes.string.isRequired,
+  phoneNumber: PropTypes.string.isRequired,
+  sourceIcons: PropTypes.object.isRequired,
+};
+
+export default function ContactDisplay({
+  reference,
+  className,
+  contactMatches,
+  selected,
+  onSelectContact,
+  disabled,
+  isLogging,
+  fallBackName,
+  enableContactFallback,
+  areaCode,
+  countryCode,
+  phoneNumber,
+  currentLocale,
+  groupNumbers,
+  showType,
+  selectClassName,
+  showPlaceholder,
+  brand,
+  stopPropagation,
+  sourceIcons = {},
+  showGroupNumberName,
+}) {
+  let contentEl;
+  if (groupNumbers && showGroupNumberName) {
+    const groupNames = groupNumbers.map((groupNumber) => {
+      const groupContact = contactMatches.find(match => match.extensionNumber === groupNumber);
+      return (groupContact && groupContact.name) || groupNumber;
+    });
+    const display = groupNames.join(', ');
+    contentEl = (
+      <div title={display} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (groupNumbers) {
+    const display = groupNumbers.join(', ');
+    contentEl = (
+      <div title={display} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (contactMatches.length === 0) {
+    const display = (enableContactFallback && fallBackName) ||
+      (phoneNumber && formatNumber({
+        phoneNumber,
+        countryCode,
+        areaCode,
+      })) ||
+      i18n.getString('unknownNumber', currentLocale);
+    const title = (enableContactFallback && fallBackName) ||
+      phoneNumber || '';
+    contentEl = (
+      <div title={title} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (contactMatches.length === 1) {
+    const display = contactMatches[0].name;
+    const title = displayFormatter({
+      entityName: display,
+      entityType: contactMatches[0].entityType,
+      phoneNumber,
+      brand,
+      currentLocale
+    });
+    contentEl = (
+      <div title={title} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (contactMatches.length > 1) {
+    const options = [
+      ...contactMatches,
+    ];
+    let placeholder;
+    let _selected = selected;
+    if (showPlaceholder) {
+      placeholder = i18n.getString('select', currentLocale);
+    } else {
+      _selected = _selected < 0 ? 0 : _selected;
+    }
+    contentEl = (
+      <DropdownSelect
+        reference={reference}
+        className={classnames(styles.select, selectClassName)}
+        value={`${_selected}`}
+        onChange={onSelectContact}
+        disabled={disabled || isLogging}
+        options={options}
+        placeholder={placeholder}
+        renderFunction={entity => (
+          ContactDisplayItem({
+            entityName: entity.name,
+            entityType: entity.entityType,
+            brand,
+            currentLocale,
+            sourceIcons
+          })
+        )}
+        renderValue={value => (
+          displayFormatter({
+            entityName: options[value].name,
+            entityType: showType && options[value].entityType,
+            brand,
+            currentLocale,
+          })
+        )}
+        renderTitle={entity => (
+          entity ? displayFormatter({
+            entityName: entity.name,
+            entityType: entity.entityType,
+            phoneNumber,
+            brand,
+            currentLocale,
+          }) : phoneNumber)
+        }
+        dropdownAlign="left"
+        titleEnabled
+        noPadding
+        stopPropagation={stopPropagation}
+      />
+    );
+  }
+  
+  return (
+    <div
+      className={classnames(
+        styles.root,
+        className,
+      )} >
+      {contentEl}
+    </div>
+  );
+}
+ContactDisplay.propTypes = {
+  reference: PropTypes.func,
+  className: PropTypes.string,
+  contactMatches: PropTypes.arrayOf(PropTypes.any).isRequired,
+  selected: PropTypes.number.isRequired,
+  onSelectContact: PropTypes.func,
+  disabled: PropTypes.bool.isRequired,
+  isLogging: PropTypes.bool.isRequired,
+  fallBackName: PropTypes.string,
+  enableContactFallback: PropTypes.bool,
+  areaCode: PropTypes.string.isRequired,
+  countryCode: PropTypes.string.isRequired,
+  phoneNumber: PropTypes.string,
+  currentLocale: PropTypes.string.isRequired,
+  groupNumbers: PropTypes.arrayOf(PropTypes.string),
+  showType: PropTypes.bool,
+  selectClassName: PropTypes.string,
+  showPlaceholder: PropTypes.bool,
+  brand: PropTypes.string,
+  stopPropagation: PropTypes.bool,
+  sourceIcons: PropTypes.object,
+  showGroupNumberName: PropTypes.bool,
+};
+ContactDisplay.defaultProps = {
+  reference: undefined,
+  className: undefined,
+  onSelectContact: undefined,
+  fallBackName: '',
+  phoneNumber: undefined,
+  groupNumbers: undefined,
+  enableContactFallback: undefined,
+  showType: true,
+  selectClassName: undefined,
+  showPlaceholder: true,
+  brand: undefined,
+  stopPropagation: true,
+  sourceIcons: undefined,
+  showGroupNumberName: false,
+};

From 2e5de9b9411a88c560daf2fb362eb9551b7f5778 Mon Sep 17 00:00:00 2001
From: Bella Lian <bella.lian@lmxmn176.rcoffice.ringcentral.com>
Date: Fri, 30 Mar 2018 13:33:43 +0800
Subject: [PATCH 02/14] fixbug-colon

---
 src/components/ActiveCallItem/i18n/fr-CA.js   | 4 ++--
 src/components/ActiveCallItem/i18n/fr-FR.js   | 4 ++--
 src/components/ComposeTextPanel/i18n/fr-CA.js | 4 ++--
 src/components/ComposeTextPanel/i18n/fr-FR.js | 4 ++--
 src/components/FromField/i18n/fr-CA.js        | 2 +-
 src/components/FromField/i18n/fr-FR.js        | 2 +-
 src/components/RecipientsInput/i18n/fr-CA.js  | 2 +-
 src/components/RecipientsInput/i18n/fr-FR.js  | 2 +-
 src/components/ToField/i18n/fr-CA.js          | 2 +-
 src/components/ToField/i18n/fr-FR.js          | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/ActiveCallItem/i18n/fr-CA.js b/src/components/ActiveCallItem/i18n/fr-CA.js
index b67a4353e1..e6d00f2cea 100644
--- a/src/components/ActiveCallItem/i18n/fr-CA.js
+++ b/src/components/ActiveCallItem/i18n/fr-CA.js
@@ -18,8 +18,8 @@ export default {
   missedCall: 'Manqué',
   inboundCall: 'Entrant',
   outboundCall: 'Sortant',
-  from: 'De',
-  to: 'À',
+  from: 'De ',
+  to: 'À ',
   hangup: 'Raccrocher',
   accept: 'Accepter',
   toVoicemail: 'Envoyer vers la messagerie vocale',
diff --git a/src/components/ActiveCallItem/i18n/fr-FR.js b/src/components/ActiveCallItem/i18n/fr-FR.js
index 8e16e37cc8..8526d9497f 100644
--- a/src/components/ActiveCallItem/i18n/fr-FR.js
+++ b/src/components/ActiveCallItem/i18n/fr-FR.js
@@ -18,8 +18,8 @@ export default {
   missedCall: 'Manqué',
   inboundCall: 'Entrant',
   outboundCall: 'Sortant',
-  from: 'De',
-  to: 'À',
+  from: 'De ',
+  to: 'À ',
   hangup: 'Raccrocher',
   accept: 'Accepter',
   toVoicemail: 'Envoyer vers la messagerie vocale',
diff --git a/src/components/ComposeTextPanel/i18n/fr-CA.js b/src/components/ComposeTextPanel/i18n/fr-CA.js
index 0c31a02ea3..21998f5cf4 100644
--- a/src/components/ComposeTextPanel/i18n/fr-CA.js
+++ b/src/components/ComposeTextPanel/i18n/fr-CA.js
@@ -1,6 +1,6 @@
 export default {
-  from: 'De',
-  to: 'À',
+  from: 'De ',
+  to: 'À ',
   enterNameOrNumber: 'Saisir le numéro ou le nom',
   typeMessage: 'Entrer le message...',
   send: 'Envoyer',
diff --git a/src/components/ComposeTextPanel/i18n/fr-FR.js b/src/components/ComposeTextPanel/i18n/fr-FR.js
index 9e37c36355..4aba4165b9 100644
--- a/src/components/ComposeTextPanel/i18n/fr-FR.js
+++ b/src/components/ComposeTextPanel/i18n/fr-FR.js
@@ -1,6 +1,6 @@
 export default {
-  from: 'De',
-  to: 'À',
+  from: 'De ',
+  to: 'À ',
   enterNameOrNumber: 'Saisir le numéro ou le nom',
   typeMessage: 'Saisie du message...',
   send: 'Envoyer',
diff --git a/src/components/FromField/i18n/fr-CA.js b/src/components/FromField/i18n/fr-CA.js
index cb84186967..7b618d7c91 100644
--- a/src/components/FromField/i18n/fr-CA.js
+++ b/src/components/FromField/i18n/fr-CA.js
@@ -4,7 +4,7 @@ export default {
   CompanyNumber: 'Entreprise',
   CompanyFaxNumber: 'Fax',
   Blocked: 'Bloqué',
-  from: 'De',
+  from: 'De ',
   AdditionalCompanyNumber: 'Entreprise',
   ForwardedCompanyNumber: 'Transféré',
 };
diff --git a/src/components/FromField/i18n/fr-FR.js b/src/components/FromField/i18n/fr-FR.js
index cb84186967..7b618d7c91 100644
--- a/src/components/FromField/i18n/fr-FR.js
+++ b/src/components/FromField/i18n/fr-FR.js
@@ -4,7 +4,7 @@ export default {
   CompanyNumber: 'Entreprise',
   CompanyFaxNumber: 'Fax',
   Blocked: 'Bloqué',
-  from: 'De',
+  from: 'De ',
   AdditionalCompanyNumber: 'Entreprise',
   ForwardedCompanyNumber: 'Transféré',
 };
diff --git a/src/components/RecipientsInput/i18n/fr-CA.js b/src/components/RecipientsInput/i18n/fr-CA.js
index f8ea27062d..1dcae1cd31 100644
--- a/src/components/RecipientsInput/i18n/fr-CA.js
+++ b/src/components/RecipientsInput/i18n/fr-CA.js
@@ -1,5 +1,5 @@
 export default {
-  to: 'À',
+  to: 'À ',
   enterNameOrNumber: 'Entrer le nom ou le numéro',
 };
 
diff --git a/src/components/RecipientsInput/i18n/fr-FR.js b/src/components/RecipientsInput/i18n/fr-FR.js
index e139061f2f..dd5d72f5e4 100644
--- a/src/components/RecipientsInput/i18n/fr-FR.js
+++ b/src/components/RecipientsInput/i18n/fr-FR.js
@@ -1,5 +1,5 @@
 export default {
-  to: 'À',
+  to: 'À ',
   enterNameOrNumber: 'Saisir un nom ou numéro',
 };
 
diff --git a/src/components/ToField/i18n/fr-CA.js b/src/components/ToField/i18n/fr-CA.js
index 06a7bc19ad..4f710ca7fc 100644
--- a/src/components/ToField/i18n/fr-CA.js
+++ b/src/components/ToField/i18n/fr-CA.js
@@ -1,5 +1,5 @@
 export default {
-  to: 'À',
+  to: 'À ',
   enterNameOrNumber: 'Saisir le numéro ou le nom',
 };
 
diff --git a/src/components/ToField/i18n/fr-FR.js b/src/components/ToField/i18n/fr-FR.js
index 06a7bc19ad..4f710ca7fc 100644
--- a/src/components/ToField/i18n/fr-FR.js
+++ b/src/components/ToField/i18n/fr-FR.js
@@ -1,5 +1,5 @@
 export default {
-  to: 'À',
+  to: 'À ',
   enterNameOrNumber: 'Saisir le numéro ou le nom',
 };
 

From 182d2421017edbea61b515a3cb6d855c4c5e2ee6 Mon Sep 17 00:00:00 2001
From: Jack Tzu-Chieh Huang <nightlancer@hotmail.com>
Date: Fri, 30 Mar 2018 18:36:52 +0800
Subject: [PATCH 03/14] [RCINT-7103] Remove auto focus on dialer and compose
 text pages (#867)

---
 src/components/ComposeTextPanel/index.js | 4 +++-
 src/components/DialerPanel/index.js      | 5 ++++-
 src/components/ForwardForm/index.js      | 5 ++++-
 src/components/TransferPanel/index.js    | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/ComposeTextPanel/index.js b/src/components/ComposeTextPanel/index.js
index 327ada79f5..6e1e9a4cab 100644
--- a/src/components/ComposeTextPanel/index.js
+++ b/src/components/ComposeTextPanel/index.js
@@ -88,7 +88,7 @@ class ComposeTextPanel extends Component {
             contactInfoRenderer={this.props.recipientsContactInfoRenderer}
             contactPhoneRenderer={this.props.recipientsContactPhoneRenderer}
             titleEnabled
-            autoFocus
+            autoFocus={this.props.autoFocus}
             multiple
           />
           <div className={styles.senderField}>
@@ -163,6 +163,7 @@ ComposeTextPanel.propTypes = {
   phoneTypeRenderer: PropTypes.func,
   recipientsContactInfoRenderer: PropTypes.func,
   recipientsContactPhoneRenderer: PropTypes.func,
+  autoFocus: PropTypes.bool,
 };
 
 ComposeTextPanel.defaultProps = {
@@ -176,6 +177,7 @@ ComposeTextPanel.defaultProps = {
   phoneTypeRenderer: undefined,
   recipientsContactInfoRenderer: undefined,
   recipientsContactPhoneRenderer: undefined,
+  autoFocus: false,
 };
 
 export default ComposeTextPanel;
diff --git a/src/components/DialerPanel/index.js b/src/components/DialerPanel/index.js
index 44e93f0914..d65a73c85c 100644
--- a/src/components/DialerPanel/index.js
+++ b/src/components/DialerPanel/index.js
@@ -34,6 +34,7 @@ function DialerPanel({
   phoneTypeRenderer,
   recipientsContactInfoRenderer,
   recipientsContactPhoneRenderer,
+  autoFocus,
 }) {
   const onCallFunc = () => {
     if (!callButtonDisabled) {
@@ -58,7 +59,7 @@ function DialerPanel({
         contactInfoRenderer={recipientsContactInfoRenderer}
         contactPhoneRenderer={recipientsContactPhoneRenderer}
         titleEnabled
-        autoFocus
+        autoFocus={autoFocus}
       />
       <div className={styles.inputFields}>
         <FromField
@@ -133,6 +134,7 @@ DialerPanel.propTypes = {
   phoneTypeRenderer: PropTypes.func,
   recipientsContactInfoRenderer: PropTypes.func,
   recipientsContactPhoneRenderer: PropTypes.func,
+  autoFocus: PropTypes.bool,
 };
 
 DialerPanel.defaultProps = {
@@ -152,6 +154,7 @@ DialerPanel.defaultProps = {
   phoneTypeRenderer: undefined,
   recipientsContactInfoRenderer: undefined,
   recipientsContactPhoneRenderer: undefined,
+  autoFocus: false,
 };
 
 export default DialerPanel;
diff --git a/src/components/ForwardForm/index.js b/src/components/ForwardForm/index.js
index e2025496bb..ea56e17086 100644
--- a/src/components/ForwardForm/index.js
+++ b/src/components/ForwardForm/index.js
@@ -149,6 +149,7 @@ export default class ForwardForm extends Component {
       searchContact,
       searchContactList,
       phoneTypeRenderer,
+      autoFocus,
     } = this.props;
     const value = this.getValue();
     const disableButton = isBlank(value) || this.state.handling;
@@ -189,7 +190,7 @@ export default class ForwardForm extends Component {
             formatContactPhone={formatPhone}
             currentLocale={currentLocale}
             titleEnabled
-            autoFocus
+            autoFocus={autoFocus}
           />
         </div>
         <div className={styles.buttonGroup}>
@@ -227,10 +228,12 @@ ForwardForm.propTypes = {
   searchContactList: PropTypes.array.isRequired,
   searchContact: PropTypes.func.isRequired,
   phoneTypeRenderer: PropTypes.func,
+  autoFocus: PropTypes.bool,
 };
 
 ForwardForm.defaultProps = {
   className: null,
   onChange: undefined,
   phoneTypeRenderer: undefined,
+  autoFocus: true,
 };
diff --git a/src/components/TransferPanel/index.js b/src/components/TransferPanel/index.js
index 41793c25fa..bd9591a93e 100644
--- a/src/components/TransferPanel/index.js
+++ b/src/components/TransferPanel/index.js
@@ -20,11 +20,13 @@ export default class TransferPanel extends PureComponent {
     formatPhone: PropTypes.func.isRequired,
     phoneTypeRenderer: PropTypes.func,
     isOnTransfer: PropTypes.bool,
+    autoFocus: PropTypes.bool,
   };
 
   static defaultProps = {
     phoneTypeRenderer: undefined,
     isOnTransfer: false,
+    autoFocus: true,
   };
 
   constructor(props) {
@@ -106,7 +108,7 @@ export default class TransferPanel extends PureComponent {
           currentLocale={this.props.currentLocale}
           phoneTypeRenderer={this.props.phoneTypeRenderer}
           titleEnabled
-          autoFocus
+          autoFocus={this.props.autoFocus}
         />
         <div className={styles.padContainer}>
           <DialPad

From e654ef1df05c8d5a882a6c6bb281a4f9329d54aa Mon Sep 17 00:00:00 2001
From: caffffe <1223840780@qq.com>
Date: Mon, 2 Apr 2018 14:07:03 +0800
Subject: [PATCH 04/14] fix bug presence status display incorrectly in contact
 detail (#870)

---
 src/components/ContactDetails/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ContactDetails/index.js b/src/components/ContactDetails/index.js
index 7098c90b2e..6efde31d85 100644
--- a/src/components/ContactDetails/index.js
+++ b/src/components/ContactDetails/index.js
@@ -11,11 +11,11 @@ import i18n from './i18n';
 import styles from './styles.scss';
 
 export function getPresenceStatusName(presence, currentLocale) {
-  const { userStatus, dndStatus } = presence;
+  const { presenceStatus, dndStatus } = presence;
   if (dndStatus === DndStatus.doNotAcceptAnyCalls) {
     return i18n.getString(dndStatus, currentLocale);
   }
-  return i18n.getString(userStatus, currentLocale);
+  return i18n.getString(presenceStatus, currentLocale);
 }
 
 function AvatarNode({ name, avatarUrl }) {

From 06aba1564a7e9fe046930166ed486f692c648277 Mon Sep 17 00:00:00 2001
From: Eric Huang <ele828@gmail.com>
Date: Mon, 2 Apr 2018 16:44:45 +0800
Subject: [PATCH 05/14] Sync changes from commons and widgets (#863)

* git subrepo pull packages/ringcentral-integration

subrepo:
  subdir:   "packages/ringcentral-integration"
  merged:   "e8cd64892"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-integration-commons.git"
  branch:   "master"
  commit:   "bebfba673"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* git subrepo pull packages/ringcentral-widgets

subrepo:
  subdir:   "packages/ringcentral-widgets"
  merged:   "e024e3189"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-widgets.git"
  branch:   "master"
  commit:   "33f1332ba"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* fix tests & lint

* git subrepo commit packages/ringcentral-integration

subrepo:
  subdir:   "packages/ringcentral-integration"
  merged:   "458bff886"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-integration-commons.git"
  branch:   "master"
  commit:   "8446edcf0"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* fix test

* upgrade ringcentral-integration

* update appview in dev-server

* git subrepo pull packages/ringcentral-integration

subrepo:
  subdir:   "packages/ringcentral-integration"
  merged:   "c3cdacff2"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-integration-commons.git"
  branch:   "master"
  commit:   "c3cdacff2"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* git subrepo pull packages/ringcentral-widgets

subrepo:
  subdir:   "packages/ringcentral-widgets"
  merged:   "2956435f6"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-widgets.git"
  branch:   "master"
  commit:   "2956435f6"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* git subrepo pull packages/ringcentral-widgets

subrepo:
  subdir:   "packages/ringcentral-widgets"
  merged:   "eb789eb39"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-widgets.git"
  branch:   "master"
  commit:   "eb789eb39"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* git subrepo pull packages/ringcentral-integration

subrepo:
  subdir:   "packages/ringcentral-integration"
  merged:   "3a8efb211"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-integration-commons.git"
  branch:   "master"
  commit:   "3a8efb211"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* git subrepo pull packages/ringcentral-integration

subrepo:
  subdir:   "packages/ringcentral-integration"
  merged:   "a963aec51"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-integration-commons.git"
  branch:   "master"
  commit:   "a963aec51"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* add dependencies to Phone

* git subrepo pull packages/ringcentral-widgets

subrepo:
  subdir:   "packages/ringcentral-widgets"
  merged:   "b190f5cf7"
upstream:
  origin:   "https://github.com/ringcentral/ringcentral-js-widgets.git"
  branch:   "master"
  commit:   "6da03ef42"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"

* bugfix: apply reducer from successor in Presence module

* add storage for presence module
---
 dev-server/containers/AppView/index.js |   3 +
 src/components/ContactDisplay/index.js | 507 ++++++++++++-------------
 2 files changed, 256 insertions(+), 254 deletions(-)

diff --git a/dev-server/containers/AppView/index.js b/dev-server/containers/AppView/index.js
index 343ad1e73f..f50aab3a8d 100644
--- a/dev-server/containers/AppView/index.js
+++ b/dev-server/containers/AppView/index.js
@@ -53,6 +53,7 @@ AppView.propTypes = {
   offline: PropTypes.bool.isRequired,
   showOfflineAlert: PropTypes.func.isRequired,
   webphoneUnavailable: PropTypes.bool.isRequired,
+  onWebphoneBadgeClicked: PropTypes.func.isRequired,
 };
 
 AppView.defaultProps = {
@@ -121,6 +122,8 @@ export default withPhone(connect((state, {
       audioSettings.getUserMedia();
     }
     if (webphone && webphone.ready) {
+      // Trigger reconnect
+      // webphone.connect();
       webphone.showAlert();
     }
   },
diff --git a/src/components/ContactDisplay/index.js b/src/components/ContactDisplay/index.js
index 9c6dcadafb..1b581a2eb5 100644
--- a/src/components/ContactDisplay/index.js
+++ b/src/components/ContactDisplay/index.js
@@ -1,254 +1,253 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import formatNumber from 'ringcentral-integration/lib/formatNumber';
-import formatMessage from 'format-message';
-import DropdownSelect from '../DropdownSelect';
-import i18n from './i18n';
-import styles from './styles.scss';
-import phoneSourceNames from '../../lib/phoneSourceNames';
-import phoneSources from '../../enums/phoneSources';
-
-const displayFormatter = ({
-  entityName,
-  entityType,
-  phoneNumber,
-  currentLocale,
-  brand,
-}) => {
-  let typeName;
-  if (entityType) {
-    typeName = formatMessage(
-      phoneSourceNames.getString(entityType, currentLocale),
-      { brand }
-    );
-  }
-  if (phoneNumber && entityName && entityType) {
-    return `${entityName} | ${typeName} ${phoneNumber}`;
-  } else if (entityName && entityType) {
-    return `${entityName} | ${typeName}`;
-  } else if (entityName) {
-    return entityName;
-  } else if (phoneNumber) {
-    return `${phoneNumber}`;
-  }
-  return '';
-};
-
-function ContactDisplayItem({
-  entityName,
-  entityType,
-  phoneNumber,
-  sourceIcons
-}) {
-  let SourceIcon = null;
-  if (entityType) {
-    if (entityType === phoneSources.rcContact) {
-      SourceIcon = sourceIcons.brandIcon;
-    } else {
-      SourceIcon = sourceIcons[entityType];
-    }
-  }
-  if (phoneNumber && entityName !== undefined && SourceIcon) {
-    return (
-      <span>
-        <SourceIcon className={styles.typeIcon} width={10} height={10} />
-        <span className={styles.typeName}>{entityName}</span>
-      </span>
-    );
-  } else if (entityName !== undefined && SourceIcon) {
-    return (
-      <span>
-        <SourceIcon className={styles.typeIcon} width={10} height={10} />
-        <span className={styles.typeName}>{entityName}</span>
-      </span>
-    );
-  } else if (entityName !== undefined) {
-    return <span>{entityName}</span>;
-  } else if (phoneNumber) {
-    return <span>{phoneNumber}</span>;
-  }
-  return null;
-}
-
-ContactDisplayItem.propTypes = {
-  entityName: PropTypes.string.isRequired,
-  entityType: PropTypes.string.isRequired,
-  phoneNumber: PropTypes.string.isRequired,
-  sourceIcons: PropTypes.object.isRequired,
-};
-
-export default function ContactDisplay({
-  reference,
-  className,
-  contactMatches,
-  selected,
-  onSelectContact,
-  disabled,
-  isLogging,
-  fallBackName,
-  enableContactFallback,
-  areaCode,
-  countryCode,
-  phoneNumber,
-  currentLocale,
-  groupNumbers,
-  showType,
-  selectClassName,
-  showPlaceholder,
-  brand,
-  stopPropagation,
-  sourceIcons = {},
-  showGroupNumberName,
-}) {
-  let contentEl;
-  if (groupNumbers && showGroupNumberName) {
-    const groupNames = groupNumbers.map((groupNumber) => {
-      const groupContact = contactMatches.find(match => match.extensionNumber === groupNumber);
-      return (groupContact && groupContact.name) || groupNumber;
-    });
-    const display = groupNames.join(', ');
-    contentEl = (
-      <div title={display} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (groupNumbers) {
-    const display = groupNumbers.join(', ');
-    contentEl = (
-      <div title={display} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (contactMatches.length === 0) {
-    const display = (enableContactFallback && fallBackName) ||
-      (phoneNumber && formatNumber({
-        phoneNumber,
-        countryCode,
-        areaCode,
-      })) ||
-      i18n.getString('unknownNumber', currentLocale);
-    const title = (enableContactFallback && fallBackName) ||
-      phoneNumber || '';
-    contentEl = (
-      <div title={title} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (contactMatches.length === 1) {
-    const display = contactMatches[0].name;
-    const title = displayFormatter({
-      entityName: display,
-      entityType: contactMatches[0].entityType,
-      phoneNumber,
-      brand,
-      currentLocale
-    });
-    contentEl = (
-      <div title={title} className={styles.currentName}>
-        {display}
-      </div>
-    );
-  } else if (contactMatches.length > 1) {
-    const options = [
-      ...contactMatches,
-    ];
-    let placeholder;
-    let _selected = selected;
-    if (showPlaceholder) {
-      placeholder = i18n.getString('select', currentLocale);
-    } else {
-      _selected = _selected < 0 ? 0 : _selected;
-    }
-    contentEl = (
-      <DropdownSelect
-        reference={reference}
-        className={classnames(styles.select, selectClassName)}
-        value={`${_selected}`}
-        onChange={onSelectContact}
-        disabled={disabled || isLogging}
-        options={options}
-        placeholder={placeholder}
-        renderFunction={entity => (
-          ContactDisplayItem({
-            entityName: entity.name,
-            entityType: entity.entityType,
-            brand,
-            currentLocale,
-            sourceIcons
-          })
-        )}
-        renderValue={value => (
-          displayFormatter({
-            entityName: options[value].name,
-            entityType: showType && options[value].entityType,
-            brand,
-            currentLocale,
-          })
-        )}
-        renderTitle={entity => (
-          entity ? displayFormatter({
-            entityName: entity.name,
-            entityType: entity.entityType,
-            phoneNumber,
-            brand,
-            currentLocale,
-          }) : phoneNumber)
-        }
-        dropdownAlign="left"
-        titleEnabled
-        noPadding
-        stopPropagation={stopPropagation}
-      />
-    );
-  }
-  
-  return (
-    <div
-      className={classnames(
-        styles.root,
-        className,
-      )} >
-      {contentEl}
-    </div>
-  );
-}
-ContactDisplay.propTypes = {
-  reference: PropTypes.func,
-  className: PropTypes.string,
-  contactMatches: PropTypes.arrayOf(PropTypes.any).isRequired,
-  selected: PropTypes.number.isRequired,
-  onSelectContact: PropTypes.func,
-  disabled: PropTypes.bool.isRequired,
-  isLogging: PropTypes.bool.isRequired,
-  fallBackName: PropTypes.string,
-  enableContactFallback: PropTypes.bool,
-  areaCode: PropTypes.string.isRequired,
-  countryCode: PropTypes.string.isRequired,
-  phoneNumber: PropTypes.string,
-  currentLocale: PropTypes.string.isRequired,
-  groupNumbers: PropTypes.arrayOf(PropTypes.string),
-  showType: PropTypes.bool,
-  selectClassName: PropTypes.string,
-  showPlaceholder: PropTypes.bool,
-  brand: PropTypes.string,
-  stopPropagation: PropTypes.bool,
-  sourceIcons: PropTypes.object,
-  showGroupNumberName: PropTypes.bool,
-};
-ContactDisplay.defaultProps = {
-  reference: undefined,
-  className: undefined,
-  onSelectContact: undefined,
-  fallBackName: '',
-  phoneNumber: undefined,
-  groupNumbers: undefined,
-  enableContactFallback: undefined,
-  showType: true,
-  selectClassName: undefined,
-  showPlaceholder: true,
-  brand: undefined,
-  stopPropagation: true,
-  sourceIcons: undefined,
-  showGroupNumberName: false,
-};
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import formatNumber from 'ringcentral-integration/lib/formatNumber';
+import formatMessage from 'format-message';
+import DropdownSelect from '../DropdownSelect';
+import i18n from './i18n';
+import styles from './styles.scss';
+import phoneSourceNames from '../../lib/phoneSourceNames';
+import phoneSources from '../../enums/phoneSources';
+
+const displayFormatter = ({
+  entityName,
+  entityType,
+  phoneNumber,
+  currentLocale,
+  brand,
+}) => {
+  let typeName;
+  if (entityType) {
+    typeName = formatMessage(
+      phoneSourceNames.getString(entityType, currentLocale),
+      { brand }
+    );
+  }
+  if (phoneNumber && entityName && entityType) {
+    return `${entityName} | ${typeName} ${phoneNumber}`;
+  } else if (entityName && entityType) {
+    return `${entityName} | ${typeName}`;
+  } else if (entityName) {
+    return entityName;
+  } else if (phoneNumber) {
+    return `${phoneNumber}`;
+  }
+  return '';
+};
+
+function ContactDisplayItem({
+  entityName,
+  entityType,
+  phoneNumber,
+  sourceIcons
+}) {
+  let SourceIcon = null;
+  if (entityType) {
+    if (entityType === phoneSources.rcContact) {
+      SourceIcon = sourceIcons.brandIcon;
+    } else {
+      SourceIcon = sourceIcons[entityType];
+    }
+  }
+  if (phoneNumber && entityName !== undefined && SourceIcon) {
+    return (
+      <span>
+        <SourceIcon className={styles.typeIcon} width={10} height={10} />
+        <span className={styles.typeName}>{entityName}</span>
+      </span>
+    );
+  } else if (entityName !== undefined && SourceIcon) {
+    return (
+      <span>
+        <SourceIcon className={styles.typeIcon} width={10} height={10} />
+        <span className={styles.typeName}>{entityName}</span>
+      </span>
+    );
+  } else if (entityName !== undefined) {
+    return <span>{entityName}</span>;
+  } else if (phoneNumber) {
+    return <span>{phoneNumber}</span>;
+  }
+  return null;
+}
+
+ContactDisplayItem.propTypes = {
+  entityName: PropTypes.string.isRequired,
+  entityType: PropTypes.string.isRequired,
+  phoneNumber: PropTypes.string.isRequired,
+  sourceIcons: PropTypes.object.isRequired,
+};
+
+export default function ContactDisplay({
+  reference,
+  className,
+  contactMatches,
+  selected,
+  onSelectContact,
+  disabled,
+  isLogging,
+  fallBackName,
+  enableContactFallback,
+  areaCode,
+  countryCode,
+  phoneNumber,
+  currentLocale,
+  groupNumbers,
+  showType,
+  selectClassName,
+  showPlaceholder,
+  brand,
+  stopPropagation,
+  sourceIcons = {},
+  showGroupNumberName,
+}) {
+  let contentEl;
+  if (groupNumbers && showGroupNumberName) {
+    const groupNames = groupNumbers.map((groupNumber) => {
+      const groupContact = contactMatches.find(match => match.extensionNumber === groupNumber);
+      return (groupContact && groupContact.name) || groupNumber;
+    });
+    const display = groupNames.join(', ');
+    contentEl = (
+      <div title={display} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (groupNumbers) {
+    const display = groupNumbers.join(', ');
+    contentEl = (
+      <div title={display} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (contactMatches.length === 0) {
+    const display = (enableContactFallback && fallBackName) ||
+      (phoneNumber && formatNumber({
+        phoneNumber,
+        countryCode,
+        areaCode,
+      })) ||
+      i18n.getString('unknownNumber', currentLocale);
+    const title = (enableContactFallback && fallBackName) ||
+      phoneNumber || '';
+    contentEl = (
+      <div title={title} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (contactMatches.length === 1) {
+    const display = contactMatches[0].name;
+    const title = displayFormatter({
+      entityName: display,
+      entityType: contactMatches[0].entityType,
+      phoneNumber,
+      brand,
+      currentLocale
+    });
+    contentEl = (
+      <div title={title} className={styles.currentName}>
+        {display}
+      </div>
+    );
+  } else if (contactMatches.length > 1) {
+    const options = [
+      ...contactMatches,
+    ];
+    let placeholder;
+    let _selected = selected;
+    if (showPlaceholder) {
+      placeholder = i18n.getString('select', currentLocale);
+    } else {
+      _selected = _selected < 0 ? 0 : _selected;
+    }
+    contentEl = (
+      <DropdownSelect
+        reference={reference}
+        className={classnames(styles.select, selectClassName)}
+        value={`${_selected}`}
+        onChange={onSelectContact}
+        disabled={disabled || isLogging}
+        options={options}
+        placeholder={placeholder}
+        renderFunction={entity => (
+          ContactDisplayItem({
+            entityName: entity.name,
+            entityType: entity.entityType,
+            brand,
+            currentLocale,
+            sourceIcons
+          })
+        )}
+        renderValue={value => (
+          displayFormatter({
+            entityName: options[value].name,
+            entityType: showType && options[value].entityType,
+            brand,
+            currentLocale,
+          })
+        )}
+        renderTitle={entity => (
+          entity ? displayFormatter({
+            entityName: entity.name,
+            entityType: entity.entityType,
+            phoneNumber,
+            brand,
+            currentLocale,
+          }) : phoneNumber)
+        }
+        dropdownAlign="left"
+        titleEnabled
+        noPadding
+        stopPropagation={stopPropagation}
+      />
+    );
+  }
+  return (
+    <div
+      className={classnames(
+        styles.root,
+        className,
+      )} >
+      {contentEl}
+    </div>
+  );
+}
+ContactDisplay.propTypes = {
+  reference: PropTypes.func,
+  className: PropTypes.string,
+  contactMatches: PropTypes.arrayOf(PropTypes.any).isRequired,
+  selected: PropTypes.number.isRequired,
+  onSelectContact: PropTypes.func,
+  disabled: PropTypes.bool.isRequired,
+  isLogging: PropTypes.bool.isRequired,
+  fallBackName: PropTypes.string,
+  enableContactFallback: PropTypes.bool,
+  areaCode: PropTypes.string.isRequired,
+  countryCode: PropTypes.string.isRequired,
+  phoneNumber: PropTypes.string,
+  currentLocale: PropTypes.string.isRequired,
+  groupNumbers: PropTypes.arrayOf(PropTypes.string),
+  showType: PropTypes.bool,
+  selectClassName: PropTypes.string,
+  showPlaceholder: PropTypes.bool,
+  brand: PropTypes.string,
+  stopPropagation: PropTypes.bool,
+  sourceIcons: PropTypes.object,
+  showGroupNumberName: PropTypes.bool,
+};
+ContactDisplay.defaultProps = {
+  reference: undefined,
+  className: undefined,
+  onSelectContact: undefined,
+  fallBackName: '',
+  phoneNumber: undefined,
+  groupNumbers: undefined,
+  enableContactFallback: undefined,
+  showType: true,
+  selectClassName: undefined,
+  showPlaceholder: true,
+  brand: undefined,
+  stopPropagation: true,
+  sourceIcons: undefined,
+  showGroupNumberName: false,
+};

From 4435a831b112306d54417c8429fe9dcc00c5d92a Mon Sep 17 00:00:00 2001
From: Jack Tzu-Chieh Huang <nightlancer@hotmail.com>
Date: Tue, 3 Apr 2018 12:35:27 +0800
Subject: [PATCH 06/14] enable falling back to rc caller/callee name display if
 no contact match was found (#866)

---
 src/containers/ActiveCallsPage/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/containers/ActiveCallsPage/index.js b/src/containers/ActiveCallsPage/index.js
index 69a32c8453..76f7a22e04 100644
--- a/src/containers/ActiveCallsPage/index.js
+++ b/src/containers/ActiveCallsPage/index.js
@@ -14,6 +14,7 @@ function mapToProps(_, {
     rolesAndPermissions,
   },
   showContactDisplayPlaceholder = false,
+  enableContactFallback = false,
 }) {
   return {
     currentLocale: locale.currentLocale,
@@ -35,6 +36,7 @@ function mapToProps(_, {
     brand: brand.fullName,
     showContactDisplayPlaceholder,
     autoLog: !!(callLogger && callLogger.autoLog),
+    enableContactFallback,
   };
 }
 

From b46ec475a60abd1d5e3dcd80ed5453171cec2699 Mon Sep 17 00:00:00 2001
From: Jack Tzu-Chieh Huang <nightlancer@hotmail.com>
Date: Tue, 3 Apr 2018 12:35:47 +0800
Subject: [PATCH 07/14] fix bug where when editing message text  in compose
 text page, the cursor will always be force to the end of text (#869)

---
 src/components/ComposeTextPanel/index.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/ComposeTextPanel/index.js b/src/components/ComposeTextPanel/index.js
index 6e1e9a4cab..3a82a4ebd6 100644
--- a/src/components/ComposeTextPanel/index.js
+++ b/src/components/ComposeTextPanel/index.js
@@ -12,6 +12,9 @@ import FromField from '../FromField';
 class ComposeTextPanel extends Component {
   constructor(props) {
     super(props);
+    this.state = {
+      messageText: props.messageText,
+    };
 
     this.onSenderChange = (value) => {
       this.props.updateSenderNumber(value);
@@ -35,6 +38,9 @@ class ComposeTextPanel extends Component {
 
     this.onTextChange = (e) => {
       const value = e.currentTarget.value;
+      this.setState({
+        messageText: value,
+      });
       this.props.updateMessageText(value);
     };
 
@@ -51,6 +57,13 @@ class ComposeTextPanel extends Component {
       console.debug('send message ...');
     };
   }
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.messageText !== this.state.messageText) {
+      this.setState({
+        messageText: nextProps.messageText,
+      });
+    }
+  }
 
   hasSenderNumbers() {
     return this.props.senderNumbers.length > 0;
@@ -106,7 +119,7 @@ class ComposeTextPanel extends Component {
             <div className={styles.textField}>
               <textarea
                 placeholder={i18n.getString('typeMessage', this.props.currentLocale)}
-                value={this.props.messageText}
+                value={this.state.messageText}
                 maxLength="1000"
                 onChange={this.onTextChange}
                 onKeyPressCapture={this.onTextAreaKeyDown}

From a0344bdc2d01dcdc0f748eaa40e70a89e1a2edd7 Mon Sep 17 00:00:00 2001
From: caffffe <1223840780@qq.com>
Date: Wed, 4 Apr 2018 15:47:25 +0800
Subject: [PATCH 08/14] import delta locale for widgets and google (#880)

* import delta locale for widgets and google

* add space before colon
---
 src/components/ActiveCallPad/i18n/fr-CA.js            |  4 ++--
 src/components/CallAlert/i18n/de-DE.js                |  1 +
 src/components/CallAlert/i18n/en-CA.js                |  1 +
 src/components/CallAlert/i18n/en-GB.js                |  1 +
 src/components/CallAlert/i18n/es-419.js               |  1 +
 src/components/CallAlert/i18n/es-ES.js                |  1 +
 src/components/CallAlert/i18n/fr-CA.js                |  3 ++-
 src/components/CallAlert/i18n/fr-FR.js                |  1 +
 src/components/CallAlert/i18n/it-IT.js                |  1 +
 src/components/CallAlert/i18n/ja-JP.js                |  1 +
 src/components/CallAlert/i18n/pt-BR.js                |  1 +
 src/components/CallingSettingsPanel/i18n/fr-CA.js     |  4 ++--
 src/components/CallsListPanel/i18n/de-DE.js           |  2 +-
 src/components/CallsListPanel/i18n/en-CA.js           |  2 +-
 src/components/CallsListPanel/i18n/en-GB.js           |  2 +-
 src/components/CallsListPanel/i18n/es-419.js          |  2 +-
 src/components/CallsListPanel/i18n/es-ES.js           |  2 +-
 src/components/CallsListPanel/i18n/fr-CA.js           |  2 +-
 src/components/CallsListPanel/i18n/fr-FR.js           |  2 +-
 src/components/CallsListPanel/i18n/it-IT.js           |  2 +-
 src/components/CallsListPanel/i18n/ja-JP.js           |  2 +-
 src/components/CallsListPanel/i18n/pt-BR.js           |  2 +-
 src/components/ConferenceCommands/i18n/fr-CA.js       |  4 ++--
 src/components/ConferencePanel/i18n/de-DE.js          |  5 ++++-
 src/components/ConferencePanel/i18n/en-CA.js          |  5 ++++-
 src/components/ConferencePanel/i18n/en-GB.js          |  5 ++++-
 src/components/ConferencePanel/i18n/es-419.js         |  5 ++++-
 src/components/ConferencePanel/i18n/es-ES.js          |  5 ++++-
 src/components/ConferencePanel/i18n/fr-CA.js          |  7 +++++--
 src/components/ConferencePanel/i18n/fr-FR.js          |  5 ++++-
 src/components/ConferencePanel/i18n/it-IT.js          |  5 ++++-
 src/components/ConferencePanel/i18n/ja-JP.js          |  5 ++++-
 src/components/ConferencePanel/i18n/pt-BR.js          |  5 ++++-
 src/components/IncomingCallPad/i18n/es-419.js         |  2 +-
 src/components/IncomingCallPad/i18n/fr-CA.js          |  4 ++--
 src/components/IncomingCallPad/i18n/pt-BR.js          |  2 +-
 src/components/MessageSenderAlert/i18n/de-DE.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/en-CA.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/en-GB.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/es-419.js      |  9 +++++----
 src/components/MessageSenderAlert/i18n/es-ES.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/fr-CA.js       | 11 ++++++-----
 src/components/MessageSenderAlert/i18n/fr-FR.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/it-IT.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/ja-JP.js       |  9 +++++----
 src/components/MessageSenderAlert/i18n/pt-BR.js       |  9 +++++----
 src/components/PresenceItem/i18n/en-GB.js             |  1 -
 src/components/PresenceItem/i18n/es-419.js            |  1 -
 src/components/PresenceItem/i18n/fr-CA.js             |  1 -
 src/components/RolesAndPermissionsAlert/i18n/de-DE.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/en-CA.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/en-GB.js |  1 +
 .../RolesAndPermissionsAlert/i18n/es-419.js           |  1 +
 src/components/RolesAndPermissionsAlert/i18n/es-ES.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/fr-CA.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/fr-FR.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/it-IT.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/ja-JP.js |  1 +
 src/components/RolesAndPermissionsAlert/i18n/pt-BR.js |  1 +
 src/components/SettingsPanel/i18n/fr-CA.js            |  2 +-
 60 files changed, 134 insertions(+), 77 deletions(-)

diff --git a/src/components/ActiveCallPad/i18n/fr-CA.js b/src/components/ActiveCallPad/i18n/fr-CA.js
index 226afb1f3c..6ba5ffa396 100644
--- a/src/components/ActiveCallPad/i18n/fr-CA.js
+++ b/src/components/ActiveCallPad/i18n/fr-CA.js
@@ -1,6 +1,6 @@
 export default {
-  unmute: 'Désactiver\nle mode discrétion',
-  mute: 'Activer\nle mode discrétion',
+  unmute: 'Désac. mode disc.',
+  mute: 'Act. mode disc.',
   keypad: 'Clavier',
   hold: 'Mettre\nen attente',
   onHold: 'En attente',
diff --git a/src/components/CallAlert/i18n/de-DE.js b/src/components/CallAlert/i18n/de-DE.js
index af891e0b30..804e306a0a 100644
--- a/src/components/CallAlert/i18n/de-DE.js
+++ b/src/components/CallAlert/i18n/de-DE.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/en-CA.js b/src/components/CallAlert/i18n/en-CA.js
index 1ece98b55a..7229f0f351 100644
--- a/src/components/CallAlert/i18n/en-CA.js
+++ b/src/components/CallAlert/i18n/en-CA.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/en-GB.js b/src/components/CallAlert/i18n/en-GB.js
index b7f4a0774b..d16d7a9c1b 100644
--- a/src/components/CallAlert/i18n/en-GB.js
+++ b/src/components/CallAlert/i18n/en-GB.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/es-419.js b/src/components/CallAlert/i18n/es-419.js
index 434e9ff5d8..83acd3f037 100644
--- a/src/components/CallAlert/i18n/es-419.js
+++ b/src/components/CallAlert/i18n/es-419.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/es-ES.js b/src/components/CallAlert/i18n/es-ES.js
index b925ad332b..67da36301a 100644
--- a/src/components/CallAlert/i18n/es-ES.js
+++ b/src/components/CallAlert/i18n/es-ES.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/fr-CA.js b/src/components/CallAlert/i18n/fr-CA.js
index a02e231769..8b83433866 100644
--- a/src/components/CallAlert/i18n/fr-CA.js
+++ b/src/components/CallAlert/i18n/fr-CA.js
@@ -2,7 +2,7 @@ import callErrors from 'ringcentral-integration/modules/Call/callErrors';
 
 export default {
   [callErrors.noToNumber]: 'Veuillez entrer un numéro de téléphone valide.',
-  [callErrors.noAreaCode]: 'Veuillez configurer {areaCodeLink} pour utiliser des numéros de téléphone locaux à 7\xA0chiffres.',
+  [callErrors.noAreaCode]: 'Veuillez configurer l\'{areaCodeLink} pour utiliser des numéros de téléphone locaux à 7\xA0chiffres.',
   [callErrors.specialNumber]: 'La composition de numéros d\'urgence ou renvoyant à des services spéciaux n\'est pas prise en charge.',
   [callErrors.connectFailed]: 'Échec de la connexion. Veuillez réessayer plus tard.',
   [callErrors.internalError]: 'Connexion impossible en raison d\'erreurs internes. Veuillez réessayer plus tard.',
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/fr-FR.js b/src/components/CallAlert/i18n/fr-FR.js
index 969e947f39..277e72fcd5 100644
--- a/src/components/CallAlert/i18n/fr-FR.js
+++ b/src/components/CallAlert/i18n/fr-FR.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/it-IT.js b/src/components/CallAlert/i18n/it-IT.js
index 77f8d1ff7f..98c9ce872b 100644
--- a/src/components/CallAlert/i18n/it-IT.js
+++ b/src/components/CallAlert/i18n/it-IT.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/ja-JP.js b/src/components/CallAlert/i18n/ja-JP.js
index 9aa6867636..6a1df02878 100644
--- a/src/components/CallAlert/i18n/ja-JP.js
+++ b/src/components/CallAlert/i18n/ja-JP.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallAlert/i18n/pt-BR.js b/src/components/CallAlert/i18n/pt-BR.js
index c42fb84194..fab3acf167 100644
--- a/src/components/CallAlert/i18n/pt-BR.js
+++ b/src/components/CallAlert/i18n/pt-BR.js
@@ -20,6 +20,7 @@ export default {
 // @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
+// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
 // @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
 // @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
diff --git a/src/components/CallingSettingsPanel/i18n/fr-CA.js b/src/components/CallingSettingsPanel/i18n/fr-CA.js
index dd942c1b2f..1d8109178e 100644
--- a/src/components/CallingSettingsPanel/i18n/fr-CA.js
+++ b/src/components/CallingSettingsPanel/i18n/fr-CA.js
@@ -13,10 +13,10 @@ export default {
   [callingOptions.browser]: 'Navigateur',
   save: 'Sauvegarder',
   [`${callingOptions.browser}Tooltip`]: 'Utilisez cette option pour faire et recevoir des appels au moyen du microphone et du haut-parleur de votre ordinateur.',
-  [`${callingOptions.softphone}Tooltip`]: 'Utilisez cette option pour faire et recevoir des appels au moyen de votre application {brand} pour bureau.',
+  [`${callingOptions.softphone}Tooltip`]: 'Utilisez cette option pour faire et recevoir des appels au moyen de votre application {brand} pour ordinateur de bureau.',
   [`${callingOptions.myphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant votre téléphone {brand}.',
   [`${callingOptions.myphone}Tooltip1`]: 'Pour l\'appel en cours, votre téléphone {brand} sonnera d\'abord, puis celui de la personne appelée.',
-  [`${callingOptions.otherphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant vos autres téléphones, comme celui de votre domicile ou des téléphones cellulaires que vous avez ajoutés dans votre extension {brand}.',
+  [`${callingOptions.otherphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant vos autres téléphones, comme celui de votre domicile ou des téléphones cellulaires que vous avez ajoutés dans votre poste {brand}.',
   [`${callingOptions.otherphone}Tooltip1`]: 'Pour l\'appel en cours, ce téléphone sonnera d\'abord, puis celui de la personne appelée.',
   [`${callingOptions.customphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant n\'importe quel téléphone. Entrez un numéro de téléphone valide dans le champ ci-dessous.',
   [`${callingOptions.customphone}Tooltip1`]: 'Pour l\'appel en cours, ce téléphone sonnera d\'abord, puis celui de la personne appelée.',
diff --git a/src/components/CallsListPanel/i18n/de-DE.js b/src/components/CallsListPanel/i18n/de-DE.js
index c26762bd27..daf82f0c2f 100644
--- a/src/components/CallsListPanel/i18n/de-DE.js
+++ b/src/components/CallsListPanel/i18n/de-DE.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/en-CA.js b/src/components/CallsListPanel/i18n/en-CA.js
index 86cd03b276..1eb1768c1b 100644
--- a/src/components/CallsListPanel/i18n/en-CA.js
+++ b/src/components/CallsListPanel/i18n/en-CA.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/en-GB.js b/src/components/CallsListPanel/i18n/en-GB.js
index 86cd03b276..1eb1768c1b 100644
--- a/src/components/CallsListPanel/i18n/en-GB.js
+++ b/src/components/CallsListPanel/i18n/en-GB.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/es-419.js b/src/components/CallsListPanel/i18n/es-419.js
index beebe98e53..877b680ed5 100644
--- a/src/components/CallsListPanel/i18n/es-419.js
+++ b/src/components/CallsListPanel/i18n/es-419.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/es-ES.js b/src/components/CallsListPanel/i18n/es-ES.js
index beebe98e53..877b680ed5 100644
--- a/src/components/CallsListPanel/i18n/es-ES.js
+++ b/src/components/CallsListPanel/i18n/es-ES.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/fr-CA.js b/src/components/CallsListPanel/i18n/fr-CA.js
index c118339262..1531ab23a5 100644
--- a/src/components/CallsListPanel/i18n/fr-CA.js
+++ b/src/components/CallsListPanel/i18n/fr-CA.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/fr-FR.js b/src/components/CallsListPanel/i18n/fr-FR.js
index 7cd14b5c65..87f7434691 100644
--- a/src/components/CallsListPanel/i18n/fr-FR.js
+++ b/src/components/CallsListPanel/i18n/fr-FR.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/it-IT.js b/src/components/CallsListPanel/i18n/it-IT.js
index 3ecf461dad..c6e93d491c 100644
--- a/src/components/CallsListPanel/i18n/it-IT.js
+++ b/src/components/CallsListPanel/i18n/it-IT.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/ja-JP.js b/src/components/CallsListPanel/i18n/ja-JP.js
index 1336b6a67f..5b6faa30ff 100644
--- a/src/components/CallsListPanel/i18n/ja-JP.js
+++ b/src/components/CallsListPanel/i18n/ja-JP.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/CallsListPanel/i18n/pt-BR.js b/src/components/CallsListPanel/i18n/pt-BR.js
index 6a78ecccb2..032a5dc169 100644
--- a/src/components/CallsListPanel/i18n/pt-BR.js
+++ b/src/components/CallsListPanel/i18n/pt-BR.js
@@ -13,5 +13,5 @@ export default {
 // @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
 // @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
 // @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
-// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
+// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
 // @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
diff --git a/src/components/ConferenceCommands/i18n/fr-CA.js b/src/components/ConferenceCommands/i18n/fr-CA.js
index 1230896eb1..889d7cd59c 100644
--- a/src/components/ConferenceCommands/i18n/fr-CA.js
+++ b/src/components/ConferenceCommands/i18n/fr-CA.js
@@ -5,9 +5,9 @@ export default {
   starSharp3Title: 'Quitter la conférence',
   starSharp3Body: 'Permet à l\'animateur de raccrocher et de mettre fin à l\'appel',
   starSharp4Title: 'Menu',
-  starSharp4Body: 'Permet d\'écouter la liste de commandes du téléphone à clavier',
+  starSharp4Body: 'Permet d\'écouter la liste de commandes au clavier',
   starSharp5Title: 'Définir les modes d\'écoute',
-  starSharp5Body: 'Faire la commande une fois pour\xA0: Activer le mode discrétion sur la ligne des appelants. Ces derniers peuvent le désactiver en appuyant sur les touches *, # et 6\r\nFaire la commande deux fois pour\xA0: Activer le mode discrétion sur la ligne des appelants afin d\'écouter uniquement Aucune option de désactivation du mode discrétion\r\nFaire la commande trois fois pour\xA0: Désactiver le mode discrétion sur la ligne des appelants, leur ligne est donc rouverte.',
+  starSharp5Body: 'Faire la commande une fois pour\xA0: Activer le mode discrétion sur la ligne des appelants. Ces derniers peuvent le désactiver en appuyant sur les touches *, # et 6\r\nFaire la commande deux fois pour\xA0: Activer le mode discrétion sur la ligne des appelants afin d\'écouter uniquement. Aucune option de désactivation du mode discrétion.\r\nFaire la commande trois fois pour\xA0: Désactiver le mode discrétion sur la ligne des appelants, leur ligne est donc rouverte.',
   starSharp6Title: 'Activer le mode discrétion sur la ligne de l\'animateur',
   starSharp6Body: 'Appuyer une fois pour activer le mode discrétion\r\nAppuyer une deuxième fois pour désactiver le mode discrétion',
   starSharp7Title: 'Sécuriser la conférence',
diff --git a/src/components/ConferencePanel/i18n/de-DE.js b/src/components/ConferencePanel/i18n/de-DE.js
index e69d717a57..47d9da79b6 100644
--- a/src/components/ConferencePanel/i18n/de-DE.js
+++ b/src/components/ConferencePanel/i18n/de-DE.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/en-CA.js b/src/components/ConferencePanel/i18n/en-CA.js
index f83ca37273..a857873c55 100644
--- a/src/components/ConferencePanel/i18n/en-CA.js
+++ b/src/components/ConferencePanel/i18n/en-CA.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/en-GB.js b/src/components/ConferencePanel/i18n/en-GB.js
index 7d1af46276..cfd9c524bf 100644
--- a/src/components/ConferencePanel/i18n/en-GB.js
+++ b/src/components/ConferencePanel/i18n/en-GB.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/es-419.js b/src/components/ConferencePanel/i18n/es-419.js
index 555bc0a616..4b4f31dd6b 100644
--- a/src/components/ConferencePanel/i18n/es-419.js
+++ b/src/components/ConferencePanel/i18n/es-419.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/es-ES.js b/src/components/ConferencePanel/i18n/es-ES.js
index e92559bb27..4401b3a686 100644
--- a/src/components/ConferencePanel/i18n/es-ES.js
+++ b/src/components/ConferencePanel/i18n/es-ES.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/fr-CA.js b/src/components/ConferencePanel/i18n/fr-CA.js
index bfe07660a1..cfa202a771 100644
--- a/src/components/ConferencePanel/i18n/fr-CA.js
+++ b/src/components/ConferencePanel/i18n/fr-CA.js
@@ -11,7 +11,7 @@ export default {
   hostAccess: 'Accès de l\'animateur',
   participantsAccess: 'Accès des participants',
   addinalDialInNumbers: 'Autres numéros à composer',
-  selectNumbers: 'Sélect. numéros',
+  selectNumbers: 'Sélectionner les numéros',
   enableJoinBeforeHost: 'Activer l\'option permettant de joindre la réunion avant l\'animateur',
   conferenceCommands: 'Commandes de téléconférence',
   inviteWithGCalendar: 'Inviter avec Google Agenda',
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/fr-FR.js b/src/components/ConferencePanel/i18n/fr-FR.js
index b9761bd963..c72e611b1a 100644
--- a/src/components/ConferencePanel/i18n/fr-FR.js
+++ b/src/components/ConferencePanel/i18n/fr-FR.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/it-IT.js b/src/components/ConferencePanel/i18n/it-IT.js
index 2fdb03db06..471b2f52c4 100644
--- a/src/components/ConferencePanel/i18n/it-IT.js
+++ b/src/components/ConferencePanel/i18n/it-IT.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/ja-JP.js b/src/components/ConferencePanel/i18n/ja-JP.js
index 5137812e94..76ce7f905f 100644
--- a/src/components/ConferencePanel/i18n/ja-JP.js
+++ b/src/components/ConferencePanel/i18n/ja-JP.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/ConferencePanel/i18n/pt-BR.js b/src/components/ConferencePanel/i18n/pt-BR.js
index eb70a5eb29..b9e5d8f699 100644
--- a/src/components/ConferencePanel/i18n/pt-BR.js
+++ b/src/components/ConferencePanel/i18n/pt-BR.js
@@ -31,4 +31,7 @@ export default {
 // @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
 // @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
 // @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
-// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
+// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
+// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
diff --git a/src/components/IncomingCallPad/i18n/es-419.js b/src/components/IncomingCallPad/i18n/es-419.js
index 42f44e1e6a..1caac29f5e 100644
--- a/src/components/IncomingCallPad/i18n/es-419.js
+++ b/src/components/IncomingCallPad/i18n/es-419.js
@@ -5,7 +5,7 @@ export default {
   toVoicemail: 'A buzón de voz',
   answer: 'Responder',
   answerAndEnd: 'Resp. y finalizar',
-  answerAndHold: 'Resp. y poner en esp.',
+  answerAndHold: 'Resp. y en esp.',
 };
 
 // @key: @#@"forward"@#@ @source: @#@"Forward"@#@
diff --git a/src/components/IncomingCallPad/i18n/fr-CA.js b/src/components/IncomingCallPad/i18n/fr-CA.js
index 568ff592cd..712fbf9217 100644
--- a/src/components/IncomingCallPad/i18n/fr-CA.js
+++ b/src/components/IncomingCallPad/i18n/fr-CA.js
@@ -4,8 +4,8 @@ export default {
   ignore: 'Ignorer',
   toVoicemail: 'Boîte vocale',
   answer: 'Réponse',
-  answerAndEnd: 'Répondre et\nterminer',
-  answerAndHold: 'Répondre et\nmettre en attente',
+  answerAndEnd: 'Rép. et term.',
+  answerAndHold: 'Rép. et mise en att.',
 };
 
 // @key: @#@"forward"@#@ @source: @#@"Forward"@#@
diff --git a/src/components/IncomingCallPad/i18n/pt-BR.js b/src/components/IncomingCallPad/i18n/pt-BR.js
index 747142e475..1cab06e21f 100644
--- a/src/components/IncomingCallPad/i18n/pt-BR.js
+++ b/src/components/IncomingCallPad/i18n/pt-BR.js
@@ -5,7 +5,7 @@ export default {
   toVoicemail: 'Para caixa postal',
   answer: 'Responder',
   answerAndEnd: 'Atender e enc.',
-  answerAndHold: 'Atender e em espera',
+  answerAndHold: 'Atender e espera',
 };
 
 // @key: @#@"forward"@#@ @source: @#@"Forward"@#@
diff --git a/src/components/MessageSenderAlert/i18n/de-DE.js b/src/components/MessageSenderAlert/i18n/de-DE.js
index ff856be0c3..673d8e642c 100644
--- a/src/components/MessageSenderAlert/i18n/de-DE.js
+++ b/src/components/MessageSenderAlert/i18n/de-DE.js
@@ -29,18 +29,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/en-CA.js b/src/components/MessageSenderAlert/i18n/en-CA.js
index 707a3ef60c..c36855feca 100644
--- a/src/components/MessageSenderAlert/i18n/en-CA.js
+++ b/src/components/MessageSenderAlert/i18n/en-CA.js
@@ -29,18 +29,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/en-GB.js b/src/components/MessageSenderAlert/i18n/en-GB.js
index b61c3edfd8..c520113541 100644
--- a/src/components/MessageSenderAlert/i18n/en-GB.js
+++ b/src/components/MessageSenderAlert/i18n/en-GB.js
@@ -29,18 +29,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/es-419.js b/src/components/MessageSenderAlert/i18n/es-419.js
index 35978f6257..8230c3fdb5 100644
--- a/src/components/MessageSenderAlert/i18n/es-419.js
+++ b/src/components/MessageSenderAlert/i18n/es-419.js
@@ -28,18 +28,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/es-ES.js b/src/components/MessageSenderAlert/i18n/es-ES.js
index 859dc0f2d0..3a47fc6b1c 100644
--- a/src/components/MessageSenderAlert/i18n/es-ES.js
+++ b/src/components/MessageSenderAlert/i18n/es-ES.js
@@ -28,18 +28,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/fr-CA.js b/src/components/MessageSenderAlert/i18n/fr-CA.js
index ef26645e71..c2f70bfe32 100644
--- a/src/components/MessageSenderAlert/i18n/fr-CA.js
+++ b/src/components/MessageSenderAlert/i18n/fr-CA.js
@@ -9,7 +9,7 @@ export default {
   [messageSenderMessages.senderEmpty]: 'Vous devez sélectionner un numéro parmi les numéros de téléphone pour envoyer',
   [messageSenderMessages.recipientsEmpty]: 'Veuillez entrer un numéro de destinataire valide.',
   [messageSenderMessages.textTooLong]: 'Le texte est trop long, limite\xA0: 1\xA0000',
-  [messageSenderMessages.noAreaCode]: 'Veuillez configurer {areaCodeLink} pour utiliser des numéros de téléphone locaux à 7\xA0chiffres.',
+  [messageSenderMessages.noAreaCode]: 'Veuillez configurer l\'{areaCodeLink} pour utiliser des numéros de téléphone locaux à 7\xA0chiffres.',
   [messageSenderMessages.connectFailed]: 'Échec de la connexion. Veuillez réessayer plus tard.',
   [messageSenderMessages.internalError]: 'Connexion impossible en raison d\'erreurs internes. Veuillez réessayer plus tard.',
   [messageSenderMessages.notAnExtension]: 'Le numéro de poste n\'existe pas.',
@@ -29,18 +29,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/fr-FR.js b/src/components/MessageSenderAlert/i18n/fr-FR.js
index 03b16ae80d..45ce02183c 100644
--- a/src/components/MessageSenderAlert/i18n/fr-FR.js
+++ b/src/components/MessageSenderAlert/i18n/fr-FR.js
@@ -29,18 +29,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/it-IT.js b/src/components/MessageSenderAlert/i18n/it-IT.js
index 388ecdbf0c..e593dccf6e 100644
--- a/src/components/MessageSenderAlert/i18n/it-IT.js
+++ b/src/components/MessageSenderAlert/i18n/it-IT.js
@@ -28,18 +28,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/ja-JP.js b/src/components/MessageSenderAlert/i18n/ja-JP.js
index 74014af1be..54a6a1f222 100644
--- a/src/components/MessageSenderAlert/i18n/ja-JP.js
+++ b/src/components/MessageSenderAlert/i18n/ja-JP.js
@@ -28,18 +28,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/MessageSenderAlert/i18n/pt-BR.js b/src/components/MessageSenderAlert/i18n/pt-BR.js
index 0786586706..9fa61b3710 100644
--- a/src/components/MessageSenderAlert/i18n/pt-BR.js
+++ b/src/components/MessageSenderAlert/i18n/pt-BR.js
@@ -28,18 +28,19 @@ export default {
 // @key: @#@"[messageSenderMessages.textEmpty]"@#@ @source: @#@"Please enter the text to be sent."@#@
 // @key: @#@"[messageSenderMessages.noPermission]"@#@ @source: @#@"You have no permission to send message."@#@
 // @key: @#@"[messageSenderMessages.senderEmpty]"@#@ @source: @#@"You must select a number from your phone numbers to send"@#@
-// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Invalid phone number."@#@
+// @key: @#@"[messageSenderMessages.noToNumber]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.recipientsEmpty]"@#@ @source: @#@"Please enter a valid receiver number."@#@
 // @key: @#@"[messageSenderMessages.textTooLong]"@#@ @source: @#@"Text is too long, 1000 Limited"@#@
 // @key: @#@"[messageSenderMessages.recipientNumberInvalids]"@#@ @source: @#@"Please enter a valid phone number."@#@
 // @key: @#@"[messageSenderMessages.noAreaCode]"@#@ @source: @#@"Please set {areaCodeLink} to use 7-digit local phone numbers."@#@
-// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Dialing emergency or special service numbers is not supported."@#@
+// @key: @#@"[messageSenderMessages.specialNumber]"@#@ @source: @#@"Sending text to emergency/special service numbers is not supported."@#@
 // @key: @#@"[messageSenderMessages.connectFailed]"@#@ @source: @#@"Connection failed. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
 // @key: @#@"[messageSenderMessages.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
 // @key: @#@"[messageSenderMessages.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
-// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.senderNumberInvalid]"@#@ @source: @#@"A valid Phone Number is required to send text message to recipients outside of your company, Please contact your Administrator to add a direct number to your account."@#@
 // @key: @#@"[messageSenderMessages.notSmsToExtension]"@#@ @source: @#@"Cannot send To a extension number with main phone number. If you want to sent to a extension Number, please just enter extension Number."@#@
 // @key: @#@"[messageSenderMessages.internationalSMSNotSupported]"@#@ @source: @#@"Sending SMS to international phone number is not supported."@#@
-// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your RingCentral account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noInternalSMSPermission]"@#@ @source: @#@"You don't have permission to send messages. Please contact your {brand} account administrator for upgrade."@#@
+// @key: @#@"[messageSenderMessages.noSMSPermission]"@#@ @source: @#@"You don't have permission to send messages to recipients outside of your organization. Please contact your {brand} account administrator for upgrade."@#@
 // @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
diff --git a/src/components/PresenceItem/i18n/en-GB.js b/src/components/PresenceItem/i18n/en-GB.js
index 211d3c2507..f7ac4f32b5 100644
--- a/src/components/PresenceItem/i18n/en-GB.js
+++ b/src/components/PresenceItem/i18n/en-GB.js
@@ -12,4 +12,3 @@ export default {
 // @key: @#@"[presenceStatus.busy]"@#@ @source: @#@"Busy"@#@
 // @key: @#@"[presenceStatus.offline]"@#@ @source: @#@"Invisible"@#@
 // @key: @#@"[dndStatus.doNotAcceptAnyCalls]"@#@ @source: @#@"Do not Disturb"@#@
-
diff --git a/src/components/PresenceItem/i18n/es-419.js b/src/components/PresenceItem/i18n/es-419.js
index a23fecb86c..b98a48625d 100644
--- a/src/components/PresenceItem/i18n/es-419.js
+++ b/src/components/PresenceItem/i18n/es-419.js
@@ -12,4 +12,3 @@ export default {
 // @key: @#@"[presenceStatus.busy]"@#@ @source: @#@"Busy"@#@
 // @key: @#@"[presenceStatus.offline]"@#@ @source: @#@"Invisible"@#@
 // @key: @#@"[dndStatus.doNotAcceptAnyCalls]"@#@ @source: @#@"Do not Disturb"@#@
-
diff --git a/src/components/PresenceItem/i18n/fr-CA.js b/src/components/PresenceItem/i18n/fr-CA.js
index 3ef6eb813b..d35979625c 100644
--- a/src/components/PresenceItem/i18n/fr-CA.js
+++ b/src/components/PresenceItem/i18n/fr-CA.js
@@ -12,4 +12,3 @@ export default {
 // @key: @#@"[presenceStatus.busy]"@#@ @source: @#@"Busy"@#@
 // @key: @#@"[presenceStatus.offline]"@#@ @source: @#@"Invisible"@#@
 // @key: @#@"[dndStatus.doNotAcceptAnyCalls]"@#@ @source: @#@"Do not Disturb"@#@
-
diff --git a/src/components/RolesAndPermissionsAlert/i18n/de-DE.js b/src/components/RolesAndPermissionsAlert/i18n/de-DE.js
index a6c7b0468f..425947ea0c 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/de-DE.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/de-DE.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/en-CA.js b/src/components/RolesAndPermissionsAlert/i18n/en-CA.js
index 5e7020f827..fe09ed77de 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/en-CA.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/en-CA.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/en-GB.js b/src/components/RolesAndPermissionsAlert/i18n/en-GB.js
index 5e7020f827..fe09ed77de 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/en-GB.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/en-GB.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/es-419.js b/src/components/RolesAndPermissionsAlert/i18n/es-419.js
index f569697c44..391b0030c1 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/es-419.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/es-419.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/es-ES.js b/src/components/RolesAndPermissionsAlert/i18n/es-ES.js
index f569697c44..391b0030c1 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/es-ES.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/es-ES.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/fr-CA.js b/src/components/RolesAndPermissionsAlert/i18n/fr-CA.js
index 67246b2f60..f489ddc026 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/fr-CA.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/fr-CA.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/fr-FR.js b/src/components/RolesAndPermissionsAlert/i18n/fr-FR.js
index 6bebc06d5b..3d3860cfdf 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/fr-FR.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/fr-FR.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/it-IT.js b/src/components/RolesAndPermissionsAlert/i18n/it-IT.js
index e9c3c82dd9..86ff002197 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/it-IT.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/it-IT.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/ja-JP.js b/src/components/RolesAndPermissionsAlert/i18n/ja-JP.js
index 0823905ecd..03ed92982e 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/ja-JP.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/ja-JP.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/RolesAndPermissionsAlert/i18n/pt-BR.js b/src/components/RolesAndPermissionsAlert/i18n/pt-BR.js
index 5d5dc02f14..4e10c3c46e 100644
--- a/src/components/RolesAndPermissionsAlert/i18n/pt-BR.js
+++ b/src/components/RolesAndPermissionsAlert/i18n/pt-BR.js
@@ -6,3 +6,4 @@ export default {
 };
 
 // @key: @#@"[permissionMessages.invalidTier]"@#@ @source: @#@"Your edition does not support {application} integration. Please contact your account representative to upgrade your {brand} edition."@#@
+// @key: @#@"[permissionMessages.insufficientPrivilege]"@#@ @source: @#@"Insufficient privilege. Please contact your account representative for an upgrade."@#@
diff --git a/src/components/SettingsPanel/i18n/fr-CA.js b/src/components/SettingsPanel/i18n/fr-CA.js
index faf0907dc4..4ea20c2461 100644
--- a/src/components/SettingsPanel/i18n/fr-CA.js
+++ b/src/components/SettingsPanel/i18n/fr-CA.js
@@ -7,7 +7,7 @@ export default {
   clickToDial: 'Cliquer pour composer',
   autoCreateLog: 'Créer automatiquement un journal des appels',
   clickToSMS: 'Cliquez pour envoyer un texto',
-  clickToDialSMS: 'Cliquez pour composer ou envoyer un texto',
+  clickToDialSMS: 'Cliquer pour composer ou envoyer un texto',
   autoCreateSMSLog: 'Créer automatiquement une liste de textos',
   autoLogCalls: 'Liste d\'appels automatique',
   autoLogSMS: 'Liste de textos automatique',

From 617371eb8971945f623a79c48a067a72bbaa81f5 Mon Sep 17 00:00:00 2001
From: Eric Huang <ele828@gmail.com>
Date: Wed, 4 Apr 2018 16:52:46 +0800
Subject: [PATCH 09/14] feat: implement float window dock (#874)

* implement POC of dock mode for float window

* update minimized float window badge

* implement new design of float window badge

* import icon for float window

* update styles & small tweaks

* style issue: use flex to layout svg image

* make new badge compatible with old version
---
 src/lib/AdapterCore/index.js                  | 1100 +++++++++--------
 src/lib/AdapterCore/styles.scss               |    7 +-
 .../getDefaultGlobalStorageReducer.js         |  159 +--
 src/lib/AdapterModuleCore/index.js            |  567 ++++-----
 4 files changed, 941 insertions(+), 892 deletions(-)

diff --git a/src/lib/AdapterCore/index.js b/src/lib/AdapterCore/index.js
index 1af274f4e9..99c2010049 100644
--- a/src/lib/AdapterCore/index.js
+++ b/src/lib/AdapterCore/index.js
@@ -1,530 +1,570 @@
-import classnames from 'classnames';
-import { prefixEnum } from 'ringcentral-integration/lib/Enum';
-import ensureExist from 'ringcentral-integration/lib/ensureExist';
-import debounce from 'ringcentral-integration/lib/debounce';
-import baseMessageTypes from './baseMessageTypes';
-
-const SANDBOX_ATTRIBUTE_VALUE = [
-  'allow-same-origin',
-  'allow-scripts',
-  'allow-forms',
-  'allow-popups',
-].join(' ');
-
-// chrome 63 mandate the declaration of this attribute for getUserMedia to work in iframes
-const ALLOW_ATTRIBUTE_VALUE = [
-  'microphone',
-  // 'camera',
-].join(' ');
-
-export default class AdapterCore {
-  constructor({
-    prefix,
-    styles,
-    container,
-    root = container,
-    messageTypes = baseMessageTypes,
-    defaultDirection = 'left',
-    defaultPadding = 15,
-  }) {
-    this._prefix = prefix;
-    this._messageTypes = prefixEnum({ enumMap: messageTypes, prefix });
-    this._container = this::ensureExist(container, 'container');
-    this._root = root;
-    this._styles = styles;
-    this._defaultDirection = defaultDirection;
-
-    this._padding = defaultPadding;
-    this._minTranslateX = 0;
-    this._translateX = 0;
-    this._translateY = 0;
-    this._appWidth = 0;
-    this._appHeight = 0;
-    this._dragStartPosition = null;
-
-    this._closed = true;
-    this._minimized = true;
-    this._dragging = false;
-    this._hover = false;
-    this._loading = false;
-    this._userStatus = null;
-    this._dndStatus = null;
-    this._telephonyStatus = null;
-  }
-  _onMessage(msg) {
-    if (msg) {
-      switch (msg.type) {
-        case this._messageTypes.syncClosed:
-          this._onSyncClosed(msg.closed);
-          break;
-        case this._messageTypes.syncMinimized:
-          this._onSyncMinimized(msg.minimized);
-          break;
-        case this._messageTypes.syncSize:
-          this._onSyncSize(msg.size);
-          break;
-        case this._messageTypes.syncPresence:
-          this._onPushPresence(msg);
-          break;
-        case this._messageTypes.pushAdapterState:
-          this._onPushAdapterState(msg);
-          break;
-        case this._messageTypes.pushLocale:
-          this._onPushLocale(msg);
-          break;
-        case this._messageTypes.pushRingState:
-          this._onPushRingState(msg);
-          break;
-        default:
-          break;
-      }
-    }
-  }
-  _generateContentDOM() {
-    this._root.innerHTML = `
-      <header class="${this._styles.header}" draggable="false">
-        <div class="${this._styles.presence} ${this._styles.NoPresence}">
-          <div class="${this._styles.presenceBar}">
-          </div>
-        </div>
-        <div class="${this._styles.button} ${this._styles.toggle}">
-          <div class="${this._styles.minimizeIcon}">
-            <div class="${this._styles.minimizeIconBar}"></div>
-          </div>
-        </div>
-        <div class="${this._styles.button} ${this._styles.close}">
-          <div class="${this._styles.closeIcon}">
-            <div></div><div></div>
-          </div>
-        </div>
-        <img class="${this._styles.logo}" draggable="false"></img>
-      </header>
-      <div class="${this._styles.frameContainer}">
-        <iframe class="${this._styles.contentFrame}" sandbox="${SANDBOX_ATTRIBUTE_VALUE}" allow="${ALLOW_ATTRIBUTE_VALUE}" >
-        </iframe>
-      </div>
-    `;
-    this._headerEl = this._root.querySelector(
-      `.${this._styles.header}`
-    );
-    this._logoEl = this._root.querySelector(
-      `.${this._styles.logo}`
-    );
-    this._logoEl.addEventListener('dragstart', () => false);
-
-    this._contentFrameContainerEl = this._root.querySelector(
-      `.${this._styles.frameContainer}`
-    );
-
-    // toggle button
-    this._toggleEl = this._root.querySelector(
-      `.${this._styles.toggle}`
-    );
-    this._toggleEl.addEventListener('click', () => {
-      this.toggleMinimized();
-    });
-
-    // close button
-    this._closeEl = this._root.querySelector(
-      `.${this._styles.close}`
-    );
-    this._closeEl.addEventListener('click', () => {
-      this.setClosed(true);
-    });
-
-    this._presenceEl = this._root.querySelector(
-      `.${this._styles.presence}`
-    );
-    this._presenceEl.addEventListener('click', () => {
-      this._postMessage({
-        type: this._messageTypes.presenceClicked,
-      });
-    });
-    this._contentFrameEl = this._root.querySelector(
-      `.${this._styles.contentFrame}`
-    );
-
-    this._headerEl.addEventListener('mousedown', (e) => {
-      this._dragging = true;
-      this._dragStartPosition = {
-        x: e.clientX,
-        y: e.clientY,
-        translateX: this._translateX,
-        translateY: this._translateY,
-        minTranslateX: this._minTranslateX,
-      };
-      this._renderMainClass();
-    });
-    this._headerEl.addEventListener('mouseup', () => {
-      this._dragging = false;
-      this._renderMainClass();
-    });
-    window.addEventListener('mousemove', this._onWindowMouseMove);
-
-    this._resizeTimeout = null;
-    this._resizeTick = null;
-    window.addEventListener('resize', this._onWindowResize);
-
-    // hover detection for ie
-    this._container.addEventListener('mouseenter', () => {
-      this._hover = true;
-      this._renderMainClass();
-    });
-    this._container.addEventListener('mouseleave', () => {
-      this._hover = false;
-      this._renderMainClass();
-    });
-    if (document.readyState === 'loading') {
-      window.addEventListener('load', () => {
-        document.body.appendChild(this._container);
-      });
-    } else {
-      document.body.appendChild(this._container);
-    }
-
-    this._render();
-  }
-  _onWindowResize = () => {
-    if (this._dragging) { return; }
-    if (this._resizeTimeout) { clearTimeout(this._resizeTimeout); }
-    this._resizeTimeout = setTimeout(() => this._renderRestrictedPosition(), 100);
-    if (!this._resizeTick || Date.now() - this._resizeTick > 50) {
-      this._resizeTick = Date.now();
-      this._renderRestrictedPosition();
-    }
-  }
-  _onWindowMouseMove = (e) => {
-    if (this._dragging) {
-      if (e.buttons === 0) {
-        this._dragging = false;
-        this._renderMainClass();
-        return;
-      }
-      const factor = this._calculateFactor();
-      const delta = {
-        x: e.clientX - this._dragStartPosition.x,
-        y: e.clientY - this._dragStartPosition.y,
-      };
-      if (this._minimized) {
-        this._minTranslateX = this._dragStartPosition.minTranslateX + delta.x * factor;
-      } else {
-        this._translateX = this._dragStartPosition.translateX + delta.x * factor;
-        this._translateY = this._dragStartPosition.translateY + delta.y;
-      }
-      this._syncPosition();
-      this._renderRestrictedPosition();
-    }
-  }
-
-  get messageTransport() {
-    return this._messageTransport;
-  }
-
-  _postMessage(data) {
-    this.messageTransport.postMessage(data);
-  }
-
-  _setLogoUrl(logoUrl) {
-    this._logoUrl = logoUrl;
-    this._logoEl.src = logoUrl;
-    this._logoEl.setAttribute('class', classnames(
-      this._styles.logo,
-      this._logoUrl && this._logoUrl !== '' && this._styles.visible,
-    ));
-  }
-
-  _setAppUrl(appUrl) {
-    this._appUrl = appUrl;
-    if (appUrl) {
-      this.contentFrameEl.src = appUrl;
-    }
-  }
-
-  _onSyncMinimized(minimized) {
-    this._minimized = !!minimized;
-    this._renderMainClass();
-    this.renderAdapterSize();
-    this._renderRestrictedPosition();
-  }
-  setMinimized(minimized) {
-    this._onSyncMinimized(minimized);
-    this._postMessage({
-      type: this._messageTypes.syncMinimized,
-      minimized: this._minimized,
-    });
-  }
-  toggleMinimized() {
-    this.setMinimized(!this._minimized);
-  }
-
-  _calculateMinMaxPosition() {
-    const maximumX = window.innerWidth -
-      (this._minimized ? this._headerEl.clientWidth : this._appWidth) - 2 * this._padding;
-    const maximumY = window.innerHeight -
-      (this._minimized ?
-        this._headerEl.clientHeight :
-        this._headerEl.clientHeight + this._appHeight) - this._padding;
-    return {
-      minimumX: this._padding,
-      minimumY: this._padding,
-      maximumX,
-      maximumY,
-    };
-  }
-
-  _onSyncClosed(closed) {
-    this._closed = !!closed;
-    this._renderMainClass();
-  }
-  setClosed(closed) {
-    this._onSyncClosed(closed);
-    this._postMessage({
-      type: this._messageTypes.syncClosed,
-      closed: this.closed,
-    });
-  }
-  toggleClosed() {
-    this.setClosed(!this.closed);
-  }
-
-  _onSyncSize({ width, height }) {
-    this._appWidth = width;
-    this._appHeight = height;
-    this._contentFrameEl.style.width = `${width}px`;
-    this._contentFrameEl.style.height = `${height}px`;
-    this.renderAdapterSize();
-  }
-  setSize(size) {
-    this._onSyncSize(size);
-    this._postMessage({
-      type: this._messageTypes.syncSize,
-      size,
-    });
-  }
-
-  _onPushRingState({ ringing }) {
-    this._ringing = ringing;
-    this._render();
-  }
-
-  _onPushPresence({ dndStatus, userStatus, telephonyStatus }) {
-    if (
-      dndStatus !== this._dndStatus ||
-      userStatus !== this._userStatus ||
-      telephonyStatus !== this._telephonyStatus
-    ) {
-      this._dndStatus = dndStatus;
-      this._userStatus = userStatus;
-      this._telephonyStatus = telephonyStatus;
-      this.renderPresence();
-    }
-  }
-  _onPushLocale({
-    locale,
-    strings = {},
-  }) {
-    this._locale = locale;
-    this._strings = strings;
-  }
-
-  _debouncedPostMessage = debounce(this._postMessage, 200)
-
-  _syncPosition() {
-    this._debouncedPostMessage.call(this, {
-      type: this._messageTypes.syncPosition,
-      position: {
-        translateX: this._translateX,
-        translateY: this._translateY,
-        minTranslateX: this._minTranslateX,
-      },
-    });
-  }
-  _onPushAdapterState({
-    size: {
-      width,
-      height
-    },
-    minimized,
-    closed,
-    position: { translateX, translateY, minTranslateX },
-    dndStatus,
-    userStatus,
-    telephonyStatus,
-  }) {
-    this._minimized = minimized;
-    this._closed = closed;
-    if (!this._dragging) {
-      this._translateX = translateX;
-      this._translateY = translateY;
-      this._minTranslateX = minTranslateX;
-    }
-    this._appWidth = width;
-    this._appHeight = height;
-    this._dndStatus = dndStatus;
-    this._userStatus = userStatus;
-    this._telephonyStatus = telephonyStatus;
-    this._loading = false;
-    this._render();
-  }
-  _calculateFactor() {
-    return this._defaultDirection === 'right' ?
-      -1 :
-      1;
-  }
-  renderPosition() {
-    const factor = this._calculateFactor();
-    if (this._minimized) {
-      this._container.setAttribute(
-        'style',
-        `transform: translate( ${this._minTranslateX * factor}px, ${-this._padding}px)!important;`
-      );
-    } else {
-      this._container.setAttribute(
-        'style',
-        `transform: translate( ${this._translateX * factor}px, ${this._translateY}px)!important;`
-      );
-    }
-  }
-  _renderRestrictedPosition() {
-    const {
-      minimumX,
-      minimumY,
-      maximumX,
-      maximumY,
-    } = this._calculateMinMaxPosition();
-
-    if (this._minimized) {
-      const newMinTranslateX = Math.max(Math.min(this._minTranslateX, maximumX), minimumX);
-      if (newMinTranslateX !== this._minTranslateX) {
-        this._minTranslateX = newMinTranslateX;
-      }
-    } else {
-      const newTranslateX = Math.max(Math.min(this._translateX, maximumX), minimumX);
-      const newTranslateY = Math.max(Math.min(this._translateY, -minimumY), -maximumY);
-      if (this._translateX !== newTranslateX || this._translateY !== newTranslateY) {
-        this._translateX = newTranslateX;
-        this._translateY = newTranslateY;
-      }
-    }
-    this.renderPosition();
-  }
-  renderAdapterSize() {
-    if (this._minimized) {
-      this._contentFrameContainerEl.style.width = 0;
-      this._contentFrameContainerEl.style.height = 0;
-    } else {
-      this._contentFrameContainerEl.style.width = `${this._appWidth}px`;
-      this._contentFrameContainerEl.style.height = `${this._appHeight}px`;
-      this._contentFrameEl.style.width = `${this._appWidth}px`;
-      this._contentFrameEl.style.height = `${this._appHeight}px`;
-    }
-  }
-  _renderMainClass() {
-    this._container.setAttribute('class', classnames(
-      this._styles.root,
-      this._styles[this._defaultDirection],
-      this._closed && this._styles.closed,
-      this._minimized && this._styles.minimized,
-      this._dragging && this._styles.dragging,
-      this._hover && this._styles.hover,
-      this._loading && this._styles.loading,
-    ));
-    this._headerEl.setAttribute('class', classnames(
-      this._styles.header,
-      this._minimized && this._styles.minimized,
-      this._ringing && this._styles.ringing,
-    ));
-  }
-  renderPresence() {
-    this._presenceEl.setAttribute('class', classnames(
-      this._minimized && this._styles.minimized,
-      this._styles.presence,
-      this._userStatus && this._styles[this._userStatus],
-      this._dndStatus && this._styles[this._dndStatus],
-    ));
-  }
-  _render() {
-    this._renderMainClass();
-    this.renderPresence();
-    this.renderAdapterSize();
-    this._renderRestrictedPosition();
-  }
-
-  dispose() {
-    // TODO clean up
-    window.removeEventListener('mousemove', this._onWindowMouseMove);
-    window.removeEventListener('resize', this._onWindowResize);
-    if (this._resizeTimeout) {
-      clearTimeout(this._resizeTick);
-    }
-    this._container.remove();
-  }
-
-  get container() {
-    return this._container;
-  }
-  get root() {
-    return this._root;
-  }
-  get headerEl() {
-    return this._headerEl;
-  }
-  get contentFrameContainerEl() {
-    return this._contentFrameContainerEl;
-  }
-  get toggleEl() {
-    return this._toggleEl;
-  }
-  get closeEl() {
-    return this._closeEl;
-  }
-  get presenceEl() {
-    return this._presenceEl;
-  }
-  get contentFrameEl() {
-    return this._contentFrameEl;
-  }
-  get minTranslateX() {
-    return this._minTranslateX;
-  }
-  get translateX() {
-    return this._translateX;
-  }
-  get translateY() {
-    return this._translateY;
-  }
-  get appWidth() {
-    return this._appWidth;
-  }
-  get appHeight() {
-    return this._appHeight;
-  }
-  get dragStartPosition() {
-    return this._dragStartPosition;
-  }
-
-  get closed() {
-    return this._closed;
-  }
-  get minimized() {
-    return this._minimized;
-  }
-  get dragging() {
-    return this._dragging;
-  }
-  get hover() {
-    return this._hover;
-  }
-  get loading() {
-    return this._loading;
-  }
-  get userStatus() {
-    return this._userStatus;
-  }
-  get dndStatus() {
-    return this._dndStatus;
-  }
-  get ringing() {
-    return this._ringing;
-  }
-}
+import classnames from 'classnames';
+import { prefixEnum } from 'ringcentral-integration/lib/Enum';
+import ensureExist from 'ringcentral-integration/lib/ensureExist';
+import debounce from 'ringcentral-integration/lib/debounce';
+import baseMessageTypes from './baseMessageTypes';
+
+const SANDBOX_ATTRIBUTE_VALUE = [
+  'allow-same-origin',
+  'allow-scripts',
+  'allow-forms',
+  'allow-popups',
+].join(' ');
+
+// chrome 63 mandate the declaration of this attribute for getUserMedia to work in iframes
+const ALLOW_ATTRIBUTE_VALUE = [
+  'microphone',
+  // 'camera',
+].join(' ');
+
+export default class AdapterCore {
+  constructor({
+    prefix,
+    styles,
+    container,
+    root = container,
+    messageTypes = baseMessageTypes,
+    defaultDirection = 'left',
+    defaultPadding = 15,
+  }) {
+    this._prefix = prefix;
+    this._messageTypes = prefixEnum({ enumMap: messageTypes, prefix });
+    this._container = this::ensureExist(container, 'container');
+    this._root = root;
+    this._styles = styles;
+    this._defaultDirection = defaultDirection;
+
+    this._padding = defaultPadding;
+    this._minTranslateX = 0;
+    this._minTranslateY = 0;
+    this._translateX = 0;
+    this._translateY = 0;
+    this._appWidth = 0;
+    this._appHeight = 0;
+    this._dragStartPosition = null;
+
+    this._closed = true;
+    this._minimized = true;
+    this._dragging = false;
+    this._hover = false;
+    this._hoverHeader = false;
+    this._loading = true;
+    this._userStatus = null;
+    this._dndStatus = null;
+    this._telephonyStatus = null;
+  }
+  _onMessage(msg) {
+    if (msg) {
+      switch (msg.type) {
+        case this._messageTypes.syncClosed:
+          this._onSyncClosed(msg.closed);
+          break;
+        case this._messageTypes.syncMinimized:
+          this._onSyncMinimized(msg.minimized);
+          break;
+        case this._messageTypes.syncSize:
+          this._onSyncSize(msg.size);
+          break;
+        case this._messageTypes.syncPresence:
+          this._onPushPresence(msg);
+          break;
+        case this._messageTypes.pushAdapterState:
+          this._onPushAdapterState(msg);
+          break;
+        case this._messageTypes.pushLocale:
+          this._onPushLocale(msg);
+          break;
+        case this._messageTypes.pushRingState:
+          this._onPushRingState(msg);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  _getContentDOM(sanboxAttributeValue, allowAttributeValue) {
+    return `
+      <header class="${this._styles.header}" draggable="false">
+        <div class="${this._styles.presence} ${this._styles.NoPresence}">
+          <div class="${this._styles.presenceBar}">
+          </div>
+        </div>
+        <div class="${this._styles.button} ${this._styles.toggle}">
+          <div class="${this._styles.minimizeIcon}">
+            <div class="${this._styles.minimizeIconBar}"></div>
+          </div>
+        </div>
+        <div class="${this._styles.button} ${this._styles.close}">
+          <div class="${this._styles.closeIcon}">
+            <div></div><div></div>
+          </div>
+        </div>
+        <img class="${this._styles.logo}" draggable="false"></img>
+      </header>
+      <div class="${this._styles.frameContainer}">
+        <iframe class="${this._styles.contentFrame}" sandbox="${sanboxAttributeValue}" allow="${allowAttributeValue}" >
+        </iframe>
+      </div>`;
+  }
+
+  _generateContentDOM() {
+    this._root.innerHTML = this._getContentDOM(SANDBOX_ATTRIBUTE_VALUE, ALLOW_ATTRIBUTE_VALUE);
+    this._headerEl = this._root.querySelector(
+      `.${this._styles.header}`
+    );
+    this._logoEl = this._root.querySelector(
+      `.${this._styles.logo}`
+    );
+    this._logoEl.addEventListener('dragstart', () => false);
+
+    this._contentFrameContainerEl = this._root.querySelector(
+      `.${this._styles.frameContainer}`
+    );
+
+    // toggle button
+    this._toggleEl = this._root.querySelector(
+      `.${this._styles.toggle}`
+    );
+    this._toggleEl.addEventListener('click', (evt) => {
+      evt.stopPropagation();
+      this.toggleMinimized();
+    });
+
+    // close button
+    this._closeEl = this._root.querySelector(
+      `.${this._styles.close}`
+    );
+    this._closeEl.addEventListener('click', () => {
+      this.setClosed(true);
+    });
+
+    this._presenceEl = this._root.querySelector(
+      `.${this._styles.presence}`
+    );
+    this._presenceEl.addEventListener('click', (evt) => {
+      evt.stopPropagation();
+      this._postMessage({
+        type: this._messageTypes.presenceClicked,
+      });
+    });
+    this._contentFrameEl = this._root.querySelector(
+      `.${this._styles.contentFrame}`
+    );
+
+    this._headerEl.addEventListener('mousedown', (e) => {
+      this._dragging = true;
+      this._isClick = true;
+      this._dragStartPosition = {
+        x: e.clientX,
+        y: e.clientY,
+        translateX: this._translateX,
+        translateY: this._translateY,
+        minTranslateX: this._minTranslateX,
+        minTranslateY: this._minTranslateY,
+      };
+      this._renderMainClass();
+    });
+    this._headerEl.addEventListener('mouseup', () => {
+      this._dragging = false;
+      this._renderMainClass();
+    });
+    window.addEventListener('mousemove', this._onWindowMouseMove);
+
+    this._headerEl.addEventListener('mouseenter', () => {
+      if (!this._minimized) return;
+      this._hoverHeader = true;
+      this._renderMainClass();
+    });
+    this._headerEl.addEventListener('mouseleave', () => {
+      this._hoverHeader = false;
+      this._renderMainClass();
+    });
+
+    this._isClick = true;
+    this._headerEl.addEventListener('click', (evt) => {
+      if (!this._isClick) return;
+      this._onHeaderClicked(evt);
+    });
+
+    this._resizeTimeout = null;
+    this._resizeTick = null;
+    window.addEventListener('resize', this._onWindowResize);
+
+    // hover detection for ie
+    this._container.addEventListener('mouseenter', () => {
+      this._hover = true;
+      this._renderMainClass();
+    });
+    this._container.addEventListener('mouseleave', () => {
+      this._hover = false;
+      this._renderMainClass();
+    });
+    if (document.readyState === 'loading') {
+      window.addEventListener('load', () => {
+        document.body.appendChild(this._container);
+      });
+    } else {
+      document.body.appendChild(this._container);
+    }
+
+    if (typeof this._beforeRender === 'function') {
+      this._beforeRender();
+    }
+    this._render();
+  }
+  _onWindowResize = () => {
+    if (this._dragging) { return; }
+    if (this._resizeTimeout) { clearTimeout(this._resizeTimeout); }
+    this._resizeTimeout = setTimeout(() => this._renderRestrictedPosition(), 100);
+    if (!this._resizeTick || Date.now() - this._resizeTick > 50) {
+      this._resizeTick = Date.now();
+      this._renderRestrictedPosition();
+    }
+  }
+  _onWindowMouseMove = (e) => {
+    if (this._dragging) {
+      if (e.buttons === 0) {
+        this._dragging = false;
+        this._renderMainClass();
+        return;
+      }
+      const factor = this._calculateFactor();
+      const delta = {
+        x: e.clientX - this._dragStartPosition.x,
+        y: e.clientY - this._dragStartPosition.y,
+      };
+      if (this._minimized) {
+        this._minTranslateX = this._dragStartPosition.minTranslateX + delta.x * factor;
+        this._minTranslateY = this._dragStartPosition.minTranslateY + delta.y;
+      } else {
+        this._translateX = this._dragStartPosition.translateX + delta.x * factor;
+        this._translateY = this._dragStartPosition.translateY + delta.y;
+      }
+      if (delta.x !== 0 || delta.y !== 0) this._isClick = false;
+      this._syncPosition();
+      this._renderRestrictedPosition();
+    }
+  }
+
+  get messageTransport() {
+    return this._messageTransport;
+  }
+
+  _postMessage(data) {
+    this.messageTransport.postMessage(data);
+  }
+
+  _setLogoUrl(logoUrl) {
+    this._logoUrl = logoUrl;
+    this._logoEl.src = logoUrl;
+    this._logoEl.setAttribute('class', classnames(
+      this._styles.logo,
+      this._logoUrl && this._logoUrl !== '' && this._styles.visible,
+    ));
+  }
+
+  _setAppUrl(appUrl) {
+    this._appUrl = appUrl;
+    if (appUrl) {
+      this.contentFrameEl.src = appUrl;
+    }
+  }
+
+  _onSyncMinimized(minimized) {
+    this._minimized = !!minimized;
+    this._renderMainClass();
+    this.renderAdapterSize();
+    this._renderRestrictedPosition();
+  }
+  setMinimized(minimized) {
+    this._onSyncMinimized(minimized);
+    this._postMessage({
+      type: this._messageTypes.syncMinimized,
+      minimized: this._minimized,
+    });
+  }
+  toggleMinimized() {
+    this.setMinimized(!this._minimized);
+  }
+
+  _calculateMinMaxPosition() {
+    const maximumX = window.innerWidth -
+      (this._minimized ? this._headerEl.clientWidth : this._appWidth) - 2 * this._padding;
+    const maximumY = window.innerHeight -
+      (this._minimized ?
+        this._headerEl.clientHeight :
+        this._headerEl.clientHeight + this._appHeight) - this._padding;
+    return {
+      minimumX: this._padding,
+      minimumY: this._padding,
+      maximumX,
+      maximumY,
+    };
+  }
+
+  _onSyncClosed(closed) {
+    this._closed = !!closed;
+    this._renderMainClass();
+  }
+  setClosed(closed) {
+    this._onSyncClosed(closed);
+    this._postMessage({
+      type: this._messageTypes.syncClosed,
+      closed: this.closed,
+    });
+  }
+  toggleClosed() {
+    this.setClosed(!this.closed);
+  }
+
+  _onSyncSize({ width, height }) {
+    this._appWidth = width;
+    this._appHeight = height;
+    this._contentFrameEl.style.width = `${width}px`;
+    this._contentFrameEl.style.height = `${height}px`;
+    this.renderAdapterSize();
+  }
+  setSize(size) {
+    this._onSyncSize(size);
+    this._postMessage({
+      type: this._messageTypes.syncSize,
+      size,
+    });
+  }
+
+  _onPushRingState({ ringing }) {
+    this._ringing = ringing;
+    this._render();
+  }
+
+  _onPushPresence({ dndStatus, userStatus, telephonyStatus }) {
+    if (
+      dndStatus !== this._dndStatus ||
+      userStatus !== this._userStatus ||
+      telephonyStatus !== this._telephonyStatus
+    ) {
+      this._dndStatus = dndStatus;
+      this._userStatus = userStatus;
+      this._telephonyStatus = telephonyStatus;
+      this.renderPresence();
+    }
+  }
+  _onPushLocale({
+    locale,
+    strings = {},
+  }) {
+    this._locale = locale;
+    this._strings = strings;
+  }
+
+  _debouncedPostMessage = debounce(this._postMessage, 200)
+
+  _syncPosition() {
+    this._debouncedPostMessage.call(this, {
+      type: this._messageTypes.syncPosition,
+      position: {
+        translateX: this._translateX,
+        translateY: this._translateY,
+        minTranslateX: this._minTranslateX,
+        minTranslateY: this._minTranslateY,
+      },
+    });
+  }
+  _onPushAdapterState({
+    size: {
+      width,
+      height
+    },
+    minimized,
+    closed,
+    position: { translateX, translateY, minTranslateX, minTranslateY },
+    dndStatus,
+    userStatus,
+    telephonyStatus,
+  }) {
+    this._minimized = minimized;
+    this._closed = closed;
+    if (!this._dragging) {
+      this._translateX = translateX;
+      this._translateY = translateY;
+      this._minTranslateX = minTranslateX;
+      this._minTranslateY = minTranslateY;
+    }
+    this._appWidth = width;
+    this._appHeight = height;
+    this._dndStatus = dndStatus;
+    this._userStatus = userStatus;
+    this._telephonyStatus = telephonyStatus;
+    this._loading = false;
+    this._render();
+  }
+  _calculateFactor() {
+    return this._defaultDirection === 'right' ?
+      -1 :
+      1;
+  }
+  renderPosition() {
+    const factor = this._calculateFactor();
+    if (this._minimized) {
+      this._container.setAttribute(
+        'style',
+        `transform: translate( ${this._minTranslateX * factor}px, ${-this._padding}px)!important;`
+      );
+    } else {
+      this._container.setAttribute(
+        'style',
+        `transform: translate( ${this._translateX * factor}px, ${this._translateY}px)!important;`
+      );
+    }
+  }
+  _renderRestrictedPosition() {
+    const {
+      minimumX,
+      minimumY,
+      maximumX,
+      maximumY,
+    } = this._calculateMinMaxPosition();
+
+    if (this._minimized) {
+      const newMinTranslateX = Math.max(Math.min(this._minTranslateX, maximumX), minimumX);
+      if (newMinTranslateX !== this._minTranslateX) {
+        this._minTranslateX = newMinTranslateX;
+      }
+      const newMinTranslateY = Math.max(Math.min(this._minTranslateY, -minimumY), -maximumY);
+      if (newMinTranslateY !== this._minTranslateY) {
+        this._minTranslateY = newMinTranslateY;
+      }
+    } else {
+      const newTranslateX = Math.max(Math.min(this._translateX, maximumX), minimumX);
+      const newTranslateY = Math.max(Math.min(this._translateY, -minimumY), -maximumY);
+      if (this._translateX !== newTranslateX || this._translateY !== newTranslateY) {
+        this._translateX = newTranslateX;
+        this._translateY = newTranslateY;
+      }
+    }
+    this.renderPosition();
+  }
+  renderAdapterSize() {
+    if (this._minimized) {
+      this._contentFrameContainerEl.style.width = 0;
+      this._contentFrameContainerEl.style.height = 0;
+    } else {
+      this._contentFrameContainerEl.style.width = `${this._appWidth}px`;
+      this._contentFrameContainerEl.style.height = `${this._appHeight}px`;
+      this._contentFrameEl.style.width = `${this._appWidth}px`;
+      this._contentFrameEl.style.height = `${this._appHeight}px`;
+    }
+  }
+  _renderMainClass() {
+    this._container.setAttribute('class', classnames(
+      this._styles.root,
+      this._styles[this._defaultDirection],
+      this._closed && this._styles.closed,
+      this._minimized && this._styles.minimized,
+      this._dragging && this._styles.dragging,
+      this._hover && this._styles.hover,
+      this._loading && this._styles.loading,
+    ));
+    this._headerEl.setAttribute('class', classnames(
+      this._styles.header,
+      this._minimized && this._styles.minimized,
+      this._ringing && this._styles.ringing,
+    ));
+  }
+  renderPresence() {
+    this._presenceEl.setAttribute('class', classnames(
+      this._minimized && this._styles.minimized,
+      this._styles.presence,
+      this._userStatus && this._styles[this._userStatus],
+      this._dndStatus && this._styles[this._dndStatus],
+    ));
+  }
+  _render() {
+    this.renderPresence();
+    this.renderAdapterSize();
+    this._renderRestrictedPosition();
+    this._renderMainClass();
+  }
+
+  dispose() {
+    // TODO clean up
+    window.removeEventListener('mousemove', this._onWindowMouseMove);
+    window.removeEventListener('resize', this._onWindowResize);
+    if (this._resizeTimeout) {
+      clearTimeout(this._resizeTick);
+    }
+    this._container.remove();
+  }
+
+  get container() {
+    return this._container;
+  }
+  get root() {
+    return this._root;
+  }
+  get headerEl() {
+    return this._headerEl;
+  }
+  get contentFrameContainerEl() {
+    return this._contentFrameContainerEl;
+  }
+  get toggleEl() {
+    return this._toggleEl;
+  }
+  get closeEl() {
+    return this._closeEl;
+  }
+  get presenceEl() {
+    return this._presenceEl;
+  }
+  get contentFrameEl() {
+    return this._contentFrameEl;
+  }
+  get minTranslateX() {
+    return this._minTranslateX;
+  }
+  get minTranslateY() {
+    return this._minTranslateY;
+  }
+  get translateX() {
+    return this._translateX;
+  }
+  get translateY() {
+    return this._translateY;
+  }
+  get appWidth() {
+    return this._appWidth;
+  }
+  get appHeight() {
+    return this._appHeight;
+  }
+  get dragStartPosition() {
+    return this._dragStartPosition;
+  }
+
+  get closed() {
+    return this._closed;
+  }
+  get minimized() {
+    return this._minimized;
+  }
+  get dragging() {
+    return this._dragging;
+  }
+  get hover() {
+    return this._hover;
+  }
+  get loading() {
+    return this._loading;
+  }
+  get userStatus() {
+    return this._userStatus;
+  }
+  get dndStatus() {
+    return this._dndStatus;
+  }
+  get ringing() {
+    return this._ringing;
+  }
+}
diff --git a/src/lib/AdapterCore/styles.scss b/src/lib/AdapterCore/styles.scss
index 0ed30f0bb6..da28c26947 100644
--- a/src/lib/AdapterCore/styles.scss
+++ b/src/lib/AdapterCore/styles.scss
@@ -42,12 +42,15 @@
   transition: opacity 0.1s 0s linear;
 }
 
-.root.closed,
-.root.loading {
+.root.closed {
   visibility: hidden;
   opacity: 0;
 }
 
+.root.loading {
+  display: none;
+}
+
 .header {
   @include no-select;
   position: relative;
diff --git a/src/lib/AdapterModuleCore/getDefaultGlobalStorageReducer.js b/src/lib/AdapterModuleCore/getDefaultGlobalStorageReducer.js
index ae4158c7e1..f2edd8f45c 100644
--- a/src/lib/AdapterModuleCore/getDefaultGlobalStorageReducer.js
+++ b/src/lib/AdapterModuleCore/getDefaultGlobalStorageReducer.js
@@ -1,78 +1,81 @@
-import { combineReducers } from 'redux';
-
-export function getClosedReducer(types) {
-  return (state = false, { type, closed }) => {
-    switch (type) {
-      case types.syncClosed:
-        return !!closed;
-      case types.showAdapter:
-        return false;
-      default:
-        return state;
-    }
-  };
-}
-
-export function getMinimizedReducer(types) {
-  return (state = false, { type, minimized }) => {
-    switch (type) {
-      case types.syncMinimized:
-        return !!minimized;
-      case types.showAdapter:
-        return false;
-      default:
-        return state;
-    }
-  };
-}
-
-
-export function getSizeReducer(types) {
-  return (state = { width: 300, height: 500 }, { type, size = {} }) => {
-    switch (type) {
-      case types.syncSize:
-        return {
-          ...state,
-          ...size,
-        };
-      default:
-        return state;
-    }
-  };
-}
-
-export function getPositionReducer(types) {
-  return (
-    state = {
-      translateX: null,
-      translateY: null,
-      minTranslateX: null,
-    },
-    {
-      type,
-      position: {
-        translateX = state.translateX,
-        translateY = state.translateY,
-        minTranslateX = state.minTranslateX,
-      } = {},
-    },
-  ) => {
-    if (type === types.syncPosition) {
-      return {
-        translateX,
-        translateY,
-        minTranslateX,
-      };
-    }
-    return state;
-  };
-}
-
-export default function getDefaultGlobalStorageReducer(types) {
-  return combineReducers({
-    closed: getClosedReducer(types),
-    minimized: getMinimizedReducer(types),
-    size: getSizeReducer(types),
-    position: getPositionReducer(types),
-  });
-}
+import { combineReducers } from 'redux';
+
+export function getClosedReducer(types) {
+  return (state = false, { type, closed }) => {
+    switch (type) {
+      case types.syncClosed:
+        return !!closed;
+      case types.showAdapter:
+        return false;
+      default:
+        return state;
+    }
+  };
+}
+
+export function getMinimizedReducer(types) {
+  return (state = false, { type, minimized }) => {
+    switch (type) {
+      case types.syncMinimized:
+        return !!minimized;
+      case types.showAdapter:
+        return false;
+      default:
+        return state;
+    }
+  };
+}
+
+
+export function getSizeReducer(types) {
+  return (state = { width: 300, height: 500 }, { type, size = {} }) => {
+    switch (type) {
+      case types.syncSize:
+        return {
+          ...state,
+          ...size,
+        };
+      default:
+        return state;
+    }
+  };
+}
+
+export function getPositionReducer(types) {
+  return (
+    state = {
+      translateX: null,
+      translateY: null,
+      minTranslateX: null,
+      minTranslateY: null,
+    },
+    {
+      type,
+      position: {
+        translateX = state.translateX,
+        translateY = state.translateY,
+        minTranslateX = state.minTranslateX,
+        minTranslateY = state.minTranslateY,
+      } = {},
+    },
+  ) => {
+    if (type === types.syncPosition) {
+      return {
+        translateX,
+        translateY,
+        minTranslateX,
+        minTranslateY,
+      };
+    }
+    return state;
+  };
+}
+
+export default function getDefaultGlobalStorageReducer(types) {
+  return combineReducers({
+    closed: getClosedReducer(types),
+    minimized: getMinimizedReducer(types),
+    size: getSizeReducer(types),
+    position: getPositionReducer(types),
+  });
+}
diff --git a/src/lib/AdapterModuleCore/index.js b/src/lib/AdapterModuleCore/index.js
index a4f3f4f0c5..3c2bf6ca0f 100644
--- a/src/lib/AdapterModuleCore/index.js
+++ b/src/lib/AdapterModuleCore/index.js
@@ -1,282 +1,285 @@
-import RcModule from 'ringcentral-integration/lib/RcModule';
-import proxify from 'ringcentral-integration/lib/proxy/proxify';
-import ensureExist from 'ringcentral-integration/lib/ensureExist';
-import moduleStatuses from 'ringcentral-integration/enums/moduleStatuses';
-import callingModes from 'ringcentral-integration/modules/CallingSettings/callingModes';
-import { prefixEnum } from 'ringcentral-integration/lib/Enum';
-import baseMessageTypes from '../AdapterCore/baseMessageTypes';
-import baseActionTypes from './baseActionTypes';
-import getDefaultGlobalStorageReducer from './getDefaultGlobalStorageReducer';
-import IframeMessageTransport from '../IframeMessageTransport';
-
-
-export default class AdapterModuleCore extends RcModule {
-  constructor({
-    prefix,
-    storageKey = 'adapterCore',
-    messageTypes = baseMessageTypes,
-    actionTypes = baseActionTypes,
-    webphone,
-    presence,
-    locale,
-    callingSettings,
-    routerInteraction,
-    globalStorage,
-    getGlobalStorageReducer = getDefaultGlobalStorageReducer,
-    messageTransport = new IframeMessageTransport({
-      targetWindow: window.parent,
-    }),
-    ...options
-  }) {
-    super({
-      prefix,
-      actionTypes,
-      ...options,
-    });
-
-    this._messageTypes = prefixEnum({ enumMap: messageTypes, prefix });
-    this._locale = this::ensureExist(locale, 'locale');
-    this._messageTransport = this::ensureExist(messageTransport, 'messageTransport');
-    this._presence = this::ensureExist(presence, 'presence');
-    this._router = this::ensureExist(routerInteraction, 'routerInteraction');
-    this._callingSettings = callingSettings;
-    this._webphone = webphone;
-
-    this._storageKey = storageKey;
-    this._globalStorage = this::ensureExist(globalStorage, 'globalStorage');
-
-    this._globalStorage.registerReducer({
-      key: this._storageKey,
-      reducer: getGlobalStorageReducer(this.actionTypes),
-    });
-  }
-  initialize() {
-    this._messageTransport.addListener(msg => this._onMessage(msg));
-    this.store.subscribe(() => this._onStateChange());
-  }
-  _shouldInit() {
-    return this.pending &&
-      this._globalStorage.ready &&
-      this._locale.ready &&
-      this._router.ready;
-  }
-  _onStateChange() {
-    if (this._shouldInit()) {
-      this.store.dispatch({
-        type: this.actionTypes.init,
-      });
-      this._pushAdapterState();
-      this._pushRingState();
-      this.store.dispatch({
-        type: this.actionTypes.initSuccess,
-      });
-    }
-    this._pushPresence();
-    this._pushLocale();
-    this._pushRingState();
-  }
-  _onMessage(msg) {
-    if (msg) {
-      switch (msg.type) {
-        case this._messageTypes.syncClosed:
-          this._syncClosed(msg.closed);
-          break;
-        case this._messageTypes.syncMinimized:
-          this._syncMinimized(msg.minimized);
-          break;
-        case this._messageTypes.syncSize:
-          this._syncSize(msg.size);
-          break;
-        case this._messageTypes.syncPosition:
-          this._syncPosition(msg.position);
-          break;
-        case this._messageTypes.presenceClicked:
-          this._onPresenceClicked();
-          break;
-        default:
-          break;
-      }
-    }
-  }
-  @proxify
-  async _syncClosed(closed) {
-    this.store.dispatch({
-      type: this.actionTypes.syncClosed,
-      closed,
-    });
-  }
-  @proxify
-  async _syncMinimized(minimized) {
-    this.store.dispatch({
-      type: this.actionTypes.syncMinimized,
-      minimized,
-    });
-  }
-  @proxify
-  async _syncSize(size = {}) {
-    this.store.dispatch({
-      type: this.acitonTypes.syncSize,
-      size,
-    });
-  }
-  @proxify
-  async _syncPosition(position = {}) {
-    this.store.dispatch({
-      type: this.actionTypes.syncPosition,
-      position,
-    });
-  }
-
-  _pushRingState() {
-    if (!this.ready || !this._callingSettings) return;
-
-    const { callingMode } = this._callingSettings;
-    if (callingMode === callingModes.webphone) {
-      const webphone = this._webphone;
-      if (!webphone) {
-        throw new Error('webphone is a required dependency for monitoring WebRTC call');
-      }
-      if (webphone.ringSession && webphone.ringSessionId !== this._ringSessionId) {
-        this._ringSessionId = webphone.ringSessionId;
-        this._postMessage({
-          type: this._messageTypes.pushRingState,
-          ringing: true
-        });
-      }
-      // Check if ringing is over
-      if (this._ringSessionId) {
-        const ringingSessions = webphone.sessions.filter(session =>
-          session.callStatus === 'webphone-session-connecting' && session.direction === 'Inbound'
-        );
-        if (ringingSessions.length <= 0) {
-          this._postMessage({
-            type: this._messageTypes.pushRingState,
-            ringing: false
-          });
-          this._ringSessionId = null;
-        }
-      }
-    } else {
-      const status = this._presence.telephonyStatus;
-      if (this._presence.telephonyStatus !== this._telephonyStatus) {
-        this._postMessage({
-          type: this._messageTypes.pushRingState,
-          ringing: status === 'Ringing'
-        });
-        this._telephonyStatus = status;
-      }
-    }
-  }
-
-  _pushPresence() {
-    if (
-      this.ready &&
-      (
-        this._lastDndStatus !== this._presence.dndStatus ||
-        this._lastUserStatus !== this._presence.userStatus ||
-        this._lastTelephonyStatus !== this._presence.telephonyStatus
-      )
-    ) {
-      this._lastDndStatus = this._presence.dndStatus;
-      this._lastUserStatus = this._presence.userStatus;
-      this._lastTelephonyStatus = this._presence.telephonyStatus;
-      this._postMessage({
-        type: this._messageTypes.pushPresence,
-        telephonyStatus: this._presence.telephonyStatus,
-        userStatus: this._presence.userStatus,
-        dndStatus: this._presence.dndStatus,
-      });
-    }
-  }
-
-  get localeStrings() {
-    return {};
-  }
-
-  _pushLocale() {
-    if (
-      this.ready &&
-      this._lastLocale !== this._locale.currentLocale
-    ) {
-      this._lastLocale = this._locale.currentLocale;
-      this._postMessage({
-        type: this._messageTypes.pushLocale,
-        locale: this._locale.currentLocale,
-        strings: this._localeStrings,
-      });
-    }
-  }
-
-  _postMessage(data) {
-    this._messageTransport.postMessage(data);
-  }
-
-  _pushAdapterState() {
-    if (
-      this.ready &&
-      (
-        this._lastDndStatus !== this._presence.dndStatus ||
-        this._lastUserStatus !== this._presence.userStatus ||
-        this._lastTelephonyStatus !== this._presence.telephonyStatus ||
-        this._lastClosed !== this.closed ||
-        this._lastMinimized !== this.minimized ||
-        this._lastPosition !== this.position
-      )
-    ) {
-      this._lastDndStatus = this._presence.dndStatus;
-      this._lastUserStatus = this._presence.userStatus;
-      this._lastTelephonyStatus = this._presence.telephonyStatus;
-      this._lastClosed = this.closed;
-      this._lastMinimized = this.minimized;
-      this._lastPosition = this.position;
-      this._postMessage({
-        type: this._messageTypes.pushAdapterState,
-        size: this.size,
-        minimized: this.minimized,
-        closed: this.closed,
-        position: this.position,
-        telephonyStatus: this._presence.telephonyStatus,
-        userStatus: this._presence.userStatus,
-        dndStatus: this._presence.dndStatus,
-      });
-    }
-  }
-  @proxify
-  async _onPresenceClicked() {
-    if (this.minimized) {
-      this.showAdapter();
-    }
-    this._router.push('/settings?showPresenceSettings=1');
-  }
-
-  @proxify
-  async showAdapter() {
-    this.store.dispatch({
-      type: this.actionTypes.showAdapter,
-    });
-  }
-
-  get status() {
-    return this.state.status;
-  }
-  get ready() {
-    return this.status === moduleStatuses.ready;
-  }
-
-  get pending() {
-    return this.status === moduleStatuses.pending;
-  }
-
-  get minimized() {
-    return this._globalStorage.getItem(this._storageKey).minimized;
-  }
-  get closed() {
-    return this._globalStorage.getItem(this._storageKey).closed;
-  }
-  get size() {
-    return this._globalStorage.getItem(this._storageKey).size;
-  }
-  get position() {
-    return this._globalStorage.getItem(this._storageKey).position;
-  }
-}
+import RcModule from 'ringcentral-integration/lib/RcModule';
+import proxify from 'ringcentral-integration/lib/proxy/proxify';
+import ensureExist from 'ringcentral-integration/lib/ensureExist';
+import moduleStatuses from 'ringcentral-integration/enums/moduleStatuses';
+import callingModes from 'ringcentral-integration/modules/CallingSettings/callingModes';
+import { prefixEnum } from 'ringcentral-integration/lib/Enum';
+import baseMessageTypes from '../AdapterCore/baseMessageTypes';
+import baseActionTypes from './baseActionTypes';
+import getDefaultGlobalStorageReducer from './getDefaultGlobalStorageReducer';
+import IframeMessageTransport from '../IframeMessageTransport';
+
+
+export default class AdapterModuleCore extends RcModule {
+  constructor({
+    prefix,
+    storageKey = 'adapterCore',
+    messageTypes = baseMessageTypes,
+    actionTypes = baseActionTypes,
+    webphone,
+    presence,
+    locale,
+    callingSettings,
+    routerInteraction,
+    globalStorage,
+    getGlobalStorageReducer = getDefaultGlobalStorageReducer,
+    messageTransport = new IframeMessageTransport({
+      targetWindow: window.parent,
+    }),
+    ...options
+  }) {
+    super({
+      prefix,
+      actionTypes,
+      ...options,
+    });
+
+    this._messageTypes = prefixEnum({ enumMap: messageTypes, prefix });
+    this._locale = this::ensureExist(locale, 'locale');
+    this._messageTransport = this::ensureExist(messageTransport, 'messageTransport');
+    this._presence = this::ensureExist(presence, 'presence');
+    this._router = this::ensureExist(routerInteraction, 'routerInteraction');
+    this._callingSettings = callingSettings;
+    this._webphone = webphone;
+
+    this._storageKey = storageKey;
+    this._globalStorage = this::ensureExist(globalStorage, 'globalStorage');
+
+    this._globalStorage.registerReducer({
+      key: this._storageKey,
+      reducer: getGlobalStorageReducer(this.actionTypes),
+    });
+  }
+  initialize() {
+    this._messageTransport.addListener(msg => this._onMessage(msg));
+    this.store.subscribe(() => this._onStateChange());
+  }
+  _shouldInit() {
+    return this.pending &&
+      this._globalStorage.ready &&
+      this._locale.ready &&
+      this._router.ready;
+  }
+  _onStateChange() {
+    if (this._shouldInit()) {
+      this.store.dispatch({
+        type: this.actionTypes.init,
+      });
+      this._pushAdapterState();
+      this._pushRingState();
+      this.store.dispatch({
+        type: this.actionTypes.initSuccess,
+      });
+    }
+    this._pushPresence();
+    this._pushLocale();
+    this._pushRingState();
+  }
+  _onMessage(msg) {
+    if (msg) {
+      switch (msg.type) {
+        case this._messageTypes.syncClosed:
+          this._syncClosed(msg.closed);
+          break;
+        case this._messageTypes.syncMinimized:
+          this._syncMinimized(msg.minimized);
+          break;
+        case this._messageTypes.syncSize:
+          this._syncSize(msg.size);
+          break;
+        case this._messageTypes.syncPosition:
+          this._syncPosition(msg.position);
+          break;
+        case this._messageTypes.presenceClicked:
+          this._onPresenceClicked();
+          break;
+        default:
+          break;
+      }
+    }
+  }
+  @proxify
+  async _syncClosed(closed) {
+    this.store.dispatch({
+      type: this.actionTypes.syncClosed,
+      closed,
+    });
+  }
+  @proxify
+  async _syncMinimized(minimized) {
+    this.store.dispatch({
+      type: this.actionTypes.syncMinimized,
+      minimized,
+    });
+  }
+  @proxify
+  async _syncSize(size = {}) {
+    this.store.dispatch({
+      type: this.acitonTypes.syncSize,
+      size,
+    });
+  }
+  @proxify
+  async _syncPosition(position = {}) {
+    this.store.dispatch({
+      type: this.actionTypes.syncPosition,
+      position,
+    });
+  }
+
+  _pushRingState() {
+    if (!this.ready || !this._callingSettings) return;
+
+    const { callingMode } = this._callingSettings;
+    if (callingMode === callingModes.webphone) {
+      const webphone = this._webphone;
+      if (!webphone) {
+        throw new Error('webphone is a required dependency for monitoring WebRTC call');
+      }
+      if (webphone.ringSession && webphone.ringSessionId !== this._ringSessionId) {
+        this._ringSessionId = webphone.ringSessionId;
+        this._postMessage({
+          type: this._messageTypes.pushRingState,
+          ringing: true
+        });
+      }
+      // Check if ringing is over
+      if (this._ringSessionId) {
+        const ringingSessions = webphone.sessions.filter(session =>
+          session.callStatus === 'webphone-session-connecting' && session.direction === 'Inbound'
+        );
+        if (ringingSessions.length <= 0) {
+          this._postMessage({
+            type: this._messageTypes.pushRingState,
+            ringing: false
+          });
+          this._ringSessionId = null;
+        }
+      }
+    } else {
+      const status = this._presence.telephonyStatus;
+      if (this._presence.telephonyStatus !== this._telephonyStatus) {
+        this._postMessage({
+          type: this._messageTypes.pushRingState,
+          ringing: status === 'Ringing'
+        });
+        this._telephonyStatus = status;
+      }
+    }
+  }
+
+  _pushPresence() {
+    if (
+      this.ready &&
+      (
+        this._lastDndStatus !== this._presence.dndStatus ||
+        this._lastUserStatus !== this._presence.userStatus ||
+        this._lastTelephonyStatus !== this._presence.telephonyStatus
+      )
+    ) {
+      this._lastDndStatus = this._presence.dndStatus;
+      this._lastUserStatus = this._presence.userStatus;
+      this._lastTelephonyStatus = this._presence.telephonyStatus;
+      this._postMessage({
+        type: this._messageTypes.pushPresence,
+        telephonyStatus: this._presence.telephonyStatus,
+        userStatus: this._presence.userStatus,
+        dndStatus: this._presence.dndStatus,
+      });
+    }
+  }
+
+  get localeStrings() {
+    return {};
+  }
+
+  _pushLocale() {
+    if (
+      this.ready &&
+      this._lastLocale !== this._locale.currentLocale
+    ) {
+      this._lastLocale = this._locale.currentLocale;
+      this._postMessage({
+        type: this._messageTypes.pushLocale,
+        locale: this._locale.currentLocale,
+        strings: this._localeStrings,
+      });
+    }
+  }
+
+  _postMessage(data) {
+    this._messageTransport.postMessage(data);
+  }
+
+  _pushAdapterState() {
+    if (
+      this.ready &&
+      (
+        this._lastDndStatus !== this._presence.dndStatus ||
+        this._lastUserStatus !== this._presence.userStatus ||
+        this._lastTelephonyStatus !== this._presence.telephonyStatus ||
+        this._lastClosed !== this.closed ||
+        this._lastMinimized !== this.minimized ||
+        this._lastPosition.translateX !== this.position.translateX ||
+        this._lastPosition.translateY !== this.position.translateY ||
+        this._lastPosition.minTranslateX !== this.position.minTranslateX ||
+        this._lastPosition.minTranslateY !== this.position.minTranslateY
+      )
+    ) {
+      this._lastDndStatus = this._presence.dndStatus;
+      this._lastUserStatus = this._presence.userStatus;
+      this._lastTelephonyStatus = this._presence.telephonyStatus;
+      this._lastClosed = this.closed;
+      this._lastMinimized = this.minimized;
+      this._lastPosition = this.position;
+      this._postMessage({
+        type: this._messageTypes.pushAdapterState,
+        size: this.size,
+        minimized: this.minimized,
+        closed: this.closed,
+        position: this.position,
+        telephonyStatus: this._presence.telephonyStatus,
+        userStatus: this._presence.userStatus,
+        dndStatus: this._presence.dndStatus,
+      });
+    }
+  }
+  @proxify
+  async _onPresenceClicked() {
+    if (this.minimized) {
+      this.showAdapter();
+    }
+    this._router.push('/settings?showPresenceSettings=1');
+  }
+
+  @proxify
+  async showAdapter() {
+    this.store.dispatch({
+      type: this.actionTypes.showAdapter,
+    });
+  }
+
+  get status() {
+    return this.state.status;
+  }
+  get ready() {
+    return this.status === moduleStatuses.ready;
+  }
+
+  get pending() {
+    return this.status === moduleStatuses.pending;
+  }
+
+  get minimized() {
+    return this._globalStorage.getItem(this._storageKey).minimized;
+  }
+  get closed() {
+    return this._globalStorage.getItem(this._storageKey).closed;
+  }
+  get size() {
+    return this._globalStorage.getItem(this._storageKey).size;
+  }
+  get position() {
+    return this._globalStorage.getItem(this._storageKey).position;
+  }
+}

From c82837fae55bb3b73099d5bf4af7f1545023bbce Mon Sep 17 00:00:00 2001
From: Eric Huang <ele828@gmail.com>
Date: Mon, 9 Apr 2018 13:10:15 +0800
Subject: [PATCH 10/14] fix debounced contact search (#890)

* fix debounced contact search

* bugfix: fix conditions for judging if pushing adapter state
---
 src/lib/AdapterCore/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/AdapterCore/index.js b/src/lib/AdapterCore/index.js
index 99c2010049..b6418126a1 100644
--- a/src/lib/AdapterCore/index.js
+++ b/src/lib/AdapterCore/index.js
@@ -358,7 +358,7 @@ export default class AdapterCore {
     this._strings = strings;
   }
 
-  _debouncedPostMessage = debounce(this._postMessage, 200)
+  _debouncedPostMessage = debounce(this._postMessage, 100)
 
   _syncPosition() {
     this._debouncedPostMessage.call(this, {

From 69737577fbe6040221eb38eef05a89005146bcc1 Mon Sep 17 00:00:00 2001
From: Eric Huang <ele828@gmail.com>
Date: Mon, 9 Apr 2018 14:53:07 +0800
Subject: [PATCH 11/14] update whats new images for showing float window badge
 (#891)

* change i18n in whats new for fr-CA

* update whats new for float window badge
---
 src/components/UserGuide/i18n/fr-CA.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UserGuide/i18n/fr-CA.js b/src/components/UserGuide/i18n/fr-CA.js
index 5ab3f7dffa..d5afe86157 100644
--- a/src/components/UserGuide/i18n/fr-CA.js
+++ b/src/components/UserGuide/i18n/fr-CA.js
@@ -1,5 +1,5 @@
 export default {
-  start: 'Faire une visite rapide',
+  start: 'Tour d\'horizon',
   skip: 'Sauter',
   next: 'Suivant',
   finish: 'Terminer',

From fda1ed0647c84e127637b50dc0a8bf1f1cacbd26 Mon Sep 17 00:00:00 2001
From: Eric Huang <ele828@gmail.com>
Date: Tue, 10 Apr 2018 11:09:44 +0800
Subject: [PATCH 12/14] Revert "enable falling back to rc caller/callee name
 display if no contact match was found (#866)" (#895)

This reverts commit 1d113a81ed5a53eea8f4dd06d9f55362d25d831c.
---
 src/containers/ActiveCallsPage/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/containers/ActiveCallsPage/index.js b/src/containers/ActiveCallsPage/index.js
index 76f7a22e04..69a32c8453 100644
--- a/src/containers/ActiveCallsPage/index.js
+++ b/src/containers/ActiveCallsPage/index.js
@@ -14,7 +14,6 @@ function mapToProps(_, {
     rolesAndPermissions,
   },
   showContactDisplayPlaceholder = false,
-  enableContactFallback = false,
 }) {
   return {
     currentLocale: locale.currentLocale,
@@ -36,7 +35,6 @@ function mapToProps(_, {
     brand: brand.fullName,
     showContactDisplayPlaceholder,
     autoLog: !!(callLogger && callLogger.autoLog),
-    enableContactFallback,
   };
 }
 

From dfd6478fd7c1eed33333fed7e4efc1bb3bab677b Mon Sep 17 00:00:00 2001
From: ele828 <ele828@gmail.com>
Date: Tue, 10 Apr 2018 14:44:29 +0800
Subject: [PATCH 13/14] upgrade commons

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index b2f565becb..fd8a7a9e11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7447,7 +7447,7 @@ ringcentral-client@^1.0.0-beta.1:
 
 "ringcentral-integration@https://github.com/ringcentral/ringcentral-js-integration-commons#latest":
   version "0.1.0"
-  resolved "https://github.com/ringcentral/ringcentral-js-integration-commons#657035373b66fe7a5d8279f47a1e1db8decbd590"
+  resolved "https://github.com/ringcentral/ringcentral-js-integration-commons#3d90b7d4b5a327238dcb091821dc0995511b4345"
   dependencies:
     file-loader "^0.11.2"
     json-mask "^0.3.8"

From f647d644fce6f1d198e968152874c9b21ac3e3a6 Mon Sep 17 00:00:00 2001
From: ele828 <ele828@gmail.com>
Date: Tue, 10 Apr 2018 14:44:53 +0800
Subject: [PATCH 14/14] fix styles of app view

---
 dev-server/containers/AppView/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-server/containers/AppView/styles.scss b/dev-server/containers/AppView/styles.scss
index 5e6b9256d2..680ceeac5e 100644
--- a/dev-server/containers/AppView/styles.scss
+++ b/dev-server/containers/AppView/styles.scss
@@ -1,4 +1,4 @@
-@import 'normalize-css/normalize.css';
+@import '~normalize-css/normalize.css';
 @import '../../../src/lib/commonStyles/full-size.scss';
 @import '../../../src/lib/commonStyles/colors.scss';