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

Commit

Permalink
Update "Our Partners" side bar on disabledContent.js to reflect BAT i…
Browse files Browse the repository at this point in the history
…ntegration

Closes #11242

Auditors: @cezaraugusto

Test Plan:
1. Open about:preferences#payments
2. Make sure 'Brave Bitcoin Wallets' is replaced with 'Brave BAT Wallets'
3. Make sure the uphold company logo is displayed
  • Loading branch information
Suguru Hirahara authored and NejcZdovc committed Oct 7, 2017
1 parent 1ce0968 commit e23cd4a
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 33 deletions.
Binary file removed app/extensions/brave/img/bitgo.png
Binary file not shown.
Binary file removed app/extensions/brave/img/bitgo_2x.png
Binary file not shown.
Binary file removed app/extensions/brave/img/coinbase.png
Binary file not shown.
Binary file removed app/extensions/brave/img/coinbase_2x.png
Binary file not shown.
Binary file removed app/extensions/brave/img/ledger/uphold-logo.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 @@ -25,8 +25,7 @@ paymentsWelcomeLink=View the FAQ
paymentsFAQLink.title=View the FAQ
paymentsSidebarText1=Our Partners
paymentsSidebarText2=All transaction IP addresses are anonymized with technology from:
paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
paymentsSidebarText3=Brave BAT Wallets are provided through a partnership with:
syncTitle=Brave Sync
syncTitleMessage=Sync encrypted browser data between your devices securely and privately using Brave Sync.
syncBetaMessage=Note: Sync for iOS and Android is still being completed and will be released soon.
Expand Down Expand Up @@ -389,3 +388,4 @@ qrCodeVersion=QR Code Version
recoverFromFile=Import recovery key
recoveryKey=Recovery Key
ledgerBackupContent=Below, you will find the anonymized recovery key that is required if you ever lose access to this computer.<br><strong>Make sure you keep this key private, or else your wallet will be compromised.</strong>
printKeys=Print key
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const appActions = require('../../../../../../js/actions/appActions')

// Styles
const {StyleSheet, css} = require('aphrodite')
const upholdLogo = require('../../../../../extensions/brave/img/ledger/uphold-logo.png')
const upholdLogo = require('../../../../../extensions/brave/img/ledger/uphold_logo_medium.png')

