lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: ui and chromium compatibility

Browse source
This commit is contained in:
Taranto 2020-10-22 16:25:22 +01:00 • committed by Josh Harvey
parent 00387e0862
commit 7b5c70a958
15 changed files with 66 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

11
new-lamassu-admin/src/pages/Commissions/Commissions.js
View file

@ -51,7 +51,12 @@ const Commissions = ({ name: SCREEN_KEY }) => {
)
const commission = config && !R.isEmpty(config) ? config : defaults
const commissionOverrides = commission.overrides ?? []
const commissionOverrides = commission?.overrides ?? []
const orderedCommissionsOverrides = R.sortWith([
R.ascend(it => (R.propEq('machine', 'ALL_MACHINES')(it) ? 0 : 1)),
R.ascend(R.prop('machine'))
])(commissionOverrides)
const save = it => {
const config = toNamespace(SCREEN_KEY)(it.commissions[0])
@ -96,8 +101,8 @@ const Commissions = ({ name: SCREEN_KEY }) => {
initialValues={overridesDefaults}
save={saveOverrides}
validationSchema={OverridesSchema}
data={commissionOverrides}
elements={overrides(data, currency, commissionOverrides)}
data={orderedCommissionsOverrides}
elements={overrides(data, currency, orderedCommissionsOverrides)}
setEditing={onEditingOverrides}
forceDisable={isEditingDefault}
/>