Merge remote-tracking branch 'origin/main' into claude-addAbsoluteFillToAttachmentLoading

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

# Conflicts:
#	src/components/ReportActionItem/IssueCardMessage.tsx
#	src/libs/ReportActionsUtils.ts
#	src/pages/MissingPersonalDetails/subPages/DateOfBirth.tsx
#	src/pages/MissingPersonalDetails/utils.ts
#	src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx
#	tests/unit/ReportActionsUtilsTest.ts

Author: MelvinBot

src/components/ReportActionItem/IssueCardMessage.tsx

@@ -36,7 +36,8 @@ function IssueCardMessage({action, policyID, shouldNavigateToCardDetails}: Issue
     const cardList = useNonPersonalCardList();
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
     const companyCard = cardList?.[(getOriginalMessage(action) as IssueNewCardOriginalMessage)?.cardID];
-    const shouldShowAddMissingDetailsButton = !!expensifyCard?.cardID && isAssigneeCurrentUser && shouldShowAddMissingDetails(action?.actionName, privatePersonalDetails);
+    const shouldShowAddMissingDetailsButton =
+        !!expensifyCard?.cardID && isAssigneeCurrentUser && shouldShowAddMissingDetails(action?.actionName, privatePersonalDetails, expensifyCard?.state);
     const shouldShowActivateButton = isAssigneeCurrentUser && shouldShowActivateCard(action?.actionName, expensifyCard, privatePersonalDetails);
 
     const route = useRoute<PlatformStackRouteProp<ReportsSplitNavigatorParamList, typeof SCREENS.REPORT>>();

src/libs/ReportActionsUtils.ts

@@ -4231,9 +4231,9 @@ function isCardIssuedAction(
     );
 }
 
-function shouldShowAddMissingDetails(actionName?: ReportActionName, privatePersonalDetail?: PrivatePersonalDetails) {
+function shouldShowAddMissingDetails(actionName?: ReportActionName, privatePersonalDetail?: PrivatePersonalDetails, cardState?: ValueOf<typeof CONST.EXPENSIFY_CARD.STATE>) {
     const missingDetails = arePersonalDetailsMissing(privatePersonalDetail);
-    return actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails;
+    return actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && (missingDetails || cardState === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED);
 }
 
 function shouldShowActivateCard(actionName?: ReportActionName, card?: Card, privatePersonalDetail?: PrivatePersonalDetails) {

src/pages/MissingPersonalDetails/subPages/DateOfBirth.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import DateOfBirthStep from '@components/SubStepForms/DateOfBirthStep';
 import useLocalize from '@hooks/useLocalize';
 import usePersonalDetailsFormSubmit from '@hooks/usePersonalDetailsFormSubmit';
+import {isValidPastDate, meetsMaximumAgeRequirement, meetsMinimumAgeRequirement} from '@libs/ValidationUtils';
 import type {CustomSubPageProps} from '@pages/MissingPersonalDetails/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
@@ -17,6 +18,9 @@ function DateOfBirth({isEditing, onNext, onMove, personalDetailsValues}: CustomS
         shouldSaveDraft: true,
     });
 
+    const dobValue = personalDetailsValues[INPUT_IDS.DATE_OF_BIRTH];
+    const isValidDOB = dobValue !== '' && isValidPastDate(dobValue) && meetsMaximumAgeRequirement(dobValue) && meetsMinimumAgeRequirement(dobValue);
+
     return (
         <DateOfBirthStep<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>
             isEditing={isEditing}
@@ -27,7 +31,7 @@ function DateOfBirth({isEditing, onNext, onMove, personalDetailsValues}: CustomS
             onSubmit={handleSubmit}
             stepFields={STEP_FIELDS}
             dobInputID={INPUT_IDS.DATE_OF_BIRTH}
-            dobDefaultValue={personalDetailsValues[INPUT_IDS.DATE_OF_BIRTH]}
+            dobDefaultValue={isValidDOB ? dobValue : ''}
         />
     );
 }

src/pages/MissingPersonalDetails/utils.ts

@@ -1,5 +1,6 @@
 import type {OnyxEntry} from 'react-native-onyx';
 import {getCurrentAddress} from '@libs/PersonalDetailsUtils';
+import {isValidPastDate, meetsMaximumAgeRequirement, meetsMinimumAgeRequirement} from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import type {PersonalDetailsForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
@@ -27,7 +28,8 @@ function getInitialSubPage(values: PersonalDetailsForm, shouldCollectPin = false
     if (values[INPUT_IDS.LEGAL_FIRST_NAME] === '' || values[INPUT_IDS.LEGAL_LAST_NAME] === '') {
         return CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME;
     }
-    if (values[INPUT_IDS.DATE_OF_BIRTH] === '') {
+    const dobValue = values[INPUT_IDS.DATE_OF_BIRTH];
+    if (dobValue === '' || !isValidPastDate(dobValue) || !meetsMaximumAgeRequirement(dobValue) || !meetsMinimumAgeRequirement(dobValue)) {
         return CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.DATE_OF_BIRTH;
     }
     if (

tests/unit/ReportActionsUtilsTest.ts

@@ -1485,7 +1485,7 @@ describe('ReportActionsUtils', () => {
             const res = ReportActionsUtils.shouldShowAddMissingDetails(CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS, mockPersonalDetail);
             expect(res).toEqual(true);
         });
-        it('should return false if personal detail is completed', () => {
+        it('should still return true when personal detail is completed but has not been confirmed yet', () => {
             const mockPersonalDetail = {
                 addresses: [
                     {
@@ -1500,7 +1500,27 @@ describe('ReportActionsUtils', () => {
                 phoneNumber: '+162992973',
                 dob: '9-9-2000',
             };
-            const res = ReportActionsUtils.shouldShowAddMissingDetails(CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS, mockPersonalDetail);
+            const cardState = CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED;
+            const res = ReportActionsUtils.shouldShowAddMissingDetails(CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS, mockPersonalDetail, cardState);
+            expect(res).toEqual(true);
+        });
+        it('should return false if personal detail is completed and has been confirmed by the user', () => {
+            const mockPersonalDetail = {
+                addresses: [
+                    {
+                        street: '123 Main St',
+                        city: 'New York',
+                        state: 'NY',
+                        postalCode: '10001',
+                    },
+                ],
+                legalFirstName: 'John',
+                legalLastName: 'David',
+                phoneNumber: '+162992973',
+                dob: '9-9-2000',
+            };
+            const cardState = CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED;
+            const res = ReportActionsUtils.shouldShowAddMissingDetails(CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS, mockPersonalDetail, cardState);
             expect(res).toEqual(false);
         });
     });