{t('scheduler.progress_schedule_info_title')}
- {progress.entries.map((entry) => (
-
-
{t('scheduler.progress_entry_label', { index: entry.index + 1 })}
-
{toScheduleEntryStateText(entry.state, entry.txid)}
-
- {entry.isLast
- ? t('scheduler.progress_entry_wait_final')
- : t('scheduler.progress_entry_wait_before_next', {
- wait: formatWaitTime(entry.waitBeforeNextSeconds),
- })}
+ {progress.entries.map((entry) => {
+ const phase = schedule.phases[entry.index]
+ return (
+
+
+
+ {t('scheduler.progress_entry_label', { index: entry.index + 1 })}
+
+
{toScheduleEntryStateText(entry.state, entry.txid)}
+
+ {entry.isLast
+ ? t('scheduler.progress_entry_wait_final')
+ : t('scheduler.progress_entry_wait_before_next', {
+ wait: formatWaitTime(entry.waitBeforeNextSeconds),
+ })}
+
+
+ {phase !== undefined && (
+
{describePhasePlan(phase)}
+ )}
+ {phase?.error && (
+
{phase.error}
+ )}
-
- ))}
+ )
+ })}
-
+ {!isTerminal && (
+
+ )}
)
diff --git a/src/components/sweep/scheduleUtils.test.ts b/src/components/sweep/scheduleUtils.test.ts
index b8efd7817..9303d022c 100644
--- a/src/components/sweep/scheduleUtils.test.ts
+++ b/src/components/sweep/scheduleUtils.test.ts
@@ -1,3 +1,4 @@
+import type { TumblerPhaseResponse, TumblerPlanResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { describe, expect, it } from 'vitest'
import {
isScheduleLikelyCompletedSuccessfully,
@@ -6,19 +7,45 @@ import {
type Schedule,
} from './scheduleUtils'
+const phase = (index: number, overrides: Partial
= {}): TumblerPhaseResponse => ({
+ kind: 'taker_coinjoin',
+ index,
+ status: 'pending',
+ wait_seconds: 0,
+ ...overrides,
+})
+
+const plan = (overrides: Partial = {}): Schedule => ({
+ plan_id: 'plan-1',
+ wallet_name: 'wallet.jmdat',
+ status: 'running',
+ destinations: ['bc1qdestination'],
+ current_phase: 0,
+ phases: [],
+ created_at: '2024-01-01T00:00:00Z',
+ updated_at: '2024-01-01T00:00:00Z',
+ ...overrides,
+})
+
describe('scheduleUtils', () => {
it('identifies valid schedule values', () => {
- expect(isScheduleValue([[0, 0, 8, 'INTERNAL', 10, 16, 0]])).toBe(true)
+ expect(isScheduleValue(plan({ phases: [phase(0)] }))).toBe(true)
expect(isScheduleValue(undefined)).toBe(false)
- expect(isScheduleValue([{}])).toBe(false)
+ expect(isScheduleValue(null)).toBe(false)
+ expect(isScheduleValue({ plan_id: 'x' })).toBe(false)
+ // legacy 7-tuple shape must no longer pass — drop-in shouldn't masquerade
+ expect(isScheduleValue([[0, 0, 8, 'INTERNAL', 10, 16, 0]])).toBe(false)
})
- it('creates progress summary from schedule entries', () => {
- const schedule: Schedule = [
- [0, 0, 8, 'INTERNAL', 10, 16, 1],
- [1, 0, 8, 'INTERNAL', 5, 16, 0],
- [2, 0, 8, 'bc1qdestination', 1, 16, 0],
- ]
+ it('creates progress summary from phases', () => {
+ const schedule = plan({
+ current_phase: 1,
+ phases: [
+ phase(0, { status: 'completed', wait_seconds: 600, txid: 'a'.repeat(64) }),
+ phase(1, { status: 'pending', wait_seconds: 300 }),
+ phase(2, { status: 'pending', wait_seconds: 60 }),
+ ],
+ })
const summary = toScheduleProgressSummary(schedule)
@@ -27,6 +54,7 @@ describe('scheduleUtils', () => {
expect(summary.currentTransactionIndex).toBe(1)
expect(summary.isDone).toBe(false)
expect(summary.steps).toHaveLength(3)
+ expect(summary.steps[0].isComplete).toBe(true)
expect(summary.steps[1].isActive).toBe(true)
expect(summary.entries).toHaveLength(3)
expect(summary.entries[0].state).toBe('confirmed')
@@ -35,25 +63,32 @@ describe('scheduleUtils', () => {
})
it('derives current state while waiting for transaction confirmation', () => {
- const schedule: Schedule = [
- [0, 0, 8, 'INTERNAL', 10, 16, 1],
- [1, 0, 8, 'INTERNAL', 5, 16, '8'.repeat(64)],
- [2, 0, 8, 'bc1qdestination', 1, 16, 0],
- ]
+ const broadcastTxId = '8'.repeat(64)
+ const schedule = plan({
+ current_phase: 1,
+ phases: [
+ phase(0, { status: 'completed', wait_seconds: 600 }),
+ phase(1, { status: 'running', wait_seconds: 300, txid: broadcastTxId }),
+ phase(2, { status: 'pending', wait_seconds: 60 }),
+ ],
+ })
const summary = toScheduleProgressSummary(schedule)
expect(summary.currentState?.type).toBe('waiting_for_confirmation')
expect(summary.currentState?.currentTransaction).toBe(2)
expect(summary.entries[1].state).toBe('broadcasted')
- expect(summary.entries[1].txid).toBe('8'.repeat(64))
+ expect(summary.entries[1].txid).toBe(broadcastTxId)
})
it('derives current state while waiting before the next transaction', () => {
- const schedule: Schedule = [
- [0, 0, 8, 'INTERNAL', 2, 16, 1],
- [1, 0, 8, 'bc1qdestination', 0, 16, 0],
- ]
+ const schedule = plan({
+ current_phase: 1,
+ phases: [
+ phase(0, { status: 'completed', wait_seconds: 120 }),
+ phase(1, { status: 'pending', wait_seconds: 0 }),
+ ],
+ })
const summary = toScheduleProgressSummary(schedule)
@@ -62,13 +97,59 @@ describe('scheduleUtils', () => {
expect(summary.currentState?.waitSeconds).toBe(120)
})
- it('falls back to frozen-utxo check when last schedule entry is stale', () => {
- const schedule: Schedule = [
- [0, 0, 8, 'INTERNAL', 10, 16, 1],
- [1, 0, 8, 'bc1qdestination', 0, 16, 0],
- ]
+ it('reports creating_and_broadcasting for a running phase without a txid', () => {
+ const schedule = plan({
+ current_phase: 0,
+ phases: [phase(0, { status: 'running', wait_seconds: 0 })],
+ })
+
+ const summary = toScheduleProgressSummary(schedule)
+ expect(summary.currentState?.type).toBe('creating_and_broadcasting')
+ })
+
+ it('marks the plan done when the runner reports a terminal status', () => {
+ const schedule = plan({
+ status: 'completed',
+ current_phase: 1,
+ phases: [
+ phase(0, { status: 'completed' }),
+ phase(1, { status: 'completed' }),
+ ],
+ })
+
+ const summary = toScheduleProgressSummary(schedule)
+ expect(summary.isDone).toBe(true)
+ expect(summary.currentState).toBeUndefined()
+ })
+
+ it('treats completed plans as likely successful', () => {
+ const schedule = plan({
+ status: 'completed',
+ phases: [phase(0, { status: 'completed' }), phase(1, { status: 'completed' })],
+ })
+
+ expect(isScheduleLikelyCompletedSuccessfully(schedule, false)).toBe(true)
+ })
+
+ it('falls back to the frozen-utxo check when only the last phase failed', () => {
+ const schedule = plan({
+ status: 'failed',
+ phases: [
+ phase(0, { status: 'completed' }),
+ phase(1, { status: 'failed' }),
+ ],
+ })
expect(isScheduleLikelyCompletedSuccessfully(schedule, false)).toBe(false)
expect(isScheduleLikelyCompletedSuccessfully(schedule, true)).toBe(true)
})
+
+ it('does not claim success while the plan is still running', () => {
+ const schedule = plan({
+ status: 'running',
+ phases: [phase(0, { status: 'completed' }), phase(1, { status: 'completed' })],
+ })
+
+ expect(isScheduleLikelyCompletedSuccessfully(schedule, true)).toBe(false)
+ })
})
diff --git a/src/components/sweep/scheduleUtils.ts b/src/components/sweep/scheduleUtils.ts
index 70c84ea1f..1f0803651 100644
--- a/src/components/sweep/scheduleUtils.ts
+++ b/src/components/sweep/scheduleUtils.ts
@@ -1,28 +1,19 @@
+import type { TumblerPhaseResponse, TumblerPlanResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import type { TxId } from '@/store/jmTxStore'
-import type { BitcoinAddress, JarIndex, Minutes } from '@/types/global'
-
-type AmountFraction = number
-type AmountCounterparties = number
-type SchedulerDestinationAddress = 'INTERNAL' | BitcoinAddress
-type WaitTimeInMinutes = Minutes
-type Rounding = number
-type StateFlag = 0 | 1 | TxId
-
-// [mixdepth, amount-fraction, N-counterparties (requested), destination address, wait time in minutes, rounding, flag indicating incomplete/broadcast/completed (0/txid/1)]
-// e.g.
-// - [ 2, 0.2456498211214867, 4, "INTERNAL", 0.01, 16, 1 ]
-// - [ 3, 0, 8, "bcrt1qpnv3nze7u6ecw63mn06ksxh497a3lryagh233q", 0.04, 16, 0 ]
-export type ScheduleEntry = [
- JarIndex,
- AmountFraction,
- AmountCounterparties,
- SchedulerDestinationAddress,
- WaitTimeInMinutes,
- Rounding,
- StateFlag,
-]
-
-export type Schedule = ScheduleEntry[]
+
+// Phase ``status`` values mirror :class:`jm_tumbler.plan.PhaseStatus` on the
+// backend. Treat any unknown value as ``pending`` so future status additions
+// degrade gracefully.
+export type SchedulePhaseStatus = 'pending' | 'running' | 'completed' | 'failed' | 'cancelled'
+
+// Plan ``status`` values mirror :class:`jm_tumbler.plan.PlanStatus`.
+export type SchedulePlanStatus = SchedulePhaseStatus
+
+// Re-export the SDK schedule type under a UI-local alias so that consumers
+// don't have to reach into the generated client and so that future shape
+// changes are localized to this module.
+export type Schedule = TumblerPlanResponse
+export type SchedulePhase = TumblerPhaseResponse
export interface ScheduleProgressStep {
widthPercent: number
@@ -32,7 +23,7 @@ export interface ScheduleProgressStep {
isLast: boolean
}
-export type ScheduleEntryState = 'pending' | 'broadcasted' | 'confirmed'
+export type ScheduleEntryState = 'pending' | 'broadcasted' | 'confirmed' | 'failed' | 'cancelled'
export interface ScheduleProgressEntry {
index: number
@@ -69,66 +60,91 @@ export interface ScheduleProgressSummary {
const MIN_STEP_WIDTH_PERCENT = 8
-const toNumberOrDefault = (value: unknown, fallback: number): number => {
- return typeof value === 'number' && Number.isFinite(value) ? value : fallback
+const PHASE_STATUS_VALUES: ReadonlySet = new Set([
+ 'pending',
+ 'running',
+ 'completed',
+ 'failed',
+ 'cancelled',
+])
+
+const toPhaseStatus = (value: unknown): SchedulePhaseStatus => {
+ return typeof value === 'string' && PHASE_STATUS_VALUES.has(value as SchedulePhaseStatus)
+ ? (value as SchedulePhaseStatus)
+ : 'pending'
}
-const getScheduleEntryWaitMinutes = (entry: ScheduleEntry): number => {
- return Math.max(0, toNumberOrDefault(entry[4], 0))
+export { toPhaseStatus }
+
+const isTerminalStatus = (status: SchedulePhaseStatus): boolean => {
+ return status === 'completed' || status === 'failed' || status === 'cancelled'
}
-const getScheduleEntryState = (entry: ScheduleEntry): string | number => {
- return entry[6] ?? 0
+export const isScheduleTerminal = (schedule: Schedule): boolean => {
+ return isTerminalStatus(toPhaseStatus(schedule.status))
}
-const getScheduleEntryTxId = (entry: ScheduleEntry): TxId | undefined => {
- const state = getScheduleEntryState(entry)
- return typeof state === 'string' ? state : undefined
+const phaseTxId = (phase: SchedulePhase): TxId | undefined => {
+ // Bondless taker bursts emit multiple txids; surface the most recent one
+ // so the UI keeps showing live progress instead of falling back to the
+ // single-tx ``txid`` field.
+ const fromList = Array.isArray(phase.txids) && phase.txids.length > 0 ? phase.txids.at(-1) : null
+ const candidate = phase.txid ?? fromList
+ return typeof candidate === 'string' && candidate !== '' ? candidate : undefined
}
-// Scheduler state flag convention from backend:
-// 0 => not yet broadcast, txid string => broadcasted (unconfirmed), 1 => confirmed.
-const toScheduleEntryState = (entry: ScheduleEntry): ScheduleEntryState => {
- const state = getScheduleEntryState(entry)
+const phaseWaitSeconds = (phase: SchedulePhase): number => {
+ return Number.isFinite(phase.wait_seconds) ? Math.max(0, phase.wait_seconds) : 0
+}
- if (state === 1) {
- return 'confirmed'
- }
- if (typeof state === 'string') {
- return 'broadcasted'
- }
+const phaseEntryState = (phase: SchedulePhase): ScheduleEntryState => {
+ const status = toPhaseStatus(phase.status)
+ if (status === 'completed') return 'confirmed'
+ if (status === 'failed') return 'failed'
+ if (status === 'cancelled') return 'cancelled'
+ if (status === 'running' && phaseTxId(phase) !== undefined) return 'broadcasted'
return 'pending'
}
-const isScheduleEntryConfirmed = (entry: ScheduleEntry): boolean => {
- return getScheduleEntryState(entry) === 1
+const isPhaseSuccessful = (phase: SchedulePhase): boolean => {
+ // ``completed`` is the only terminal "succeeded" state. ``running`` with a
+ // broadcast txid is still in flight: don't claim success until the runner
+ // has confirmed it.
+ return toPhaseStatus(phase.status) === 'completed'
}
-export const isScheduleEntrySuccessful = (entry: ScheduleEntry): boolean => {
- const state = getScheduleEntryState(entry)
- return state === 1 || typeof state === 'string'
+const isPhaseFinished = (phase: SchedulePhase): boolean => {
+ return isTerminalStatus(toPhaseStatus(phase.status))
}
+export const isSchedulePhaseSuccessful = isPhaseSuccessful
+
+// Narrow ``unknown`` to a usable ``Schedule``. This guards against pre-plan
+// state (``null``/``undefined``) and ensures the required scalar fields are
+// present so the rest of the module can operate without per-call validation.
export const isScheduleValue = (value: unknown): value is Schedule => {
- return (
- Array.isArray(value) &&
- value.every(
- (entry) =>
- Array.isArray(entry) &&
- entry.length >= 7 &&
- typeof entry[0] === 'number' /* JarIndex */ &&
- typeof entry[1] === 'number' /* AmountFraction */ &&
- typeof entry[2] === 'number' /* AmountCounterparties */ &&
- typeof entry[3] === 'string' /* SchedulerDestinationAddress */ &&
- typeof entry[4] === 'number' /* WaitTimeInMinutes */ &&
- typeof entry[5] === 'number' /* Rounding */ &&
- (typeof entry[6] === 'number' || typeof entry[6] === 'string') /* StateFlag */,
- )
+ if (value === null || typeof value !== 'object') return false
+ const candidate = value as Partial
+ if (typeof candidate.plan_id !== 'string') return false
+ if (typeof candidate.wallet_name !== 'string') return false
+ if (typeof candidate.status !== 'string') return false
+ if (!Array.isArray(candidate.destinations)) return false
+ if (typeof candidate.current_phase !== 'number') return false
+ if (!Array.isArray(candidate.phases)) return false
+ return candidate.phases.every(
+ (phase) =>
+ phase !== null &&
+ typeof phase === 'object' &&
+ typeof phase.kind === 'string' &&
+ typeof phase.index === 'number' &&
+ typeof phase.status === 'string' &&
+ typeof phase.wait_seconds === 'number',
)
}
export const toScheduleProgressSummary = (schedule: Schedule): ScheduleProgressSummary => {
- if (schedule.length === 0) {
+ const phases = schedule.phases
+ if (phases.length === 0) {
return {
totalWaitSeconds: 0,
totalTransactions: 0,
@@ -140,95 +156,118 @@ export const toScheduleProgressSummary = (schedule: Schedule): ScheduleProgressS
}
}
- const completedTransactions = schedule.reduce((acc, entry) => {
- return acc + (isScheduleEntryConfirmed(entry) ? 1 : 0)
- }, 0)
+ const planStatus = toPhaseStatus(schedule.status)
+ const completedTransactions = phases.reduce((acc, phase) => acc + (isPhaseSuccessful(phase) ? 1 : 0), 0)
+ // Sum waits between phases (i.e. drop the trailing phase's post-wait, since
+ // there's nothing after it). Floor at 1 so per-step width math never divides
+ // by zero on instant-run schedules.
const totalWaitSeconds = Math.max(
1,
- schedule.slice(0, Math.max(0, schedule.length - 1)).reduce((acc, entry) => {
- return acc + getScheduleEntryWaitMinutes(entry) * 60
- }, 0),
+ phases.slice(0, Math.max(0, phases.length - 1)).reduce((acc, phase) => acc + phaseWaitSeconds(phase), 0),
)
- const isDone = completedTransactions >= schedule.length
- const currentTransactionIndex = Math.min(completedTransactions, schedule.length - 1)
+ const isDone = isTerminalStatus(planStatus)
- const steps: ScheduleProgressStep[] = schedule.map((_entry, index) => {
+ // ``current_phase`` is authoritative when the plan is mid-run; otherwise
+ // fall back to "after the last completed one" so the UI keeps highlighting
+ // a sensible step before the runner advances the index.
+ const currentPhaseIndex = (() => {
+ const declared = schedule.current_phase
+ if (typeof declared === 'number' && declared >= 0 && declared < phases.length) {
+ return declared
+ }
+ return Math.min(completedTransactions, phases.length - 1)
+ })()
+
+ const steps: ScheduleProgressStep[] = phases.map((_phase, index) => {
const widthPercent =
index === 0
? MIN_STEP_WIDTH_PERCENT
- : Math.max(
- MIN_STEP_WIDTH_PERCENT,
- ((Math.max(1, getScheduleEntryWaitMinutes(schedule[index - 1])) * 60) / totalWaitSeconds) * 100,
- )
+ : Math.max(MIN_STEP_WIDTH_PERCENT, (Math.max(1, phaseWaitSeconds(phases[index - 1])) / totalWaitSeconds) * 100)
+ const isPhaseComplete = isPhaseFinished(phases[index])
return {
widthPercent,
- isComplete: completedTransactions > index,
- isActive: !isDone && completedTransactions === index,
+ isComplete: isPhaseComplete,
+ isActive: !isDone && index === currentPhaseIndex && !isPhaseComplete,
isFirst: index === 0,
- isLast: index === schedule.length - 1,
+ isLast: index === phases.length - 1,
}
})
- const entries: ScheduleProgressEntry[] = schedule.map((entry, index) => {
- return {
- index,
- waitBeforeNextSeconds: index >= schedule.length - 1 ? 0 : getScheduleEntryWaitMinutes(entry) * 60,
- state: toScheduleEntryState(entry),
- txid: getScheduleEntryTxId(entry),
- isLast: index === schedule.length - 1,
- }
- })
+ const entries: ScheduleProgressEntry[] = phases.map((phase, index) => ({
+ index,
+ waitBeforeNextSeconds: index >= phases.length - 1 ? 0 : phaseWaitSeconds(phase),
+ state: phaseEntryState(phase),
+ txid: phaseTxId(phase),
+ isLast: index === phases.length - 1,
+ }))
let currentState: ScheduleCurrentState | undefined
if (!isDone) {
- const activeEntry = schedule[currentTransactionIndex]
- const activeEntryTxId = getScheduleEntryTxId(activeEntry)
- const activeEntryState = getScheduleEntryState(activeEntry)
+ const activePhase = phases[currentPhaseIndex]
+ const activeStatus = toPhaseStatus(activePhase.status)
+ const activeTxId = phaseTxId(activePhase)
- // Infer the user-facing phase from the currently active entry and the previous wait slot.
- if (activeEntryTxId !== undefined) {
+ if (activeStatus === 'running' && activeTxId !== undefined) {
currentState = {
type: 'waiting_for_confirmation',
- currentTransaction: currentTransactionIndex + 1,
- totalTransactions: schedule.length,
- txid: activeEntryTxId,
- }
- } else if (activeEntryState === 1) {
- currentState = {
- type: 'transaction_confirmed',
- currentTransaction: currentTransactionIndex + 1,
- totalTransactions: schedule.length,
+ currentTransaction: currentPhaseIndex + 1,
+ totalTransactions: phases.length,
+ txid: activeTxId,
}
- } else {
- const waitSeconds =
- currentTransactionIndex > 0
- ? Math.ceil(getScheduleEntryWaitMinutes(schedule[currentTransactionIndex - 1]) * 60)
- : 0
-
+ } else if (activeStatus === 'completed') {
+ // The runner finished this phase but hasn't advanced ``current_phase``
+ // yet (we're inside the inter-phase wait). Show the wait before the
+ // next phase starts when there is one.
+ const nextPhase = phases[currentPhaseIndex + 1]
+ const waitSeconds = Math.ceil(phaseWaitSeconds(activePhase))
+ currentState =
+ nextPhase !== undefined && waitSeconds > 0
+ ? {
+ type: 'waiting_before_next',
+ currentTransaction: currentPhaseIndex + 2,
+ totalTransactions: phases.length,
+ waitSeconds,
+ }
+ : {
+ type: 'transaction_confirmed',
+ currentTransaction: currentPhaseIndex + 1,
+ totalTransactions: phases.length,
+ }
+ } else if (activeStatus === 'pending' && currentPhaseIndex > 0) {
+ // We're between two phases: the previous one completed and the next is
+ // queued but not yet started.
+ const previousPhase = phases[currentPhaseIndex - 1]
+ const waitSeconds = Math.ceil(phaseWaitSeconds(previousPhase))
currentState =
waitSeconds > 0
? {
type: 'waiting_before_next',
- currentTransaction: currentTransactionIndex + 1,
- totalTransactions: schedule.length,
+ currentTransaction: currentPhaseIndex + 1,
+ totalTransactions: phases.length,
waitSeconds,
}
: {
type: 'creating_and_broadcasting',
- currentTransaction: currentTransactionIndex + 1,
- totalTransactions: schedule.length,
+ currentTransaction: currentPhaseIndex + 1,
+ totalTransactions: phases.length,
}
+ } else {
+ currentState = {
+ type: 'creating_and_broadcasting',
+ currentTransaction: currentPhaseIndex + 1,
+ totalTransactions: phases.length,
+ }
}
}
return {
totalWaitSeconds,
- totalTransactions: schedule.length,
- completedTransactions: Math.min(completedTransactions, schedule.length),
- currentTransactionIndex,
+ totalTransactions: phases.length,
+ completedTransactions: Math.min(completedTransactions, phases.length),
+ currentTransactionIndex: currentPhaseIndex,
isDone,
steps,
entries,
@@ -237,17 +276,21 @@ export const toScheduleProgressSummary = (schedule: Schedule): ScheduleProgressS
}
export const isScheduleLikelyCompletedSuccessfully = (schedule: Schedule, allUtxosFrozen: boolean): boolean => {
- if (schedule.length === 0) {
- return false
+ const phases = schedule.phases
+ if (phases.length === 0) return false
+
+ // The plan status is authoritative when the runner reaches a terminal state.
+ const planStatus = toPhaseStatus(schedule.status)
+ if (planStatus === 'completed') return true
+ if (planStatus === 'failed' || planStatus === 'cancelled') {
+ // Mirror the legacy heuristic: if every non-final phase succeeded and the
+ // user has no remaining spendable UTXOs, treat the run as a successful
+ // sweep even if the last phase didn't formally complete.
+ const allButLastSucceeded = phases.slice(0, -1).every((phase) => isPhaseSuccessful(phase))
+ return allButLastSucceeded && allUtxosFrozen
}
- const entriesBeforeLastSucceeded = schedule.slice(0, -1).every((entry) => isScheduleEntrySuccessful(entry))
- const lastEntry = schedule.at(-1)
- if (lastEntry === undefined) {
- return false
- }
-
- const lastEntrySucceeded = isScheduleEntrySuccessful(lastEntry)
-
- return entriesBeforeLastSucceeded && (lastEntrySucceeded || allUtxosFrozen)
+ // Plan still running but every phase succeeded — caller is asking whether
+ // the run "looks done"; defer until the backend marks the plan completed.
+ return false
}
diff --git a/src/components/wallet/WalletJarsDetailsContent.tsx b/src/components/wallet/WalletJarsDetailsContent.tsx
index 747dc0e02..655d191b7 100644
--- a/src/components/wallet/WalletJarsDetailsContent.tsx
+++ b/src/components/wallet/WalletJarsDetailsContent.tsx
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useMemo, useState } from 'react'
-import { freezeMutation } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
+import { freezeMutation } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
import { useMutation } from '@tanstack/react-query'
import type { RowSelectionState } from '@tanstack/react-table'
import type { TFunction } from 'i18next'
diff --git a/src/context/JamSessionInfoContextProvider.tsx b/src/context/JamSessionInfoContextProvider.tsx
index 83b375047..f7a71c47c 100644
--- a/src/context/JamSessionInfoContextProvider.tsx
+++ b/src/context/JamSessionInfoContextProvider.tsx
@@ -1,6 +1,6 @@
import type { PropsWithChildren } from 'react'
import { useMemo, useState } from 'react'
-import { getrescaninfoOptions } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
+import { getrescaninfoOptions } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
import { useQuery } from '@tanstack/react-query'
import { useStore } from 'zustand'
import { JAM_RESCAN_PROGRESS_INTERVAL } from '@/constants/jam'
@@ -58,7 +58,7 @@ export const JamSessionInfoContextProvider = ({
setRescanInfo({
updatedAt: getrescaninfoQuery.dataUpdatedAt,
rescanning: isRescanning,
- progress: rescanningFinished ? 1 : getrescaninfoQuery.data.progress,
+ progress: rescanningFinished ? 1 : (getrescaninfoQuery.data.progress ?? undefined),
})
}
diff --git a/src/context/JamWalletInfoContext.ts b/src/context/JamWalletInfoContext.ts
index 35d0f87f3..bd423c8a7 100644
--- a/src/context/JamWalletInfoContext.ts
+++ b/src/context/JamWalletInfoContext.ts
@@ -1,5 +1,5 @@
import { createContext, useContext, type Dispatch, type SetStateAction } from 'react'
-import type { ErrorMessage, WalletDisplayResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import type { WalletDisplayResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { Network, type AddressInfo } from 'bitcoin-address-validation'
import type { UseQueryDisplayWalletResult } from '@/hooks/useQueryDisplayWallet'
import type { FidelityBondUtxo, UseQueryUtxosResult, Utxo, UtxoId } from '@/hooks/useQueryUtxos'
@@ -96,7 +96,7 @@ interface JamWalletInfoContextType {
isLoading: boolean
isFetching: boolean
- error: Error | ErrorMessage | null
+ error: Error | unknown | null
refetch: (options?: WalletRefetchOptions) => Promise
utxosQueryResult: UseQueryUtxosResult['queryResult']
diff --git a/src/context/JamWalletInfoContextProvider.tsx b/src/context/JamWalletInfoContextProvider.tsx
index dde5d63d9..9b8c18083 100644
--- a/src/context/JamWalletInfoContextProvider.tsx
+++ b/src/context/JamWalletInfoContextProvider.tsx
@@ -22,14 +22,14 @@ import {
} from './JamWalletInfoContext'
const toAccountSummary = (walletInfo: WalletInfoApiObject): AccountSummary => {
- return walletInfo.accounts.reduce((acc, __raw) => {
+ return (walletInfo.accounts ?? []).reduce((acc, __raw) => {
if (__raw.account === undefined) {
return acc
}
const branches = (__raw.branches || [])
.filter((it) => it.branch !== undefined)
.map((it) => {
- const [type, derivation] = it.branch!.split('\t')
+ const [type, derivation] = it.branch.split('\t')
return {
type,
derivation,
diff --git a/src/hooks/useJmConfig.ts b/src/hooks/useJmConfig.ts
index 252d4afee..753a7e2bc 100644
--- a/src/hooks/useJmConfig.ts
+++ b/src/hooks/useJmConfig.ts
@@ -1,5 +1,5 @@
import { useCallback } from 'react'
-import { configgetMutation } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
+import { configgetMutation } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
import { useMutation } from '@tanstack/react-query'
import { useStore } from 'zustand'
import type { ConfigKey, ConfigValue } from '@/constants/jm'
diff --git a/src/hooks/useQueryDisplayWallet.ts b/src/hooks/useQueryDisplayWallet.ts
index 61ce0c2e9..46ed8e84c 100644
--- a/src/hooks/useQueryDisplayWallet.ts
+++ b/src/hooks/useQueryDisplayWallet.ts
@@ -1,5 +1,5 @@
-import { displaywalletOptions } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
-import type { DisplaywalletResponse, ErrorMessage, WalletDisplayResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import { displaywalletOptions } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
+import type { DisplaywalletResponse, WalletDisplayResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { useQuery, type UseQueryResult } from '@tanstack/react-query'
import { useStore } from 'zustand'
import { isDevMode } from '@/constants/debugFeatures'
@@ -12,7 +12,7 @@ export type WalletInfoApiObject = NonNullable
+ queryResult: UseQueryResult
}
interface UseQueryDisplayWalletProps {
diff --git a/src/hooks/useQueryJmInfo.ts b/src/hooks/useQueryJmInfo.ts
index f3f50eb95..73f196d48 100644
--- a/src/hooks/useQueryJmInfo.ts
+++ b/src/hooks/useQueryJmInfo.ts
@@ -1,12 +1,12 @@
-import { versionOptions } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
-import type { ErrorMessage, VersionResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import { versionOptions } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
+import type { VersionResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { useQuery, type UseQueryResult } from '@tanstack/react-query'
import { useApiClient } from '@/hooks/useApiClient'
import { parseSemanticVersion, type SemanticVersion } from '@/lib/utils'
type UseQueryJmInfoResult = {
version: SemanticVersion | undefined
- queryResult: UseQueryResult
+ queryResult: UseQueryResult
}
export function useQueryJmInfo(): UseQueryJmInfoResult {
diff --git a/src/hooks/useQueryUtxos.ts b/src/hooks/useQueryUtxos.ts
index cd18b33aa..c4c0c0503 100644
--- a/src/hooks/useQueryUtxos.ts
+++ b/src/hooks/useQueryUtxos.ts
@@ -1,5 +1,5 @@
-import { listutxosOptions } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
-import type { ErrorMessage, ListUtxosResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import { listutxosOptions } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
+import type { ListUtxosResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { useQuery, type UseQueryResult } from '@tanstack/react-query'
import { useStore } from 'zustand'
import { isDevMode } from '@/constants/debugFeatures'
@@ -31,7 +31,7 @@ export type FidelityBondUtxo = Omit & {
export type UseQueryUtxosResult = {
utxos: Utxo[]
- queryResult: UseQueryResult
+ queryResult: UseQueryResult
}
interface UseQueryUtxosProps {
diff --git a/src/hooks/useRefreshSession.ts b/src/hooks/useRefreshSession.ts
index 739f143ad..e6655f013 100644
--- a/src/hooks/useRefreshSession.ts
+++ b/src/hooks/useRefreshSession.ts
@@ -1,6 +1,6 @@
import { useEffect } from 'react'
-import { sessionOptions } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
-import type { SessionResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import { sessionOptions } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
+import type { SessionResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { useQuery } from '@tanstack/react-query'
import { toast } from 'sonner'
import { useStore } from 'zustand'
diff --git a/src/hooks/useUtxoSelectionDialog.ts b/src/hooks/useUtxoSelectionDialog.ts
index 5308e994a..799e92592 100644
--- a/src/hooks/useUtxoSelectionDialog.ts
+++ b/src/hooks/useUtxoSelectionDialog.ts
@@ -1,5 +1,5 @@
import { useMemo, useState } from 'react'
-import { freezeMutation } from '@joinmarket-webui/joinmarket-api-ts/@tanstack/react-query'
+import { freezeMutation } from '@joinmarket-ng/joinmarket-ng-api-ts/@tanstack/react-query'
import { useMutation } from '@tanstack/react-query'
import type { RowSelectionState } from '@tanstack/react-table'
import { useTranslation } from 'react-i18next'
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index eba3e8285..a6701ffad 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -793,6 +793,11 @@
"subtitle": "Execute multiple transactions using random amounts and time intervals to increase the privacy of yourself and others. Every scheduled transaction is a collaborative transaction.",
"error_starting_schedule_failed": "Starting the scheduler failed.",
"error_stopping_schedule_failed": "Stopping the scheduler failed.",
+ "error_dismissing_plan_failed": "Could not clear the previous plan.",
+ "terminal_completed": "Tumble completed successfully.",
+ "terminal_cancelled": "Tumble was cancelled.",
+ "terminal_failed": "Tumble ended with an error.",
+ "button_dismiss_plan": "Clear and start a new tumble",
"complete_wallet_title": "Complete Wallet",
"complete_wallet_subtitle": "This will use all of your non-frozen funds.",
"description_destination_addresses": "The scheduler will send all available funds to multiple destinations, splitting them up in random chunks.",
@@ -819,6 +824,8 @@
"progress_entry_state_pending": "Pending",
"progress_entry_state_waiting_confirmation": "Waiting for confirmation ({{ txid }})",
"progress_entry_state_confirmed": "Confirmed",
+ "progress_entry_state_failed": "Failed",
+ "progress_entry_state_cancelled": "Cancelled",
"progress_entry_wait_before_next": "Wait before next: {{ wait }}",
"progress_entry_wait_final": "Final transaction",
"progress_done": "All transactions completed successfully. The scheduler will stop soon.",
diff --git a/src/lib/api/logs.ts b/src/lib/api/logs.ts
index efd813df5..5838040ca 100644
--- a/src/lib/api/logs.ts
+++ b/src/lib/api/logs.ts
@@ -35,21 +35,24 @@ export const fetchFeatures = async ({ token, signal }: AuthApiRequestContext) =>
}
/**
- * Fetch log file content from the server
+ * Fetch log content from the server.
+ *
+ * jm-ng exposes a single in-memory log buffer (the daemon does not write log
+ * files); the ``fileName`` parameter is retained for API compatibility but
+ * ignored server-side.
* @param token - Authentication token
* @param signal - AbortSignal for cancelling requests
- * @param fileName - Name of the log file to fetch
+ * @param fileName - Deprecated/ignored; present for reference API compat.
* @returns Promise
*/
export const fetchLog = async ({
token,
signal,
- fileName,
+ fileName: _fileName,
}: AuthApiRequestContext & {
fileName: string
}) => {
- const encodedFileName = encodeURIComponent(fileName)
- return await fetch(`/jam/api/v0/log/${encodedFileName}`, {
+ return await fetch(`/api/v1/logs`, {
headers: { ...buildAuthHeaderMap(token) },
signal,
}).then((response) => withExpectedContentTypeOrThrow(response, 'text/plain'))
diff --git a/src/lib/config.test.ts b/src/lib/config.test.ts
index f17338e24..a7a4ee1f5 100644
--- a/src/lib/config.test.ts
+++ b/src/lib/config.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
import { authStore } from '@/store/authStore'
import { unauthorizedResponseInterceptor } from './config'
-vi.mock('@joinmarket-webui/joinmarket-api-ts', () => ({
+vi.mock('@joinmarket-ng/joinmarket-ng-api-ts', () => ({
createClient: vi.fn(() => ({
interceptors: {
request: { use: vi.fn() },
diff --git a/src/lib/config.ts b/src/lib/config.ts
index a2e79bd83..e3cb508fb 100644
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@@ -1,6 +1,6 @@
-import { createClient } from '@joinmarket-webui/joinmarket-api-ts'
-import type { Client } from '@joinmarket-webui/joinmarket-api-ts/client'
-import type { ClientOptions, UnlockWalletResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import { createClient } from '@joinmarket-ng/joinmarket-ng-api-ts'
+import type { Client } from '@joinmarket-ng/joinmarket-ng-api-ts/client'
+import type { ClientOptions, UnlockWalletResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { isDevMode } from '@/constants/debugFeatures'
import { normalizeAppError } from '@/lib/errorReason'
import { authStore } from '@/store/authStore'
diff --git a/src/store/authStore.ts b/src/store/authStore.ts
index a00a431b0..5c3544442 100644
--- a/src/store/authStore.ts
+++ b/src/store/authStore.ts
@@ -1,4 +1,4 @@
-import type { UnlockWalletResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import type { UnlockWalletResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { createStore } from 'zustand'
import { persist, createJSONStorage } from 'zustand/middleware'
import type { WalletFileName } from '@/lib/utils'
diff --git a/src/store/jmSessionStore.ts b/src/store/jmSessionStore.ts
index 96223cefc..29f01652a 100644
--- a/src/store/jmSessionStore.ts
+++ b/src/store/jmSessionStore.ts
@@ -1,4 +1,4 @@
-import type { SessionResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import type { SessionResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { createStore } from 'zustand'
interface JmSessionStoreState {
diff --git a/src/store/jmTxStore.ts b/src/store/jmTxStore.ts
index 09432f72c..f9d6472ad 100644
--- a/src/store/jmTxStore.ts
+++ b/src/store/jmTxStore.ts
@@ -1,4 +1,4 @@
-import type { DirectSendResponse } from '@joinmarket-webui/joinmarket-api-ts/jm'
+import type { DirectSendResponse } from '@joinmarket-ng/joinmarket-ng-api-ts/jm'
import { createStore } from 'zustand'
import { persist, createJSONStorage } from 'zustand/middleware'