From a4c0bab814d1e5794f0d46d1057c3065fd08e4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= Date: Tue, 23 Feb 2021 19:07:11 +0000 Subject: [PATCH] fix: generelise deprecation --- lib/new-admin/config/accounts.js | 2 +- lib/new-admin/graphql/schema.js | 1 + new-lamassu-admin/src/pages/Wallet/Wallet.js | 1 + new-lamassu-admin/src/pages/Wallet/Wizard.js | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/new-admin/config/accounts.js b/lib/new-admin/config/accounts.js index a080460f..514fd756 100644 --- a/lib/new-admin/config/accounts.js +++ b/lib/new-admin/config/accounts.js @@ -22,7 +22,7 @@ const ALL_ACCOUNTS = [ { code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] }, { code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS }, { code: 'infura', display: 'Infura', class: WALLET, cryptos: [ETH] }, - { code: 'geth', display: 'geth', class: WALLET, cryptos: [ETH] }, + { code: 'geth', display: 'geth (DEPRECATED)', class: WALLET, cryptos: [ETH], deprecated: true }, { code: 'zcashd', display: 'zcashd', class: WALLET, cryptos: [ZEC] }, { code: 'litecoind', display: 'litecoind', class: WALLET, cryptos: [LTC] }, { code: 'dashd', display: 'dashd', class: WALLET, cryptos: [DASH] }, diff --git a/lib/new-admin/graphql/schema.js b/lib/new-admin/graphql/schema.js index 65151303..e26c70ba 100644 --- a/lib/new-admin/graphql/schema.js +++ b/lib/new-admin/graphql/schema.js @@ -135,6 +135,7 @@ const typeDefs = gql` display: String! class: String! cryptos: [String] + deprecated: Boolean } type MachineLog { diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.js b/new-lamassu-admin/src/pages/Wallet/Wallet.js index b1bbbcc4..a71249aa 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wallet.js +++ b/new-lamassu-admin/src/pages/Wallet/Wallet.js @@ -35,6 +35,7 @@ const GET_INFO = gql` display class cryptos + deprecated } cryptoCurrencies { code diff --git a/new-lamassu-admin/src/pages/Wallet/Wizard.js b/new-lamassu-admin/src/pages/Wallet/Wizard.js index 1f37cdfc..01ec886b 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wizard.js +++ b/new-lamassu-admin/src/pages/Wallet/Wizard.js @@ -15,10 +15,11 @@ const contains = crypto => R.compose(R.contains(crypto), R.prop('cryptos')) const sameClass = type => R.propEq('class', type) const filterConfig = (crypto, type) => R.filter(it => sameClass(type)(it) && contains(crypto)(it)) -const removeGethOption = R.filter(config => config.code !== 'geth') +const removeDeprecated = R.filter(({ deprecated }) => !deprecated) const getItems = (accountsConfig, accounts, type, crypto) => { - const fConfig = removeGethOption(filterConfig(crypto, type)(accountsConfig)) + const fConfig = removeDeprecated(filterConfig(crypto, type)(accountsConfig)) + const find = code => accounts && accounts[code] const [filled, unfilled] = R.partition(({ code }) => {