diff --git a/apps/machine/src/views/CashInView.vue b/apps/machine/src/views/CashInView.vue index 146c815..2ab193f 100644 --- a/apps/machine/src/views/CashInView.vue +++ b/apps/machine/src/views/CashInView.vue @@ -20,8 +20,9 @@ const isElectron = typeof window !== 'undefined' && window.electronAPI !== undef const showCancelButton = computed(() => { const state = atmStore.nestedState const hasBills = (atmStore.context?.billsInserted.length ?? 0) > 0 - // Always show in insertingBills (before bills) and error (without bills) - if (state === 'insertingBills' || state === 'fetchingRate') return true + // Show in fetchingRate (no bills yet) and insertingBills only before bills are in + if (state === 'fetchingRate') return true + if (state === 'insertingBills' && !hasBills) return true if (state === 'error' && !hasBills) return true // Hide when bills are in the cash box return false diff --git a/packages/state-machine/src/machine.ts b/packages/state-machine/src/machine.ts index c2cc434..02edb04 100644 --- a/packages/state-machine/src/machine.ts +++ b/packages/state-machine/src/machine.ts @@ -426,8 +426,26 @@ export function createATMMachine( guard: 'hasInsertedBills', target: 'generatingNdebit', }, - CANCEL: '#atm.idle', - TIMEOUT: '#atm.idle', + CANCEL: [ + { + // No bills inserted yet: safe to cancel + guard: ({ context }) => context.billsInserted.length === 0, + target: '#atm.idle', + }, + { + // Bills already stacked: warn user before abandoning + target: 'confirmAbandon', + }, + ], + TIMEOUT: [ + { + guard: ({ context }) => context.billsInserted.length === 0, + target: '#atm.idle', + }, + { + target: 'confirmAbandon', + }, + ], }, }, generatingNdebit: {