diff --git a/src/platform/workspace/api/workspaceApi.ts b/src/platform/workspace/api/workspaceApi.ts index 8a3fb2d8a63..84387438c9a 100644 --- a/src/platform/workspace/api/workspaceApi.ts +++ b/src/platform/workspace/api/workspaceApi.ts @@ -292,6 +292,7 @@ export interface BillingStatusResponse { change_at?: string billing_status?: BillingStatus pending_billing_op_id?: string + pending_billing_op_type?: 'subscription' | 'topup' action_url?: string has_funds: boolean cancel_at?: string diff --git a/src/platform/workspace/composables/useWorkspaceBilling.test.ts b/src/platform/workspace/composables/useWorkspaceBilling.test.ts index 8adfa65898d..b7c8748cb9b 100644 --- a/src/platform/workspace/composables/useWorkspaceBilling.test.ts +++ b/src/platform/workspace/composables/useWorkspaceBilling.test.ts @@ -285,6 +285,27 @@ describe('useWorkspaceBilling', () => { ) }) + it('recovers a pending top-up as a top-up, not a subscription', async () => { + const actionUrl = 'https://invoice.stripe.com/sensitive-token' + mockWorkspaceApi.getBillingStatus.mockResolvedValue({ + ...activeStatus, + billing_status: 'pending_payment', + pending_billing_op_id: 'op-topup', + pending_billing_op_type: 'topup', + action_url: actionUrl + } satisfies BillingStatusResponse) + + const billing = setupBilling() + await billing.fetchStatus() + + expect(mockStartOperation).toHaveBeenCalledWith( + 'op-topup', + 'topup', + undefined, + actionUrl + ) + }) + it('does not restart an operation recovered by an earlier status read', async () => { mockWorkspaceApi.getBillingStatus.mockResolvedValue({ ...activeStatus, diff --git a/src/platform/workspace/composables/useWorkspaceBilling.ts b/src/platform/workspace/composables/useWorkspaceBilling.ts index a39ff63c3eb..28bdaaed7b2 100644 --- a/src/platform/workspace/composables/useWorkspaceBilling.ts +++ b/src/platform/workspace/composables/useWorkspaceBilling.ts @@ -179,7 +179,7 @@ export function useWorkspaceBilling(): BillingState & BillingActions { ) { void billingOperationStore.startOperation( status.pending_billing_op_id, - 'subscription', + status.pending_billing_op_type === 'topup' ? 'topup' : 'subscription', undefined, status.action_url )