From 20f59200fc7c32bcc19b00cb4cc3eec6839b0d80 Mon Sep 17 00:00:00 2001 From: fPolic Date: Tue, 22 Oct 2024 17:27:03 +0200 Subject: [PATCH 1/3] fix: truncate price cell titles --- .../create-data-grid-price-columns.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/admin/dashboard/src/components/data-grid/helpers/create-data-grid-price-columns.tsx b/packages/admin/dashboard/src/components/data-grid/helpers/create-data-grid-price-columns.tsx index cc38a97f09cec..0c1fff4eb677c 100644 --- a/packages/admin/dashboard/src/components/data-grid/helpers/create-data-grid-price-columns.tsx +++ b/packages/admin/dashboard/src/components/data-grid/helpers/create-data-grid-price-columns.tsx @@ -45,6 +45,10 @@ export const createDataGridPriceColumns = < (p) => p.attribute === "currency_code" && p.value === currency ) + const translatedCurrencyName = t("fields.priceTemplate", { + regionOrCurrency: currency.toUpperCase(), + }) + return columnHelper.column({ id: `currency_prices.${currency}`, name: t("fields.priceTemplate", { @@ -62,9 +66,9 @@ export const createDataGridPriceColumns = < type: "number", header: () => (
- {t("fields.priceTemplate", { - regionOrCurrency: currency.toUpperCase(), - })} + + {translatedCurrencyName} +
), @@ -82,6 +86,10 @@ export const createDataGridPriceColumns = < (p) => p.attribute === "region_id" && p.value === region.id ) + const translatedRegionName = t("fields.priceTemplate", { + regionOrCurrency: region.name, + }) + return columnHelper.column({ id: `region_prices.${region.id}`, name: t("fields.priceTemplate", { @@ -99,9 +107,9 @@ export const createDataGridPriceColumns = < type: "number", header: () => (
- {t("fields.priceTemplate", { - regionOrCurrency: region.name, - })} + + {translatedRegionName} +
), From a6f4e293ece84956e0eb63c82ec7bc7e94780cc8 Mon Sep 17 00:00:00 2001 From: fPolic Date: Wed, 23 Oct 2024 09:10:03 +0200 Subject: [PATCH 2/3] fix: cutoff icon --- .../dashboard/src/components/common/tax-badge/tax-badge.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx b/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx index df59b0b27f574..ad89ed19dbc40 100644 --- a/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx +++ b/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx @@ -20,7 +20,9 @@ export const IncludesTaxTooltip = ({ : t("general.excludesTaxTooltip") } > - + ) } From 7f7d35ba743a35996e610651129121ca3fb7a141 Mon Sep 17 00:00:00 2001 From: fPolic Date: Wed, 23 Oct 2024 09:13:10 +0200 Subject: [PATCH 3/3] fix: use shrink instead --- .../dashboard/src/components/common/tax-badge/tax-badge.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx b/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx index ad89ed19dbc40..60801b9ccaef9 100644 --- a/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx +++ b/packages/admin/dashboard/src/components/common/tax-badge/tax-badge.tsx @@ -21,7 +21,7 @@ export const IncludesTaxTooltip = ({ } > )