From 3e562f1a1e594955f203b75a0be595e4bd6bca76 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 27 Dec 2017 17:31:38 -0800
Subject: Add backend fix for util in normalizeethstringtowei.

---
 ui/app/util.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ui/app')

diff --git a/ui/app/util.js b/ui/app/util.js
index 3f8b4dcc3..293f4228c 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -193,6 +193,9 @@ function normalizeEthStringToWei (str) {
     while (decimal.length < 18) {
       decimal += '0'
     }
+    if (decimal.length > 18) {
+      decimal = decimal.slice(0, 18)
+    }
     const decimalBN = new ethUtil.BN(decimal, 10)
     eth = eth.add(decimalBN)
   }
-- 
cgit 


From 92eb16fc112eeac749c0ddfff163773ce3a35ef2 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 27 Dec 2017 17:36:56 -0800
Subject: Add frontend validation to check if send ether input is a valid
 number.

---
 ui/app/send.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ui/app')

diff --git a/ui/app/send.js b/ui/app/send.js
index e59c1130e..7b31eef7e 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -247,6 +247,12 @@ SendTransactionScreen.prototype.onSubmit = function () {
   const recipient = state.recipient || document.querySelector('input[name="address"]').value.replace(/^[.\s]+|[.\s]+$/g, '')
   const nickname = state.nickname || ' '
   const input = document.querySelector('input[name="amount"]').value
+
+  if (isNaN(input)) {
+    message = 'Invalid ether value.'
+    return this.props.dispatch(actions.displayWarning(message))
+  }
+
   const value = util.normalizeEthStringToWei(input)
   const txData = document.querySelector('input[name="txData"]').value
   const balance = this.props.balance
-- 
cgit 


From e682fb05fcdeca5f50a2176934d25935e13538f6 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 27 Dec 2017 18:22:10 -0800
Subject: Add frontend validation to ensure that ether inputs are valid.

---
 ui/app/send.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'ui/app')

diff --git a/ui/app/send.js b/ui/app/send.js
index 7b31eef7e..09c9e03d4 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -247,16 +247,26 @@ SendTransactionScreen.prototype.onSubmit = function () {
   const recipient = state.recipient || document.querySelector('input[name="address"]').value.replace(/^[.\s]+|[.\s]+$/g, '')
   const nickname = state.nickname || ' '
   const input = document.querySelector('input[name="amount"]').value
+  const parts = input.split('')
 
-  if (isNaN(input)) {
+  let message
+
+  if (isNaN(input) || input === '') {
     message = 'Invalid ether value.'
     return this.props.dispatch(actions.displayWarning(message))
   }
 
+  if (parts[1]) {
+    var decimal = parts[1]
+    if (decimal.length > 18) {
+      message = 'Ether amount is too precise.'
+      return this.props.dispatch(actions.displayWarning(message))
+    }
+  }
+
   const value = util.normalizeEthStringToWei(input)
   const txData = document.querySelector('input[name="txData"]').value
   const balance = this.props.balance
-  let message
 
   if (value.gt(balance)) {
     message = 'Insufficient funds.'
-- 
cgit 


From 4a598fc7ac59ccf4c6cc0290956bb4985fafa8a5 Mon Sep 17 00:00:00 2001
From: Renier Oosthuizen <oosthuizen.renier@gmail.com>
Date: Tue, 2 Jan 2018 21:07:48 +0200
Subject: Fixes #2834

---
 ui/app/app.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'ui/app')

diff --git a/ui/app/app.js b/ui/app/app.js
index bd0ccb0a2..2a2438d97 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -460,11 +460,6 @@ App.prototype.renderPrimary = function () {
     })
   }
 
-  if (props.seedWords) {
-    log.debug('rendering seed words')
-    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
-  }
-
   // show initialize screen
   if (!props.isInitialized || props.forgottenPassword) {
     // show current view
@@ -499,6 +494,12 @@ App.prototype.renderPrimary = function () {
     }
   }
 
+  //Show seed words screen
+  if (props.seedWords) {
+    log.debug('rendering seed words')
+    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
+  }
+
   // show current view
   switch (props.currentView.name) {
 
-- 
cgit 


From 1da385f78b9e61e7a17c19164558779a37376868 Mon Sep 17 00:00:00 2001
From: oosthuizenr <renier@flatrocksolutions.co.za>
Date: Tue, 2 Jan 2018 21:29:26 +0200
Subject: fix comment

---
 ui/app/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app')

diff --git a/ui/app/app.js b/ui/app/app.js
index 2a2438d97..bc198b482 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -494,7 +494,7 @@ App.prototype.renderPrimary = function () {
     }
   }
 
-  //Show seed words screen
+  // show seed words screen
   if (props.seedWords) {
     log.debug('rendering seed words')
     return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
-- 
cgit