@open-mercato/core 0.6.7-develop.6751.1.ac823a3d26 → 0.6.7-develop.6758.1.697eade236

package/src/modules/dashboards/lib/formatters.ts

@@ -1,36 +1,161 @@
 export type FormatCurrencyOptions = {
-  currency?: string
+  currency?: string | null
+  locale?: string
   minimumFractionDigits?: number
   maximumFractionDigits?: number
 }
 
-export function formatCurrency(value: number, options: FormatCurrencyOptions = {}): string {
-  const { currency = 'USD', minimumFractionDigits = 0, maximumFractionDigits = 0 } = options
-  return new Intl.NumberFormat(undefined, {
-    style: 'currency',
-    currency,
+export type FormatCurrencyCompactOptions = {
+  currency?: string | null
+  locale?: string
+}
+
+const CURRENCY_CODE_PATTERN = /^[A-Za-z]{3}$/
+const NUMBER_FORMATTER_CACHE_LIMIT = 128
+const numberFormatterCache = new Map<string, Intl.NumberFormat>()
+
+function normalizeCurrencyCode(currency?: string | null): string | null {
+  if (typeof currency !== 'string') return null
+  const trimmed = currency.trim()
+  if (!CURRENCY_CODE_PATTERN.test(trimmed)) return null
+  return trimmed.toUpperCase()
+}
+
+function getNumberFormatter(
+  locale: string | undefined,
+  options: Intl.NumberFormatOptions,
+): Intl.NumberFormat {
+  const key = `${locale ?? ''}:${JSON.stringify(options)}`
+  const cached = numberFormatterCache.get(key)
+  if (cached) return cached
+  const formatter = new Intl.NumberFormat(locale, options)
+  if (numberFormatterCache.size >= NUMBER_FORMATTER_CACHE_LIMIT) {
+    const oldest = numberFormatterCache.keys().next().value
+    if (oldest) numberFormatterCache.delete(oldest)
+  }
+  numberFormatterCache.set(key, formatter)
+  return formatter
+}
+
+function formatDecimal(
+  value: number,
+  minimumFractionDigits: number,
+  maximumFractionDigits: number,
+  locale?: string,
+): string {
+  return getNumberFormatter(locale, {
+    style: 'decimal',
     minimumFractionDigits,
     maximumFractionDigits,
   }).format(value)
 }
 
+/**
+ * Formats a monetary amount. Without a currency code the amount renders as a plain
+ * number: analytics values carry no currency of their own, and labelling them with a
+ * guessed one (see #4620) is worse than leaving them unlabelled.
+ */
+export function formatCurrency(value: number, options: FormatCurrencyOptions = {}): string {
+  const { currency, locale, minimumFractionDigits = 0, maximumFractionDigits = 0 } = options
+  const code = normalizeCurrencyCode(currency)
+  if (!code) return formatDecimal(value, minimumFractionDigits, maximumFractionDigits, locale)
+  try {
+    return getNumberFormatter(locale, {
+      style: 'currency',
+      currency: code,
+      minimumFractionDigits,
+      maximumFractionDigits,
+    }).format(value)
+  } catch {
+    return `${formatDecimal(value, minimumFractionDigits, maximumFractionDigits, locale)} ${code}`
+  }
+}
+
 export function formatCurrencyWithDecimals(value: number, options: FormatCurrencyOptions = {}): string {
   return formatCurrency(value, { minimumFractionDigits: 2, maximumFractionDigits: 2, ...options })
 }
 
-export function formatCurrencyCompact(value: number, currencySymbol = '$'): string {
+function formatWithLiteralSymbol(value: number, symbol: string): string {
   if (Math.abs(value) >= 1_000_000) {
-    return `${currencySymbol}${(value / 1_000_000).toFixed(1)}M`
+    return `${symbol}${(value / 1_000_000).toFixed(1)}M`
   }
   if (Math.abs(value) >= 1_000) {
-    return `${currencySymbol}${(value / 1_000).toFixed(1)}K`
+    return `${symbol}${(value / 1_000).toFixed(1)}K`
   }
-  return `${currencySymbol}${value.toFixed(0)}`
+  return `${symbol}${value.toFixed(0)}`
 }
 
-export function formatCurrencySafe(value: unknown, fallback = '--'): string {
+export function formatCurrencyCompact(
+  value: number,
+  currencyOrOptions: string | null | FormatCurrencyCompactOptions = {},
+): string {
+  if (typeof currencyOrOptions === 'string' && !normalizeCurrencyCode(currencyOrOptions)) {
+    return formatWithLiteralSymbol(value, currencyOrOptions)
+  }
+
+  const options = typeof currencyOrOptions === 'string'
+    ? { currency: currencyOrOptions }
+    : (currencyOrOptions ?? {})
+  const code = normalizeCurrencyCode(options.currency)
+  const compact = Math.abs(value) >= 1_000
+  const formatOptions: Intl.NumberFormatOptions = {
+    style: code ? 'currency' : 'decimal',
+    notation: compact ? 'compact' : 'standard',
+    compactDisplay: 'short',
+    minimumFractionDigits: compact ? 1 : 0,
+    maximumFractionDigits: compact ? 1 : 0,
+  }
+  if (code) formatOptions.currency = code
+
+  try {
+    return getNumberFormatter(options.locale, formatOptions).format(value)
+  } catch {
+    const formatted = getNumberFormatter(options.locale, {
+      style: 'decimal',
+      notation: compact ? 'compact' : 'standard',
+      compactDisplay: 'short',
+      minimumFractionDigits: compact ? 1 : 0,
+      maximumFractionDigits: compact ? 1 : 0,
+    }).format(value)
+    return code ? `${formatted} ${code}` : formatted
+  }
+}
+
+export function formatCurrencySafe(
+  value: unknown,
+  fallback = '--',
+  options: FormatCurrencyOptions = {},
+): string {
   if (value === null || value === undefined) return fallback
   const num = Number(value)
   if (!Number.isFinite(num)) return fallback
-  return formatCurrency(num)
+  return formatCurrency(num, options)
+}
+
+export type CurrencyFormatters = {
+  currency: string | null
+  format: (value: number) => string
+  formatWithDecimals: (value: number) => string
+  formatCompact: (value: number) => string
+  formatSafe: (value: unknown) => string
+}
+
+/**
+ * Binds the resolved currency once so widgets can hand chart and KPI components a
+ * stable single-argument formatter — passing `formatCurrency` by reference is what
+ * made its currency option unreachable in the first place (#4620).
+ */
+export function createCurrencyFormatters(
+  currency?: string | null,
+  fallback = '--',
+  locale?: string,
+): CurrencyFormatters {
+  const code = normalizeCurrencyCode(currency)
+  return {
+    currency: code,
+    format: (value: number) => formatCurrency(value, { currency: code, locale }),
+    formatWithDecimals: (value: number) => formatCurrencyWithDecimals(value, { currency: code, locale }),
+    formatCompact: (value: number) => formatCurrencyCompact(value, { currency: code, locale }),
+    formatSafe: (value: unknown) => formatCurrencySafe(value, fallback, { currency: code, locale }),
+  }
 }

package/src/modules/dashboards/lib/optionalBaseCurrency.ts

@@ -0,0 +1,22 @@
+import type { AppContainer } from '@open-mercato/shared/lib/di/container'
+
+export type BaseCurrencyResolution =
+  | { status: 'resolved'; code: string }
+  | { status: 'missing' | 'ambiguous' | 'unavailable' }
+
+export type BaseCurrencyResolver = {
+  resolveBaseCurrency(scope: {
+    tenantId: string
+    organizationIds: string[]
+  }): Promise<BaseCurrencyResolution>
+}
+
+export function resolveOptionalBaseCurrencyResolver(
+  container: AppContainer,
+): BaseCurrencyResolver | undefined {
+  try {
+    return container.resolve<BaseCurrencyResolver>('baseCurrencyService')
+  } catch {
+    return undefined
+  }
+}

package/src/modules/dashboards/services/widgetDataService.ts

@@ -21,6 +21,7 @@ import {
   type AggregateFunction,
   type DateGranularity,
   buildAggregationQuery,
+  buildDistinctCurrencyQuery,
   buildGroupSourceRowsQuery,
   resolveGroupExpression,
 } from '../lib/aggregations'
@@ -33,6 +34,9 @@ import {
   parseExactDecimal,
 } from '../lib/exactDecimal'
 import type { AnalyticsRegistry } from './analyticsRegistry'
+import type { BaseCurrencyResolver } from '../lib/optionalBaseCurrency'
+
+const logger = createLogger('dashboards').child({ component: 'widget-data-service' })
 
 const WIDGET_DATA_CACHE_TTL = 120_000
 const WIDGET_DATA_SEGMENT_TTL = 86_400_000
@@ -47,8 +51,6 @@ const ENCRYPTED_GROUP_SCAN_LIMIT = 20_000
 
 const SAFE_IDENTIFIER_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/
 
-const logger = createLogger('dashboards').child({ component: 'widget-data' })
-
 export class WidgetDataValidationError extends Error {
   constructor(message: string) {
     super(message)
@@ -213,6 +215,7 @@ export type WidgetDataResponse = {
   metadata: {
     fetchedAt: string
     recordCount: number
+    currency?: string | null
   }
 }
 
@@ -226,6 +229,7 @@ export type WidgetDataServiceOptions = {
   scope: WidgetDataScope
   registry: AnalyticsRegistry
   cache?: CacheStrategy
+  baseCurrencyResolver?: BaseCurrencyResolver
 }
 
 export class WidgetDataService {
@@ -233,12 +237,15 @@ export class WidgetDataService {
   private scope: WidgetDataScope
   private registry: AnalyticsRegistry
   private cache?: CacheStrategy
+  private baseCurrencyResolver?: BaseCurrencyResolver
+  private baseCurrencyPromise?: Promise<string | null>
 
   constructor(options: WidgetDataServiceOptions) {
     this.em = options.em
     this.scope = options.scope
     this.registry = options.registry
     this.cache = options.cache
+    this.baseCurrencyResolver = options.baseCurrencyResolver
   }
 
   private buildCacheKey(request: WidgetDataRequest): string {
@@ -278,11 +285,15 @@ export class WidgetDataService {
 
     const shouldFetchComparison = Boolean(comparisonRange && request.dateRange)
 
-    const [mainResult, comparisonResult] = await Promise.all([
+    const aggregatedRanges =
+      shouldFetchComparison && comparisonRange ? [dateRangeResolved, comparisonRange] : [dateRangeResolved]
+
+    const [mainResult, comparisonResult, currency] = await Promise.all([
       this.executeQuery(request, dateRangeResolved),
       shouldFetchComparison && comparisonRange
         ? this.executeQuery(request, comparisonRange)
         : Promise.resolve<{ value: number | null; data: WidgetDataItem[] } | undefined>(undefined),
+      this.resolveCurrencyLabel(request, aggregatedRanges),
     ])
 
     const response: WidgetDataResponse = {
@@ -291,6 +302,7 @@ export class WidgetDataService {
       metadata: {
         fetchedAt: now.toISOString(),
         recordCount: mainResult.data.length || (mainResult.value !== null ? 1 : 0),
+        currency,
       },
     }
 
@@ -319,6 +331,99 @@ export class WidgetDataService {
     return response
   }
 
+  /**
+   * Resolves the currency the response may be labelled with. The base currency of the
+   * scope is only half the answer: it describes how the organizations are configured, not
+   * what the aggregated rows are actually denominated in. A PLN-based organization holding
+   * both PLN and EUR orders would otherwise sum them and present the total as PLN (#4676),
+   * so the base currency survives only when every aggregated row carries exactly that code.
+   *
+   * The check is deliberately conservative — anything it cannot prove resolves to `null`
+   * and the widgets render an explicitly unlabelled number, which is recoverable, while a
+   * confident wrong label is not.
+   */
+  private async resolveCurrencyLabel(
+    request: WidgetDataRequest,
+    aggregatedRanges: Array<{ start: Date; end: Date } | undefined>,
+  ): Promise<string | null> {
+    const baseCurrency = await this.resolveBaseCurrency()
+    if (!baseCurrency) return null
+
+    try {
+      for (const range of aggregatedRanges) {
+        const uniform = await this.rowsShareCurrency(request, range, baseCurrency)
+        if (!uniform) return null
+      }
+      return baseCurrency
+    } catch (err) {
+      logger.warn('Row-currency uniformity check failed; leaving the amount unlabelled', {
+        err,
+        entityType: request.entityType,
+      })
+      return null
+    }
+  }
+
+  /**
+   * Reads the distinct per-row currencies of the rows one aggregation range would sum.
+   * Entities that declare no `currencyField` carry no per-row currency to contradict the
+   * base one, so they pass. An empty range has nothing to mislabel and also passes.
+   *
+   * A missing currency cannot prove the row uses the scope's base currency, so it fails
+   * closed just like a conflicting code. An empty range has no row to mislabel and passes.
+   */
+  private async rowsShareCurrency(
+    request: WidgetDataRequest,
+    dateRange: { start: Date; end: Date } | undefined,
+    expectedCode: string,
+  ): Promise<boolean> {
+    const query = buildDistinctCurrencyQuery({
+      entityType: request.entityType,
+      dateRange: dateRange && request.dateRange ? { field: request.dateRange.field, ...dateRange } : undefined,
+      filters: request.filters,
+      scope: this.scope,
+      registry: this.registry,
+    })
+
+    if (!query) return true
+
+    const rows = await this.em.getConnection().execute(query.sql, query.params)
+    const resultRows = (Array.isArray(rows) ? rows : []) as Array<Record<string, unknown>>
+
+    const recordedCodes = new Set<string>()
+    for (const row of resultRows) {
+      const code = typeof row.code === 'string' ? row.code.trim().toUpperCase() : ''
+      if (!code) return false
+      recordedCodes.add(code)
+    }
+
+    if (recordedCodes.size === 0) return true
+    if (recordedCodes.size > 1) return false
+    return recordedCodes.has(expectedCode)
+  }
+
+  /**
+   * Resolves the base currency of the current scope so money widgets can label amounts
+   * with the tenant's own currency instead of a hard-coded default (#4620). The lookup
+   * is soft: a scope spanning organizations with different base currencies, a missing
+   * base currency, or an unavailable currencies module all resolve to `null`, and the
+   * widgets then render unlabelled numbers rather than a wrong currency.
+   */
+  private resolveBaseCurrency(): Promise<string | null> {
+    if (!this.baseCurrencyPromise) {
+      const organizationIds = [...new Set(this.scope.organizationIds ?? [])]
+      if (!this.baseCurrencyResolver || organizationIds.length === 0) {
+        this.baseCurrencyPromise = Promise.resolve(null)
+      } else {
+        this.baseCurrencyPromise = this.baseCurrencyResolver
+          .resolveBaseCurrency({ tenantId: this.scope.tenantId, organizationIds })
+          .then((result) => result.status === 'resolved' ? result.code : null)
+          .catch(() => null)
+      }
+    }
+    return this.baseCurrencyPromise
+  }
+
   private validateRequest(request: WidgetDataRequest): void {
     if (!this.registry.isValidEntityType(request.entityType)) {
       throw new WidgetDataValidationError(`Invalid entity type: ${request.entityType}`)
@@ -824,6 +929,7 @@ export function createWidgetDataService(
   scope: WidgetDataScope,
   registry: AnalyticsRegistry,
   cache?: CacheStrategy,
+  baseCurrencyResolver?: BaseCurrencyResolver,
 ): WidgetDataService {
-  return new WidgetDataService({ em, scope, registry, cache })
+  return new WidgetDataService({ em, scope, registry, cache, baseCurrencyResolver })
 }

package/src/modules/dashboards/subscribers/invalidateWidgetDataCache.ts

@@ -0,0 +1,32 @@
+import { runWithCacheTenant } from '@open-mercato/cache'
+
+type CacheService = {
+  deleteByTags(tags: string[]): Promise<number>
+}
+
+export const metadata = {
+  event: 'currencies.currency.*',
+  persistent: false,
+  id: 'dashboards:invalidate-widget-data-on-currency-change',
+}
+
+export default async function handle(
+  payload: unknown,
+  context: { resolve: <T = unknown>(name: string) => T },
+): Promise<void> {
+  const data = (payload ?? {}) as Record<string, unknown>
+  const tenantId = typeof data.tenantId === 'string' ? data.tenantId : null
+  if (!tenantId) return
+
+  let cache: CacheService
+  try {
+    cache = context.resolve<CacheService>('cache')
+  } catch {
+    return
+  }
+
+  try {
+    await runWithCacheTenant(tenantId, () => cache.deleteByTags(['widget-data']))
+  } catch {
+  }
+}

package/src/modules/dashboards/widgets/dashboard/aov-kpi/widget.client.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { KpiCard, type KpiTrend } from '@open-mercato/ui/backend/charts'
 import {
   DateRangeSelect,
@@ -13,7 +13,8 @@ import {
 } from '@open-mercato/ui/backend/date-range'
 import { DEFAULT_SETTINGS, hydrateSettings, type AovKpiSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { formatCurrencyWithDecimals } from '../../../lib/formatters'
+import { createCurrencyFormatters } from '../../../lib/formatters'
+import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'aov-kpi' })
@@ -43,11 +44,14 @@ const AovKpiWidget: React.FC<DashboardWidgetComponentProps<AovKpiSettings>> = ({
   onRefreshStateChange,
 }) => {
   const t = useT()
+  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [value, setValue] = React.useState<number | null>(null)
   const [trend, setTrend] = React.useState<KpiTrend | undefined>(undefined)
+  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -57,6 +61,7 @@ const AovKpiWidget: React.FC<DashboardWidgetComponentProps<AovKpiSettings>> = ({
     try {
       const data = await fetchAovData(hydrated, fetchWidgetData)
       setValue(data.value)
+      setCurrency(data.metadata?.currency ?? null)
       if (data.comparison) {
         setTrend({
           value: data.comparison.change,
@@ -114,7 +119,8 @@ const AovKpiWidget: React.FC<DashboardWidgetComponentProps<AovKpiSettings>> = ({
       comparisonLabel={comparisonLabel}
       loading={loading}
       error={error}
-      formatValue={formatCurrencyWithDecimals}
+      formatValue={money.formatWithDecimals}
+      footer={<UnlabelledAmountNotice currency={currency} loading={loading} error={error} />}
       headerAction={
         <InlineDateRangeSelect
           value={hydrated.dateRange}

package/src/modules/dashboards/widgets/dashboard/pipeline-summary/widget.client.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { BarChart, type BarChartDataItem } from '@open-mercato/ui/backend/charts'
 import {
   DateRangeSelect,
@@ -19,7 +19,8 @@ import {
   type PipelineSummarySettings,
 } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { formatCurrencyCompact } from '../../../lib/formatters'
+import { createCurrencyFormatters } from '../../../lib/formatters'
+import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'pipeline-summary' })
@@ -47,10 +48,13 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
   onRefreshStateChange,
 }) => {
   const t = useT()
+  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<BarChartDataItem[]>([])
+  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -66,6 +70,7 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
           Value: item.value ?? 0,
         }))
       setData(chartData)
+      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load pipeline data', { err })
       setError(t('dashboards.analytics.widgets.pipelineSummary.error', 'Failed to load data'))
@@ -132,12 +137,13 @@ const PipelineSummaryWidget: React.FC<DashboardWidgetComponentProps<PipelineSumm
           categoryLabels={{ Value: t('dashboards.analytics.labels.value', 'Value') }}
           loading={loading}
           error={error}
-          valueFormatter={formatCurrencyCompact}
+          valueFormatter={money.formatCompact}
           colors={['violet']}
           showLegend={false}
           emptyMessage={t('dashboards.analytics.widgets.pipelineSummary.empty', 'No deal data for this period')}
         />
       </div>
+      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
     </div>
   )
 }

package/src/modules/dashboards/widgets/dashboard/revenue-kpi/widget.client.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
 import { useWidgetData, type WidgetDataFetcher } from '@open-mercato/ui/backend/dashboard/widgetData'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { KpiCard, type KpiTrend } from '@open-mercato/ui/backend/charts'
 import {
   DateRangeSelect,
@@ -13,7 +13,8 @@ import {
 } from '@open-mercato/ui/backend/date-range'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueKpiSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { formatCurrency } from '../../../lib/formatters'
+import { createCurrencyFormatters } from '../../../lib/formatters'
+import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'revenue-kpi' })
@@ -43,11 +44,14 @@ const RevenueKpiWidget: React.FC<DashboardWidgetComponentProps<RevenueKpiSetting
   onRefreshStateChange,
 }) => {
   const t = useT()
+  const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [value, setValue] = React.useState<number | null>(null)
   const [trend, setTrend] = React.useState<KpiTrend | undefined>(undefined)
+  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -57,6 +61,7 @@ const RevenueKpiWidget: React.FC<DashboardWidgetComponentProps<RevenueKpiSetting
     try {
       const data = await fetchRevenueData(hydrated, fetchWidgetData)
       setValue(data.value)
+      setCurrency(data.metadata?.currency ?? null)
       if (data.comparison) {
         setTrend({
           value: data.comparison.change,
@@ -114,7 +119,8 @@ const RevenueKpiWidget: React.FC<DashboardWidgetComponentProps<RevenueKpiSetting
       comparisonLabel={comparisonLabel}
       loading={loading}
       error={error}
-      formatValue={formatCurrency}
+      formatValue={money.format}
+      footer={<UnlabelledAmountNotice currency={currency} loading={loading} error={error} />}
       headerAction={
         <InlineDateRangeSelect
           value={hydrated.dateRange}

package/src/modules/dashboards/widgets/dashboard/revenue-trend/widget.client.tsx

@@ -20,7 +20,8 @@ import {
 import type { DateGranularity } from '@open-mercato/shared/modules/analytics'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueTrendSettings } from './config'
 import type { WidgetDataResponse } from '../../../services/widgetDataService'
-import { formatCurrencyCompact } from '../../../lib/formatters'
+import { createCurrencyFormatters } from '../../../lib/formatters'
+import { UnlabelledAmountNotice } from '../../../components/UnlabelledAmountNotice'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dashboards').child({ component: 'revenue-trend' })
@@ -114,8 +115,10 @@ const RevenueTrendWidget: React.FC<DashboardWidgetComponentProps<RevenueTrendSet
   const locale = useLocale()
   const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
   const [data, setData] = React.useState<LineChartDataItem[]>([])
+  const [currency, setCurrency] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const money = React.useMemo(() => createCurrencyFormatters(currency, '--', locale), [currency, locale])
 
   const fetchWidgetData = useWidgetData()
   const refresh = React.useCallback(async () => {
@@ -134,6 +137,7 @@ const RevenueTrendWidget: React.FC<DashboardWidgetComponentProps<RevenueTrendSet
         Revenue: item.value ?? 0,
       }))
       setData(chartData)
+      setCurrency(result.metadata?.currency ?? null)
     } catch (err) {
       logger.error('Failed to load revenue trend data', { err })
       setError(t('dashboards.analytics.widgets.revenueTrend.error', 'Failed to load data'))
@@ -212,10 +216,11 @@ const RevenueTrendWidget: React.FC<DashboardWidgetComponentProps<RevenueTrendSet
         loading={loading}
         error={error}
         showArea={hydrated.showArea}
-        valueFormatter={formatCurrencyCompact}
+        valueFormatter={money.formatCompact}
         colors={['blue']}
         emptyMessage={t('dashboards.analytics.widgets.revenueTrend.empty', 'No revenue data for this period')}
       />
+      <UnlabelledAmountNotice currency={currency} loading={loading} error={error} />
     </div>
   )
 }