diff --git a/lib/blockchain/install.js b/lib/blockchain/install.js index 2a312e18..51a17157 100644 --- a/lib/blockchain/install.js +++ b/lib/blockchain/install.js @@ -19,11 +19,11 @@ const logger = common.logger const PLUGINS = { BTC: require('./bitcoin.js'), - LTC: require('./litecoin.js'), - ETH: require('./ethereum.js'), + BCH: require('./bitcoincash.js'), DASH: require('./dash.js'), - ZEC: require('./zcash.js'), - BCH: require('./bitcoincash.js') + ETH: require('./ethereum.js'), + LTC: require('./litecoin.js'), + ZEC: require('./zcash.js') } module.exports = {run} diff --git a/new-lamassu-admin/src/pages/Wallet/WizardSplash.js b/new-lamassu-admin/src/pages/Wallet/WizardSplash.js index 64ca440b..5cdce3f9 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardSplash.js +++ b/new-lamassu-admin/src/pages/Wallet/WizardSplash.js @@ -8,8 +8,12 @@ import { ReactComponent as BitcoinCashLogo } from 'src/styling/logos/icon-bitcoi import { ReactComponent as DashLogo } from 'src/styling/logos/icon-dash-colour.svg' import { ReactComponent as EthereumLogo } from 'src/styling/logos/icon-ethereum-colour.svg' import { ReactComponent as LitecoinLogo } from 'src/styling/logos/icon-litecoin-colour.svg' +<<<<<<< HEAD import { ReactComponent as TetherLogo } from 'src/styling/logos/icon-tether-colour.svg' import { ReactComponent as ZCashLogo } from 'src/styling/logos/icon-zcash-colour.svg' +======= +import { ReactComponent as ZcashLogo } from 'src/styling/logos/icon-zcash-colour.svg' +>>>>>>> 8daa184b (chore: order coins alphabetically, bch logo green) const styles = { logo: { diff --git a/new-lamassu-admin/src/styling/logos/icon-bitcoincash-colour.svg b/new-lamassu-admin/src/styling/logos/icon-bitcoincash-colour.svg index abc16f63..e10506eb 100644 --- a/new-lamassu-admin/src/styling/logos/icon-bitcoincash-colour.svg +++ b/new-lamassu-admin/src/styling/logos/icon-bitcoincash-colour.svg @@ -1,4 +1,4 @@ - +