Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #15035 from Slava/eth-wallet-payments
Browse files Browse the repository at this point in the history
eth-wallet: 'enable brave payments' notice
  • Loading branch information
ryanml committed Aug 16, 2018
1 parent 16a7383 commit 22f4cc8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
13 changes: 6 additions & 7 deletions app/ethWallet-geth.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ const appStore = require('../js/stores/appStore')
const ledgerState = require('./common/state/ledgerState')
const {getSetting} = require('../js/settings')
const settings = require('../js/constants/settings')
const appDispatcher = require('../js/dispatcher/appDispatcher')
const appConstants = require('../js/constants/appConstants')
const appActions = require('../js/actions/appActions')

const gethCache = process.env.GETH_CACHE || '1024'
const envNet = process.env.ETHEREUM_NETWORK || 'mainnet'
Expand Down Expand Up @@ -324,11 +323,7 @@ ipcMain.on('eth-wallet-get-metamask-state', (e) => {
})

ipcMain.on('eth-wallet-enable-metamask', (e) => {
appDispatcher.dispatch({
actionType: appConstants.APP_CHANGE_SETTING,
key: settings.METAMASK_ENABLED,
value: true
})
appActions.changeSetting(settings.METAMASK_ENABLED, true)
})

ipcMain.on('eth-wallet-get-keys-path', (e) => {
Expand Down Expand Up @@ -375,6 +370,10 @@ ipcMain.on('eth-wallet-get-compare-password-hash', (e, str, hash) => {
})
})

ipcMain.on('eth-wallet-enable-brave-payments', (e) => {
appActions.changeSetting(settings.PAYMENTS_ENABLED, true)
})

const launchGeth = async function () {
await spawnGeth()
}
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"less": "^2.5.3",
"less-loader": "^2.2.1",
"lolex": "~1.3.2",
"meteor-dapp-wallet-prebuilt": "0.2.31",
"meteor-dapp-wallet-prebuilt": "0.2.32",
"mkdirp": "^0.5.1",
"mocha": "^2.3.4",
"mockery": "^2.1.0",
Expand Down

0 comments on commit 22f4cc8

Please sign in to comment.