diff --git a/app/scripts/lib/buy-eth-url.js b/app/scripts/lib/buy-eth-url.js index b83e83e2e..10743259c 100644 --- a/app/scripts/lib/buy-eth-url.js +++ b/app/scripts/lib/buy-eth-url.js @@ -5,13 +5,12 @@ export default getBuyEthUrl * * @param {Object} opts - Options required to determine the correct url * @param {string} opts.network The network for which to return a url - * @param {string} opts.amount The amount of ETH to buy on coinbase. Only relevant if network === '1'. * @param {string} opts.address The address the bought ETH should be sent to. Only relevant if network === '1'. * @returns {string|undefined} - The url at which the user can access ETH, while in the given network. If the passed * network does not match any of the specified cases, or if no network is given, returns undefined. * */ -function getBuyEthUrl ({ network, amount, address, service }) { +function getBuyEthUrl ({ network, address, service }) { // default service by network if not specified if (!service) { service = getDefaultServiceForNetwork(network) @@ -22,8 +21,6 @@ function getBuyEthUrl ({ network, amount, address, service }) { return `https://pay.sendwyre.com/?dest=ethereum:${address}&destCurrency=ETH&accountId=AC-7AG3W4XH4N2&paymentMethod=debit-card` case 'coinswitch': return `https://metamask.coinswitch.co/?address=${address}&to=eth` - case 'coinbase': - return `https://buy.coinbase.com/?code=9ec56d01-7e81-5017-930c-513daa27bb6a&amount=${amount}&address=${address}&crypto_currency=ETH` case 'metamask-faucet': return 'https://faucet.metamask.io/' case 'rinkeby-faucet': diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index ad031f4e4..56d9a66a9 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -460,8 +460,6 @@ export default class MetamaskController extends EventEmitter { markPasswordForgotten: this.markPasswordForgotten.bind(this), unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this), getGasPrice: (cb) => cb(null, this.getGasPrice()), - - // coinbase buyEth: this.buyEth.bind(this), // primary HD keyring management diff --git a/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js b/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js index 31f10eff9..5c7c8caec 100644 --- a/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js +++ b/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js @@ -12,7 +12,7 @@ function mapStateToProps (state) { function mapDispatchToProps (dispatch) { return { toWyre: (address) => { - dispatch(buyEth({ service: 'wyre', address, amount: 0 })) + dispatch(buyEth({ service: 'wyre', address })) }, toCoinSwitch: (address) => { dispatch(buyEth({ service: 'coinswitch', address })) diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index 627e9f627..185f1a0ce 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -450,10 +450,6 @@ } } - &__coinbase-logo { - height: 40px; - } - &__shapeshift-logo { height: 60px; } diff --git a/ui/app/pages/create-account/new-account.container.js b/ui/app/pages/create-account/new-account.container.js index 93a89fe31..ce7f37b53 100644 --- a/ui/app/pages/create-account/new-account.container.js +++ b/ui/app/pages/create-account/new-account.container.js @@ -16,7 +16,6 @@ const mapStateToProps = (state) => { const mapDispatchToProps = (dispatch) => { return { - toCoinbase: (address) => dispatch(actions.buyEth({ network: '1', address, amount: 0 })), createAccount: (newAccountName) => { return dispatch(actions.addNewAccount()) .then((newAccountAddress) => { diff --git a/ui/app/store/actionConstants.js b/ui/app/store/actionConstants.js index d84afc67f..02396e2ee 100644 --- a/ui/app/store/actionConstants.js +++ b/ui/app/store/actionConstants.js @@ -68,7 +68,7 @@ export default { // loading overlay SHOW_LOADING: 'SHOW_LOADING_INDICATION', HIDE_LOADING: 'HIDE_LOADING_INDICATION', - // buy Eth with coinbase + BUY_ETH: 'BUY_ETH', TOGGLE_ACCOUNT_MENU: 'TOGGLE_ACCOUNT_MENU',