From 240bdaa5f235156da99a87fc298445f0a8359bbb Mon Sep 17 00:00:00 2001
From: caffffe <sophie.wu@rcoffice.ringcentral.com>
Date: Wed, 19 Jul 2017 10:00:58 +0800
Subject: [PATCH 1/4] messy forwardnumber lists

---
 src/components/ForwardForm/styles.scss     | 4 ++--
 src/components/IncomingCallPad/styles.scss | 2 +-
 src/containers/ActiveCallPage/index.js     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/ForwardForm/styles.scss b/src/components/ForwardForm/styles.scss
index 7ca0e62e18..bbc32c0bfc 100644
--- a/src/components/ForwardForm/styles.scss
+++ b/src/components/ForwardForm/styles.scss
@@ -103,7 +103,7 @@
   .number {
     box-sizing: border-box;
     height: 28px;
-    padding: 5px 0 5px 20px;
+    padding: 8px 20px 5px 20px;
     span {
       display: inline-block;
       overflow: hidden;
@@ -111,7 +111,7 @@
       text-overflow: ellipsis;
     }
     .label {
-      max-width: 33px;
+      max-width: 38px;
     }
     .colon {
       padding-right: 5px;
diff --git a/src/components/IncomingCallPad/styles.scss b/src/components/IncomingCallPad/styles.scss
index 0964c3e520..4b7a40c649 100644
--- a/src/components/IncomingCallPad/styles.scss
+++ b/src/components/IncomingCallPad/styles.scss
@@ -41,7 +41,7 @@
     border-radius: 5px;
     opacity: 1;
     width: 79%;
-    min-width: 201px;
+    min-width: 226px;
     background: #fff;
     z-index: 9;
   }
diff --git a/src/containers/ActiveCallPage/index.js b/src/containers/ActiveCallPage/index.js
index 4db53775ac..a4dbda86fe 100644
--- a/src/containers/ActiveCallPage/index.js
+++ b/src/containers/ActiveCallPage/index.js
@@ -98,9 +98,9 @@ class ActiveCallPage extends Component {
   render() {
     const session = this.props.session;
     const active = !!session.id;
-    if (!active) {
-      return null;
-    }
+    // if (!active) {
+    //   return null;
+    // }
     if (this.props.minimized) {
       return (
         <ActiveCallBadge
@@ -119,7 +119,7 @@ class ActiveCallPage extends Component {
     ) {
       isRinging = true;
     }
-    // isRinging = true;
+    isRinging = true;
     const phoneNumber = session.direction === callDirections.outbound ?
       session.to : session.from;
     const nameMatches = session.direction === callDirections.outbound ?

From 2486267624923390f9cb11e5f46ec78c1a31c1f4 Mon Sep 17 00:00:00 2001
From: caffffe <sophie.wu@rcoffice.ringcentral.com>
Date: Thu, 20 Jul 2017 14:10:46 +0800
Subject: [PATCH 2/4] the forwarding number list is messy

---
 src/components/ForwardForm/styles.scss     | 2 +-
 src/components/IncomingCallPad/index.js    | 2 +-
 src/components/IncomingCallPad/styles.scss | 2 +-
 src/containers/ActiveCallPage/index.js     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/ForwardForm/styles.scss b/src/components/ForwardForm/styles.scss
index bbc32c0bfc..a50f76217d 100644
--- a/src/components/ForwardForm/styles.scss
+++ b/src/components/ForwardForm/styles.scss
@@ -111,7 +111,7 @@
       text-overflow: ellipsis;
     }
     .label {
-      max-width: 38px;
+      width: 43px;
     }
     .colon {
       padding-right: 5px;
diff --git a/src/components/IncomingCallPad/index.js b/src/components/IncomingCallPad/index.js
index 56a16e5b4b..20badf4788 100644
--- a/src/components/IncomingCallPad/index.js
+++ b/src/components/IncomingCallPad/index.js
@@ -74,7 +74,7 @@ export default class IncomingCallPad extends Component {
         />
         <div className={styles.buttonRow}>
           <Tooltip
-            defaultVisible={false}
+            defaultVisible
             visible={this.state.showForward}
             onVisibleChange={this.onShowForwardChange}
             placement="topRight"
diff --git a/src/components/IncomingCallPad/styles.scss b/src/components/IncomingCallPad/styles.scss
index 4b7a40c649..8e49ce710e 100644
--- a/src/components/IncomingCallPad/styles.scss
+++ b/src/components/IncomingCallPad/styles.scss
@@ -41,7 +41,7 @@
     border-radius: 5px;
     opacity: 1;
     width: 79%;
-    min-width: 226px;
+    min-width: 230px;
     background: #fff;
     z-index: 9;
   }
diff --git a/src/containers/ActiveCallPage/index.js b/src/containers/ActiveCallPage/index.js
index a4dbda86fe..4db53775ac 100644
--- a/src/containers/ActiveCallPage/index.js
+++ b/src/containers/ActiveCallPage/index.js
@@ -98,9 +98,9 @@ class ActiveCallPage extends Component {
   render() {
     const session = this.props.session;
     const active = !!session.id;
-    // if (!active) {
-    //   return null;
-    // }
+    if (!active) {
+      return null;
+    }
     if (this.props.minimized) {
       return (
         <ActiveCallBadge
@@ -119,7 +119,7 @@ class ActiveCallPage extends Component {
     ) {
       isRinging = true;
     }
-    isRinging = true;
+    // isRinging = true;
     const phoneNumber = session.direction === callDirections.outbound ?
       session.to : session.from;
     const nameMatches = session.direction === callDirections.outbound ?

From a888918181e7b7277c0fe5cd734dc895e34a609a Mon Sep 17 00:00:00 2001
From: caffffe <sophie.wu@rcoffice.ringcentral.com>
Date: Thu, 20 Jul 2017 14:13:05 +0800
Subject: [PATCH 3/4] the forwarding number list is messy

---
 src/components/ForwardForm/styles.scss  | 2 +-
 src/components/IncomingCallPad/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ForwardForm/styles.scss b/src/components/ForwardForm/styles.scss
index a50f76217d..e2d3dfa764 100644
--- a/src/components/ForwardForm/styles.scss
+++ b/src/components/ForwardForm/styles.scss
@@ -103,7 +103,7 @@
   .number {
     box-sizing: border-box;
     height: 28px;
-    padding: 8px 20px 5px 20px;
+    padding: 5px 20px 5px 20px;
     span {
       display: inline-block;
       overflow: hidden;
diff --git a/src/components/IncomingCallPad/index.js b/src/components/IncomingCallPad/index.js
index 20badf4788..56a16e5b4b 100644
--- a/src/components/IncomingCallPad/index.js
+++ b/src/components/IncomingCallPad/index.js
@@ -74,7 +74,7 @@ export default class IncomingCallPad extends Component {
         />
         <div className={styles.buttonRow}>
           <Tooltip
-            defaultVisible
+            defaultVisible={false}
             visible={this.state.showForward}
             onVisibleChange={this.onShowForwardChange}
             placement="topRight"

From 6dfe48c341fa32304a70f3b5dcd6be73327c7af0 Mon Sep 17 00:00:00 2001
From: caffffe <sophie.wu@rcoffice.ringcentral.com>
Date: Thu, 20 Jul 2017 14:17:13 +0800
Subject: [PATCH 4/4] change padding right

---
 src/components/ForwardForm/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ForwardForm/styles.scss b/src/components/ForwardForm/styles.scss
index e2d3dfa764..b861ca184a 100644
--- a/src/components/ForwardForm/styles.scss
+++ b/src/components/ForwardForm/styles.scss
@@ -103,7 +103,7 @@
   .number {
     box-sizing: border-box;
     height: 28px;
-    padding: 5px 20px 5px 20px;
+    padding: 5px 0 5px 20px;
     span {
       display: inline-block;
       overflow: hidden;