From e4d196e522a44ef379c5957c20c95ef28357e2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Sun, 11 May 2025 16:06:11 +0200
Subject: [PATCH] fix(dashboard): tax regions UI polish (#12437)

---
 .../dashboard-app/routes/get-route.map.tsx    | 10 ++--
 .../src/i18n/translations/$schema.json        |  8 +++-
 .../dashboard/src/i18n/translations/en.json   |  2 +
 .../tax-region-create-form.tsx                | 46 +++++++++----------
 .../tax-region-edit/tax-region-edit.tsx       |  4 +-
 5 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/packages/admin/dashboard/src/dashboard-app/routes/get-route.map.tsx b/packages/admin/dashboard/src/dashboard-app/routes/get-route.map.tsx
index edd9c09b86..b8348eff14 100644
--- a/packages/admin/dashboard/src/dashboard-app/routes/get-route.map.tsx
+++ b/packages/admin/dashboard/src/dashboard-app/routes/get-route.map.tsx
@@ -1589,6 +1589,11 @@ export function getRouteMap({
                         }
                       },
                       children: [
+                        {
+                          path: "edit",
+                          lazy: () =>
+                            import("../../routes/tax-regions/tax-region-edit"),
+                        },
                         {
                           path: "provinces/create",
                           lazy: () =>
@@ -1626,11 +1631,6 @@ export function getRouteMap({
                         },
                       ],
                     },
-                    {
-                      path: "edit",
-                      lazy: () =>
-                        import("../../routes/tax-regions/tax-region-edit"),
-                    },
                     {
                       path: "provinces/:province_id",
                       lazy: async () => {
diff --git a/packages/admin/dashboard/src/i18n/translations/$schema.json b/packages/admin/dashboard/src/i18n/translations/$schema.json
index d6bf8c2075..2fc9da45a3 100644
--- a/packages/admin/dashboard/src/i18n/translations/$schema.json
+++ b/packages/admin/dashboard/src/i18n/translations/$schema.json
@@ -6482,11 +6482,17 @@
         "edit": {
           "type": "object",
           "properties": {
+            "header": {
+              "type": "string"
+            },
+            "hint": {
+              "type": "string"
+            },
             "successToast": {
               "type": "string"
             }
           },
-          "required": ["successToast"],
+          "required": ["header", "hint", "successToast"],
           "additionalProperties": false
         },
         "province": {
diff --git a/packages/admin/dashboard/src/i18n/translations/en.json b/packages/admin/dashboard/src/i18n/translations/en.json
index d5d6d06c94..fcad3dde1e 100644
--- a/packages/admin/dashboard/src/i18n/translations/en.json
+++ b/packages/admin/dashboard/src/i18n/translations/en.json
@@ -1724,6 +1724,8 @@
       "successToast": "The tax region was successfully created."
     },
     "edit": {
+      "header": "Edit Tax Region",
+      "hint": "Edit the tax region details.",
       "successToast": "The tax region was successfully updated."
     },
     "province": {
diff --git a/packages/admin/dashboard/src/routes/tax-regions/tax-region-create/components/tax-region-create-form/tax-region-create-form.tsx b/packages/admin/dashboard/src/routes/tax-regions/tax-region-create/components/tax-region-create-form/tax-region-create-form.tsx
index 22ef01a64e..d8a4c2281a 100644
--- a/packages/admin/dashboard/src/routes/tax-regions/tax-region-create/components/tax-region-create-form/tax-region-create-form.tsx
+++ b/packages/admin/dashboard/src/routes/tax-regions/tax-region-create/components/tax-region-create-form/tax-region-create-form.tsx
@@ -129,6 +129,29 @@ export const TaxRegionCreateForm = ({ parentId }: TaxRegionCreateFormProps) => {
                       )
                     }}
                   />
+                  <Form.Field
+                    control={form.control}
+                    name="provider_id"
+                    render={({ field }) => (
+                      <Form.Item>
+                        <Form.Label>
+                          {t("taxRegions.fields.taxProvider")}
+                        </Form.Label>
+                        <Form.Control>
+                          <Combobox
+                            {...field}
+                            options={taxProviders.options}
+                            searchValue={taxProviders.searchValue}
+                            onSearchValueChange={
+                              taxProviders.onSearchValueChange
+                            }
+                            fetchNextPage={taxProviders.fetchNextPage}
+                          />
+                        </Form.Control>
+                        <Form.ErrorMessage />
+                      </Form.Item>
+                    )}
+                  />
                 </div>
               </div>
               <div className="flex flex-col gap-4">
@@ -209,29 +232,6 @@ export const TaxRegionCreateForm = ({ parentId }: TaxRegionCreateFormProps) => {
                         )
                       }}
                     />
-                    <Form.Field
-                      control={form.control}
-                      name="provider_id"
-                      render={({ field }) => (
-                        <Form.Item>
-                          <Form.Label>
-                            {t("taxRegions.fields.taxProvider")}
-                          </Form.Label>
-                          <Form.Control>
-                            <Combobox
-                              {...field}
-                              options={taxProviders.options}
-                              searchValue={taxProviders.searchValue}
-                              onSearchValueChange={
-                                taxProviders.onSearchValueChange
-                              }
-                              fetchNextPage={taxProviders.fetchNextPage}
-                            />
-                          </Form.Control>
-                          <Form.ErrorMessage />
-                        </Form.Item>
-                      )}
-                    />
                   </div>
                 </div>
               </div>
diff --git a/packages/admin/dashboard/src/routes/tax-regions/tax-region-edit/tax-region-edit.tsx b/packages/admin/dashboard/src/routes/tax-regions/tax-region-edit/tax-region-edit.tsx
index 03cbf32721..c61aefa162 100644
--- a/packages/admin/dashboard/src/routes/tax-regions/tax-region-edit/tax-region-edit.tsx
+++ b/packages/admin/dashboard/src/routes/tax-regions/tax-region-edit/tax-region-edit.tsx
@@ -21,10 +21,10 @@ export const TaxRegionEdit = () => {
     <RouteDrawer>
       <RouteDrawer.Header>
         <RouteDrawer.Title asChild>
-          <Heading>{t("taxRegions.taxRates.edit.header")}</Heading>
+          <Heading>{t("taxRegions.edit.header")}</Heading>
         </RouteDrawer.Title>
         <RouteDrawer.Description className="sr-only">
-          {t("taxRegions.taxRates.edit.hint")}
+          {t("taxRegions.edit.hint")}
         </RouteDrawer.Description>
       </RouteDrawer.Header>
       {ready && <TaxRegionEditForm taxRegion={tax_region} />}