From 0878e81fb0c90d098b10030bf2e7a3defcc9eb35 Mon Sep 17 00:00:00 2001
From: Rodrigo Fuentes <rodrigo.fuentes@globalfishingwatch.org>
Date: Fri, 10 Sep 2021 09:12:09 -0300
Subject: [PATCH 1/2] Fix region names in events

---
 .../vessels/activity/vessels-activity.selectors.ts        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts b/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts
index 0554b4c11c..e06c320576 100644
--- a/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts
+++ b/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts
@@ -13,7 +13,7 @@ import { selectActiveTrackDataviews } from 'features/dataviews/dataviews.selecto
 import { ActivityEvent, Regions } from 'types/activity'
 import { selectEEZs, selectMPAs, selectRFMOs } from 'features/regions/regions.selectors'
 import { getEEZName } from 'utils/region-name-transform'
-import { Region } from 'features/regions/regions.slice'
+import { Region, RegionId } from 'features/regions/regions.slice'
 import { selectSettings } from 'features/settings/settings.slice'
 import { filterActivityHighlightEvents } from './vessels-highlight.worker'
 
@@ -200,7 +200,7 @@ const getEventRegionDescription = (
   rfmos: Region[],
   mpas: Region[]
 ) => {
-  const getRegionNamesByType = (regionType: string, values: string[]) => {
+  const getRegionNamesByType = (regionType: string, values: RegionId[]) => {
     switch (regionType) {
       case 'eez':
         return values
@@ -236,7 +236,9 @@ const getEventRegionDescription = (
       (regionType) =>
         `${getRegionNamesByType(
           regionType,
-          event?.regions[regionType].filter((x: string) => x.length > 0)
+          event?.regions[regionType]
+            .map((regionId) => `${regionId}`)
+            .filter((x: string) => x.length > 0)
         )}`
     )
     .pop()

From 2db2a0c6df3b2c7962e4900687f775c2d3c60f1a Mon Sep 17 00:00:00 2001
From: Rodrigo Fuentes <rodrigo.fuentes@globalfishingwatch.org>
Date: Fri, 10 Sep 2021 09:52:10 -0300
Subject: [PATCH 2/2] cleanup

---
 .../features/vessels/activity/vessels-activity.selectors.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts b/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts
index e06c320576..5dac52ecf9 100644
--- a/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts
+++ b/applications/vessel-history/src/features/vessels/activity/vessels-activity.selectors.ts
@@ -200,7 +200,7 @@ const getEventRegionDescription = (
   rfmos: Region[],
   mpas: Region[]
 ) => {
-  const getRegionNamesByType = (regionType: string, values: RegionId[]) => {
+  const getRegionNamesByType = (regionType: string, values: string[]) => {
     switch (regionType) {
       case 'eez':
         return values
@@ -218,7 +218,7 @@ const getEventRegionDescription = (
         )
       case 'mpa':
         return values
-          .map((mpaId) => mpas.find((eez) => eez.id.toString() === mpaId)?.label ?? '')
+          .map((mpaId) => mpas.find((mpa) => mpa.id.toString() === mpaId)?.label ?? '')
           .filter((value) => value.length > 0)
           .join(', ')
       default: