Merge pull request #638 from MetaMask/i555-SaltVault

Add new eth-lightwallet salting to vault.

5 files changed, 15 insertions, 18 deletions

diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 0b4acdfec..4e0d69ed7 100644
--- a/ui/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
@@ -7,14 +7,14 @@ const EthBalance = require('../components/eth-balance')
 const CopyButton = require('../components/copyButton')
 const Identicon = require('../components/identicon')
 
-module.exports = NewComponent
+module.exports = AccountListItem
 
-inherits(NewComponent, Component)
-function NewComponent () {
+inherits(AccountListItem, Component)
+function AccountListItem () {
   Component.call(this)
 }
 
-NewComponent.prototype.render = function () {
+AccountListItem.prototype.render = function () {
   const identity = this.props.identity
   var isSelected = this.props.selectedAddress === identity.address
   var account = this.props.accounts[identity.address]
@@ -23,9 +23,6 @@ NewComponent.prototype.render = function () {
   return (
     h(`.accounts-list-option.flex-row.flex-space-between.pointer.hover-white${selectedClass}`, {
       key: `account-panel-${identity.address}`,
-      style: {
-        flex: '1 0 auto',
-      },
       onClick: (event) => this.props.onShowDetail(identity.address, event),
     }, [
 
@@ -73,7 +70,7 @@ NewComponent.prototype.render = function () {
   )
 }
 
-NewComponent.prototype.pendingOrNot = function () {
+AccountListItem.prototype.pendingOrNot = function () {
   const pending = this.props.pending
   if (pending.length === 0) return null
   return h('.pending-dot', pending.length)
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index c20900c1e..d3c84d387 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -84,7 +84,7 @@ AccountsScreen.prototype.render = function () {
             })
           }),
 
-          h('hr.horizontal-line', {key: 'horizontal-line1'}),
+          h('hr.horizontal-line'),
           h('div.footer.hover-white.pointer', {
             key: 'reveal-account-bar',
             onClick: () => {
@@ -92,7 +92,6 @@ AccountsScreen.prototype.render = function () {
             },
             style: {
               display: 'flex',
-              flex: '1 0 auto',
               height: '40px',
               paddint: '10px',
               justifyContent: 'center',
@@ -101,6 +100,7 @@ AccountsScreen.prototype.render = function () {
           }, [
             h('i.fa.fa-plus.fa-lg', {key: ''}),
           ]),
+          h('hr.horizontal-line'),
         ]),
 
       unconfTxList.length ? (
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js
index 58b7942c3..77c0d12b1 100644
--- a/ui/app/components/shapeshift-form.js
+++ b/ui/app/components/shapeshift-form.js
@@ -69,7 +69,7 @@ ShapeshiftForm.prototype.renderMain = function () {
         h('input#fromCoin.buy-inputs.ex-coins', {
           type: 'text',
           list: 'coinList',
-          dataset: {
+          dataSet: {
             persistentFormId: 'input-coin',
           },
           style: {
@@ -165,7 +165,7 @@ ShapeshiftForm.prototype.renderMain = function () {
       h('input#fromCoinAddress.buy-inputs', {
         type: 'text',
         placeholder: `Your ${coin} Refund Address`,
-        dataset: {
+        dataSet: {
           persistentFormId: 'refund-address',
         },
         style: {
diff --git a/ui/app/first-time/restore-vault.js b/ui/app/first-time/restore-vault.js
index 4c1f21008..c34cd7e66 100644
--- a/ui/app/first-time/restore-vault.js
+++ b/ui/app/first-time/restore-vault.js
@@ -41,7 +41,7 @@ RestoreVaultScreen.prototype.render = function () {
       // wallet seed entry
       h('h3', 'Wallet Seed'),
       h('textarea.twelve-word-phrase.letter-spacey', {
-        dataset: {
+        dataSet: {
           persistentFormId: 'wallet-seed',
         },
         placeholder: 'Enter your secret twelve word phrase here to restore your vault.',
@@ -52,7 +52,7 @@ RestoreVaultScreen.prototype.render = function () {
         type: 'password',
         id: 'password-box',
         placeholder: 'New Password (min 8 chars)',
-        dataset: {
+        dataSet: {
           persistentFormId: 'password',
         },
         style: {
@@ -67,7 +67,7 @@ RestoreVaultScreen.prototype.render = function () {
         id: 'password-box-confirm',
         placeholder: 'Confirm Password',
         onKeyPress: this.onMaybeCreate.bind(this),
-        dataset: {
+        dataSet: {
           persistentFormId: 'password-confirmation',
         },
         style: {
diff --git a/ui/app/send.js b/ui/app/send.js
index 009866cf7..e660e90a8 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -138,7 +138,7 @@ SendTransactionScreen.prototype.render = function () {
         h('input.large-input', {
           name: 'address',
           placeholder: 'Recipient Address',
-          dataset: {
+          dataSet: {
             persistentFormId: 'recipient-address',
           },
         }),
@@ -154,7 +154,7 @@ SendTransactionScreen.prototype.render = function () {
           style: {
             marginRight: 6,
           },
-          dataset: {
+          dataSet: {
             persistentFormId: 'tx-amount',
           },
         }),
@@ -192,7 +192,7 @@ SendTransactionScreen.prototype.render = function () {
             width: '100%',
             resize: 'none',
           },
-          dataset: {
+          dataSet: {
             persistentFormId: 'tx-data',
           },
         }),