diff --git a/app/extensions/brave/img/bitgo.png b/app/extensions/brave/img/bitgo.png deleted file mode 100644 index 977d40232f5..00000000000 Binary files a/app/extensions/brave/img/bitgo.png and /dev/null differ diff --git a/app/extensions/brave/img/bitgo_2x.png b/app/extensions/brave/img/bitgo_2x.png deleted file mode 100644 index 24a759402d8..00000000000 Binary files a/app/extensions/brave/img/bitgo_2x.png and /dev/null differ diff --git a/app/extensions/brave/img/coinbase.png b/app/extensions/brave/img/coinbase.png deleted file mode 100644 index 54ec9c0a5ca..00000000000 Binary files a/app/extensions/brave/img/coinbase.png and /dev/null differ diff --git a/app/extensions/brave/img/coinbase_2x.png b/app/extensions/brave/img/coinbase_2x.png deleted file mode 100644 index e40905cebe1..00000000000 Binary files a/app/extensions/brave/img/coinbase_2x.png and /dev/null differ diff --git a/app/extensions/brave/img/ledger/uphold-logo.png b/app/extensions/brave/img/ledger/uphold-logo.png deleted file mode 100644 index c4f4bef4392..00000000000 Binary files a/app/extensions/brave/img/ledger/uphold-logo.png and /dev/null differ diff --git a/app/extensions/brave/img/ledger/uphold_logo_medium.png b/app/extensions/brave/img/ledger/uphold_logo_medium.png new file mode 100644 index 00000000000..7ff90143b82 Binary files /dev/null and b/app/extensions/brave/img/ledger/uphold_logo_medium.png differ diff --git a/app/extensions/brave/img/ledger/uphold_logo_small.png b/app/extensions/brave/img/ledger/uphold_logo_small.png new file mode 100644 index 00000000000..0807810cc54 Binary files /dev/null and b/app/extensions/brave/img/ledger/uphold_logo_small.png differ diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index cd285aeb0ef..e5b17befb87 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -234,8 +234,7 @@ payments=Payments 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: paymentsWelcomeLink=View the FAQ paymentsWelcomeText1=Brave has created a simple way for you to contribute to the sites you use most. paymentsWelcomeText2=To begin using Brave Payments, simply flip the switch at the top of this window. The rest is easy. diff --git a/app/renderer/components/preferences/payment/addFundsDialog/addFundsDialogFooter.js b/app/renderer/components/preferences/payment/addFundsDialog/addFundsDialogFooter.js index 3b8ae33b6d8..8d81f6fb438 100644 --- a/app/renderer/components/preferences/payment/addFundsDialog/addFundsDialogFooter.js +++ b/app/renderer/components/preferences/payment/addFundsDialog/addFundsDialogFooter.js @@ -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) { diff --git a/app/renderer/components/preferences/payment/disabledContent.js b/app/renderer/components/preferences/payment/disabledContent.js index 0fc79671cc3..9a041d5917a 100644 --- a/app/renderer/components/preferences/payment/disabledContent.js +++ b/app/renderer/components/preferences/payment/disabledContent.js @@ -13,10 +13,8 @@ const globalStyles = require('../../styles/global') const commonStyles = require('../../styles/commonStyles') 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 () { @@ -39,9 +37,7 @@ class DisabledContent extends ImmutableComponent {
- -
- +
} @@ -105,16 +101,11 @@ const styles = StyleSheet.create({ height: '20px' }, - disabledContent__sidebar__logo_bitgo: { - backgroundImage: `-webkit-image-set(url(${BitGo}) 1x, url(${BitGo2}) 2x)`, - width: '100px', - height: '25px' - }, - - disabledContent__sidebar__logo_coinbase: { - backgroundImage: `-webkit-image-set(url(${CoinBase}) 1x, url(${CoinBase2}) 2x)`, - width: '100px', - height: '35px' + disabledContent__sidebar__logo_uphold: { + backgroundImage: `-webkit-image-set(url(${uphold}) 1x, url(${uphold2}) 2x)`, + backgroundSize: 'contain', + backgroundRepeat: 'no-repeat', + height: '50px' } }) diff --git a/img/coinbase_logo_blue_trans.png b/img/coinbase_logo_blue_trans.png deleted file mode 100644 index 53da54f52a1..00000000000 Binary files a/img/coinbase_logo_blue_trans.png and /dev/null differ diff --git a/test/unit/about/preferencesTest.js b/test/unit/about/preferencesTest.js index 244c89cb574..68dcc9c5d02 100644 --- a/test/unit/about/preferencesTest.js +++ b/test/unit/about/preferencesTest.js @@ -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') @@ -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 = {} diff --git a/test/unit/app/renderer/components/preferences/paymentsTabTest.js b/test/unit/app/renderer/components/preferences/paymentsTabTest.js index b3b0a17dd90..8159464d82f 100644 --- a/test/unit/app/renderer/components/preferences/paymentsTabTest.js +++ b/test/unit/app/renderer/components/preferences/paymentsTabTest.js @@ -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') @@ -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)