diff options
author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-11 04:29:18 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 04:29:18 +0800 |
commit | e8e06542e47b41668f196b6db54290490003845b (patch) | |
tree | 4303cfc6a21ea057e60c53e5eee8874f9a380928 | |
parent | de22ab2090ca7d7929dbba188476a18d9d5f50d0 (diff) | |
parent | efde16aae506158d269f70b53b74b09eefd3eff8 (diff) | |
download | tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.tar tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.tar.gz tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.tar.bz2 tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.tar.lz tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.tar.xz tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.tar.zst tangerine-wallet-browser-e8e06542e47b41668f196b6db54290490003845b.zip |
Merge pull request #984 from MetaMask/correctCoinbaseInfo
Correct coinbase info
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | ui/app/components/coinbase-form.js | 8 | ||||
-rw-r--r-- | ui/app/reducers/app.js | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ee9add3..807f03aa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/ui/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js index 3c5708bf8..32e3066fd 100644 --- a/ui/app/components/coinbase-form.js +++ b/ui/app/components/coinbase-form.js @@ -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 { diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 5c5c0acce..31b9e109f 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -418,7 +418,7 @@ function reduceApp (state, action) { }, buyView: { subview: 'buyForm', - amount: '5.00', + amount: '15.00', buyAddress: action.value, formView: { coinbase: true, |