From 624352607eacfbc572cadd2440676306093f8688 Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:08:13 +0200 Subject: [PATCH 1/2] fix: `getCryptoUnits` default value fix: `getCryptosFromWalletNamespace` returns 'advanced' --- lib/new-config-manager.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js index c44653e4..8428d6a6 100644 --- a/lib/new-config-manager.js +++ b/lib/new-config-manager.js @@ -145,13 +145,13 @@ const getTriggersAutomation = (customInfoRequests, config) => { const splitGetFirst = _.compose(_.head, _.split('_')) -const getCryptosFromWalletNamespace = config => { - return _.uniq(_.map(splitGetFirst, _.keys(fromNamespace('wallets', config)))) -} +const getCryptosFromWalletNamespace = + _.compose(_.without(['advanced']), _.uniq, _.map(splitGetFirst), _.keys, fromNamespace('wallets')) const getCashInSettings = config => fromNamespace(namespaces.CASH_IN)(config) -const getCryptoUnits = (crypto, config) => getWalletSettings(crypto, config).cryptoUnits +const getCryptoUnits = (crypto, config) => + getWalletSettings(crypto, config).cryptoUnits ?? 'full' const setTermsConditions = toNamespace(namespaces.TERMS_CONDITIONS) From 33b72aa9fd5a490e096197f37375a7798380f153 Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:10:36 +0200 Subject: [PATCH 2/2] fix: coin-specific `cryptoUnits` in the Wizard --- .../src/pages/Wizard/components/Wallet/AllSet.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 ae891826..911762c8 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js @@ -1,5 +1,4 @@ import { useQuery, useMutation } from '@apollo/react-hooks' -import { utils as coinUtils } from '@lamassu/coins' import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' @@ -54,13 +53,9 @@ const AllSet = ({ data: currentData, doContinue }) => { const cryptoCurrencies = data?.cryptoCurrencies ?? [] const save = () => { - const defaultCryptoUnit = R.head( - R.keys(coinUtils.getCryptoCurrency(coin).units) - ) const adjustedData = { zeroConfLimit: 0, - ...currentData, - cryptoUnits: defaultCryptoUnit + ...currentData } if (!WalletSchema.isValidSync(adjustedData)) return setError(true)