From 7210406a8a1343fa2f5966aca960b00f1c0c51dd Mon Sep 17 00:00:00 2001 From: csrapr <26280794+csrapr@users.noreply.github.com> Date: Thu, 13 May 2021 00:20:58 +0100 Subject: [PATCH] Fix: remove unnecessary variables --- lib/new-config-manager.js | 3 +-- .../1617742522808-zeroConfLimit-migrate.js | 12 ++++++------ new-lamassu-admin/src/pages/Locales/Locales.js | 2 -- new-lamassu-admin/src/pages/Wallet/Wallet.js | 2 -- new-lamassu-admin/src/pages/Wallet/Wizard.js | 16 +++------------- new-lamassu-admin/src/pages/Wallet/WizardStep.js | 6 +----- .../src/pages/Wizard/components/Wallet/AllSet.js | 7 +++---- 7 files changed, 14 insertions(+), 34 deletions(-) diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js index 97234a19..ecc57a05 100644 --- a/lib/new-config-manager.js +++ b/lib/new-config-manager.js @@ -104,8 +104,7 @@ const getGlobalNotifications = config => getNotifications(null, null, config) const getTriggers = _.get('triggers') -const split = _.curry(_.split) -const splitGetFirst = _.compose(_.head, split('_')) +const splitGetFirst = _.compose(_.head, _.split('_')) const getCryptosFromWalletNamespace = config => { return _.uniq(_.map(splitGetFirst, _.keys(fromNamespace('wallets', config)))) diff --git a/migrations/1617742522808-zeroConfLimit-migrate.js b/migrations/1617742522808-zeroConfLimit-migrate.js index c26a8462..3ad03e05 100644 --- a/migrations/1617742522808-zeroConfLimit-migrate.js +++ b/migrations/1617742522808-zeroConfLimit-migrate.js @@ -3,7 +3,6 @@ var db = require('../lib/db') const settingsLoader = require('../lib/new-settings-loader') const configManager = require('../lib/new-config-manager') -const isNil = val => val == null const curriedGetCashout = _.curry(configManager.getCashOut) exports.up = function (next) { @@ -12,24 +11,25 @@ exports.up = function (next) { const machinesPromise = t.any('SELECT device_id FROM devices') const [{ config }, machines] = await Promise.all([settingsPromise, machinesPromise]) const cryptoCodes = configManager.getCryptosFromWalletNamespace(config) - const zeroConfLimits = _.map(_.flow(_.get('device_id'), curriedGetCashout(_, config), _.get('zeroConfLimit')), machines) const minArr = _.min(zeroConfLimits) - const min = !isNil(minArr) && minArr < Infinity ? Number(minArr) : 0 + const min = !_.isNil(minArr) && minArr < Infinity ? Number(minArr) : 0 _.forEach(cryptoCode => { const walletConfig = configManager.getWalletSettings(cryptoCode, config) const zeroConfLimit = _.get('zeroConfLimit', walletConfig) const key = `wallets_${cryptoCode}_zeroConfLimit` - if (isNil(zeroConfLimit)) { + if (_.isNil(zeroConfLimit)) { config[key] = min } }, cryptoCodes) - const regexp = /^cashOut_[0-9a-z]+_zeroConfLimit$/ - const keysToErase = _.keys(config).filter(key => key.match(regexp)) + const keysToErase = machines.map(machine => + config[`cashOut_${machine.device_id}_zeroConfLimit`] ? `cashOut_${machine.device_id}_zeroConfLimit` : null + ) _.forEach(key => { + if (_.isNil(key)) return config[key] = null }, keysToErase) diff --git a/new-lamassu-admin/src/pages/Locales/Locales.js b/new-lamassu-admin/src/pages/Locales/Locales.js index 92115d93..a91459e5 100644 --- a/new-lamassu-admin/src/pages/Locales/Locales.js +++ b/new-lamassu-admin/src/pages/Locales/Locales.js @@ -224,8 +224,6 @@ const Locales = ({ name: SCREEN_KEY }) => { userAccounts={data?.config?.accounts} accounts={accounts} accountsConfig={accountsConfig} - locale={locale} - zeroConfLimit={wallets[`${wizard}_zeroConfLimit`]} /> )} diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.js b/new-lamassu-admin/src/pages/Wallet/Wallet.js index 861caecc..0e18174b 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wallet.js +++ b/new-lamassu-admin/src/pages/Wallet/Wallet.js @@ -123,8 +123,6 @@ const Wallet = ({ name: SCREEN_KEY }) => { userAccounts={data?.config?.accounts} accounts={accounts} accountsConfig={accountsConfig} - locale={data?.config && fromNamespace('locale')(data.config)} - zeroConfLimit={config[`${wizard}_zeroConfLimit`]} /> )} {editingSchema && ( diff --git a/new-lamassu-admin/src/pages/Wallet/Wizard.js b/new-lamassu-admin/src/pages/Wallet/Wizard.js index 20070dab..4123f3fd 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wizard.js +++ b/new-lamassu-admin/src/pages/Wallet/Wizard.js @@ -33,16 +33,7 @@ const getItems = (accountsConfig, accounts, type, crypto) => { return { filled, unfilled } } -const Wizard = ({ - coin, - onClose, - accountsConfig, - accounts, - save, - error, - locale, - zeroConfLimit -}) => { +const Wizard = ({ coin, onClose, accountsConfig, accounts, save, error }) => { const [{ step, config, accountsToSave }, setState] = useState({ step: 0, config: { active: true }, @@ -66,8 +57,8 @@ const Wizard = ({ : accountsToSave if (isLastStep) { - newConfig.zeroConfLimit = zeroConfLimit || 0 - return save(toNamespace(coin.code, newConfig), newAccounts) + const configToSave = { ...newConfig, zeroConfLimit: 0 } + return save(toNamespace(coin.code, configToSave), newAccounts) } setState({ @@ -113,7 +104,6 @@ const Wizard = ({ {...getStepData()} onContinue={onContinue} getValue={getValue} - locale={locale} /> )} diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.js b/new-lamassu-admin/src/pages/Wallet/WizardStep.js index 1699115a..81147383 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardStep.js +++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.js @@ -59,8 +59,7 @@ const WizardStep = ({ onContinue, filled, unfilled, - getValue, - locale + getValue }) => { const classes = useStyles() const [{ innerError, selected, form, isNew }, dispatch] = useReducer( @@ -69,9 +68,6 @@ const WizardStep = ({ ) useEffect(() => { - if (step === 5) { - return dispatch({ type: 'form', form: { code: 'zeroConfLimit' } }) - } dispatch({ type: 'reset' }) }, [step]) diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js index 15209af8..a9c3cd8f 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js @@ -52,12 +52,11 @@ const AllSet = ({ data: currentData, doContinue }) => { const accountsConfig = data?.accountsConfig const cryptoCurrencies = data?.cryptoCurrencies ?? [] - currentData.zeroConfLimit = 0 - const save = () => { - if (!WalletSchema.isValidSync(currentData)) return setError(true) + const adjustedData = { zeroConfLimit: 0, ...currentData } + if (!WalletSchema.isValidSync(adjustedData)) return setError(true) - const withCoin = toNamespace(coin, R.omit('coin', currentData)) + const withCoin = toNamespace(coin, R.omit('coin', adjustedData)) const config = toNamespace(namespaces.WALLETS)(withCoin) setError(false) return saveConfig({ variables: { config } })