From 1ff07863bab7511b991e50ed317d9da9ccac40cd Mon Sep 17 00:00:00 2001 From: Dysto coder Date: Tue, 21 Jan 2025 13:37:27 +0300 Subject: [PATCH 1/4] do not parse tax name --- src/pages/workspace/taxes/NamePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx index dd18229102ef..7ea48b588533 100644 --- a/src/pages/workspace/taxes/NamePage.tsx +++ b/src/pages/workspace/taxes/NamePage.tsx @@ -38,7 +38,7 @@ function NamePage({ const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID); const {inputCallbackRef} = useAutoFocusInput(); - const [name, setName] = useState(() => Parser.htmlToMarkdown(currentTaxRate?.name ?? '')); + const [name, setName] = useState(currentTaxRate?.name ?? ''); const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '-1', taxID)), [policyID, taxID]); From 10860cbb14f55fbc26b1e134d94877fac26ccb77 Mon Sep 17 00:00:00 2001 From: Dysto coder Date: Tue, 21 Jan 2025 13:47:31 +0300 Subject: [PATCH 2/4] remove unused Parser import --- src/pages/workspace/taxes/NamePage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx index 7ea48b588533..3b89720d834d 100644 --- a/src/pages/workspace/taxes/NamePage.tsx +++ b/src/pages/workspace/taxes/NamePage.tsx @@ -13,7 +13,6 @@ import {renamePolicyTax, validateTaxName} from '@libs/actions/TaxRate'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; -import Parser from '@libs/Parser'; import * as PolicyUtils from '@libs/PolicyUtils'; import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; From 44396bbee11f12ee7f4e91db28c3936be6eb743f Mon Sep 17 00:00:00 2001 From: Dysto coder Date: Tue, 21 Jan 2025 14:00:01 +0300 Subject: [PATCH 3/4] fix elint name export error --- src/pages/workspace/taxes/NamePage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx index 3b89720d834d..bcf74ee9fdf5 100644 --- a/src/pages/workspace/taxes/NamePage.tsx +++ b/src/pages/workspace/taxes/NamePage.tsx @@ -13,7 +13,7 @@ import {renamePolicyTax, validateTaxName} from '@libs/actions/TaxRate'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; -import * as PolicyUtils from '@libs/PolicyUtils'; +import {getTaxByID} from '@libs/PolicyUtils'; import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading'; @@ -34,7 +34,7 @@ function NamePage({ }: NamePageProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); - const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID); + const currentTaxRate = getTaxByID(policy, taxID); const {inputCallbackRef} = useAutoFocusInput(); const [name, setName] = useState(currentTaxRate?.name ?? ''); From 64c0f8c4e692e0a3ef3ff1ab7257fb51344ef1d8 Mon Sep 17 00:00:00 2001 From: Dysto coder Date: Tue, 21 Jan 2025 17:17:08 +0300 Subject: [PATCH 4/4] fix eslint changed files error for default policy id --- src/pages/workspace/taxes/NamePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx index bcf74ee9fdf5..d886cc31b82b 100644 --- a/src/pages/workspace/taxes/NamePage.tsx +++ b/src/pages/workspace/taxes/NamePage.tsx @@ -39,7 +39,7 @@ function NamePage({ const [name, setName] = useState(currentTaxRate?.name ?? ''); - const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '-1', taxID)), [policyID, taxID]); + const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, taxID)), [policyID, taxID]); const submit = () => { const taxName = name.trim();