diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index dc934e774c3..40c74a6594e 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -45,7 +45,7 @@ paymentHistoryTitle=Your Payment History paymentHistoryFooterText=Your next payment submission is {{reconcileDate}}. paymentHistoryOKText=OK bitcoinAddress=Your Brave wallet address is: -bitcoinPaymentURL=Scan the QR code or copy this link: +bitcoinPaymentURL=Scan the QR code or transfer {{amount}} to: bitcoinQR=Brave wallet QR code: paymentHistoryTitle=Your Payment History bitcoinCopyAddress=Copy Bitcoin address to clipboard diff --git a/app/ledger.js b/app/ledger.js index 7ad79b79e87..82c21a64fa3 100644 --- a/app/ledger.js +++ b/app/ledger.js @@ -160,6 +160,7 @@ var boot = () => { if (ipc) { ipc.on(messages.CHECK_BITCOIN_HANDLER, () => { + // TODO: https://github.com/brave/browser-laptop/issues/3625 if (typeof protocolHandler.isNavigatorProtocolHandled === 'function') { ledgerInfo.hasBitcoinHandler = protocolHandler.isNavigatorProtocolHandled('', 'bitcoin') appActions.updateLedgerInfo(underscore.omit(ledgerInfo, [ '_internal' ])) diff --git a/js/about/preferences.js b/js/about/preferences.js index a9eb70ccf0d..9045b0a7ccf 100644 --- a/js/about/preferences.js +++ b/js/about/preferences.js @@ -263,10 +263,14 @@ class BitcoinDashboard extends ImmutableComponent { get overlayContent () { return } + get currency () { + return this.props.ledgerData.get('currency') || 'USD' + } + get amount () { + return getSetting(settings.PAYMENTS_CONTRIBUTION_AMOUNT, this.props.settings) || 0 + } get canUseCoinbase () { - // This assumes amount is USD - const amount = getSetting(settings.PAYMENTS_CONTRIBUTION_AMOUNT, this.props.settings) || 0 - return amount < 6 + return this.currency === 'USD' && this.amount < 6 } get coinbasePanel () { if (this.canUseCoinbase) { @@ -314,24 +318,24 @@ class BitcoinDashboard extends ImmutableComponent {