class AddFundsDialogFooter extends React.Component {
constructor (props) {
Expand Down
29 changes: 9 additions & 20 deletions app/renderer/components/preferences/payment/disabledContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ const globalStyles = require('../../styles/global')
const {paymentStyles} = require('../../styles/payment')
const PIA = require('../../../../extensions/brave/img/private_internet_access.png')
const PIA2 = require('../../../../extensions/brave/img/private_internet_access_2x.png')
const BitGo = require('../../../../extensions/brave/img/bitgo.png')
const BitGo2 = require('../../../../extensions/brave/img/bitgo_2x.png')
const CoinBase = require('../../../../extensions/brave/img/coinbase.png')
const CoinBase2 = require('../../../../extensions/brave/img/coinbase_2x.png')
const uphold = require('../../../../extensions/brave/img/ledger/uphold_logo_small.png')
const uphold2 = require('../../../../extensions/brave/img/ledger/uphold_logo_medium.png')

class DisabledContent extends ImmutableComponent {
render () {
Expand All @@ -39,9 +37,7 @@ class DisabledContent extends ImmutableComponent {
<div className={css(styles.textSide)} data-l10n-id='paymentsSidebarText2' />
<a href='https://www.privateinternetaccess.com/' target='_blank'><span className={css(styles.paymentsSidebarPIA)} /></a>
<div className={css(styles.textSide)} data-l10n-id='paymentsSidebarText3' />
<a href='https://www.bitgo.com/' target='_blank'><span className={css(styles.paymentsSidebarBitgo)} /></a>
<div className={css(styles.textSide)} data-l10n-id='paymentsSidebarText4' />
<a href='https://www.coinbase.com/' target='_blank'><span className={css(styles.paymentsSidebarCoinbase)} /></a>
<a href='https://uphold.com/' rel='noopener' target='_blank'><span className={css(styles.paymentsSidebarUphold)} /></a>
</div>
</section>
}
Expand Down Expand Up @@ -101,20 +97,13 @@ const styles = StyleSheet.create({
display: 'block'
},

paymentsSidebarBitgo: {
backgroundImage: `-webkit-image-set(url(${BitGo}) 1x, url(${BitGo2}) 2x)`,
width: '100px',
height: '25px',
paymentsSidebarUphold: {
backgroundImage: `-webkit-image-set(url(${uphold}) 1x, url(${uphold2}) 2x)`,
backgroundSize: 'contain',
backgroundRepeat: 'no-repeat',
margin: '0 0 20px 12px',
display: 'block'
},

paymentsSidebarCoinbase: {
backgroundImage: `-webkit-image-set(url(${CoinBase}) 1x, url(${CoinBase2}) 2x)`,
width: '100px',
height: '35px',
margin: '0 0 20px 12px',
display: 'block'
display: 'block',
height: '50px'
}
})

Expand Down
Binary file removed img/coinbase_logo_blue_trans.png
Binary file not shown.
8 changes: 3 additions & 5 deletions test/unit/about/preferencesTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ describe('Preferences component unittest', function () {
mockery.registerMock('../../../../extensions/brave/img/ledger/verified_white_icon.svg')
mockery.registerMock('../../../../extensions/brave/img/ledger/icon_remove.svg')
mockery.registerMock('../../../../extensions/brave/img/ledger/icon_pin.svg')
mockery.registerMock('../../../../extensions/brave/img/ledger/uphold_logo_small.png')
mockery.registerMock('../../../../extensions/brave/img/ledger/uphold_logo_medium.png')
mockery.registerMock('../../../../extensions/brave/img/private_internet_access.png')
mockery.registerMock('../../../../extensions/brave/img/private_internet_access_2x.png')
mockery.registerMock('../../../../extensions/brave/img/bitgo.png')
mockery.registerMock('../../../../extensions/brave/img/bitgo_2x.png')
mockery.registerMock('../../../../extensions/brave/img/coinbase.png')
mockery.registerMock('../../../../extensions/brave/img/coinbase_2x.png')
mockery.registerMock('../../../../extensions/brave/img/coinbase_logo.png')
mockery.registerMock('../../../../extensions/brave/img/android_download.svg')
mockery.registerMock('../../../../extensions/brave/img/ios_download.svg')
Expand All @@ -62,7 +60,7 @@ describe('Preferences component unittest', function () {
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('../../../../../extensions/brave/img/ledger/uphold_logo_medium.png')

window.chrome = fakeElectron
window.CustomEvent = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ describe('PaymentsTab component', function () {
mockery.registerMock('../../../../extensions/brave/img/ledger/verified_white_icon.svg')
mockery.registerMock('../../../../extensions/brave/img/ledger/icon_remove.svg')
mockery.registerMock('../../../../extensions/brave/img/ledger/icon_pin.svg')
mockery.registerMock('../../../../extensions/brave/img/ledger/uphold_logo_small.png')
mockery.registerMock('../../../../extensions/brave/img/ledger/uphold_logo_medium.png')
mockery.registerMock('../../../../extensions/brave/img/private_internet_access.png')
mockery.registerMock('../../../../extensions/brave/img/private_internet_access_2x.png')
mockery.registerMock('../../../../extensions/brave/img/bitgo.png')
mockery.registerMock('../../../../extensions/brave/img/bitgo_2x.png')
mockery.registerMock('../../../../extensions/brave/img/coinbase.png')
mockery.registerMock('../../../../extensions/brave/img/coinbase_2x.png')
mockery.registerMock('../../../../extensions/brave/img/coinbase_logo.png')
mockery.registerMock('../../../../extensions/brave/img/android_download.svg')
mockery.registerMock('../../../../extensions/brave/img/ios_download.svg')
Expand All @@ -63,7 +61,7 @@ describe('PaymentsTab component', function () {
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('../../../../../extensions/brave/img/ledger/uphold_logo_medium.png')

mockery.registerMock('electron', fakeElectron)
mockery.registerMock('../../../../js/settings', fakeSettings)
Expand Down

0 comments on commit e23cd4a

Please sign in to comment.