Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.

feature/default_network_editable
Kevin Serrano 8 years ago
commit 86832e6feb
  1. 3
      CHANGELOG.md
  2. 5
      app/manifest.json
  3. 17
      app/scripts/lib/config-manager.js
  4. 1
      app/scripts/lib/idStore.js
  5. 39
      app/scripts/metamask-controller.js
  6. 14
      ui/app/account-detail.js
  7. 35
      ui/app/actions.js
  8. 4
      ui/app/app.js
  9. 6
      ui/app/css/index.css
  10. 89
      ui/app/eth-store-warning.js
  11. 18
      ui/app/reducers/app.js
  12. 5
      ui/app/reducers/metamask.js

@ -2,7 +2,10 @@
## Current Master
- Added a Warning screen about storing ETH
- Add buy Button!
- MetaMask now throws descriptive errors when apps try to use synchronous web3 methods.
- Removed firefox-specific line in manifest.
## 2.6.2 2016-07-20

@ -37,11 +37,6 @@
"all_frames": false
}
],
"applications": {
"gecko": {
"id": "MOZILLA_EXTENSION_ID"
}
},
"permissions": [
"notifications",
"storage",

@ -289,6 +289,12 @@ ConfigManager.prototype.updateConversionRate = function () {
const parsedResponse = JSON.parse(response)
this.setConversionPrice(parsedResponse.ticker.price)
this.setConversionDate(parsedResponse.timestamp)
console.log('=================')
console.log('Updated currency!')
console.log('=================')
console.log(this.getConversionRate())
console.log(this.getCurrentFiat())
console.log(parsedResponse)
}).catch((err) => {
console.error('Error in conversion.', err)
})
@ -315,3 +321,14 @@ ConfigManager.prototype.getConversionDate = function () {
var data = this.getData()
return ('conversionDate' in data) && data.conversionDate
}
ConfigManager.prototype.setShouldntShowWarning = function (confirmed) {
var data = this.getData()
data.isEthConfirmed = confirmed
this.setData(data)
}
ConfigManager.prototype.getShouldntShowWarning = function () {
var data = this.getData()
return ('isEthConfirmed' in data) && data.isEthConfirmed
}

@ -94,6 +94,7 @@ IdentityStore.prototype.getState = function () {
isUnlocked: this._isUnlocked(),
seedWords: seedWords,
isConfirmed: configManager.getConfirmed(),
isEthConfirmed: configManager.getShouldntShowWarning(),
unconfTxs: configManager.unconfirmedTxs(),
transactions: configManager.getTxList(),
unconfMsgs: messageManager.unconfirmedMsgs(),

@ -20,7 +20,9 @@ module.exports = class MetamaskController {
this.ethStore = new EthStore(this.provider)
this.idStore.setStore(this.ethStore)
this.messageManager = messageManager
this.publicConfigStore = this.initPublicConfigStore()
this.publicConfigStore = this.initPublicConfigStore
this.configManager.setCurrentFiat('usd')
this.configManager.updateConversionRate()
this.scheduleConversionInterval()
}
@ -42,6 +44,8 @@ module.exports = class MetamaskController {
useEtherscanProvider: this.useEtherscanProvider.bind(this),
agreeToDisclaimer: this.agreeToDisclaimer.bind(this),
setCurrentFiat: this.setCurrentFiat.bind(this),
agreeToEthWarning: this.agreeToEthWarning.bind(this),
// forward directly to idStore
createNewVault: idStore.createNewVault.bind(idStore),
recoverFromSeed: idStore.recoverFromSeed.bind(idStore),
@ -58,6 +62,8 @@ module.exports = class MetamaskController {
saveAccountLabel: idStore.saveAccountLabel.bind(idStore),
tryPassword: idStore.tryPassword.bind(idStore),
recoverSeed: idStore.recoverSeed.bind(idStore),
// coinbase
buyEth: this.buyEth.bind(this),
}
}
@ -260,11 +266,18 @@ module.exports = class MetamaskController {
clearInterval(this.conversionInterval)
}
this.conversionInterval = setInterval(() => {
console.log('=================')
console.log('Updated currency!')
console.log('=================')
console.log('started update conversion rate.')
this.configManager.updateConversionRate()
}, 1000)
}, 300000)
}
agreeToEthWarning (cb) {
try {
this.configManager.setShouldntShowWarning(true)
cb()
} catch (e) {
cb(e)
}
}
// called from popup
@ -284,6 +297,22 @@ module.exports = class MetamaskController {
this.configManager.useEtherscanProvider()
extension.runtime.reload()
}
buyEth (address, amount) {
if (!amount) amount = '5'
var network = this.idStore._currentState.network
var url = `https://buy.coinbase.com/?code=9ec56d01-7e81-5017-930c-513daa27bb6a&amount=${amount}&address=${address}&crypto_currency=ETH`
if (network === '2') {
url = 'https://testfaucet.metamask.io/'
}
extension.tabs.create({
url,
})
}
}
function noop () {}

