Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
change strings per brad feedback, move tooltip to top
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
cezaraugusto authored and NejcZdovc committed Oct 6, 2017
1 parent 5942db2 commit 323017a
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 15 deletions.
4 changes: 2 additions & 2 deletions app/extensions/brave/locales/en-US/preferences.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions app/renderer/components/common/clipboardButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ClipboardButton extends React.Component {
return <span className={css(styles.clipboardButton)}>
<span className={css(
styles.doneLabel,
this.props.topTooltip && styles.doneLabelTop,
this.props.bottomTooltip && styles.doneLabelBottom,
this.state.visibleLabel && styles.visible
)} onAnimationEnd={this.onAnimationEnd} data-l10n-id='copied' />
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class AddFundsWizardAddress extends React.Component {
get copyToClipboardButton () {
return (
<ClipboardButton
bottomTooltip
topTooltip
className={globalStyles.appIcons.clipboard}
copyAction={this.onCopy}
/>
Expand Down
18 changes: 13 additions & 5 deletions test/unit/about/preferencesTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 = {}
Expand Down
20 changes: 13 additions & 7 deletions test/unit/app/renderer/components/preferences/paymentsTabTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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(
<PaymentsTab
Expand All @@ -207,7 +213,7 @@ describe.skip('PaymentsTab component', function () {
assert.equal(batToCurrencyString(10, inst.props.ledgerData), '10.00 USD')
})

it('renders partial balance correctly', function () {
it.skip('renders partial balance correctly', function () {
fakeSettings.mockReturnValue = true
const wrapper = mount(
<EnabledContent
Expand Down

0 comments on commit 323017a

Please sign in to comment.