From 820736b427fba833c920a73334fde4ba30a7fb2a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 22 Apr 2016 14:39:12 -0700 Subject: [PATCH 1/2] Add RPC config buttons and styles - Add save button for custom RPC input field - Add button for RPC at `localhost:8545`. - Improve `Current RPC` display. --- ui/app/config.js | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/ui/app/config.js b/ui/app/config.js index 878c9955f..f4eecf7f8 100644 --- a/ui/app/config.js +++ b/ui/app/config.js @@ -47,11 +47,14 @@ ConfigScreen.prototype.render = function() { currentProviderDisplay(metamaskState), - h('div', [ - h('input', { + h('div', { style: {display: 'flex'} }, [ + h('input#new_rpc', { placeholder: 'New RPC URL', style: { - width: '100%', + width: 'inherit', + flex: '1 0 auto', + height: '30px', + margin: '8px', }, onKeyPress(event) { if (event.key === 'Enter') { @@ -61,6 +64,17 @@ ConfigScreen.prototype.render = function() { } } }), + h('button', { + style: { + alignSelf: 'center', + }, + onClick(event) { + event.preventDefault() + var element = document.querySelector('input#new_rpc') + var newRpc = element.value + state.dispatch(actions.setRpcTarget(newRpc)) + } + }, 'Save') ]), h('div', [ @@ -87,6 +101,18 @@ ConfigScreen.prototype.render = function() { }, 'Use Morden Test Network') ]), + h('div', [ + h('button', { + style: { + alignSelf: 'center', + }, + onClick(event) { + event.preventDefault() + state.dispatch(actions.setRpcTarget('http://localhost:8545/')) + } + }, 'Use http://localhost:8545') + ]), + ]), ]), ]) @@ -96,7 +122,7 @@ ConfigScreen.prototype.render = function() { function currentProviderDisplay(metamaskState) { var rpc = metamaskState.provider.rpcTarget return h('div', [ - h('h3', {style: { fontWeight: 'bold' }}, 'Currently using RPC'), - h('p', rpc) + h('span', {style: { fontWeight: 'bold', paddingRight: '10px'}}, 'Current RPC'), + h('span', rpc) ]) } From c5dfd2e3fda2ce255f767f8dcf0f1941bebf3337 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 22 Apr 2016 14:41:24 -0700 Subject: [PATCH 2/2] Bump changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2bcf006f..f6abe3bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - Added transaction list to account detail view. - Fix bug on config screen where current RPC address was always displayed wrong. - Fixed bug where entering a decimal value when sending a transaction would result in sending the wrong amount. +- Add save button to custom RPC input field. +- Add quick-select button for RPC on `localhost:8545`. +- Improve config view styling. # 1.5.1 2016-04-15