From 61cb97da263004980f8df27ec5b7aaef999bf757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
<16856471+fPolic@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:01:00 +0100
Subject: [PATCH] fix(dashboard): truncate price cell titles (#9715)
Before:

After

Co-authored-by: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com>
---
.../components/common/tax-badge/tax-badge.tsx | 4 +++-
.../create-data-grid-price-columns.tsx | 20 +++++++++++++------
.../edit-region-form/edit-region-form.tsx | 1 -
3 files changed, 17 insertions(+), 8 deletions(-)
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 df59b0b27f..60801b9cca 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")
}
>
-
+
)
}
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 cc38a97f09..0c1fff4eb6 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}
+
),
diff --git a/packages/admin/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx b/packages/admin/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx
index 0803b7222c..12039625e3 100644
--- a/packages/admin/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx
+++ b/packages/admin/dashboard/src/routes/regions/region-edit/components/edit-region-form/edit-region-form.tsx
@@ -64,7 +64,6 @@ export const EditRegionForm = ({
currency_code: values.currency_code.toLowerCase(),
payment_providers: values.payment_providers,
is_tax_inclusive: values.is_tax_inclusive,
- automatic_taxes: values.automatic_taxes,
},
{
onSuccess: () => {