fix: removed input from machine and coin and removed tableData composition from jsx

This commit is contained in:
Jose Sousa 2020-11-27 16:36:51 +00:00 committed by Josh Harvey
parent 6b569a89c2
commit 772be35d06
2 changed files with 8 additions and 11 deletions

View file

@ -60,6 +60,11 @@ const CommissionsList = memo(
getCommissions(cryptoCode, deviceId, config) getCommissions(cryptoCode, deviceId, config)
)(machinesCoinsTuples) )(machinesCoinsTuples)
const tableData = R.compose(
sortCommissionsBy(orderProp, machines),
filterCommissions(coinFilter, machineFilter, machines)
)(commissions)
return ( return (
<div> <div>
<div className={classes.headerLine}> <div className={classes.headerLine}>
@ -93,10 +98,7 @@ const CommissionsList = memo(
save={saveOverrides} save={saveOverrides}
initialValues={overridesDefaults} initialValues={overridesDefaults}
validationSchema={getListCommissionsSchema()} validationSchema={getListCommissionsSchema()}
data={R.compose( data={tableData}
sortCommissionsBy(orderProp, machines),
filterCommissions(coinFilter, machineFilter, machines)
)(commissions)}
elements={commissionsList(data, currency)} elements={commissionsList(data, currency)}
/> />
</div> </div>

View file

@ -410,7 +410,7 @@ const getMachineCoins = (deviceId, localeConfig) => {
const overrides = R.prop('overrides', localeConfig) const overrides = R.prop('overrides', localeConfig)
if (!R.isEmpty(overrides)) { if (overrides && !R.isEmpty(overrides)) {
const override = R.find(it => it.machine === deviceId)(overrides) const override = R.find(it => it.machine === deviceId)(overrides)
if (override !== undefined) return R.prop('cryptoCurrencies', override) if (override !== undefined) return R.prop('cryptoCurrencies', override)
@ -473,11 +473,7 @@ const getListCommissionsFields = (getData, currency, defaults) => {
size: 'sm', size: 'sm',
view: getView(machineData, 'name', 'deviceId'), view: getView(machineData, 'name', 'deviceId'),
input: TextInput, input: TextInput,
editable: false, editable: false
inputProps: {
valueProp: 'deviceId',
getLabel: R.path(['name'])
}
}, },
{ {
name: 'cryptoCurrencies', name: 'cryptoCurrencies',
@ -485,7 +481,6 @@ const getListCommissionsFields = (getData, currency, defaults) => {
width: 280, width: 280,
view: R.prop(0), view: R.prop(0),
size: 'sm', size: 'sm',
input: TextInput,
editable: false editable: false
}, },
{ {