diff --git a/packages/admin/dashboard/src/index.css b/packages/admin/dashboard/src/index.css index e73e75abb6..bc87c9f0be 100644 --- a/packages/admin/dashboard/src/index.css +++ b/packages/admin/dashboard/src/index.css @@ -30,7 +30,6 @@ :root { @apply bg-ui-bg-subtle text-ui-fg-base antialiased; text-rendering: optimizeLegibility; - color-scheme: light dark; } } diff --git a/packages/admin/dashboard/src/providers/router-provider/route-map.tsx b/packages/admin/dashboard/src/providers/router-provider/route-map.tsx index 82f5a6f7f9..9c1c497628 100644 --- a/packages/admin/dashboard/src/providers/router-provider/route-map.tsx +++ b/packages/admin/dashboard/src/providers/router-provider/route-map.tsx @@ -1347,6 +1347,20 @@ export const RouteMap: RouteObject[] = [ "../../routes/tax-regions/tax-region-tax-rate-edit" ), }, + { + path: "overrides/create", + lazy: () => + import( + "../../routes/tax-regions/tax-region-tax-override-create" + ), + }, + { + path: "overrides/:tax_rate_id/edit", + lazy: () => + import( + "../../routes/tax-regions/tax-region-tax-override-edit" + ), + }, ], }, ], diff --git a/packages/admin/dashboard/src/providers/theme-provider/theme-provider.tsx b/packages/admin/dashboard/src/providers/theme-provider/theme-provider.tsx index 5b56ed5ec2..26561beea8 100644 --- a/packages/admin/dashboard/src/providers/theme-provider/theme-provider.tsx +++ b/packages/admin/dashboard/src/providers/theme-provider/theme-provider.tsx @@ -64,6 +64,8 @@ export const ThemeProvider = ({ children }: PropsWithChildren) => { html.classList.remove(value === "light" ? "dark" : "light") html.classList.add(value) + // Ensures that native elements respect the theme, e.g. the scrollbar. + html.style.colorScheme = value /** * Re-enable transitions after the theme has been set, diff --git a/packages/admin/dashboard/src/routes/tax-regions/tax-region-tax-override-create/tax-region-tax-override-create.tsx b/packages/admin/dashboard/src/routes/tax-regions/tax-region-tax-override-create/tax-region-tax-override-create.tsx index dde788de11..3a797f046f 100644 --- a/packages/admin/dashboard/src/routes/tax-regions/tax-region-tax-override-create/tax-region-tax-override-create.tsx +++ b/packages/admin/dashboard/src/routes/tax-regions/tax-region-tax-override-create/tax-region-tax-override-create.tsx @@ -4,9 +4,11 @@ import { useTaxRegion } from "../../../hooks/api/tax-regions" import { TaxRegionCreateTaxOverrideForm } from "./components/tax-region-override-create-form" export const TaxRegionCreateTaxOverride = () => { - const { id } = useParams() + const { id, province_id } = useParams() - const { tax_region, isPending, isError, error } = useTaxRegion(id!) + const { tax_region, isPending, isError, error } = useTaxRegion( + province_id || id! + ) const ready = !isPending && !!tax_region