From 2a204624f54da65613e57c24d047af6b17014ec7 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Jul 2016 12:27:34 -0700
Subject: Implement tx confirmation style refinements

---
 ui/app/components/pending-tx-details.js | 46 ++++++++++++++++++++++++++-------
 ui/app/components/pending-tx.js         |  8 ------
 ui/app/conf-tx.js                       |  4 +--
 ui/app/css/index.css                    |  4 ---
 4 files changed, 38 insertions(+), 24 deletions(-)

(limited to 'ui')

diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index 9c3272faa..e0b629e89 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -3,6 +3,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 
 const MiniAccountPanel = require('./mini-account-panel')
+const EtherBalance = require('./eth-balance')
 const addressSummary = require('../util').addressSummary
 const formatBalance = require('../util').formatBalance
 const nameForAddress = require('../../lib/contract-namer')
@@ -52,7 +53,7 @@ PTXP.render = function () {
         }, [
           h('span.font-small', {
             style: {
-              fontFamily: 'Montserrat Light, Montserrat, sans-serif',
+              fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
             },
           }, identity.name),
           h('span.font-small', {
@@ -65,7 +66,10 @@ PTXP.render = function () {
             style: {
               fontFamily: 'Montserrat Light, Montserrat, sans-serif',
             },
-          }, formatBalance(balance)),
+          }, h(EtherBalance, {
+            value: balance,
+            inline: true,
+          })),
 
         ]),
 
@@ -73,7 +77,7 @@ PTXP.render = function () {
           src: 'images/forward-carrat.svg',
           style: {
             padding: '5px 6px 0px 10px',
-            height: '48px',
+            height: '37px',
           },
         }),
 
@@ -82,7 +86,8 @@ PTXP.render = function () {
 
       h('style', `
         .table-box {
-          margin: 7px 6px 0px 6px;
+          margin: 7px 0px 0px 0px;
+          width: 100%;
         }
         .table-box .row {
           margin: 0px;
@@ -91,7 +96,10 @@ PTXP.render = function () {
           justify-content: space-between;
           font-family: Montserrat Light, sans-serif;
           font-size: 13px;
-          padding: 5px 15px;
+          padding: 5px 25px;
+        }
+        .table-box .row .value {
+          font-family: Montserrat Regular;
         }
       `),
 
@@ -110,11 +118,24 @@ PTXP.render = function () {
         h('.cell.row', {
           style: {
             fontFamily: 'Montserrat Regular',
-            background: 'rgb(216,216,216)',
+            background: 'white',
+            padding: '10px 25px',
           },
         }, [
           h('.cell.label', 'Max Total'),
-          h('.cell.value', formatBalance(maxCost)),
+          h('.cell.value', {
+            style: {
+              display: 'flex',
+              alignItems: 'center',
+            },
+          }, [
+            h(EtherBalance, {
+              value: maxCost,
+              inline: true,
+              labelColor: 'black',
+              fontSize: '16px',
+            }),
+          ]),
         ]),
 
         h('.cell.row', {
@@ -124,7 +145,12 @@ PTXP.render = function () {
           },
         }, [
           h('.cell.label'),
-          h('.cell.value', `Data included: ${dataLength} bytes`),
+          h('.cell.value', {
+            style: {
+              fontFamily: 'Montserrat Light',
+              fontSize: '11px',
+            },
+          }, `Data included: ${dataLength} bytes`),
         ]),
       ]), // End of Table
 
@@ -149,7 +175,7 @@ PTXP.miniAccountPanelForRecipient = function () {
     }, [
       h('span.font-small', {
         style: {
-          fontFamily: 'Montserrat Light, Montserrat, sans-serif',
+          fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
         },
       }, nameForAddress(txParams.to)),
       h('span.font-small', {
@@ -167,7 +193,7 @@ PTXP.miniAccountPanelForRecipient = function () {
 
       h('span.font-small', {
         style: {
-          fontFamily: 'Montserrat Light, Montserrat, sans-serif',
+          fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
         },
       }, 'New Contract'),
 
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 77dba87ee..8067aef05 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -21,14 +21,6 @@ PendingTx.prototype.render = function () {
       key: txData.id,
     }, [
 
-      // header
-      h('h3', {
-        style: {
-          fontWeight: 'bold',
-          textAlign: 'center',
-        },
-      }, 'Submit Transaction'),
-
       // tx info
       h(PendingTxDetails, state),
 
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 8455826b8..db876dd9b 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -39,14 +39,14 @@ ConfirmTxScreen.prototype.render = function () {
 
   return (
 
-    h('.unconftx-section.flex-column.flex-grow', [
+    h('.flex-column.flex-grow', [
 
       // subtitle and nav
       h('.section-title.flex-row.flex-center', [
         h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
           onClick: this.goHome.bind(this),
         }),
-        h('h2.page-subtitle', 'Confirmation'),
+        h('h2.page-subtitle', 'Confirm Transaction'),
       ]),
 
       h('h3', {
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index de694f873..3f52b6ed4 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -411,10 +411,6 @@ input.large-input {
 }
 /* tx confirm */
 
-.unconftx-section {
-  margin: 0 20px;
-}
-
 .unconftx-section input[type=password] {
   height: 22px;
   padding: 2px;
-- 
cgit