fix: remove conditionalAmountWidget

bcgov · Aug 9, 2022 · ce7a75b · ce7a75b
1 parent 27733a2
commit ce7a75b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 94 deletions.
diff --git a/app/lib/theme/CustomDiffFields.tsx b/app/lib/theme/CustomDiffFields.tsx
@@ -271,8 +271,7 @@ const CUSTOM_DIFF_FIELDS: Record<
           id,
           formContext?.oldData?.[props.name],
           formData,
-          uiSchema?.["ui:widget"] === "MoneyWidget" ||
-            uiSchema?.["ui:widget"] === "ConditionalAmountWidget",
+          uiSchema?.["ui:widget"] === "MoneyWidget",
           uiSchema?.["ui:widget"] === "PercentageWidget"
         );
       } else if (
@@ -283,8 +282,7 @@ const CUSTOM_DIFF_FIELDS: Record<
         return showNumberAdded(
           id,
           formData,
-          uiSchema?.["ui:widget"] === "MoneyWidget" ||
-            uiSchema?.["ui:widget"] === "ConditionalAmountWidget",
+          uiSchema?.["ui:widget"] === "MoneyWidget",
           uiSchema?.["ui:widget"] === "PercentageWidget"
         );
       } else if (
@@ -294,8 +292,7 @@ const CUSTOM_DIFF_FIELDS: Record<
         return showNumberRemoved(
           id,
           formContext?.oldData?.[props.name],
-          uiSchema?.["ui:widget"] === "MoneyWidget" ||
-            uiSchema?.["ui:widget"] === "ConditionalAmountWidget",
+          uiSchema?.["ui:widget"] === "MoneyWidget",
           uiSchema?.["ui:widget"] === "PercentageWidget"
         );
       } else {

diff --git a/app/lib/theme/FormWithTheme.tsx b/app/lib/theme/FormWithTheme.tsx
@@ -11,7 +11,6 @@ import SelectParentWidget from "lib/theme/widgets/SelectParentWidget";
 import MoneyWidget from "lib/theme/widgets/MoneyWidget";
 import PhoneNumberWidget from "lib/theme/widgets/PhoneNumberWidget";
 import DueDateWidget from "lib/theme/widgets/DueDateWidget";
-import ConditionalAmountWidget from "./widgets/ConditionalAmountWidget";
 import DateWidget from "./widgets/DateWidget";
 import { AdjustableCalculatedValueWidget } from "./widgets/AdjustableCalculatedValueWidget";
 import ReadOnlyCalculatedValueWidget from "./widgets/ReadOnlyCalculatedValueWidget";
@@ -31,7 +30,6 @@ const formTheme: ThemeProps = {
     SelectWidget: SelectWidget,
     SelectParentWidget: SelectParentWidget,
     MoneyWidget: MoneyWidget,
-    ConditionalAmountWidget: ConditionalAmountWidget,
     PhoneNumberWidget,
     DueDateWidget: DueDateWidget,
     DateWidget,

diff --git a/app/lib/theme/ReadOnlyTheme.tsx b/app/lib/theme/ReadOnlyTheme.tsx
@@ -25,7 +25,6 @@ const readOnlyTheme: ThemeProps = {
     PhoneNumberWidget: ReadOnlyWidget,
     SelectRfpWidget: ReadOnlyWidget,
     SelectProjectStatusWidget: ReadOnlyWidget,
-    ConditionalAmountWidget: ReadOnlyMoneyWidget,
     DueDateWidget: ReadOnlyDateWidget,
     DateWidget: ReadOnlyDateWidget,
     AdjustableCalculatedValueWidget: ReadOnlyAdjustableCalculatedValueWidget,

diff --git a/app/lib/theme/widgets/ConditionalAmountWidget.tsx b/app/lib/theme/widgets/ConditionalAmountWidget.tsx