From e2bd35f267a72ddd237f8fa98915eb95ddf4b3d9 Mon Sep 17 00:00:00 2001
From: Loup Theron <loup-rodney@hotmail.fr>
Date: Thu, 23 Jan 2025 11:24:40 +0100
Subject: [PATCH] Fix cypress tests

---
 .../manual_prior_notification_form/form.spec.ts          | 5 +++++
 .../side_window/mission_form/sea_control_edition.spec.ts | 9 ++-------
 .../components/ManualPriorNotificationForm/utils.tsx     | 7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/frontend/cypress/e2e/side_window/manual_prior_notification_form/form.spec.ts b/frontend/cypress/e2e/side_window/manual_prior_notification_form/form.spec.ts
index b04a4f2d60..cbef9c5cc4 100644
--- a/frontend/cypress/e2e/side_window/manual_prior_notification_form/form.spec.ts
+++ b/frontend/cypress/e2e/side_window/manual_prior_notification_form/form.spec.ts
@@ -433,6 +433,11 @@ context('Side Window > Manual Prior Notification Form > Form', () => {
 
     cy.fill('Engins utilisés', ['OTB'], { index: 1 })
 
+    const { utcDateTupleWithTime: arrivalDateTupleWithTime } =
+      getUtcDateInMultipleFormats(customDayjs().add(2, 'hours').startOf('minute').toISOString())
+    cy.fill("Date et heure estimées d'arrivée au port (UTC)", arrivalDateTupleWithTime)
+    cy.fill("équivalentes à celles de l'arrivée au port", true)
+
     cy.wait('@computePriorNotification')
     cy.countRequestsByAlias('@computePriorNotification').should('be.equal', 1)
 
diff --git a/frontend/cypress/e2e/side_window/mission_form/sea_control_edition.spec.ts b/frontend/cypress/e2e/side_window/mission_form/sea_control_edition.spec.ts
index aa4e8d6113..52215e4e11 100644
--- a/frontend/cypress/e2e/side_window/mission_form/sea_control_edition.spec.ts
+++ b/frontend/cypress/e2e/side_window/mission_form/sea_control_edition.spec.ts
@@ -82,7 +82,7 @@ context('Side Window > Mission Form > Sea Control Edition', () => {
           otherComments: 'Commentaires post contrôle',
           otherInfractions: [],
           portLocode: null,
-          segments: [{ segment: 'SWW04', segmentName: 'SWW04' }],
+          segments: [],
           seizureAndDiversion: false,
           seizureAndDiversionComments: null,
           separateStowageOfPreservedSpecies: 'NO',
@@ -179,12 +179,7 @@ context('Side Window > Mission Form > Sea Control Edition', () => {
           otherComments: 'Commentaires post contrôle',
           otherInfractions: [],
           portLocode: null,
-          segments: [
-            {
-              segment: 'SWW02',
-              segmentName: 'SWW02'
-            }
-          ],
+          segments: [],
           seizureAndDiversion: false,
           seizureAndDiversionComments: null,
           separateStowageOfPreservedSpecies: 'NO',
diff --git a/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/utils.tsx b/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/utils.tsx
index 004d12ad2e..eb4cfbc61a 100644
--- a/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/utils.tsx
+++ b/frontend/src/features/PriorNotification/components/ManualPriorNotificationForm/utils.tsx
@@ -12,14 +12,19 @@ import { INITIAL_FORM_VALUES } from './constants'
 import type { ManualPriorNotificationFormValues, ManualPriorNotificationFormValuesFishingCatch } from './types'
 
 export function getPartialComputationRequestData({
+  expectedArrivalDate,
   expectedLandingDate,
   fishingCatches,
   globalFaoArea,
+  isExpectedLandingDateSameAsExpectedArrivalDate,
   portLocode,
   tripGearCodes,
   vesselIdentity
 }: ManualPriorNotificationFormValues) {
-  const year = expectedLandingDate ? customDayjs(expectedLandingDate).get('year') : undefined
+  const computedExpectedLandingDate = isExpectedLandingDateSameAsExpectedArrivalDate
+    ? expectedArrivalDate
+    : expectedLandingDate
+  const year = computedExpectedLandingDate ? customDayjs(computedExpectedLandingDate).get('year') : undefined
 
   return {
     fishingCatches,