Merge branch 'feature/contracts' into develop

code4romania · Sep 30, 2024 · 2e984a2 · 2e984a2
2 parents 6143b68 + c454b90
commit 2e984a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/frontend/src/components/DocumentContractsTable.tsx b/frontend/src/components/DocumentContractsTable.tsx
@@ -235,6 +235,9 @@ const DocumentContractsTable = ({ query, setQuery }: DocumentContractsTableBasic
         case DocumentContractStatusForFilter.REJECTED_VOLUNTEER:
         case DocumentContractStatusForFilter.PENDING_APPROVAL_NGO:
         case DocumentContractStatusForFilter.PENDING_NGO_REPRESENTATIVE_SIGNATURE:
+        case DocumentContractStatusForFilter.ACTIVE:
+        case DocumentContractStatusForFilter.NOT_STARTED:
+        case DocumentContractStatusForFilter.EXPIRED:
           return contractsMenuItems;
         default:
           return [];

diff --git a/mobile/src/common/utils/document-contracts.helpers.ts b/mobile/src/common/utils/document-contracts.helpers.ts
@@ -123,6 +123,9 @@ export const renderContractInfoText = (contract: DocumentContract, t: any) => {
 };
 
 export const isIdentityDataIncomplete = (userProfile: IUserProfile) => {
+  if (!userProfile || !userProfile?.userPersonalData) {
+    return true;
+  }
   // required fields for all users
   const defaultRequiredFields = [
     'cnp',
@@ -145,7 +148,9 @@ export const isIdentityDataIncomplete = (userProfile: IUserProfile) => {
     'address',
   ];
 
-  const isUserOver16 = isOver16FromCNP(userProfile ? userProfile?.userPersonalData.cnp : '');
+  const isUserOver16 = isOver16FromCNP(
+    userProfile && userProfile?.userPersonalData.cnp ? userProfile?.userPersonalData?.cnp : '',
+  );
 
   // check if all required fields are present in userProfile.userPersonalData object
   const isMissingRequiredFields = defaultRequiredFields.some(