do not limit use of buy widget when using custom ADDFUNDS_URL

brave · Nov 15, 2016 · d89d29c · d89d29c
1 parent d323edb
commit d89d29c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/ledger.js b/app/ledger.js
@@ -988,13 +988,17 @@ var updateLedgerInfo = () => {
     underscore.extend(ledgerInfo,
                       underscore.pick(info, [ 'address', 'passphrase', 'balance', 'unconfirmed', 'satoshis', 'btc', 'amount',
                                               'currency' ]))
-    if ((!info.buyURLExpires) || (info.buyURLExpires > now)) ledgerInfo.buyURL = info.buyURL
-    if ((process.env.NODE_ENV === 'development') && (typeof process.env.ADDFUNDS_URL !== 'undefined')) {
+    if ((!info.buyURLExpires) || (info.buyURLExpires > now)) {
+      ledgerInfo.buyURL = info.buyURL
+      ledgerInfo.buyMaximumUSD = 6
+    }
+    if (typeof process.env.ADDFUNDS_URL !== 'undefined') {
       ledgerInfo.buyURLFrame = true
       ledgerInfo.buyURL = process.env.ADDFUNDS_URL + '?' +
                           querystring.stringify({ currency: ledgerInfo.currency,
                                                   amount: getSetting(settings.PAYMENTS_CONTRIBUTION_AMOUNT),
                                                   address: ledgerInfo.address })
+      ledgerInfo.buyMaximumUSD = false
     }
 
     underscore.extend(ledgerInfo, ledgerInfo._internal.cache || {})

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -350,7 +350,9 @@ class BitcoinDashboard extends ImmutableComponent {
     return getSetting(settings.PAYMENTS_CONTRIBUTION_AMOUNT, this.props.settings) || 0
   }
   get canUseCoinbase () {
-    return this.currency === 'USD' && this.amount < 6
+    if (!this.props.ledgerData.get('buyMaximumUSD')) return true
+
+    return this.currency === 'USD' && this.amount < this.props.ledgerData.get('buyMaximumUSD')
   }
   get userInAmerica () {
     const countryCode = this.props.ledgerData.get('countryCode')