From 323017a808e9b69aea668760469425c65aff4649 Mon Sep 17 00:00:00 2001 From: Cezar Augusto Date: Thu, 5 Oct 2017 16:25:57 -0300 Subject: [PATCH] change strings per brad feedback, move tooltip to top unskip preferences and paymentsTab tests Auditors: @nejczdovc Test Plan: npm run test -- --grep="PaymentsTab component" npm run test -- --grep="Preferences component unittest" Note that this undercovered two failing tests: npm run test -- grep="PaymentsTab component fundsamount functionality renders full balance correctly" npm run test-- --grep="PaymentsTab component fundsamount functionality renders partial balance correctl" --- .../locales/en-US/preferences.properties | 4 ++-- .../components/common/clipboardButton.js | 9 +++++++++ .../steps/addFundsWizardAddress.js | 2 +- test/unit/about/preferencesTest.js | 18 ++++++++++++----- .../components/preferences/paymentsTabTest.js | 20 ++++++++++++------- 5 files changed, 38 insertions(+), 15 deletions(-) diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index 0b0e5a9fc7a..73301d266ad 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -20,8 +20,8 @@ addFundsWizardMainHeader=Brave makes it easy to transfer funds from your existin addFundsWizardMainOptions=Select one of the currencies below to begin a new transfer. addFundsWizardMainReminder=Reminder: The Brave Wallet is unidirectional and BAT flows to publisher sites. For more information about Brave Payments, please visit theFAQ=the FAQ. -addFundsWizardAddressHeader=Go to your external {{currencyName}} account and send a minimum of 5.00 USD in {{currency}} to your Brave wallet address below: -addFundsWizardAddressInputNote=Note: we recommend starting with enough {{currency}} to cover your first contribution of {{funds}}. +addFundsWizardAddressHeader=Go to your external {{currencyName}} account and send {{currency}} to your Brave wallet address below: +addFundsWizardAddressInputNote=Note: We recommend starting with enough {{currency}} to cover your first contribution of {{funds}}. addFundsWizardAddressFooter=Your {{currency}} will be converted to BAT and appear in your Brave wallet in minutes. addFundsWizardAddressFooterBAT=Your additional BAT will appear in your Brave wallet after a few minutes. or=or diff --git a/app/renderer/components/common/clipboardButton.js b/app/renderer/components/common/clipboardButton.js index 3ff9b219d58..0729e9d1f17 100644 --- a/app/renderer/components/common/clipboardButton.js +++ b/app/renderer/components/common/clipboardButton.js @@ -36,6 +36,7 @@ class ClipboardButton extends React.Component { return @@ -85,6 +86,14 @@ const styles = StyleSheet.create({ opacity: 0, display: 'none' }, + doneLabelTop: { + position: 'absolute', + bottom: '35px', + right: '30px', + width: '-webkit-fill-available', + opacity: 0, + display: 'none' + }, visible: { display: 'inline', animationName: animation, diff --git a/app/renderer/components/preferences/payment/addFundsDialog/steps/addFundsWizardAddress.js b/app/renderer/components/preferences/payment/addFundsDialog/steps/addFundsWizardAddress.js index 6c04a9d6650..84c9c43e64f 100644 --- a/app/renderer/components/preferences/payment/addFundsDialog/steps/addFundsWizardAddress.js +++ b/app/renderer/components/preferences/payment/addFundsDialog/steps/addFundsWizardAddress.js @@ -47,7 +47,7 @@ class AddFundsWizardAddress extends React.Component { get copyToClipboardButton () { return ( diff --git a/test/unit/about/preferencesTest.js b/test/unit/about/preferencesTest.js index e1b4f1cba3d..244c89cb574 100644 --- a/test/unit/about/preferencesTest.js +++ b/test/unit/about/preferencesTest.js @@ -11,7 +11,7 @@ const fakeElectron = require('../lib/fakeElectron') let Preferences, appActions, SettingItemIcon require('../braveUnit') -describe.skip('Preferences component', function () { +describe('Preferences component unittest', function () { before(function () { mockery.enable({ warnOnReplace: false, @@ -51,10 +51,18 @@ describe.skip('Preferences component', function () { mockery.registerMock('../../../../extensions/brave/img/ios_download.svg') mockery.registerMock('../../img/icon_pencil.svg') mockery.registerMock('../../../../img/toolbar/stoploading_btn.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/BAT_icon.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/BTC_icon.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/ETH_icon.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/LTC_icon.svg') + mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_payments_on.svg') + mockery.registerMock('../../../extensions/brave/img/preferences/browser_prefs_payments_off.svg') + // Mocks the icon used in payments tab + mockery.registerMock('../../../extensions/brave/img/ledger/cryptoIcons/BAT_icon.svg') + // Mocks the icons used in addFundsDialog and its steps + mockery.registerMock('../../../../../../extensions/brave/img/ledger/wallet_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/ETH_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/BTC_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/LTC_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/BAT_icon.svg') + // Mock image from addFundsDialogFooter + mockery.registerMock('../../../../../extensions/brave/img/ledger/uphold-logo.png') window.chrome = fakeElectron window.CustomEvent = {} diff --git a/test/unit/app/renderer/components/preferences/paymentsTabTest.js b/test/unit/app/renderer/components/preferences/paymentsTabTest.js index 495f218e5ca..b3b0a17dd90 100644 --- a/test/unit/app/renderer/components/preferences/paymentsTabTest.js +++ b/test/unit/app/renderer/components/preferences/paymentsTabTest.js @@ -15,7 +15,7 @@ const {advancedSettingsDialog} = require('../../../../../lib/selectors') let PaymentsTab, EnabledContent require('../../../../braveUnit') -describe.skip('PaymentsTab component', function () { +describe('PaymentsTab component', function () { before(function () { mockery.enable({ warnOnReplace: false, @@ -54,10 +54,16 @@ describe.skip('PaymentsTab component', function () { mockery.registerMock('../../../../extensions/brave/img/coinbase_logo.png') mockery.registerMock('../../../../extensions/brave/img/android_download.svg') mockery.registerMock('../../../../extensions/brave/img/ios_download.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/BAT_icon.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/BTC_icon.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/ETH_icon.svg') - mockery.registerMock('../../../../extensions/brave/img/ledger/cryptoIcons/LTC_icon.svg') + // Mocks the icon used in payments tab + mockery.registerMock('../../../extensions/brave/img/ledger/cryptoIcons/BAT_icon.svg') + // Mocks the icons used in addFundsDialog and its steps + mockery.registerMock('../../../../../../extensions/brave/img/ledger/wallet_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/ETH_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/BTC_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/LTC_icon.svg') + mockery.registerMock('../../../../../../extensions/brave/img/ledger/cryptoIcons/BAT_icon.svg') + // Mock image from addFundsDialogFooter + mockery.registerMock('../../../../../extensions/brave/img/ledger/uphold-logo.png') mockery.registerMock('electron', fakeElectron) mockery.registerMock('../../../../js/settings', fakeSettings) @@ -195,7 +201,7 @@ describe.skip('PaymentsTab component', function () { assert.equal(wrapper.find('[data-test-id="fundsAmount"]').length, 1) }) - it('renders full balance correctly', function () { + it.skip('renders full balance correctly', function () { fakeSettings.mockReturnValue = true const wrapper = mount(