web/src/helpers · 0220df84291c127f49df80c7e1cfcbf4f3ffde49 · phsl / new-api

Merge branch 'origin/main' into nightly · 35d07046

Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys

Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API

committed Apr 02, 2026

35d07046

Name	Last commit	Last Update
..
api.js		Loading commit data...
auth.jsx		Loading commit data...
base64.js		Loading commit data...
boolean.js		Loading commit data...
dashboard.jsx		Loading commit data...
data.js		Loading commit data...
history.js		Loading commit data...
index.js		Loading commit data...
log.js		Loading commit data...
passkey.js		Loading commit data...
quota.js		Loading commit data...
render.jsx		Loading commit data...
secureApiCall.js		Loading commit data...
statusCodeRules.js		Loading commit data...
subscriptionFormat.js		Loading commit data...
token.js		Loading commit data...
utils.jsx		Loading commit data...