From b39bd5333b8bb55cc11a191313c742c60a623650 Mon Sep 17 00:00:00 2001 From: Dan Finlay <dan@danfinlay.com> Date: Thu, 25 Aug 2016 14:10:07 -0700 Subject: Persist send tx form field values --- ui/app/send.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'ui/app/send.js') diff --git a/ui/app/send.js b/ui/app/send.js index 06ea199f4..0cc3a032f 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -1,5 +1,5 @@ const inherits = require('util').inherits -const Component = require('react').Component +const PersistentForm = require('../lib/persistent-form') const h = require('react-hyperscript') const connect = require('react-redux').connect const Identicon = require('./components/identicon') @@ -29,12 +29,14 @@ function mapStateToProps (state) { return result } -inherits(SendTransactionScreen, Component) +inherits(SendTransactionScreen, PersistentForm) function SendTransactionScreen () { - Component.call(this) + PersistentForm.call(this) } SendTransactionScreen.prototype.render = function () { + this.persistentFormParentId = 'send-tx-form' + var state = this.props var address = state.address var account = state.account @@ -137,6 +139,9 @@ SendTransactionScreen.prototype.render = function () { h('input.large-input', { name: 'address', placeholder: 'Recipient Address', + dataset: { + persistentFormId: 'recipient-address', + }, }), ]), @@ -150,6 +155,9 @@ SendTransactionScreen.prototype.render = function () { style: { marginRight: 6, }, + dataset: { + persistentFormId: 'tx-amount', + }, }), h('button.primary', { @@ -185,11 +193,12 @@ SendTransactionScreen.prototype.render = function () { width: '100%', resize: 'none', }, + dataset: { + persistentFormId: 'tx-data', + }, }), ]), - ]) - ) } -- cgit v1.2.3 From 7f947f8ab2f22d57f5c7c84c30b942a721049a17 Mon Sep 17 00:00:00 2001 From: Dan Finlay <dan@danfinlay.com> Date: Thu, 1 Sep 2016 11:29:17 -0700 Subject: Skip loading indication from send screen --- ui/app/send.js | 1 - 1 file changed, 1 deletion(-) (limited to 'ui/app/send.js') diff --git a/ui/app/send.js b/ui/app/send.js index 0cc3a032f..cf1b43b1d 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -236,7 +236,6 @@ SendTransactionScreen.prototype.onSubmit = function () { } this.props.dispatch(actions.hideWarning()) - this.props.dispatch(actions.showLoadingIndication()) var txParams = { from: this.props.address, -- cgit v1.2.3 From 1537e3f5da8d0ad5a48ded40301445c6468521f7 Mon Sep 17 00:00:00 2001 From: Dan Finlay <dan@danfinlay.com> Date: Tue, 6 Sep 2016 17:28:25 -0700 Subject: Add fiat balances to tx conf view --- ui/app/send.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ui/app/send.js') diff --git a/ui/app/send.js b/ui/app/send.js index cf1b43b1d..009866cf7 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -7,7 +7,7 @@ const actions = require('./actions') const util = require('./util') const numericBalance = require('./util').numericBalance const addressSummary = require('./util').addressSummary -const EtherBalance = require('./components/eth-balance') +const EthBalance = require('./components/eth-balance') const ethUtil = require('ethereumjs-util') module.exports = connect(mapStateToProps)(SendTransactionScreen) @@ -107,8 +107,7 @@ SendTransactionScreen.prototype.render = function () { // balance h('.flex-row.flex-center', [ - // h('div', formatBalance(account && account.balance)), - h(EtherBalance, { + h(EthBalance, { value: account && account.balance, }), -- cgit v1.2.3 From 6d6130e2a6d79a29d67995cbf4fa22ea4870ef69 Mon Sep 17 00:00:00 2001 From: Dan Finlay <dan@danfinlay.com> Date: Sat, 10 Sep 2016 11:23:11 -0700 Subject: Camelcase dataset key for react --- ui/app/send.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/app/send.js') 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', }, }), -- cgit v1.2.3 From c37c050c8a119e4c2de1edea474c3c3d5ad1cf99 Mon Sep 17 00:00:00 2001 From: Frankie <frankie.diamond@gmail.com> Date: Mon, 12 Sep 2016 10:34:06 -0700 Subject: Revert "Add new eth-lightwallet salting to vault." --- ui/app/send.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/app/send.js') 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', }, }), -- cgit v1.2.3