feature/default_network_editable
Dan Finlay 8 years ago
parent 19f7041ba4
commit bc623bbe34
  1. 9
      ui/app/accounts/add.js
  2. 2
      ui/app/actions.js
  3. 9
      ui/app/components/buy-button-subview.js

@ -2,7 +2,7 @@ const inherits = require('util').inherits
const Component = require('react').Component const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const connect = require('react-redux').connect const connect = require('react-redux').connect
const actions = require('../../actions') const actions = require('../actions')
// Components // Components
const TabBar = require('../components/tab-bar') const TabBar = require('../components/tab-bar')
@ -23,9 +23,6 @@ function AddAccountScreen () {
} }
AddAccountScreen.prototype.render = function () { AddAccountScreen.prototype.render = function () {
const props = this.props
const state = this.state || {}
const subview = state.subview || 'new'
return ( return (
h('.flex-column', { h('.flex-column', {
@ -38,7 +35,7 @@ AddAccountScreen.prototype.render = function () {
style: { style: {
alignItems: 'center', alignItems: 'center',
padding: '0px 20px', padding: '0px 20px',
} },
}, [ }, [
h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
onClick: this.goHome.bind(this), onClick: this.goHome.bind(this),
@ -55,7 +52,7 @@ AddAccountScreen.prototype.render = function () {
defaultTab: 'new', defaultTab: 'new',
tabSelected: (key) => { tabSelected: (key) => {
this.setState({ subview: key }) this.setState({ subview: key })
} },
}), }),
this.renderNewOrImport(), this.renderNewOrImport(),

@ -254,7 +254,7 @@ function addNewKeyring (type, opts) {
function navigateToNewAccountScreen() { function navigateToNewAccountScreen() {
return { return {
type: this.NEW_ACCOUNT_SCREEN type: this.NEW_ACCOUNT_SCREEN,
} }
} }

@ -30,7 +30,6 @@ function BuyButtonSubview () {
BuyButtonSubview.prototype.render = function () { BuyButtonSubview.prototype.render = function () {
const props = this.props const props = this.props
const currentForm = props.buyView.formView
const isLoading = props.isSubLoading const isLoading = props.isSubLoading
return ( return (
@ -69,7 +68,7 @@ BuyButtonSubview.prototype.render = function () {
}), }),
]), ]),
], ],
key: 'coinbase' key: 'coinbase',
}, },
{ {
content: [ content: [
@ -83,9 +82,9 @@ BuyButtonSubview.prototype.render = function () {
margin: '0px 5px', margin: '0px 5px',
}, },
}), }),
]) ]),
], ],
key: 'shapeshift' key: 'shapeshift',
}, },
], ],
defaultTab: 'coinbase', defaultTab: 'coinbase',
@ -98,7 +97,7 @@ BuyButtonSubview.prototype.render = function () {
props.dispatch(actions.shapeShiftSubview(props.provider.type)) props.dispatch(actions.shapeShiftSubview(props.provider.type))
break break
} }
} },
}), }),
this.formVersionSubview(), this.formVersionSubview(),

Loading…
Cancel
Save