From dc36748f83ac2260a33d79d7e6d83d9edd1fc53b Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 21 Feb 2019 14:50:25 +0800
Subject: [PATCH 1/5] fix untranslated workspace

---
 src/navigation/navigation.scss    |  2 +-
 src/workspace/workspace-menu.html | 16 ++++++++--------
 src/workspace/workspace-menu.scss |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/navigation/navigation.scss b/src/navigation/navigation.scss
index 127c5ef7e4..f76a5d8c13 100644
--- a/src/navigation/navigation.scss
+++ b/src/navigation/navigation.scss
@@ -51,7 +51,7 @@ nav {
      .resources {
        .ui-icon { left: 10px; }
      }
-     .trade, .instruments, .resources {
+     .trade, .instruments, .resources, .workspace {
          .ui-menu .ui-menu-item {
             list-style-image: none !important;
             white-space: nowrap;
diff --git a/src/workspace/workspace-menu.html b/src/workspace/workspace-menu.html
index e39062ca78..0fc0604caf 100644
--- a/src/workspace/workspace-menu.html
+++ b/src/workspace/workspace-menu.html
@@ -1,20 +1,20 @@
 <ul class='workspace-ul'>
-   <li rv-on-click='showWorkspaceManager' class='invert-on-hover'>
-      <a href="#">
+   <li rv-on-click='showWorkspaceManager'>
+      <a href='#'>
          <span class='ui-icon ui-icon-workspace'></span>
-         Manage
+         {'Arrange' | i18n}
       </a>
    </li>
-   <li rv-on-click='tileDialogs' class='invert-on-hover'>
-      <a href="#">
+   <li rv-on-click='tileDialogs'>
+      <a href='#'>
          <span class='ui-icon ui-icon-arrange'></span>
-         <span>Arrange</span>
+         {'Manage' | i18n}
       </a>
    </li>
-   <li class='invert-on-hover' rv-on-click='closeAll'>
+   <li rv-on-click='closeAll'>
       <a href='#'>
          <span class='ui-icon ui-icon-delete'></span>
-         Close All
+         {'Close All' | i18n}
       </a>
    </li>
 </ul>
diff --git a/src/workspace/workspace-menu.scss b/src/workspace/workspace-menu.scss
index 59a00fa85f..39a3b01058 100644
--- a/src/workspace/workspace-menu.scss
+++ b/src/workspace/workspace-menu.scss
@@ -3,6 +3,7 @@ ul.workspace-ul {
     > a {
       &:hover { opacity: 1; }
       color: white;
+      font-size: 14px;
       padding: 0;
       line-height: 34px;
       padding: 0 10px 0 36px !important;

From aa4778935cdd60042410bfe64e2aee4010ecb8b5 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 21 Feb 2019 14:58:33 +0800
Subject: [PATCH 2/5] cursor pointer

---
 src/navigation/navigation.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/navigation/navigation.scss b/src/navigation/navigation.scss
index f76a5d8c13..84c6d3d4bb 100644
--- a/src/navigation/navigation.scss
+++ b/src/navigation/navigation.scss
@@ -58,6 +58,7 @@ nav {
             .ui-menu-item-wrapper {
                padding: 8px 30px;
                font-size: 14px;
+               cursor: pointer;
             }
            div {
              font-size: 1rem;

From decd82ba8d33d86dc6a506fe71ca365818ab7350 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 21 Feb 2019 15:08:05 +0800
Subject: [PATCH 3/5] substitude manage and arrange

---
 src/workspace/workspace-menu.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/workspace/workspace-menu.html b/src/workspace/workspace-menu.html
index 0fc0604caf..4b1342e78b 100644
--- a/src/workspace/workspace-menu.html
+++ b/src/workspace/workspace-menu.html
@@ -2,13 +2,13 @@
    <li rv-on-click='showWorkspaceManager'>
       <a href='#'>
          <span class='ui-icon ui-icon-workspace'></span>
-         {'Arrange' | i18n}
+         {'Manage' | i18n}
       </a>
    </li>
    <li rv-on-click='tileDialogs'>
       <a href='#'>
          <span class='ui-icon ui-icon-arrange'></span>
-         {'Manage' | i18n}
+         {'Arrange' | i18n}
       </a>
    </li>
    <li rv-on-click='closeAll'>

From 7f2bfb9bc027fad47d6d50a62bf910e744610a21 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 21 Feb 2019 17:29:31 +0800
Subject: [PATCH 4/5] bid price error fix

---
 src/viewtransaction/viewTransaction.es6 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/viewtransaction/viewTransaction.es6 b/src/viewtransaction/viewTransaction.es6
index fdb744e3e4..914c88fb41 100644
--- a/src/viewtransaction/viewTransaction.es6
+++ b/src/viewtransaction/viewTransaction.es6
@@ -221,8 +221,8 @@ const updateIndicative = (data, state) => {
     return;
   }
 
-  updateStateSell();
-  handleForwardStarting();
+  updateStateSell(contract, state);
+  handleForwardStarting(contract, state);
   state.chart.manualReflow();
 
   function updateState(contract, state) {
@@ -249,14 +249,14 @@ const updateIndicative = (data, state) => {
     state.note = makeNote(contract);
   }
 
-  function updateStateSell() {
+  function updateStateSell(contract, state) {
     if (contract.bid_price) {
       state.sell.bid_price.value = contract.bid_price;
-      [state.sell.bid_price.unit, state.sell.bid_price.cent] = contract.bid_price.toString().split(/[\.,]+/);
+      [state.sell.bid_price.unit, state.sell.bid_price.cent] = String(contract.bid_price).split(/[\.,]+/);
     }
   }
 
-  function handleForwardStarting() {
+  function handleForwardStarting(contract, state) {
     const constract_is_forward_starting = contract.is_forward_starting && +contract.date_start > +contract.current_spot_time;
     if (constract_is_forward_starting) {
       state.fwd_starting = '* Contract has not started yet'.i18n();

From f591d4b41cb6e540e9083b794b53eee9556ce296 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Mon, 25 Feb 2019 10:29:29 +0800
Subject: [PATCH 5/5] revert bid price fix

---
 src/viewtransaction/viewTransaction.es6 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/viewtransaction/viewTransaction.es6 b/src/viewtransaction/viewTransaction.es6
index 914c88fb41..fdb744e3e4 100644
--- a/src/viewtransaction/viewTransaction.es6
+++ b/src/viewtransaction/viewTransaction.es6
@@ -221,8 +221,8 @@ const updateIndicative = (data, state) => {
     return;
   }
 
-  updateStateSell(contract, state);
-  handleForwardStarting(contract, state);
+  updateStateSell();
+  handleForwardStarting();
   state.chart.manualReflow();
 
   function updateState(contract, state) {
@@ -249,14 +249,14 @@ const updateIndicative = (data, state) => {
     state.note = makeNote(contract);
   }
 
-  function updateStateSell(contract, state) {
+  function updateStateSell() {
     if (contract.bid_price) {
       state.sell.bid_price.value = contract.bid_price;
-      [state.sell.bid_price.unit, state.sell.bid_price.cent] = String(contract.bid_price).split(/[\.,]+/);
+      [state.sell.bid_price.unit, state.sell.bid_price.cent] = contract.bid_price.toString().split(/[\.,]+/);
     }
   }
 
-  function handleForwardStarting(contract, state) {
+  function handleForwardStarting() {
     const constract_is_forward_starting = contract.is_forward_starting && +contract.date_start > +contract.current_spot_time;
     if (constract_is_forward_starting) {
       state.fwd_starting = '* Contract has not started yet'.i18n();