Merge pull request #984 from MetaMask/correctCoinbaseInfo

Correct coinbase info
feature/default_network_editable
Dan Finlay 8 years ago committed by GitHub
commit e8e06542e4
  1. 1
      CHANGELOG.md
  2. 8
      ui/app/components/coinbase-form.js
  3. 2
      ui/app/reducers/app.js

@ -2,6 +2,7 @@
## Current Master
- Update Coinbase info. and increase the buy amount to $15
- Fixed ropsten transaction links
- Temporarily disable extension reload detection causing infinite reload bug.

@ -72,7 +72,7 @@ CoinbaseForm.prototype.render = function () {
lineHeight: '13px',
},
},
`there is a USD$ 5 a day max and a USD$ 50
`there is a USD$ 15 a day max and a USD$ 50
dollar limit per the life time of an account without a
coinbase account. A fee of 3.75% will be aplied to debit/credit cards.`),
@ -138,14 +138,14 @@ function isValidAmountforCoinBase(amount) {
amount = parseFloat(amount)
if (amount) {
if (amount <= 5 && amount > 0) {
if (amount <= 15 && amount > 0) {
return {
valid: true,
}
} else if (amount > 5) {
} else if (amount > 15) {
return {
valid: false,
message: 'The amount can not be greater then $5',
message: 'The amount can not be greater then $15',
}
} else {
return {

@ -418,7 +418,7 @@ function reduceApp (state, action) {
},
buyView: {
subview: 'buyForm',
amount: '5.00',
amount: '15.00',
buyAddress: action.value,
formView: {
coinbase: true,

Loading…
Cancel
Save