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

fix: cashout empty table image and machine status loading

Browse source
This commit is contained in:
José Oliveira 2021-03-15 21:20:47 +00:00 • committed by Josh Harvey
parent 4b2c3a3b47
commit 04c8213430
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
new-lamassu-admin/src/pages/Cashout/Cashout.js
View file

@ -116,7 +116,7 @@ const CashOut = ({ name: SCREEN_KEY }) => {
disableRowEdit={R.compose(R.not, R.path(['active']))} disableRowEdit={R.compose(R.not, R.path(['active']))}
elements={getElements(machines, locale)} elements={getElements(machines, locale)}
/> />
{R.isEmpty(config) && <EmptyTable message="No machines so far" />} {R.isEmpty(machines) && <EmptyTable message="No machines so far" />}
{wizard && ( {wizard && (
<Wizard <Wizard
machine={R.find(R.propEq('deviceId', wizard))(machines)} machine={R.find(R.propEq('deviceId', wizard))(machines)}

3
new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
View file

@ -43,7 +43,7 @@ const MachineStatus = () => {
const classes = useStyles() const classes = useStyles()
const { state } = useLocation() const { state } = useLocation()
const addedMachineId = state?.id const addedMachineId = state?.id
const { data: machinesResponse, refetch } = useQuery(GET_MACHINES) const { data: machinesResponse, refetch, loading } = useQuery(GET_MACHINES)
const elements = [ const elements = [
{ {
@ -103,6 +103,7 @@ const MachineStatus = () => {
</div> </div>
</div> </div>
<DataTable <DataTable
loading={loading}
elements={elements} elements={elements}
data={machines} data={machines}
Details={InnerMachineDetailsRow} Details={InnerMachineDetailsRow}