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

fix: revert header changes

Browse source 
fix: null pointer check
This commit is contained in:
Sérgio Salgado 2022-01-14 07:08:20 +00:00
parent 5f259dc9d3
commit 7b069c3e7b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
new-lamassu-admin/src/components/layout/Header.js
View file

@ -132,7 +132,7 @@ const Header = memo(({ tree, user }) => {
return (
<NavLink
key={idx}
to={!R.isNil(it.children) ? it.children[0].route : it.route}
to={it.route || it.children[0].route}
isActive={match => {
if (!match) return false
setActive(it)

12
new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
View file

@ -225,14 +225,14 @@ const CashCassettes = () => {
{
name: 'name',
header: 'Machine',
width: widthsByNumberOfCassettes[maxNumberOfCassettes].machine,
width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.machine,
view: name => <>{name}</>,
input: ({ field: { value: name } }) => <>{name}</>
},
{
name: 'cashbox',
header: 'Cash box',
width: widthsByNumberOfCassettes[maxNumberOfCassettes].cashbox,
width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.cashbox,
view: (value, { id }) => (
<CashIn
currency={{ code: fiatCurrency }}
@ -253,7 +253,7 @@ const CashCassettes = () => {
elements.push({
name: `cassette${it}`,
header: `Cassette ${it}`,
width: widthsByNumberOfCassettes[maxNumberOfCassettes].cassette,
width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.cassette,
stripe: true,
doubleHeader: 'Cash-out',
view: (value, { id }) => (
@ -263,7 +263,7 @@ const CashCassettes = () => {
currency={{ code: fiatCurrency }}
notes={value}
width={
widthsByNumberOfCassettes[maxNumberOfCassettes].cassetteGraph
widthsByNumberOfCassettes[maxNumberOfCassettes]?.cassetteGraph
}
threshold={
fillingPercentageSettings[`fillingPercentageCassette${it}`]
@ -274,7 +274,7 @@ const CashCassettes = () => {
input: CashCassetteInput,
inputProps: {
decimalPlaces: 0,
width: widthsByNumberOfCassettes[maxNumberOfCassettes].cassetteGraph,
width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.cassetteGraph,
inputClassName: classes.cashbox
}
})
@ -286,7 +286,7 @@ const CashCassettes = () => {
elements.push({
name: 'edit',
header: 'Edit',
width: widthsByNumberOfCassettes[maxNumberOfCassettes].editWidth,
width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.editWidth,
textAlign: 'center',
view: (value, { id }) => {
return (