enhancement of calling settings (#212)

* enhancement of calling setting

* fix typo

* remove connect failed

* update commons

Author: embbnux

dev-server/Phone.js

@@ -249,7 +249,6 @@ export default class Phone extends RcModule {
       webphone: this.webphone,
       extensionPhoneNumber: this.extensionPhoneNumber,
       numberValidate: this.numberValidate,
-      extensionPhoneNumber: this.extensionPhoneNumber,
       getState: () => this.state.call,
     }));
     this.addModule('subscription', new Subscription({

package.json

@@ -78,7 +78,7 @@
     "redux-thunk": "^2.1.0",
     "ringcentral": "3.0.0",
     "ringcentral-client": "^1.0.0-rc1",
-    "ringcentral-integration": "^0.6.9",
+    "ringcentral-integration": "^0.6.10",
     "sass-loader": "^4.1.1",
     "source-map-loader": "^0.1.5",
     "style-loader": "^0.13.1",

src/components/CallingSettingsAlert/i18n/en-US.js

@@ -19,8 +19,8 @@ export default {
     'Your phone number information has been changed recently. Please go to {link} to check your Calling options.',
   link: 'Settings > Calling',
   [callingSettingsMessages.webphonePermissionRemoved]:
-    `Your permissions have been changed and you cannot make calls with Browser.
-     For details please contact your account administrator.`,
+  `Your permissions have been changed and you cannot make calls with Browser.
+      For details please contact your account administrator.`,
   [callingSettingsMessages.emergencyCallingNotAvailable]:
     `Dialing emergency or special service numbers is not supported.
      In an emergency, use your traditional wireline or wireless phone to call an emergency number.`,

src/components/CallingSettingsAlert/index.js

@@ -11,10 +11,12 @@ function CallingSettingsAlert({ message: { message }, currentLocale, brand, call
     case callingSettingsMessages.saveSuccessWithSoftphone:
     case callingSettingsMessages.firstLogin:
     case callingSettingsMessages.firstLoginOther:
+    case callingSettingsMessages.webphonePermissionRemoved:
+    case callingSettingsMessages.emergencyCallingNotAvailable:
       return (
         <FormattedMessage
           message={i18n.getString(message)}
-          values={{ brand: brand }}
+          values={{ brand }}
         />
       );
 

src/components/WebphoneAlert/i18n/en-US.js

@@ -1,11 +1,10 @@
 import webphoneErrors from 'ringcentral-integration/modules/Webphone/webphoneErrors';
 
 export default {
-  [webphoneErrors.connectFailed]: 'Send Success.',
+  [webphoneErrors.connectFailed]: 'Connect with web phone server failed.',
   [webphoneErrors.browserNotSupported]: 'Calling with browser is only supported on Chrome.',
   [webphoneErrors.webphoneCountOverLimit]: 'A maximum of 5 web phones could be registered.',
   [webphoneErrors.notOutboundCallWithoutDL]: `Your extension is not allowed to
     make outbound calls with browser currently,
     please contact your account representative for an upgrade.`,
-  [webphoneErrors.getSipProvisionError]: 'You have no permission to send message.',
 };

src/components/WebphoneAlert/index.js

@@ -17,9 +17,7 @@ WebphoneAlert.propTypes = {
 };
 
 WebphoneAlert.handleMessage = ({ message }) => (
-  (message === webphoneErrors.connectFailed) ||
   (message === webphoneErrors.browserNotSupported) ||
   (message === webphoneErrors.webphoneCountOverLimit) ||
-  (message === webphoneErrors.notOutboundCallWithoutDL) ||
-  (message === webphoneErrors.getSipProvisionError)
+  (message === webphoneErrors.notOutboundCallWithoutDL)
 );

yarn.lock

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