Merge pull request #2845 from alextsg/NewUI-flat-4.0.5c

[NewUI] Merge master into NewUI-flat

2 files changed, 9 insertions, 5 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 1f40eccbe..c6fce0e47 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -360,11 +360,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
@@ -389,6 +384,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) {
 
diff --git a/ui/app/util.js b/ui/app/util.js
index 82a5f9f29..70c503550 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -211,6 +211,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)
   }