Merge branch 'master' into ConfirmationStyle

2 files changed, 4 insertions, 4 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index dcc44ee65..4dd41d570 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -108,7 +108,7 @@ App.prototype.renderAppBar = function () {
           background: props.isUnlocked ? 'white' : 'none',
           height: '36px',
           position: 'relative',
-          zIndex: 1,
+          zIndex: 2,
         },
       }, props.isUnlocked && [
 
@@ -197,10 +197,10 @@ App.prototype.renderNetworkDropdown = function () {
     onClickOutside: (event) => {
       this.setState({ isNetworkMenuOpen: !isOpen })
     },
+    zIndex: 1,
     style: {
       position: 'absolute',
       left: 0,
-      zIndex: 0,
     },
     innerStyle: {
       background: 'white',
@@ -245,13 +245,13 @@ App.prototype.renderDropdown = function () {
 
   return h(MenuDroppo, {
     isOpen: isOpen,
+    zIndex: 1,
     onClickOutside: (event) => {
       this.setState({ isMainMenuOpen: !isOpen })
     },
     style: {
       position: 'absolute',
       right: 0,
-      zIndex: 0,
     },
     innerStyle: {
       background: 'white',
diff --git a/ui/app/util.js b/ui/app/util.js
index 1e92f0ea2..0a243387a 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -116,7 +116,7 @@ function formatBalance (balance, decimalsToKeep) {
     if (afterDecimal !== '0') {
       var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits
       if (sigFigs) { afterDecimal = sigFigs[0] }
-      formattedBalance = `0.${afterDecimal.slice(0, 6)}`
+      formattedBalance = afterDecimal.substr(0, 5) === '00000' ? '<0.00001' : `0.${afterDecimal.slice(0, 6)}`
     }
   } else {
     formattedBalance = `${beforeDecimal}.${afterDecimal.slice(0, 2)}`