Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions __tests__/signerStore.cancelled.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { useSignerStore } from '../src/store/signerStore';

describe('signer store cancellation state', () => {
beforeEach(() => {
useSignerStore.getState().reset();
});

it('keeps cancellation separate from failure and clears review state safely', () => {
const store = useSignerStore.getState();

store.startReview({
requestId: 'req-1',
sourcePublicKey: 'GSOURCE',
destinationPublicKey: 'GDEST',
amount: '10',
assetCode: 'XLM',
network: 'Testnet',
createdAt: new Date().toISOString(),
timeoutSeconds: 30,
});

store.completeSigning({
hash: 'abc123',
review: useSignerStore.getState().currentReview!,
signerType: 'local',
completedAt: new Date().toISOString(),
});

store.cancelSigning();

expect(useSignerStore.getState().phase).toBe('cancelled');
expect(useSignerStore.getState().error).toBeNull();
expect(useSignerStore.getState().currentReview).toBeNull();
expect(useSignerStore.getState().lastResult).toBeNull();
});
});
15 changes: 9 additions & 6 deletions src/hooks/useSignerHandoff.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,16 @@ export function useSignerHandoff() {

// Check cancellation before signing
if (cancelledRef.current) {
const error = createSignerError('user_cancelled', 'Signing was cancelled.');
store.failSigning(error);
return { success: false, error };
store.cancelSigning();
return { success: false, cancelled: true };
}

const signedTx = await localSigner.sign(review, buildTransaction);

// Check cancellation before submission
if (cancelledRef.current) {
const error = createSignerError('user_cancelled', 'Signing was cancelled.');
store.failSigning(error);
return { success: false, error };
store.cancelSigning();
return { success: false, cancelled: true };
}

// Phase: submitting
Expand All @@ -138,6 +136,11 @@ export function useSignerHandoff() {
return { success: true, result };
} catch (err: any) {
const error = classifySigningError(err);
if (error.type === 'user_cancelled') {
store.cancelSigning();
return { success: false, cancelled: true, error };
}

store.failSigning(error);
return { success: false, error };
}
Expand Down
11 changes: 3 additions & 8 deletions src/store/signerStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,10 @@ export const useSignerStore = create<SignerState>((set, get) => ({
cancelSigning: () =>
set({
phase: 'cancelled',
error: createCancelledError(),
currentReview: null,
lastResult: null,
error: null,
}),

reset: () => set({ ...initialState }),
}));

function createCancelledError(): SignerError {
return {
type: 'user_cancelled',
message: 'Signing was cancelled.',
};
}