mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Position account display and burger in mobile tx view
This commit is contained in:
parent
c9b33da184
commit
17de77f24a
@ -7,7 +7,7 @@ const actions = require('../actions')
|
|||||||
const SlideoutMenu = require('react-burger-menu').slide
|
const SlideoutMenu = require('react-burger-menu').slide
|
||||||
const WalletView = require('./wallet-view')
|
const WalletView = require('./wallet-view')
|
||||||
|
|
||||||
// const Identicon = require('./identicon')
|
const Identicon = require('./identicon')
|
||||||
// const AccountDropdowns = require('./account-dropdowns').AccountDropdowns
|
// const AccountDropdowns = require('./account-dropdowns').AccountDropdowns
|
||||||
// const Content = require('./wallet-content-display')
|
// const Content = require('./wallet-content-display')
|
||||||
|
|
||||||
@ -41,6 +41,8 @@ function TxView () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TxView.prototype.render = function () {
|
TxView.prototype.render = function () {
|
||||||
|
const selected = '0x82df11beb942BEeeD58d466fCb0F0791365C7684' // TODO: remove fake address
|
||||||
|
|
||||||
return h('div.tx-view.flex-column', {
|
return h('div.tx-view.flex-column', {
|
||||||
style: {
|
style: {
|
||||||
flexGrow: 2,
|
flexGrow: 2,
|
||||||
@ -49,16 +51,49 @@ TxView.prototype.render = function () {
|
|||||||
background: '#FFFFFF',
|
background: '#FFFFFF',
|
||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
h('div.phone-visible.fa.fa-bars', {
|
|
||||||
onClick: () => {
|
h('div.flex-row.phone-visible', {
|
||||||
this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
|
style: {
|
||||||
|
margin: '1em 0.9em',
|
||||||
|
alignItems: 'center'
|
||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
|
// burger
|
||||||
|
h('div.fa.fa-bars', {
|
||||||
|
style: {
|
||||||
|
fontSize: '1.3em',
|
||||||
|
},
|
||||||
|
onClick: () => {
|
||||||
|
this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
|
||||||
|
}
|
||||||
|
}, []),
|
||||||
|
|
||||||
|
//account display
|
||||||
|
h('.identicon-wrapper.select-none', {
|
||||||
|
style: {
|
||||||
|
marginLeft: '0.9em',
|
||||||
|
},
|
||||||
|
}, [
|
||||||
|
h(Identicon, {
|
||||||
|
diameter: 24,
|
||||||
|
address: selected,
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
|
||||||
|
h('span', {
|
||||||
|
style: {
|
||||||
|
fontSize: '1.2em',
|
||||||
|
marginLeft: '0.5em', // TODO: switch all units for this component to em
|
||||||
|
}
|
||||||
|
}, [
|
||||||
|
'Account 1'
|
||||||
|
]),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
h('div.flex-row', {
|
h('div.flex-row', {
|
||||||
style: {
|
style: {
|
||||||
margin: '1.8em 1.3em 0.8em 1.3em',
|
margin: '1.8em 0.9em 0.8em 0.9em',
|
||||||
// flex: '1 0 520px',
|
// flex: '1 0 520px',
|
||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
@ -119,7 +154,7 @@ TxView.prototype.render = function () {
|
|||||||
|
|
||||||
h('div.flex-row', {
|
h('div.flex-row', {
|
||||||
style: {
|
style: {
|
||||||
margin: '1.8em 1.3em 0.8em 1.3em',
|
margin: '1.8em 0.9em 0.8em 0.9em',
|
||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ function WalletView () {
|
|||||||
const noop = () => {}
|
const noop = () => {}
|
||||||
|
|
||||||
WalletView.prototype.render = function () {
|
WalletView.prototype.render = function () {
|
||||||
const selected = '0x82df11beb942BEeeD58d466fCb0F0791365C7684'
|
const selected = '0x82df11beb942BEeeD58d466fCb0F0791365C7684' // TODO: remove fake address
|
||||||
const { network, responsiveDisplayClassname, style } = this.props
|
const { network, responsiveDisplayClassname, style } = this.props
|
||||||
|
|
||||||
return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), {
|
return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), {
|
||||||
|
Loading…
Reference in New Issue
Block a user