From df6d03cefd1917c377f658fa8423654957ca6440 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Tue, 5 Jun 2018 11:39:51 -0700 Subject: Fix account list order for the old UI --- old-ui/app/components/account-dropdowns.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index 53468a1a1..262de6601 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -23,9 +23,10 @@ class AccountDropdowns extends Component { renderAccounts () { const { identities, selected, keyrings } = this.props + const accountOrder = keyrings.reduce((list, keyring) => list.concat(keyring.accounts), []) - return Object.keys(identities).map((key, index) => { - const identity = identities[key] + return accountOrder.map((address, index) => { + const identity = identities[address] const isSelected = identity.address === selected const simpleAddress = identity.address.substring(2).toLowerCase() -- cgit v1.2.3 From 44a8e48a04ea69e1f8e530ae1bacf55890f8df98 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 13 Jun 2018 23:30:31 -0700 Subject: notices - replace getLatestNotice with getNextNotice --- old-ui/app/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/app.js b/old-ui/app/app.js index abeb4f3f9..5c2dccc03 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -73,7 +73,7 @@ function mapStateToProps (state) { network: state.metamask.network, provider: state.metamask.provider, forgottenPassword: state.appState.forgottenPassword, - lastUnreadNotice: state.metamask.lastUnreadNotice, + nextUnreadNotice: state.metamask.nextUnreadNotice, lostAccounts: state.metamask.lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], featureFlags, @@ -460,9 +460,9 @@ App.prototype.renderPrimary = function () { }, [ h(NoticeScreen, { - notice: props.lastUnreadNotice, + notice: props.nextUnreadNotice, key: 'NoticeScreen', - onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)), + onConfirm: () => props.dispatch(actions.markNoticeRead(props.nextUnreadNotice)), }), !props.isInitialized && h('.flex-row.flex-center.flex-grow', [ -- cgit v1.2.3 From f4d085550e3a8b7c43f9e887126c5722e32cd828 Mon Sep 17 00:00:00 2001 From: Koh Wei Jie Date: Fri, 22 Jun 2018 16:44:07 +0800 Subject: fixed blank boolean field for typed signing for old UI --- old-ui/app/components/typed-message-renderer.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'old-ui') diff --git a/old-ui/app/components/typed-message-renderer.js b/old-ui/app/components/typed-message-renderer.js index d170d63b7..ed372d7bc 100644 --- a/old-ui/app/components/typed-message-renderer.js +++ b/old-ui/app/components/typed-message-renderer.js @@ -34,9 +34,13 @@ TypedMessageRenderer.prototype.render = function () { function renderTypedData (values) { return values.map(function (value) { + let v = value.value + if (typeof v === "boolean") { + v = v.toString() + } return h('div', {}, [ h('strong', {style: {display: 'block', fontWeight: 'bold'}}, String(value.name) + ':'), - h('div', {}, value.value), + h('div', {}, v), ]) }) } -- cgit v1.2.3 From f17d99f81cbb72126a0d67a8d2c7d3e55bf4a4c1 Mon Sep 17 00:00:00 2001 From: Koh Wei Jie Date: Thu, 28 Jun 2018 08:06:36 +0800 Subject: Fixed lint error --- old-ui/app/components/typed-message-renderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'old-ui') diff --git a/old-ui/app/components/typed-message-renderer.js b/old-ui/app/components/typed-message-renderer.js index ed372d7bc..19e46f4fc 100644 --- a/old-ui/app/components/typed-message-renderer.js +++ b/old-ui/app/components/typed-message-renderer.js @@ -35,7 +35,7 @@ TypedMessageRenderer.prototype.render = function () { function renderTypedData (values) { return values.map(function (value) { let v = value.value - if (typeof v === "boolean") { + if (typeof v === 'boolean') { v = v.toString() } return h('div', {}, [ -- cgit v1.2.3 From a8f745f9fe74751b87f500af3857b66d4c80f45e Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 2 Jul 2018 18:49:33 -0400 Subject: eslint --fix . --- old-ui/app/components/ens-input.js | 2 +- old-ui/app/components/loading.js | 2 +- old-ui/app/components/transaction-list-item.js | 4 ++-- old-ui/app/config.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js index 7e06fa9f1..9c46f77d7 100644 --- a/old-ui/app/components/ens-input.js +++ b/old-ui/app/components/ens-input.js @@ -20,7 +20,7 @@ function EnsInput () { EnsInput.prototype.render = function () { const props = this.props - function onInputChange() { + function onInputChange () { const network = this.props.network const networkHasEnsSupport = getNetworkEnsSupport(network) if (!networkHasEnsSupport) return diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js index b8e2eb599..2a29361f9 100644 --- a/old-ui/app/components/loading.js +++ b/old-ui/app/components/loading.js @@ -28,7 +28,7 @@ LoadingIndicator.prototype.render = function () { background: 'rgba(255, 255, 255, 0.8)', }, }, [ - canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', { + canBypass ? h('i.fa.fa-close.cursor-pointer.close-loading', { style: { position: 'absolute', top: '1px', diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index b9f82c668..e9280419a 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -40,8 +40,8 @@ TransactionListItem.prototype.showRetryButton = function () { const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0] - const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce - && lastSubmittedTxWithCurrentNonce.id === transaction.id + const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce && + lastSubmittedTxWithCurrentNonce.id === transaction.id return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 } diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 508770bd4..392a6dba7 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -31,7 +31,7 @@ ConfigScreen.prototype.render = function () { return ( h('.flex-column.flex-grow', { - style:{ + style: { maxHeight: '585px', overflowY: 'auto', }, -- cgit v1.2.3