diff --git a/packages/account-ui/src/billing/addCredits/AddCreditsAmountField.vue b/packages/account-ui/src/billing/addCredits/AddCreditsAmountField.vue
index 77ac175825c..b1a56a72a84 100644
--- a/packages/account-ui/src/billing/addCredits/AddCreditsAmountField.vue
+++ b/packages/account-ui/src/billing/addCredits/AddCreditsAmountField.vue
@@ -11,51 +11,79 @@
)
"
>
- $
+
+ {{ prefix }}
+
- {{ error }}
+ {{ error ?? hint }}
diff --git a/packages/account-ui/src/billing/addCredits/useAddCreditsAutoTopUp.ts b/packages/account-ui/src/billing/addCredits/useAddCreditsAutoTopUp.ts
index 530b712b0ad..acb8ca51d41 100644
--- a/packages/account-ui/src/billing/addCredits/useAddCreditsAutoTopUp.ts
+++ b/packages/account-ui/src/billing/addCredits/useAddCreditsAutoTopUp.ts
@@ -9,12 +9,13 @@ import type {
import {
autoTopUpActivationFor,
autoTopUpTargetFor,
- CREDITS_PER_USD,
parseAutoTopUpForm,
startAutoTopUpForm,
validateAutoTopUp
} from '@comfyorg/account-core/billing'
+import { centsToCredits } from '#/billing/tab/creditsCardCopy'
+
export type AddCreditsAutoTopUpRequest =
| { readonly kind: 'not_offered' }
| { readonly kind: 'unchecked' }
@@ -33,7 +34,7 @@ export function useAddCreditsAutoTopUp(
const edits = shallowRef>({})
const creditsPicked = computed(() =>
- Math.round(((toValue(amountCents) ?? 0) * CREDITS_PER_USD) / 100)
+ centsToCredits(toValue(amountCents) ?? 0)
)
const input = computed(() => {
diff --git a/src/platform/billing/components/AddCreditsDialogContent.test.ts b/src/platform/billing/components/AddCreditsDialogContent.test.ts
index b8e4e0bba65..9f10df59f70 100644
--- a/src/platform/billing/components/AddCreditsDialogContent.test.ts
+++ b/src/platform/billing/components/AddCreditsDialogContent.test.ts
@@ -20,13 +20,14 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' }
import { readAutoTopUpActivation } from '@/platform/billing/addCredits/autoTopUpActivation'
import { billingApi } from '@/platform/billing/api/billingApi'
import {
- autoTopUpCardState,
+ autoTopUpCard,
loadedAutoTopUp
} from '@/platform/billing/composables/__mocks__/useBillingAutoTopUpCard'
import {
autoTopUpEnabledFact,
canManageAutoTopUpFact
} from '@/platform/billing/composables/__mocks__/useBillingCapabilities'
+import { useBillingAutoTopUpCard } from '@/platform/billing/composables/useBillingAutoTopUpCard'
import { useBillingCapabilities } from '@/platform/billing/composables/useBillingCapabilities'
import { useBillingSdkStore } from '@/platform/billing/sdk/billingSdkStore'
import { setLocalBillingWebEnabled } from '@/platform/billing/localBillingWebEnabled'
@@ -185,7 +186,9 @@ function renderDialog({
capabilities.autoTopUpEnabled = autoTopUpEnabledFact(true)
capabilities.canManageAutoTopUp = canManageAutoTopUpFact(true)
capabilities.autoTopUpSetup = computed(() => ({ state: 'ready' }))
- autoTopUpCardState.value = loadedAutoTopUp('off')
+ vi.mocked(useBillingAutoTopUpCard).mockReturnValue(
+ autoTopUpCard(loadedAutoTopUp('off'))
+ )
vi.mocked(useBillingSdkStore().readPaymentMethods).mockResolvedValue({
status: 'ok',
value: []
diff --git a/src/platform/billing/components/TopUpAutoTopUpCard.test.ts b/src/platform/billing/components/TopUpAutoTopUpCard.test.ts
index eafc4328865..012bf4c227c 100644
--- a/src/platform/billing/components/TopUpAutoTopUpCard.test.ts
+++ b/src/platform/billing/components/TopUpAutoTopUpCard.test.ts
@@ -8,7 +8,7 @@ import { createI18n } from 'vue-i18n'
import enMessages from '@/locales/en/main.json'
import { useTelemetry } from '@comfyorg/telemetry'
import {
- autoTopUpCardState,
+ autoTopUpCard,
loadedAutoTopUp
} from '@/platform/billing/composables/__mocks__/useBillingAutoTopUpCard'
import {
@@ -64,7 +64,7 @@ function renderCard(served: Partial = {}) {
capabilities.autoTopUpEnabled = autoTopUpEnabledFact(enabled)
capabilities.canManageAutoTopUp = canManageAutoTopUpFact(canManage)
capabilities.autoTopUpSetup = computed(() => setup)
- autoTopUpCardState.value = card
+ vi.mocked(useBillingAutoTopUpCard).mockReturnValue(autoTopUpCard(card))
render(TopUpAutoTopUpCard, {
global: {
plugins: [
diff --git a/src/platform/billing/components/TopUpCreditsDialogContentWorkspace.test.ts b/src/platform/billing/components/TopUpCreditsDialogContentWorkspace.test.ts
index 0ffd5db8c19..a5596c66b16 100644
--- a/src/platform/billing/components/TopUpCreditsDialogContentWorkspace.test.ts
+++ b/src/platform/billing/components/TopUpCreditsDialogContentWorkspace.test.ts
@@ -41,13 +41,14 @@ import type { CreateTopupResponse } from '@comfyorg/billing-core'
import { billingOperation } from '@/platform/billing/composables/billingOperationTestUtils'
import type { BillingOperation } from '@/platform/billing/composables/billingOperationTestUtils'
import {
- autoTopUpCardState,
+ autoTopUpCard,
loadedAutoTopUp
} from '@/platform/billing/composables/__mocks__/useBillingAutoTopUpCard'
import {
autoTopUpEnabledFact,
canManageAutoTopUpFact
} from '@/platform/billing/composables/__mocks__/useBillingCapabilities'
+import { useBillingAutoTopUpCard } from '@/platform/billing/legacy160/platform/billing/composables/useBillingAutoTopUpCard'
import { useBillingCapabilities } from '@/platform/billing/composables/useBillingCapabilities'
import { mockBillingContext } from '@/utils/__tests__/mockBillingContext'
@@ -2669,7 +2670,9 @@ describe('TopUpCreditsDialogContentWorkspace', () => {
capabilities.autoTopUpSetup = computed(() => ({
state: 'ready' as const
}))
- autoTopUpCardState.value = loadedAutoTopUp('off')
+ vi.mocked(useBillingAutoTopUpCard).mockReturnValue(
+ autoTopUpCard(loadedAutoTopUp('off'))
+ )
})
it('sits above Add credits on the amount step', () => {
diff --git a/src/platform/billing/composables/__mocks__/useBillingAutoTopUpCard.ts b/src/platform/billing/composables/__mocks__/useBillingAutoTopUpCard.ts
index 2aa30e2b7e5..ddefd34aa03 100644
--- a/src/platform/billing/composables/__mocks__/useBillingAutoTopUpCard.ts
+++ b/src/platform/billing/composables/__mocks__/useBillingAutoTopUpCard.ts
@@ -1,5 +1,5 @@
-import { onTestFinished, vi } from 'vitest'
-import { computed, shallowRef } from 'vue'
+import { vi } from 'vitest'
+import { computed } from 'vue'
import type { AutoReloadSettings } from '@comfyorg/billing-core'
import type { useBillingAutoTopUpCard as realUseBillingAutoTopUpCard } from '@/platform/billing/composables/useBillingAutoTopUpCard'
@@ -38,21 +38,18 @@ export function loadedAutoTopUp(
return { kind: 'loaded', settings: { ...offSettings, status } }
}
-export const autoTopUpCardState = shallowRef({
- kind: 'loading'
-})
-
-const card: AutoTopUpCard = {
- scope: computed(() => 'workspace-test'),
- state: computed(() => autoTopUpCardState.value),
- isReady: computed(() => autoTopUpCardState.value.kind !== 'loading'),
- ensureRead: vi.fn(),
- retry: vi.fn(async () => undefined)
+export function autoTopUpCard(
+ state: AutoTopUpCardState = { kind: 'loading' }
+): AutoTopUpCard {
+ return {
+ scope: computed(() => 'workspace-test'),
+ state: computed(() => state),
+ isReady: computed(() => state.kind !== 'loading'),
+ ensureRead: vi.fn(),
+ retry: vi.fn(async () => undefined)
+ }
}
-export const useBillingAutoTopUpCard = vi.fn(() => {
- onTestFinished(() => {
- autoTopUpCardState.value = { kind: 'loading' }
- })
- return card
-})
+const card = autoTopUpCard()
+
+export const useBillingAutoTopUpCard = vi.fn(() => card)
diff --git a/src/platform/billing/composables/useAddCreditsAutoTopUpOffer.test.ts b/src/platform/billing/composables/useAddCreditsAutoTopUpOffer.test.ts
index 73d783f9d00..a65d3c32600 100644
--- a/src/platform/billing/composables/useAddCreditsAutoTopUpOffer.test.ts
+++ b/src/platform/billing/composables/useAddCreditsAutoTopUpOffer.test.ts
@@ -7,7 +7,7 @@ import { reportError } from '@comfyorg/telemetry/reportError'
import { useFeatureFlags } from '@/composables/useFeatureFlags'
import { activateBillingScope } from '@/platform/billing/__tests__/activateBillingScope'
import {
- autoTopUpCardState,
+ autoTopUpCard,
loadedAutoTopUp
} from '@/platform/billing/composables/__mocks__/useBillingAutoTopUpCard'
import {
@@ -15,6 +15,7 @@ import {
canManageAutoTopUpFact
} from '@/platform/billing/composables/__mocks__/useBillingCapabilities'
import { useAddCreditsAutoTopUpOffer } from '@/platform/billing/composables/useAddCreditsAutoTopUpOffer'
+import { useBillingAutoTopUpCard } from '@/platform/billing/composables/useBillingAutoTopUpCard'
import { setLocalBillingWebEnabled } from '@/platform/billing/localBillingWebEnabled'
import { useBillingCapabilities } from '@/platform/billing/composables/useBillingCapabilities'
import { useBillingSdkStore } from '@/platform/billing/sdk/billingSdkStore'
@@ -66,7 +67,9 @@ function offerFor({
capabilities.autoTopUpEnabled = autoTopUpEnabledFact(rollout)
capabilities.canManageAutoTopUp = canManageAutoTopUpFact(true)
capabilities.autoTopUpSetup = computed(() => ({ state: 'ready' }))
- autoTopUpCardState.value = loadedAutoTopUp(status)
+ vi.mocked(useBillingAutoTopUpCard).mockReturnValue(
+ autoTopUpCard(loadedAutoTopUp(status))
+ )
const scope = effectScope()
onTestFinished(() => scope.stop())
return scope.run(useAddCreditsAutoTopUpOffer)!