1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge pull request #984 from MetaMask/correctCoinbaseInfo

Correct coinbase info
This commit is contained in:
Dan Finlay 2017-01-10 12:29:18 -08:00 committed by GitHub
commit e8e06542e4
3 changed files with 6 additions and 5 deletions

View File

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

View File

@ -72,7 +72,7 @@ CoinbaseForm.prototype.render = function () {
lineHeight: '13px', 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 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.`), coinbase account. A fee of 3.75% will be aplied to debit/credit cards.`),
@ -138,14 +138,14 @@ function isValidAmountforCoinBase(amount) {
amount = parseFloat(amount) amount = parseFloat(amount)
if (amount) { if (amount) {
if (amount <= 5 && amount > 0) { if (amount <= 15 && amount > 0) {
return { return {
valid: true, valid: true,
} }
} else if (amount > 5) { } else if (amount > 15) {
return { return {
valid: false, valid: false,
message: 'The amount can not be greater then $5', message: 'The amount can not be greater then $15',
} }
} else { } else {
return { return {

View File

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