diff --git a/frontend/public/archived_reporting_with_mission_attached.svg b/frontend/public/archived_reporting_with_mission_attached.svg
new file mode 100644
index 000000000..47dcdb35c
--- /dev/null
+++ b/frontend/public/archived_reporting_with_mission_attached.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/src/features/Reportings/ReportingForm/AttachMission/AttachedMissionCard.tsx b/frontend/src/features/Reportings/ReportingForm/AttachMission/AttachedMissionCard.tsx
index ebe53a304..12ad1cf0f 100644
--- a/frontend/src/features/Reportings/ReportingForm/AttachMission/AttachedMissionCard.tsx
+++ b/frontend/src/features/Reportings/ReportingForm/AttachMission/AttachedMissionCard.tsx
@@ -61,7 +61,9 @@ export function AttachedMissionCard({
- Mission {missionTypesToString(missionTypes)} – {missionDurationText}
+
+ Mission {missionTypesToString(missionTypes)} – {missionDurationText}
+
@@ -97,7 +99,9 @@ const NoContact = styled.div`
`
const Details = styled.div`
color: ${p => p.theme.color.slateGray};
- white-space: nowrap;
+ display: flex;
+ flex: 2;
+ flex-direction: column;
`
const Title = styled.div`
diff --git a/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx b/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx
index 6b454d214..d668c9dbd 100644
--- a/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx
+++ b/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx
@@ -33,8 +33,8 @@ export function AttachMission({ setIsAttachNewMission }) {
}
const unattachMission = () => {
- setFieldValue('attachedMissionId', undefined)
- setFieldValue('attachedMission', undefined)
+ dispatch(attachMissionToReportingSliceActions.setAttachedMissionId(undefined))
+ dispatch(attachMissionToReportingSliceActions.setAttachedMission(undefined))
}
const createMission = async () => {
diff --git a/frontend/src/features/map/layers/Reportings/style.ts b/frontend/src/features/map/layers/Reportings/style.ts
index 4b68d285d..5407b12ca 100644
--- a/frontend/src/features/map/layers/Reportings/style.ts
+++ b/frontend/src/features/map/layers/Reportings/style.ts
@@ -165,7 +165,7 @@ export const reportingPinStyleFn = feature => {
if (feature.get('attachedMissionId')) {
if (status === ReportingStatusEnum.ARCHIVED) {
- return reportingStyleFactory(THEME.color.mediumSeaGreen, 'archived_reporting_observation.svg')
+ return reportingStyleFactory(THEME.color.white, 'archived_reporting_with_mission_attached.svg')
}
return reportingStyleFactory(THEME.color.mediumSeaGreen)
diff --git a/frontend/src/features/missions/MissionForm/ActionCards/ReportingCard.tsx b/frontend/src/features/missions/MissionForm/ActionCards/ReportingCard.tsx
index 1ad974344..be1c3e84e 100644
--- a/frontend/src/features/missions/MissionForm/ActionCards/ReportingCard.tsx
+++ b/frontend/src/features/missions/MissionForm/ActionCards/ReportingCard.tsx
@@ -27,7 +27,7 @@ export function ReportingCard({
...(action.theme && {
themes: [
{
- subThemes: action.subThemes,
+ subThemes: action.subThemes || [],
theme: action.theme
}
]