fix: removed input from machine and coin and removed tableData composition from jsx
This commit is contained in:
parent
6b569a89c2
commit
772be35d06
2 changed files with 8 additions and 11 deletions
|
|
@ -60,6 +60,11 @@ const CommissionsList = memo(
|
|||
getCommissions(cryptoCode, deviceId, config)
|
||||
)(machinesCoinsTuples)
|
||||
|
||||
const tableData = R.compose(
|
||||
sortCommissionsBy(orderProp, machines),
|
||||
filterCommissions(coinFilter, machineFilter, machines)
|
||||
)(commissions)
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div className={classes.headerLine}>
|
||||
|
|
@ -93,10 +98,7 @@ const CommissionsList = memo(
|
|||
save={saveOverrides}
|
||||
initialValues={overridesDefaults}
|
||||
validationSchema={getListCommissionsSchema()}
|
||||
data={R.compose(
|
||||
sortCommissionsBy(orderProp, machines),
|
||||
filterCommissions(coinFilter, machineFilter, machines)
|
||||
)(commissions)}
|
||||
data={tableData}
|
||||
elements={commissionsList(data, currency)}
|
||||
/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ const getMachineCoins = (deviceId, 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)
|
||||
|
||||
if (override !== undefined) return R.prop('cryptoCurrencies', override)
|
||||
|
|
@ -473,11 +473,7 @@ const getListCommissionsFields = (getData, currency, defaults) => {
|
|||
size: 'sm',
|
||||
view: getView(machineData, 'name', 'deviceId'),
|
||||
input: TextInput,
|
||||
editable: false,
|
||||
inputProps: {
|
||||
valueProp: 'deviceId',
|
||||
getLabel: R.path(['name'])
|
||||
}
|
||||
editable: false
|
||||
},
|
||||
{
|
||||
name: 'cryptoCurrencies',
|
||||
|
|
@ -485,7 +481,6 @@ const getListCommissionsFields = (getData, currency, defaults) => {
|
|||
width: 280,
|
||||
view: R.prop(0),
|
||||
size: 'sm',
|
||||
input: TextInput,
|
||||
editable: false
|
||||
},
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue