1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00

Fix isMascara and update yarn.lock

This commit is contained in:
Chi Kei Chan 2017-12-12 12:22:22 -08:00
parent 57c91435a7
commit 515437a4c9
2 changed files with 464 additions and 290 deletions

View File

@ -3,7 +3,6 @@ const connect = require('react-redux').connect
const h = require('react-hyperscript') const h = require('react-hyperscript')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const inherits = require('util').inherits const inherits = require('util').inherits
const isMobileBrowser = require('../../lib/is-mobile-browser')
const actions = require('../actions') const actions = require('../actions')
const selectors = require('../selectors') const selectors = require('../selectors')
@ -33,6 +32,7 @@ function mapStateToProps (state) {
selectedToken: selectors.getSelectedToken(state), selectedToken: selectors.getSelectedToken(state),
identity, identity,
network, network,
isMascara,
} }
} }
@ -100,7 +100,7 @@ TxView.prototype.renderButtons = function () {
} }
TxView.prototype.render = function () { TxView.prototype.render = function () {
const { selectedAddress, identity, network } = this.props const { selectedAddress, identity, network, isMascara } = this.props
return h('div.tx-view.flex-column', { return h('div.tx-view.flex-column', {
style: {}, style: {},

750
yarn.lock

File diff suppressed because it is too large Load Diff