Merge branch 'master' into FixPasswording

6 files changed, 18 insertions, 16 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff1d4c2e7..9d89c2438 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,6 @@
 - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.
 - Now showing loading indication during vault unlocking, to clarify behavior for users who are experience slow unlocks.
 - Now only initially creates one wallet when restoring a vault, to reduce some users' confusion.
-- Improved the security of vault encryption by ensuring passwords are always uniquely salted.
 
 ## 2.10.2 2016-09-02
 
diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 4e0d69ed7..0b4acdfec 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 = AccountListItem
+module.exports = NewComponent
 
-inherits(AccountListItem, Component)
-function AccountListItem () {
+inherits(NewComponent, Component)
+function NewComponent () {
   Component.call(this)
 }
 
-AccountListItem.prototype.render = function () {
+NewComponent.prototype.render = function () {
   const identity = this.props.identity
   var isSelected = this.props.selectedAddress === identity.address
   var account = this.props.accounts[identity.address]
@@ -23,6 +23,9 @@ AccountListItem.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),
     }, [
 
@@ -70,7 +73,7 @@ AccountListItem.prototype.render = function () {
   )
 }
 
-AccountListItem.prototype.pendingOrNot = function () {
+NewComponent.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 d3c84d387..c20900c1e 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'),
+          h('hr.horizontal-line', {key: 'horizontal-line1'}),
           h('div.footer.hover-white.pointer', {
             key: 'reveal-account-bar',
             onClick: () => {
@@ -92,6 +92,7 @@ AccountsScreen.prototype.render = function () {
             },
             style: {
               display: 'flex',
+              flex: '1 0 auto',
               height: '40px',
               paddint: '10px',
               justifyContent: 'center',
@@ -100,7 +101,6 @@ 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 77c0d12b1..58b7942c3 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 c34cd7e66..4c1f21008 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 e660e90a8..009866cf7 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',
           },
         }),