From a313f4a8ed1790fb6bc2b239ec28de86fcf46bc5 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Wed, 6 Mar 2019 14:37:16 +0100 Subject: [PATCH 1/3] add order property to coin objects --- src/constants/coins.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/constants/coins.js b/src/constants/coins.js index fb9ef8a9..f1487f69 100644 --- a/src/constants/coins.js +++ b/src/constants/coins.js @@ -3,68 +3,81 @@ export default [ id: 'btc', coinName: 'Bitcoin', url: '../?coin=btc', + order: 1, }, { id: 'bch', coinName: 'Bitcoin Cash', url: '../?coin=bch', + order: 6, }, { id: 'btg', coinName: 'Bitcoin Gold', url: '../?coin=btg', + order: 27, }, { id: 'dash', coinName: 'Dash', url: '../?coin=dash', + order: 15, }, { id: 'dgb', coinName: 'DigiByte', url: '../?coin=dgb', + order: 42, }, { id: 'doge', coinName: 'Dogecoin', url: '../?coin=doge', + order: 26, }, { id: 'ltc', coinName: 'Litecoin', url: '../?coin=ltc', + order: 5, }, { id: 'nmc', coinName: 'Namecoin', url: '../?coin=nmc', + order: 255, }, { id: 'vtc', coinName: 'Vertcoin', url: '../?coin=vtc', + order: 154, }, { id: 'zec', coinName: 'Zcash', url: '../?coin=zec', + order: 20, }, { id: 'xem', coinName: 'NEM', url: 'https://nem.io/downloads/', external: true, + order: 19, }, { id: 'xlm', coinName: 'Stellar', url: 'https://trezor.io/stellar', external: true, + order: 9, }, { id: 'ada', coinName: 'Cardano', url: 'https://adalite.io/app', external: true, + order: 12, }, ]; From cb89d0bbcfb93e632041c45128f9f43583cef8db Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Wed, 6 Mar 2019 14:37:31 +0100 Subject: [PATCH 2/3] sort coins by order --- .../components/CoinMenu/index.js | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js index 4a7d60e8..d3cd62e5 100644 --- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js @@ -37,36 +37,38 @@ class CoinMenu extends PureComponent { } getOtherCoins() { - return coins.map(coin => { - const row = ( - - ); - - if (coin.external) - return ( - this.props.gotoExternalWallet(coin.id, coin.url)} - > - {row} - + return coins + .sort((a, b) => a.order - b.order) + .map(coin => { + const row = ( + ); - return ( - - {row} - - ); - }); + + if (coin.external) + return ( + this.props.gotoExternalWallet(coin.id, coin.url)} + > + {row} + + ); + return ( + + {row} + + ); + }); } render() { From 9a4edffa8cf05292aa670e39cbdb1dacea5ccae9 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Wed, 6 Mar 2019 14:49:55 +0100 Subject: [PATCH 3/3] sort networks --- public/data/appConfig.json | 7 ++++- src/reducers/LocalStorageReducer.js | 1 + .../components/CoinMenu/index.js | 28 ++++++++++--------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/public/data/appConfig.json b/public/data/appConfig.json index 6125250a..09d07ce9 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -1,6 +1,7 @@ { "networks": [ { + "order": 2, "type": "ethereum", "name": "Ethereum", "symbol": "ETH", @@ -21,6 +22,7 @@ } }, { + "order": 18, "type": "ethereum", "name": "Ethereum Classic", "symbol": "ETC", @@ -40,7 +42,8 @@ "address": "https://gastracker.io/addr/" } }, - { + { + "order": 2, "type": "ethereum", "name": "Ethereum Ropsten", "testnet": true, @@ -74,6 +77,7 @@ } }, { + "order": 3, "type": "ripple", "name": "Ripple", "symbol": "XRP", @@ -94,6 +98,7 @@ } }, { + "order": 3, "type": "ripple", "name": "Ripple Testnet", "testnet": true, diff --git a/src/reducers/LocalStorageReducer.js b/src/reducers/LocalStorageReducer.js index 3e3918dd..4c1c81bf 100644 --- a/src/reducers/LocalStorageReducer.js +++ b/src/reducers/LocalStorageReducer.js @@ -13,6 +13,7 @@ type NetworkFeeLevel = { }; export type Network = { + order: number, type: string, name: string, testnet?: boolean, diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js index d3cd62e5..99326b5f 100644 --- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js @@ -75,19 +75,21 @@ class CoinMenu extends PureComponent { const { config } = this.props.localStorage; return ( - {config.networks.map(item => ( - - - - ))} + {config.networks + .sort((a, b) => a.order - b.order) + .map(item => ( + + + + ))} }