Skip to content

fix(send): remove legacy cancel fallback #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kelbie merged 1 commit into from
Mar 6, 2026
Merged

fix(send): remove legacy cancel fallback #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 4 additions & 67 deletions features/send/screens/SendTokenScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ import {
nfcSendFailedPopup,
copyPopup,
tokenCannotCancelPopup,
tokenAlreadyRedeemedPopup,
tokenCannotReclaimPopup,
fundsReclaimedPopup,
reclaimFailedPopup,
transactionCancelledPopup,
tokenCannotCheckStatusPopup,
tokenRedeemedPopup,
Expand Down Expand Up @@ -345,71 +341,11 @@ export function SendTokenScreen({

const handleCancelSend = useCallback(
async (onClose: (event: any) => void) => {
// --- Legacy fallback: no operationId but we have a token ---
if (!currentTransaction?.operationId) {
if (!token) {
tokenCannotCancelPopup({ onClose: () => onClose({}) });
return;
}
try {
const mintUrl = currentTransaction?.mintUrl;
if (!mintUrl) throw new Error('Missing mint URL');

// Check proof states with the mint (NUT-07)
const wallet = await manager.walletService.getWallet(mintUrl);
const proofStates = await wallet.checkProofsStates(
token.proofs.map((p) => ({ secret: p.secret }))
);

const allSpent = proofStates.every((s) => s.state === 'SPENT');
if (allSpent) {
await updateLegacyHistoryState(
currentTransaction,
'finalized',
mintUrl,
manager,
accountIndex
);
tokenAlreadyRedeemedPopup({ onClose: () => onClose({}) });
return;
}

// Filter to only unspent proofs — mint rejects swaps containing spent proofs
const unspentProofs = token.proofs.filter((_, i) => proofStates[i]?.state === 'UNSPENT');

if (unspentProofs.length === 0) {
// All proofs are PENDING at the mint
tokenCannotReclaimPopup({ onClose: () => onClose({}) });
return;
}

// Reclaim unspent proofs
const reclaimToken: Token = { mint: token.mint, proofs: unspentProofs, unit: token.unit };
await manager.wallet.receive(reclaimToken);
await updateLegacyHistoryState(
currentTransaction,
'rolledBack',
mintUrl,
manager,
accountIndex
);

const amt = unspentProofs.reduce((s, p) => s + p.amount, 0);
fundsReclaimedPopup(
{ amount: amt, unit: currentTransaction?.unit || 'sat' },
{ onClose: () => onClose({}) }
);
} catch (error) {
console.error('[SendTokenScreen] Legacy cancel failed:', error);
reclaimFailedPopup({
text: error instanceof Error ? error.message : String(error),
onClose: () => onClose({}),
});
}
tokenCannotCancelPopup({ onClose: () => onClose({}) });
return;
}

// --- Normal path: operationId exists ---
try {
await manager.send.rollback(currentTransaction.operationId);
transactionCancelledPopup({ onClose: () => onClose({}) });
Expand All @@ -420,7 +356,7 @@ export function SendTokenScreen({
});
}
},
[currentTransaction, manager, token, accountIndex]
[currentTransaction, manager]
);

const handleCheckStatus = useCallback(
Expand Down Expand Up @@ -708,7 +644,8 @@ export function SendTokenScreen({
icon: 'mdi:cancel',
variant: 'dangerous',
onPress: handleCancelSend,
condition: !isPaymentRequestMode && !isPaid && !!token,
condition:
!isPaymentRequestMode && !isPaid && !!token && !!currentTransaction?.operationId,
},
]}
/>
Expand Down