From 809bbfcc74afb12db43ad153b6aad5ac8c125884 Mon Sep 17 00:00:00 2001
From: Sophie Wu <sophie.wu@rcoffice.ringcentral.com>
Date: Tue, 8 Aug 2017 10:32:31 +0800
Subject: [PATCH 1/2] user should have the capability to be back to active call
 page when flip error

---
 src/components/FlipPanel/index.js     | 10 +++++++---
 src/components/RadioBtnGroup/index.js |  5 ++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/FlipPanel/index.js b/src/components/FlipPanel/index.js
index fcfdcb35bb..974893eb53 100644
--- a/src/components/FlipPanel/index.js
+++ b/src/components/FlipPanel/index.js
@@ -15,6 +15,7 @@ export default class FlipPanel extends Component {
     super(props);
     this.state = {
       flipValue: '',
+      flipEnabled: true,
     };
     this.onRadioSelect = (value) => {
       this.setState({
@@ -23,6 +24,9 @@ export default class FlipPanel extends Component {
     };
     this.flip = () => {
       this.props.flip(this.state.flipValue);
+      this.setState({
+        flipEnabled: false
+      });
     };
   }
   render() {
@@ -46,16 +50,16 @@ export default class FlipPanel extends Component {
           <RadioButtonGroup
             className={styles.radioGroup}
             radioOptions={this.props.flipNumbers}
-            disabled={this.props.isOnFlip}
+            disabled={!this.state.flipEnabled}
             formatPhone={this.props.formatPhone}
             onRadioSelect={this.onRadioSelect}
           />
           <div className={styles.buttonGroup}>
             <div className={styles.button}>
               <CircleButton
-                className={this.props.isOnFlip ? styles.buttonDisabled : styles.flipButton}
+                className={this.state.flipEnabled ? styles.flipButton : styles.buttonDisabled}
                 iconClassName={styles.flipIcon}
-                onClick={this.props.isOnFlip ? () => {} : this.flip}
+                onClick={this.state.flipEnabled ? this.flip : () => {}}
                 icon={FlipIcon}
                 showBorder
               />
diff --git a/src/components/RadioBtnGroup/index.js b/src/components/RadioBtnGroup/index.js
index c0e00fe625..543cb5debd 100644
--- a/src/components/RadioBtnGroup/index.js
+++ b/src/components/RadioBtnGroup/index.js
@@ -12,7 +12,7 @@ function RadioOption(props) {
     btnClassName = styles.radioBtn;
   }
   return (
-    <div key={props.id} className={styles.radioOption} onClick={() => { props.onSelect(props.currentIndex); }}>
+    <div className={styles.radioOption} onClick={() => { props.onSelect(props.currentIndex); }}>
       <span className={btnClassName} />
       <span className={styles.optionNumber}>
         {props.phoneNumber}
@@ -24,7 +24,6 @@ function RadioOption(props) {
   );
 }
 RadioOption.propTypes = {
-  id: PropTypes.string.isRequired,
   currentIndex: PropTypes.number.isRequired,
   phoneNumber: PropTypes.string.isRequired,
   label: PropTypes.string,
@@ -58,7 +57,7 @@ export default class RadioButtonGroup extends Component {
             <RadioOption
               currentIndex={idx}
               selectedIndex={this.state.selectedIndex}
-              id={number.id}
+              key={number.id}
               phoneNumber={this.props.formatPhone(number.phoneNumber)}
               label={number.label}
               onSelect={this.chooseOption}

From f6f8fc03667a2677cf59dd50acc9b0612625ae7b Mon Sep 17 00:00:00 2001
From: caffffe <sophie.wu@rcoffice.ringcentral.com>
Date: Wed, 9 Aug 2017 11:11:44 +0800
Subject: [PATCH 2/2] update commons

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 1aade9cb28..2bf0b0ef7d 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "redux-thunk": "^2.1.0",
     "ringcentral": "^3.1.2",
     "ringcentral-client": "^1.0.0-rc1",
-    "ringcentral-integration": "^0.7.4",
+    "ringcentral-integration": "^0.7.5",
     "sass-loader": "^6.0.5",
     "source-map-loader": "^0.2.1",
     "style-loader": "^0.18.2",
diff --git a/yarn.lock b/yarn.lock
index 6da9e6042d..3364fe6050 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6263,9 +6263,9 @@ ringcentral-client@^1.0.0-rc1:
     form-data "^2.1.2"
     isomorphic-fetch "^2.2.1"
 
-ringcentral-integration@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.7.4.tgz#d089cc99c7265bf76ca3f0543b01682aea3be52b"
+ringcentral-integration@^0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.7.5.tgz#5e3428d9b5d6e6f40d1604aa40ed7885f1147bd2"
   dependencies:
     file-loader "^0.11.2"
     json-mask "^0.3.8"