@ -28,6 +28,7 @@ function mapStateToProps (state) {
network: state.metamask.network,
unconfTxs: valuesFor(state.metamask.unconfTxs),
unconfMsgs: valuesFor(state.metamask.unconfMsgs),
isEthWarningConfirmed: state.metamask.isEthConfirmed,
}
}
@ -170,6 +171,16 @@ AccountDetailScreen.prototype.render = function () {
},
}),
h('button', {
onClick: () => props.dispatch(actions.buyEth(selected)),
style: {
marginBottom: '20px',
marginRight: '8px',
position: 'absolute',
left: '219px',
},
}, 'BUY'),
h('button', {
onClick: () => props.dispatch(actions.showSendPage()),
style: {
@ -181,7 +192,7 @@ AccountDetailScreen.prototype.render = function () {
]),
]),
// subview (tx history, pk export confirm)
// subview (tx history, pk export confirm, buy eth warning)
h(ReactCSSTransitionGroup, {
className: 'css-transition-group',
transitionName: 'main',
@ -239,3 +250,4 @@ AccountDetailScreen.prototype.transactionList = function () {
AccountDetailScreen.prototype.requestAccountExport = function () {
this.props.dispatch(actions.requestExportAccount())
}

@ -68,6 +68,10 @@ var actions = {
showPrivateKey: showPrivateKey,
SAVE_ACCOUNT_LABEL: 'SAVE_ACCOUNT_LABEL',
saveAccountLabel: saveAccountLabel,
AGREE_TO_ETH_WARNING: 'AGREE_TO_ETH_WARNING',
agreeToEthWarning: agreeToEthWarning,
SHOW_ETH_WARNING: 'SHOW_ETH_WARNING',
showEthWarning: showEthWarning,
// tx conf screen
COMPLETED_TX: 'COMPLETED_TX',
TRANSACTION_ERROR: 'TRANSACTION_ERROR',
@ -108,6 +112,9 @@ var actions = {
HIDE_LOADING: 'HIDE_LOADING_INDICATION',
showLoadingIndication: showLoadingIndication,
hideLoadingIndication: hideLoadingIndication,
// buy Eth with coinbase
BUY_ETH: 'BUY_ETH',
buyEth: buyEth,
}
module.exports = actions
@ -578,3 +585,31 @@ function showSendPage () {
type: actions.SHOW_SEND_PAGE,
}
}
function agreeToEthWarning () {
return (dispatch) => {
_accountManager.agreeToEthWarning((err) => {
if (err) {
return dispatch(actions.showEthWarning(err.message))
}
dispatch({
type: actions.AGREE_TO_ETH_WARNING,
})
})
}
}
function showEthWarning () {
return {
type: actions.SHOW_ETH_WARNING,
}
}
function buyEth (address, amount) {
return (dispatch) => {
_accountManager.buyEth(address, amount)
dispatch({
type: actions.BUY_ETH,
})
}
}

@ -27,6 +27,7 @@ const MenuDroppo = require('menu-droppo')
const DropMenuItem = require('./components/drop-menu-item')
const NetworkIndicator = require('./components/network')
const Tooltip = require('./components/tooltip')
const EthStoreWarning = require('./eth-store-warning')
module.exports = connect(mapStateToProps)(App)
@ -37,6 +38,7 @@ function mapStateToProps (state) {
return {
// state from plugin
isConfirmed: state.metamask.isConfirmed,
isEthConfirmed: state.metamask.isEthConfirmed,
isInitialized: state.metamask.isInitialized,
isUnlocked: state.metamask.isUnlocked,
currentView: state.appState.currentView,
@ -324,6 +326,8 @@ App.prototype.renderPrimary = function () {
// show current view
switch (props.currentView.name) {
case 'EthStoreWarning':
return h(EthStoreWarning, {key: 'ethWarning'})
case 'accounts':
return h(AccountsScreen, {key: 'accounts'})

@ -463,3 +463,9 @@ input.large-input {
display: inline-block;
padding-left: 5px;
}
/* buy eth warning screen */
.eth-warning{
transition: opacity 400ms ease-in, transform 400ms ease-in;
}

@ -0,0 +1,89 @@
const connect = require('react-redux').connect
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const actions = require('./actions')
module.exports = connect(mapStateToProps)(EthStoreWarning)
inherits(EthStoreWarning, Component)
function EthStoreWarning () {
Component.call(this)
}
function mapStateToProps (state) {
return {
selectedAccount: state.metamask.selectedAccount,
}
}
EthStoreWarning.prototype.render = function () {
return (
h('.flex-column', {
key: 'ethWarning',
style: {
paddingTop: '25px',
marginRight: '30px',
marginLeft: '30px',
alignItems: 'center',
},
}, [
h('.warning', {
style: {
margin: '10px 10px 10px 10px',
},
},
`MetaMask is currently in beta -
exercise caution while handling
and storing your ether.
`),
h('i.fa.fa-exclamation-triangle.fa-4', {
style: {
fontSize: '152px',
color: '#AEAEAE',
textAlign: 'center',
},
}),
h('.flex-row', {
style: {
marginTop: '25px',
marginBottom: '10px',
},
}, [
h('input', {
type: 'checkbox',
onChange: this.toggleShowWarning.bind(this, event),
}),
h('.warning', {
style: {
fontSize: '11px',
},
}, 'Dont show me this message again'),
]),
h('.flex-row', {
style: {
width: '100%',
justifyContent: 'space-around',
},
}, [
h('button', {
onClick: this.toAccounts.bind(this),
},
'Continue to MetaMask'),
]),
])
)
}
EthStoreWarning.prototype.toggleShowWarning = function (event) {
this.props.dispatch(actions.agreeToEthWarning())
}
EthStoreWarning.prototype.toAccounts = function () {
this.props.dispatch(actions.showAccountDetail(this.props.account))
}

@ -28,10 +28,13 @@ function reduceApp (state, action) {
name: 'createVaultComplete',
seedWords,
}
var ethStoreWarning = {
name: 'EthStoreWarning',
}
var appState = extend({
menuOpen: false,
currentView: seedWords ? seedConfView : defaultView,
currentView: seedWords ? seedConfView : !state.metamask.isEthConfirmed ? ethStoreWarning : defaultView,
accountDetail: {
subview: 'transactions',
},
@ -366,6 +369,17 @@ function reduceApp (state, action) {
},
})
case actions.SHOW_ETH_WARNING:
return extend(appState, {
transForward: true,
currentView: {
name: 'accountDetail',
context: appState.currentView.context,
},
accountDetail: {
subview: 'buy-eth-warning',
},
})
default:
return appState
}
@ -390,3 +404,5 @@ function indexForPending (state, txId) {
})
return idx
}

@ -31,6 +31,11 @@ function reduceMetamask (state, action) {
isConfirmed: true,
})
case actions.AGREE_TO_ETH_WARNING:
return extend(metamaskState, {
isEthConfirmed: true,
})
case actions.UNLOCK_METAMASK:
return extend(metamaskState, {
isUnlocked: true,

Loading…
Cancel
Save