From c9d8f847988f8877546fb88d107a9f2b51ede23c Mon Sep 17 00:00:00 2001
From: Neal <neal@lamassu.is>
Date: Fri, 21 May 2021 12:53:33 -0400
Subject: [PATCH] chore: order coins alphabetically, bch logo green

---
 lib/blockchain/install.js                                 | 8 ++++----
 new-lamassu-admin/src/pages/Wallet/WizardSplash.js        | 4 ++++
 .../src/styling/logos/icon-bitcoincash-colour.svg         | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

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 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="104" height="64" version="1.1">
-<path fill="#F7931A" d="m0,0l29.7,0a39,39,0,0,0,0,64l-29.7,0zm52,0a32,32,0,0,0,0,64a32,32,0,0,0,0,-64m52,0l-29.7,0a39,39,0,0,1,0,64l29.7,0z"/>
+<path fill="#0AC18E" d="m0,0l29.7,0a39,39,0,0,0,0,64l-29.7,0zm52,0a32,32,0,0,0,0,64a32,32,0,0,0,0,-64m52,0l-29.7,0a39,39,0,0,1,0,64l29.7,0z"/>
 <path fill="#FFF" transform="rotate(-28 52 32)" d="m66.103,27.444c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z"/>
 </svg>