Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

ui-nit: clearer exchange-rate tooltip, dropdown check on the left, no status tooltips repeating the label

aashub8289fcfdee7
diff --git a/.claude/skills/carbon-design/references/principles.md b/.claude/skills/carbon-design/references/principles.md
index e28c82b923..d65f937c85 100644
--- a/.claude/skills/carbon-design/references/principles.md
+++ b/.claude/skills/carbon-design/references/principles.md
@@ -174,7 +174,8 @@ bug: "pending no longer lies" (`daaddf5a85`), read-only cells don't show an edit
failed, loading vs nothing, editable vs read-only, saved vs pending.)*
### P14. Status is color + icon + words, from one map
-`<Status color>` = tinted uppercase pill + a fixed icon per color + tooltip. Colors come from
+`<Status color>` = tinted uppercase pill + a fixed icon per color; a tooltip only when it adds
+something (`tooltip`) or the label is hidden (`iconOnly`) — never one repeating the label. Colors come from
`packages/utils/src/status-colors.ts`; choose by lifecycle *position* (not started gray,
waiting yellow, released/with another party blue, being worked orange, done green, dead/failed
red, special purple).
diff --git a/.claude/skills/carbon-design/references/status-and-feedback.md b/.claude/skills/carbon-design/references/status-and-feedback.md
index 99499c8386..7037f47e75 100644
--- a/.claude/skills/carbon-design/references/status-and-feedback.md
+++ b/.claude/skills/carbon-design/references/status-and-feedback.md
@@ -18,7 +18,8 @@
Single source of truth: `packages/utils/src/status-colors.ts` (`*_STATUS_COLOR_MAP` per
entity + registry). Rendered by `<Status color>` (`packages/react/src/Status.tsx`): uppercase
-12px tinted pill + a **fixed icon per color** + tooltip. Color is never the only signal.
+12px tinted pill + a **fixed icon per color**, with a tooltip only when it adds
+something (`tooltip`) or the label is hidden (`iconOnly`) — a pill never repeats its own label on hover. Color is never the only signal.
**Choose the color by lifecycle position, not by the word:**
diff --git a/apps/erp/app/components/ExchangeRateUpdatedAt.tsx b/apps/erp/app/components/ExchangeRateUpdatedAt.tsx
new file mode 100644
index 0000000000..c51d6f144a
--- /dev/null
+++ b/apps/erp/app/components/ExchangeRateUpdatedAt.tsx
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,
+// including ports, remain AGPLv3; serving them over a network requires releasing their source.
+
+import { Tooltip, TooltipContent, TooltipTrigger } from "@carbon/react";
+import { formatDate, formatRelativeTime } from "@carbon/utils";
+import { Trans } from "@lingui/react/macro";
+import { useLocale } from "@react-aria/i18n";
+import { LuInfo } from "react-icons/lu";
+
+/** Info icon beside an exchange rate that says when the rate was last updated. */
+const ExchangeRateUpdatedAt = ({ value }: { value: string }) => (
+ <Tooltip delayDuration={200}>
+ <TooltipTrigger asChild>
+ <span className="inline-flex items-center">
+ <LuInfo className="h-4 w-4 text-muted-foreground" />
+ </span>
+ </TooltipTrigger>
+ <TooltipContent side="bottom">
+ <UpdatedAtText value={value} />
+ </TooltipContent>
+ </Tooltip>
+);
+
+// Mounted only while the tooltip is open, so "X ago" is measured at hover
+// time rather than when the page rendered.
+const UpdatedAtText = ({ value }: { value: string }) => {
+ const { locale } = useLocale();
+ const relative = formatRelativeTime(value, locale);
+
+ return (
+ <>
+ <p>
+ <Trans>Rate updated {relative}</Trans>
+ </p>
+ <p className="text-xs text-muted-foreground tabular-nums">
+ {formatDate(value, { dateStyle: "medium", timeStyle: "short" }, locale)}
+ </p>
+ </>
+ );
+};
+
+export { ExchangeRateUpdatedAt };
diff --git a/apps/erp/app/components/Form/ExchangeRate.tsx b/apps/erp/app/components/Form/ExchangeRate.tsx
index e0e8aff44e..34142f91dd 100644
--- a/apps/erp/app/components/Form/ExchangeRate.tsx
+++ b/apps/erp/app/components/Form/ExchangeRate.tsx
@@ -5,8 +5,8 @@
import { cn, HStack, IconButton, VStack } from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import type React from "react";
-import { LuInfo, LuLoaderCircle } from "react-icons/lu";
-import { DateTime } from "~/components";
+import { LuLoaderCircle } from "react-icons/lu";
+import { ExchangeRateUpdatedAt } from "~/components";
import { NumberControlled } from "~/components/Form";
interface ExchangeRateProps
@@ -35,13 +35,7 @@ const ExchangeRate: React.FC<ExchangeRateProps> = ({
<Trans>Exchange Rate</Trans>
</span>
{exchangeRateUpdatedAt && (
- <DateTime
- value={exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ <ExchangeRateUpdatedAt value={exchangeRateUpdatedAt} />
)}
</HStack>
<HStack className="w-full justify-between">
@@ -56,13 +50,7 @@ const ExchangeRate: React.FC<ExchangeRateProps> = ({
<Trans>Exchange Rate</Trans>
</span>
{exchangeRateUpdatedAt && (
- <DateTime
- value={exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ <ExchangeRateUpdatedAt value={exchangeRateUpdatedAt} />
)}
</HStack>
}
diff --git a/apps/erp/app/components/index.ts b/apps/erp/app/components/index.ts
index 1796addd63..cc24d38e37 100644
--- a/apps/erp/app/components/index.ts
+++ b/apps/erp/app/components/index.ts
@@ -21,6 +21,7 @@ import EmployeeAvatarGroup from "./EmployeeAvatarGroup";
import Empty from "./Empty";
import { Enumerable } from "./Enumerable";
import { EnumerableGroup } from "./EnumerableGroup";
+import { ExchangeRateUpdatedAt } from "./ExchangeRateUpdatedAt";
import FileDropzone from "./FileDropzone";
import Hyperlink from "./Hyperlink";
import {
@@ -79,6 +80,7 @@ export {
Empty,
Enumerable,
EnumerableGroup,
+ ExchangeRateUpdatedAt,
exportOnlyColumn,
FileDropzone,
Hyperlink,
diff --git a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceProperties.tsx b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceProperties.tsx
index f5a583926a..722fe031b6 100644
--- a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceProperties.tsx
+++ b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceProperties.tsx
@@ -19,17 +19,15 @@ import {
} from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import { useCallback } from "react";
-import {
- LuCopy,
- LuInfo,
- LuKeySquare,
- LuLink,
- LuRefreshCcw
-} from "react-icons/lu";
+import { LuCopy, LuKeySquare, LuLink, LuRefreshCcw } from "react-icons/lu";
import { useFetcher, useParams } from "react-router";
import { z } from "zod";
import { zfd } from "zod-form-data";
-import { Assignee, DateTime, useOptimisticAssignment } from "~/components";
+import {
+ Assignee,
+ ExchangeRateUpdatedAt,
+ useOptimisticAssignment
+} from "~/components";
import {
Currency,
Location,
@@ -453,13 +451,9 @@ const PurchaseInvoiceProperties = () => {
Exchange Rate
</span>
{routeData?.purchaseInvoice?.exchangeRateUpdatedAt && (
- <DateTime
+ <ExchangeRateUpdatedAt
value={routeData?.purchaseInvoice?.exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ />
)}
</HStack>
<HStack className="w-full justify-between">
diff --git a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceProperties.tsx b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceProperties.tsx
index 52940ecdca..eb8e44bf46 100644
--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceProperties.tsx
+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceProperties.tsx
@@ -19,17 +19,15 @@ import {
} from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import { useCallback } from "react";
-import {
- LuCopy,
- LuInfo,
- LuKeySquare,
- LuLink,
- LuRefreshCcw
-} from "react-icons/lu";
+import { LuCopy, LuKeySquare, LuLink, LuRefreshCcw } from "react-icons/lu";
import { useFetcher, useParams } from "react-router";
import { z } from "zod";
import { zfd } from "zod-form-data";
-import { Assignee, DateTime, useOptimisticAssignment } from "~/components";
+import {
+ Assignee,
+ ExchangeRateUpdatedAt,
+ useOptimisticAssignment
+} from "~/components";
import {
Currency,
Customer,
@@ -435,13 +433,9 @@ const SalesInvoiceProperties = () => {
Exchange Rate
</span>
{routeData?.salesInvoice?.exchangeRateUpdatedAt && (
- <DateTime
+ <ExchangeRateUpdatedAt
value={routeData?.salesInvoice?.exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ />
)}
</HStack>
<HStack className="w-full justify-between">
diff --git a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderProperties.tsx b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderProperties.tsx
index 9d13da452f..8e5761aabe 100644
--- a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderProperties.tsx
+++ b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderProperties.tsx
@@ -25,7 +25,6 @@ import {
LuCirclePlay,
LuCopy,
LuExternalLink,
- LuInfo,
LuKeySquare,
LuLink,
LuRefreshCcw
@@ -35,8 +34,8 @@ import { z } from "zod";
import { zfd } from "zod-form-data";
import {
Assignee,
- DateTime,
EmployeeAvatar,
+ ExchangeRateUpdatedAt,
Hyperlink,
useOptimisticAssignment
} from "~/components";
@@ -458,13 +457,9 @@ const PurchaseOrderProperties = () => {
Exchange Rate
</span>
{routeData?.purchaseOrder?.exchangeRateUpdatedAt && (
- <DateTime
+ <ExchangeRateUpdatedAt
value={routeData?.purchaseOrder?.exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ />
)}
</HStack>
<HStack className="w-full justify-between">
diff --git a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteProperties.tsx b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteProperties.tsx
index ac7f4b66d1..26dee4011f 100644
--- a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteProperties.tsx
+++ b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteProperties.tsx
@@ -19,17 +19,15 @@ import {
} from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import { useCallback } from "react";
-import {
- LuCopy,
- LuInfo,
- LuKeySquare,
- LuLink,
- LuRefreshCcw
-} from "react-icons/lu";
+import { LuCopy, LuKeySquare, LuLink, LuRefreshCcw } from "react-icons/lu";
import { useFetcher, useParams } from "react-router";
import { z } from "zod";
import { zfd } from "zod-form-data";
-import { Assignee, DateTime, useOptimisticAssignment } from "~/components";
+import {
+ Assignee,
+ ExchangeRateUpdatedAt,
+ useOptimisticAssignment
+} from "~/components";
import {
Currency,
Supplier,
@@ -340,13 +338,9 @@ const SupplierQuoteProperties = () => {
Exchange Rate
</span>
{routeData?.quote?.exchangeRateUpdatedAt && (
- <DateTime
+ <ExchangeRateUpdatedAt
value={routeData?.quote?.exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ />
)}
</HStack>
<HStack className="w-full justify-between">
diff --git a/apps/erp/app/modules/sales/ui/Quotes/QuoteProperties.tsx b/apps/erp/app/modules/sales/ui/Quotes/QuoteProperties.tsx
index c24a6d7bf8..3264f7e41b 100644
--- a/apps/erp/app/modules/sales/ui/Quotes/QuoteProperties.tsx
+++ b/apps/erp/app/modules/sales/ui/Quotes/QuoteProperties.tsx
@@ -20,20 +20,14 @@ import {
} from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import { useCallback } from "react";
-import {
- LuCopy,
- LuInfo,
- LuKeySquare,
- LuLink,
- LuRefreshCcw
-} from "react-icons/lu";
+import { LuCopy, LuKeySquare, LuLink, LuRefreshCcw } from "react-icons/lu";
import { useFetcher, useParams } from "react-router";
import { z } from "zod";
import { zfd } from "zod-form-data";
import {
Assignee,
- DateTime,
EmployeeAvatar,
+ ExchangeRateUpdatedAt,
useOptimisticAssignment
} from "~/components";
import {
@@ -437,13 +431,9 @@ const QuoteProperties = () => {
Exchange Rate
</span>
{routeData?.quote?.exchangeRateUpdatedAt && (
- <DateTime
+ <ExchangeRateUpdatedAt
value={routeData?.quote?.exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ />
)}
</HStack>
<HStack className="w-full justify-between">
diff --git a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderProperties.tsx b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderProperties.tsx
index 6edf27e5e4..0d60422a7a 100644
--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderProperties.tsx
+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderProperties.tsx
@@ -19,20 +19,14 @@ import {
} from "@carbon/react";
import { Trans, useLingui } from "@lingui/react/macro";
import { useCallback } from "react";
-import {
- LuCopy,
- LuInfo,
- LuKeySquare,
- LuLink,
- LuRefreshCcw
-} from "react-icons/lu";
+import { LuCopy, LuKeySquare, LuLink, LuRefreshCcw } from "react-icons/lu";
import { useFetcher, useParams } from "react-router";
import { z } from "zod";
import { zfd } from "zod-form-data";
import {
Assignee,
- DateTime,
EmployeeAvatar,
+ ExchangeRateUpdatedAt,
useOptimisticAssignment
} from "~/components";
import {
@@ -438,13 +432,9 @@ const SalesOrderProperties = () => {
Exchange Rate
</span>
{routeData?.salesOrder?.exchangeRateUpdatedAt && (
- <DateTime
+ <ExchangeRateUpdatedAt
value={routeData?.salesOrder?.exchangeRateUpdatedAt}
- variant="absolute"
- side="bottom"
- >
- <LuInfo className="h-4 w-4 text-muted-foreground" />
- </DateTime>
+ />
)}
</HStack>
<HStack className="w-full justify-between">
diff --git a/packages/locale/locales/de/erp.po b/packages/locale/locales/de/erp.po
index fdd918f16d..3dbd08c721 100644
--- a/packages/locale/locales/de/erp.po
+++ b/packages/locale/locales/de/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Satzfrequenz"
msgid "Rate Limit"
msgstr "Ratenlimit"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Kurs für die Umrechnung von Eigenkapitalkonten in der Konsolidierung (IAS 21). Leer lassen, um den aktuellen Wechselkurs zu verwenden."
diff --git a/packages/locale/locales/en/erp.po b/packages/locale/locales/en/erp.po
index 48796ef226..8149cfc9a2 100644
--- a/packages/locale/locales/en/erp.po
+++ b/packages/locale/locales/en/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Rate Frequency"
msgid "Rate Limit"
msgstr "Rate Limit"
+msgid "Rate updated {relative}"
+msgstr "Rate updated {relative}"
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
diff --git a/packages/locale/locales/es/erp.po b/packages/locale/locales/es/erp.po
index 6b51418796..b5b1e6e6dd 100644
--- a/packages/locale/locales/es/erp.po
+++ b/packages/locale/locales/es/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Frecuencia de Tasa"
msgid "Rate Limit"
msgstr "Límite de Velocidad"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Tipo de cambio utilizado para la conversión de cuentas de patrimonio en la consolidación (IAS 21). Déjelo en blanco para usar el tipo de cambio actual."
diff --git a/packages/locale/locales/fr/erp.po b/packages/locale/locales/fr/erp.po
index 6f931207bc..9f51462a4a 100644
--- a/packages/locale/locales/fr/erp.po
+++ b/packages/locale/locales/fr/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Fréquence du taux"
msgid "Rate Limit"
msgstr "Limite de débit"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Taux utilisé pour la conversion des comptes de capitaux propres en consolidation (IAS 21). Laissez vide pour utiliser le taux de change actuel."
diff --git a/packages/locale/locales/hi/erp.po b/packages/locale/locales/hi/erp.po
index 824c13c061..682879f91d 100644
--- a/packages/locale/locales/hi/erp.po
+++ b/packages/locale/locales/hi/erp.po
@@ -18230,6 +18230,9 @@ msgstr "दर आवृत्ति"
msgid "Rate Limit"
msgstr "दर सीमा"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "समेकन में इक्विटी खातों के रूपांतरण के लिए उपयोग की जाने वाली दर (IAS 21)। वर्तमान विनिमय दर का उपयोग करने के लिए खाली छोड़ें।"
diff --git a/packages/locale/locales/it/erp.po b/packages/locale/locales/it/erp.po
index 87c01537a1..0291972e36 100644
--- a/packages/locale/locales/it/erp.po
+++ b/packages/locale/locales/it/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Frequenza Tariffaria"
msgid "Rate Limit"
msgstr "Limite di Velocità"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Tasso utilizzato per la conversione dei conti di patrimonio netto nel consolidamento (IAS 21). Lasciare vuoto per usare il tasso di cambio corrente."
diff --git a/packages/locale/locales/ja/erp.po b/packages/locale/locales/ja/erp.po
index ecf1939e53..2f03f811f7 100644
--- a/packages/locale/locales/ja/erp.po
+++ b/packages/locale/locales/ja/erp.po
@@ -18230,6 +18230,9 @@ msgstr "レート頻度"
msgid "Rate Limit"
msgstr "レート制限"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "連結における純資産勘定の換算に使用されるレート(IAS 21)。空欄の場合は現在の為替レートが使用されます。"
diff --git a/packages/locale/locales/ko/erp.po b/packages/locale/locales/ko/erp.po
index 7047fb9373..2c81c2c176 100644
--- a/packages/locale/locales/ko/erp.po
+++ b/packages/locale/locales/ko/erp.po
@@ -18230,6 +18230,9 @@ msgstr "요금 주기"
msgid "Rate Limit"
msgstr "요청 제한"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "연결 시 자본 계정 환산에 사용되는 환율(IAS 21)입니다. 비워 두면 현재 환율이 사용됩니다."
diff --git a/packages/locale/locales/pl/erp.po b/packages/locale/locales/pl/erp.po
index 6d244fb275..56ab37f306 100644
--- a/packages/locale/locales/pl/erp.po
+++ b/packages/locale/locales/pl/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Częstotliwość Stawki"
msgid "Rate Limit"
msgstr "Limit Szybkości"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Kurs używany do przeliczenia kont kapitału własnego w konsolidacji (IAS 21). Pozostaw puste, aby użyć bieżącego kursu wymiany."
diff --git a/packages/locale/locales/pt/erp.po b/packages/locale/locales/pt/erp.po
index 2bae4af43c..3dc099f22d 100644
--- a/packages/locale/locales/pt/erp.po
+++ b/packages/locale/locales/pt/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Frequência de Taxa"
msgid "Rate Limit"
msgstr "Limite de Taxa"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Taxa usada para a conversão de contas de patrimônio líquido na consolidação (IAS 21). Deixe em branco para usar a taxa de câmbio atual."
diff --git a/packages/locale/locales/ru/erp.po b/packages/locale/locales/ru/erp.po
index 3aca25525f..4051e7be44 100644
--- a/packages/locale/locales/ru/erp.po
+++ b/packages/locale/locales/ru/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Частота ставки"
msgid "Rate Limit"
msgstr "Ограничение скорости"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Курс, используемый для пересчета счетов собственного капитала при консолидации (IAS 21). Оставьте пустым, чтобы использовать текущий валютный курс."
diff --git a/packages/locale/locales/tr/erp.po b/packages/locale/locales/tr/erp.po
index 5420d056ee..89379127e6 100644
--- a/packages/locale/locales/tr/erp.po
+++ b/packages/locale/locales/tr/erp.po
@@ -18230,6 +18230,9 @@ msgstr "Oran Sıklığı"
msgid "Rate Limit"
msgstr "Hız Sınırı"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "Konsolidasyonda özkaynak hesaplarının çevrimi için kullanılan kur (IAS 21). Güncel döviz kurunu kullanmak için boş bırakın."
diff --git a/packages/locale/locales/zh/erp.po b/packages/locale/locales/zh/erp.po
index 2d40a93464..24889997a8 100644
--- a/packages/locale/locales/zh/erp.po
+++ b/packages/locale/locales/zh/erp.po
@@ -18230,6 +18230,9 @@ msgstr "费率频率"
msgid "Rate Limit"
msgstr "速率限制"
+msgid "Rate updated {relative}"
+msgstr ""
+
msgid "Rate used for equity account translation in consolidation (IAS 21). Leave blank to use the current exchange rate."
msgstr "合并时用于所有者权益账户折算的汇率(IAS 21)。留空则使用当前汇率。"
diff --git a/packages/react/AGENTS.md b/packages/react/AGENTS.md
index bf317a003b..22d0b6bf98 100644
--- a/packages/react/AGENTS.md
+++ b/packages/react/AGENTS.md
@@ -42,7 +42,7 @@ import { Button, Card, HStack, VStack, IconButton, cn } from "@carbon/react";
- **Choice screens**: `ChoiceCardGroup` (card radios, `autoFocus` focuses the selected card) and `RadioGroupButton` (radio styled as a secondary Button) give one tab stop + arrow-key select; Enter stays free for the screen's continue action
- **Layout**: `VStack` / `HStack` with numeric `spacing` prop (maps to `space-y-*`/`space-x-*`)
- **Overlays**: `Drawer`, `Modal`, `ModalDrawer` (unified drawer/modal), `BottomSheet`, `Popover`. A controlled `Modal`/`Drawer` with no `onOpenChange` cannot be dismissed and shows no close button; never pass a handler that does nothing (`no-noop-open-change` check). A route rendered as a modal or drawer closes with `useCloseRoute()` (back when this tab has history, else the parent route), not `navigate(-1)`
-- **Status**: `iconOnly` renders just the coloured icon, with the label in an always-on tooltip and as the `aria-label` (string children only) — for dense rows and narrow drawers. `TooltipContent` takes `anchor` to position against a different element than the trigger, when one tooltip serves many small hover targets (a strip of bars)
+- **Status**: a pill shows a tooltip only when given `tooltip` (extra detail) or `iconOnly` — never one repeating its label. `iconOnly` renders just the coloured icon, with the label in an always-on tooltip and as the `aria-label` (string children only) — for dense rows and narrow drawers. `TooltipContent` takes `anchor` to position against a different element than the trigger, when one tooltip serves many small hover targets (a strip of bars)
- **App nav**: `NavRail` is the primary left nav of both the ERP and MES shells (56px icon rail, grows to 240px after a 150ms mouse hover or when pinned, left drawer below md that closes itself on navigation). The rail renders a pin toggle beside its `header` while expanded (it calls `SidebarProvider`'s `toggleSidebar`; ⌘B also pins, unless the provider gets `keyboardShortcut={false}`). Unpinning (the toggle, ⌘B or a page's `SidebarTrigger`) collapses the rail at once, also under the mouse; hover cannot reopen it until the pointer leaves the rail. The pin is not persisted: both apps pass `defaultOpen={false}`, and the provider writes no cookie (see `.ai/lessons.md`, "A cookie that was only ever written"). Optional `header` and `footer` slots; the header is a `NavRailSwitcher` — the company's logo (`logoLight`/`logoDark`, falling back to an initials `Avatar`) in the icon column with its name fading in, a menu trigger or, with `asChild`, a link, and a full-width row on phones; `NavRailGroup` adds a titled section that shows as a divider while collapsed. Entries are `NavRailItem` (a button, or `asChild` for a trigger/link) and `NavRailLink`; `label` is a string and doubles as the accessible name. A Radix menu/popover opened from a `NavRailItem` or `NavRailSwitcher` keeps the rail as it was (open or collapsed) until it closes. Render inside `SidebarProvider`; the shadcn-style `Sidebar*` primitives remain for other layouts
- **Links that prefetch**: `PrefetchLink` is a React Router `Link` that prefetches its destination when the pointer goes down on it. Use it instead of `<Link prefetch="intent">`, which prefetches on a 100 ms hover and so runs a page's loaders for every row the mouse passes over. The click reuses the prefetch only because `prefetchCacheMiddleware` (`@carbon/utils`, in each app's root `middleware`) gives a prefetch response a few seconds of private cache; without it both requests reach the server and the click waits behind the prefetch. `NavRailLink` and both apps' `Hyperlink` already use it
- **Record outlet**: `RecordOutlet` is the `<Outlet>` of every route under `/x`. It remounts the page inside it when that page is shown for a different record (the params of the route in the outlet, not of a drawer below it), so nothing seeded from the previous record survives. A plain `<Outlet>` there fails the `no-bare-outlet` check
diff --git a/packages/react/src/Combobox.tsx b/packages/react/src/Combobox.tsx
index 9795dba42b..311717f95b 100644
--- a/packages/react/src/Combobox.tsx
+++ b/packages/react/src/Combobox.tsx
@@ -207,7 +207,6 @@ const Combobox = forwardRef<HTMLButtonElement, ComboboxProps>(
itemHeight={itemHeight}
getItemValue={getComboboxItemValue}
isChecked={(_, itemValue) => itemValue === value}
- isHelperPadded={(_, itemValue) => itemValue === value}
emptyMessage={t`No option found.`}
onSelect={(item, { setSearch }) => {
onChange?.(item.value);
diff --git a/packages/react/src/CreateableCombobox.tsx b/packages/react/src/CreateableCombobox.tsx
index c7c0e27020..2959a0ffc1 100644
--- a/packages/react/src/CreateableCombobox.tsx
+++ b/packages/react/src/CreateableCombobox.tsx
@@ -220,9 +220,6 @@ const CreatableCombobox = forwardRef<HTMLButtonElement, CreatableComboboxProps>(
isChecked={(item) =>
!!selected?.includes(item.value) || item.value === value
}
- isHelperPadded={(item) =>
- !selected?.includes(item.value) && item.value === value
- }
onSelect={(item, { isCreateOption }) => {
if (isCreateOption) {
onCreateOption?.(search);
diff --git a/packages/react/src/PickerList.tsx b/packages/react/src/PickerList.tsx
index c9d9d235ae..d3d4cd6570 100644
--- a/packages/react/src/PickerList.tsx
+++ b/packages/react/src/PickerList.tsx
@@ -47,7 +47,7 @@ export type PickerListProps = {
/** The picker's own matching; each picker keeps its own rules. */
filter: PickerListFilter;
itemHeight: number;
- /** "single" ends a row with ✓; "multiple" starts it with a checkbox. */
+ /** "single" starts a row with ✓; "multiple" starts it with a checkbox. */
selectionMode: "single" | "multiple";
/** The cmdk item value of a row (each picker escapes it differently). */
getItemValue: (option: PickerListOption) => string | undefined;
@@ -56,11 +56,6 @@ export type PickerListProps = {
option: PickerListOption,
itemValue: string | undefined
) => boolean;
- /** Single mode: pads the helper column of the row (`pr-2`). */
- isHelperPadded?: (
- option: PickerListOption,
- itemValue: string | undefined
- ) => boolean;
/** Single mode: the picker's current value. On phones it always gets the ✓. */
value?: string;
onSelect: (
@@ -97,7 +92,6 @@ function PickerList({
selectionMode,
getItemValue,
isChecked,
- isHelperPadded,
value,
onSelect,
search: searchProp,
@@ -207,17 +201,20 @@ function PickerList({
>
{selectionMode === "single" ? (
<>
+ {/* The ✓ leads the row in a fixed slot, so a checked row's text
+ and helperRight stay aligned with every other row. */}
+ <LuCheck
+ className={cn(
+ "mr-2 h-4 w-4 flex-shrink-0",
+ checked && !isCreateOption ? "opacity-100" : "opacity-0"
+ )}
+ />
{isCreateOption ? (
<div className="flex items-center min-w-0 flex-1">
<span>{createText}</span>
</div>
) : item.helper ? (
- <div
- className={cn(
- "flex flex-col min-w-0 flex-1",
- isHelperPadded?.(item, itemValue) && "pr-2"
- )}
- >
+ <div className="flex flex-col min-w-0 flex-1">
<TruncatedTooltipText
className="block w-full truncate"
tooltip={itemHoverText}
@@ -247,15 +244,6 @@ function PickerList({
{item.label}
</TruncatedTooltipText>
)}
- {!isCreateOption && (
- <LuCheck
- className={cn(
- "ml-auto h-4 w-4",
- creatable && "flex-shrink-0",
- checked ? "opacity-100" : "opacity-0 hidden"
- )}
- />
- )}
</>
) : creatable ? (
<div className="flex justify-start items-center gap-1 px-2 min-w-0 flex-1">
diff --git a/packages/react/src/Status.tsx b/packages/react/src/Status.tsx
index 32e06e5a6d..7cb8ab0efd 100644
--- a/packages/react/src/Status.tsx
+++ b/packages/react/src/Status.tsx
@@ -76,7 +76,9 @@ const Status = ({
</Badge>
);
- if (disableTooltip && !iconOnly) return badge;
+ // A pill that shows its label needs no tooltip repeating it — only one
+ // that adds something (`tooltip`) or hides the label (`iconOnly`).
+ if (!iconOnly && (disableTooltip || !tooltip)) return badge;
return (
<Tooltip>