Commit 7494f71
authored
fix(billing): make the Credits panel follow the active billing rail (#15151)
## Summary
Settings → Credits still assumed the legacy `/customers` rail, so its
activity table never loaded when the balance came from anywhere else,
and Invoice History opened the wrong Stripe customer.
## Changes
- **What**:
- `UsageLogsTable` owns its first load (`immediate` watch on the billing
route). It previously started at `loading = true` and waited for a
parent `refresh()`, which `CreditsPanel` only fired from
`authStore.lastBalanceUpdateTime` — written solely by the legacy
`/customers/balance` success path (`authStore.ts:374`). Any path that
does not write it leaves the spinner up forever.
- `CreditsPanel` refreshes activity off the balance it renders instead
of that legacy-only timestamp, so a top-up refreshes the table on both
rails. First hydration is skipped, since the table now loads itself.
- Invoice History routes through
`useBillingContext().manageSubscription()`, matching
`SubscriptionFooterLinks`. The legacy `/customers` portal bills a
different Stripe customer than the workspace on screen.
## Review Focus
Two independent ways to reach the stuck spinner on `main`:
1. **Local/Desktop, new account** — `authStore.fetchBalance()` returns
early on a `404` from `/customers/balance` (`authStore.ts:355-358`), so
`lastBalanceUpdateTime` is never written. A user with no customer record
yet gets a Credits tab that spins forever.
2. **Cloud, workspace rail** — with `billing_control_enabled` off the
standalone Credits panel stays in the sidebar (`useSettingUI.ts:325`)
while `useWorkspaceBilling.fetchBalance()` supplies the balance from
`/billing/balance` and never touches the timestamp. This also becomes
the default failure once the workspace switcher is exposed on
Local/Desktop (#15051).
Other notes:
- `AutoRefreshWrapper` is gone from the `UsageLogsTable` tests; the
component no longer needs a parent to drive its first fetch. Reverting
the `immediate` flag alone fails 19 of the 21 tests.
- Legacy `manageSubscription()` also starts the cancellation watcher,
which the raw `accessBillingPortal()` call did not.
`SubscriptionFooterLinks` already accepts that for the same action, and
`browser_tests/tests/localCreditsNoSubscribeUi.spec.ts` (which asserts
Invoice History issues `POST /customers/billing`) still passes.
## Screenshots
Captured from the same local dev-server setup and viewport with a fully
mocked Personal workspace on the workspace billing rail.
`billing_control_enabled` is off so the standalone Settings → Credits
panel is visible. AS-IS uses base `085c6ec51`; TO-BE uses this PR's head
`e9fcd6adc`.
| AS-IS | TO-BE |
| --- | --- |
| Activity stays on the loading indicator because no initial request is
issued. | Activity loads from `/api/billing/events` on mount. |
| 
| 
|
Linear:
[FE-1584](https://linear.app/comfyorg/issue/FE-1584/add-workspace-switcher-to-localdesktop-credits-only-no-settings)
Prototype this supports: #150511 parent 32d0b6e commit 7494f71
4 files changed
Lines changed: 160 additions & 47 deletions
File tree
- src/components/dialog/content/setting
Lines changed: 117 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
73 | 72 | | |
74 | 73 | | |
75 | 74 | | |
76 | 75 | | |
77 | 76 | | |
78 | 77 | | |
79 | 78 | | |
80 | | - | |
81 | | - | |
| 79 | + | |
82 | 80 | | |
83 | 81 | | |
84 | 82 | | |
85 | 83 | | |
86 | 84 | | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
95 | 89 | | |
96 | 90 | | |
97 | | - | |
| 91 | + | |
98 | 92 | | |
99 | 93 | | |
100 | 94 | | |
| |||
Lines changed: 27 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | 94 | | |
111 | 95 | | |
112 | 96 | | |
| |||
208 | 192 | | |
209 | 193 | | |
210 | 194 | | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | 195 | | |
216 | | - | |
| 196 | + | |
217 | 197 | | |
218 | 198 | | |
219 | 199 | | |
220 | 200 | | |
221 | 201 | | |
222 | 202 | | |
223 | 203 | | |
224 | | - | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
225 | 223 | | |
226 | 224 | | |
227 | 225 | | |
| |||
232 | 230 | | |
233 | 231 | | |
234 | 232 | | |
235 | | - | |
| 233 | + | |
236 | 234 | | |
237 | 235 | | |
238 | 236 | | |
| |||
244 | 242 | | |
245 | 243 | | |
246 | 244 | | |
247 | | - | |
| 245 | + | |
248 | 246 | | |
249 | 247 | | |
250 | 248 | | |
| |||
260 | 258 | | |
261 | 259 | | |
262 | 260 | | |
263 | | - | |
| 261 | + | |
264 | 262 | | |
265 | 263 | | |
266 | 264 | | |
| |||
312 | 310 | | |
313 | 311 | | |
314 | 312 | | |
315 | | - | |
| 313 | + | |
316 | 314 | | |
317 | 315 | | |
318 | 316 | | |
| |||
400 | 398 | | |
401 | 399 | | |
402 | 400 | | |
403 | | - | |
| 401 | + | |
404 | 402 | | |
405 | 403 | | |
406 | 404 | | |
| |||
442 | 440 | | |
443 | 441 | | |
444 | 442 | | |
445 | | - | |
| 443 | + | |
446 | 444 | | |
447 | 445 | | |
448 | 446 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
212 | 212 | | |
213 | 213 | | |
214 | 214 | | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
220 | 224 | | |
221 | 225 | | |
222 | 226 | | |
| |||
0 commit comments