Merge branch 'develop' into release

urfit-tech · Jan 13, 2025 · a3d1123 · a3d1123
2 parents 1acc7f4 + 13b4cb6
commit a3d1123
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/pages/NewMemberContractCreationPage/MemberContractCreationBlock.tsx b/src/pages/NewMemberContractCreationPage/MemberContractCreationBlock.tsx
@@ -50,8 +50,8 @@ const MemberContractCreationBlock: React.FC<{
   const customSetting: { paymentCompanies: PaymentCompany[] } = JSON.parse(settings['custom'] || '{}')
 
   const paymentCompany = customSetting.paymentCompanies
-    .find(c => !!c.companies.find(company => company.name === fieldValue.company))
-    ?.companies.find(company => company.name === fieldValue.company)
+    ?.find(c => !!c.companies.find(company => company.name === fieldValue.company))
+    ?.companies.find(company => company.name === fieldValue.company) || null
 
   console.log(paymentCompany)
   // Invoice Tax Calculation