From df7a1710ca01c62354819c6059be3c79598565ee Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Wed, 29 May 2024 08:55:02 +0700 Subject: [PATCH 1/2] updated required condition --- src/pages/EditReportFieldPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx index 6cc93d05ebbc..063347f3833e 100644 --- a/src/pages/EditReportFieldPage.tsx +++ b/src/pages/EditReportFieldPage.tsx @@ -130,7 +130,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps) fieldName={Str.UCFirst(reportField.name)} fieldKey={fieldKey} fieldValue={fieldValue} - isRequired={!reportField.deletable} + isRequired={!isReportFieldDeletable} onSubmit={handleReportFieldChange} /> )} @@ -140,7 +140,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps) fieldName={Str.UCFirst(reportField.name)} fieldKey={fieldKey} fieldValue={fieldValue} - isRequired={!reportField.deletable} + isRequired={!isReportFieldDeletable} onSubmit={handleReportFieldChange} /> )} From 87385999cef9d676d1595b67d6b3ce3c34ad36f6 Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Wed, 29 May 2024 21:51:10 +0700 Subject: [PATCH 2/2] revert --- src/pages/EditReportFieldPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx index 063347f3833e..53b8043c9162 100644 --- a/src/pages/EditReportFieldPage.tsx +++ b/src/pages/EditReportFieldPage.tsx @@ -140,7 +140,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps) fieldName={Str.UCFirst(reportField.name)} fieldKey={fieldKey} fieldValue={fieldValue} - isRequired={!isReportFieldDeletable} + isRequired={!reportField.deletable} onSubmit={handleReportFieldChange} /> )}