From fe3a54baa5b3e8d5f1e54bb6bfa8c4d595d43d6d Mon Sep 17 00:00:00 2001 From: justin-phxm <113923596+justin-phxm@users.noreply.github.com> Date: Sat, 3 Feb 2024 11:37:08 -0700 Subject: [PATCH] fix merge and rebase erorrs --- .../{PIStransformer.tsx => PISTransformer.tsx} | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) rename app/src/renderer/code/components/transformers/{PIStransformer.tsx => PISTransformer.tsx} (90%) diff --git a/app/src/renderer/code/components/transformers/PIStransformer.tsx b/app/src/renderer/code/components/transformers/PISTransformer.tsx similarity index 90% rename from app/src/renderer/code/components/transformers/PIStransformer.tsx rename to app/src/renderer/code/components/transformers/PISTransformer.tsx index 36838541..b0034d45 100644 --- a/app/src/renderer/code/components/transformers/PIStransformer.tsx +++ b/app/src/renderer/code/components/transformers/PISTransformer.tsx @@ -2,6 +2,7 @@ import type { I_PISField, I_PISFieldData, } from "../../objects/PIS/PIS.interface"; +import I_PIS from "../../objects/PIS/PIS.interface"; type RangeCheckedFieldDataProps = { fieldData: I_PISFieldData; @@ -69,21 +70,6 @@ type FieldDataFormatterProps = { function FieldDataFormatter(props: FieldDataFormatterProps): JSX.Element { const { data, fstring } = props; - const formatString = ( - string: string, - params: I_PISFieldData[], - ): JSX.Element | string => { - // %s •C (%s) - %s •C (%s) - - return string.replace(/%s/g, (_, index) => { - return typeof params[new Number(index).valueOf()] === "undefined" - ? "" - : RangeCheckedFieldData({ - fieldData: data[new Number(index).valueOf()], - }); - }); - }; - return fstring === undefined ? (