Merge branch 'dev' into pass-render-other-first

lib/components/user/monitored-trip/trip-status-rendering-strategies/base-renderer.js

@@ -4,18 +4,6 @@ import React from 'react'
 
 import FormattedDuration from '../../../util/formatted-duration'
 
-/**
- * Helper function that changes alert timestamps from milliseconds to seconds
- * for display using the alerts body component from itinerary-body.
- */
-function withAlertTimestampsInSeconds(alert) {
-  return {
-    ...alert,
-    effectiveEndDate: alert.effectiveEndDate / 1000,
-    effectiveStartDate: alert.effectiveStartDate / 1000
-  }
-}
-
 /**
  * Calculate commonly-used pieces of data used to render the trip status
  * component. The monitoredTrip param can be undefined.
@@ -63,9 +51,7 @@ export default function baseRenderer(monitoredTrip) {
 
   // Set some alert data if the matching itinerary exists.
   // (Convert alert timestamps in milliseconds to seconds for display using alerts body.)
-  data.alerts = data.matchingItinerary?.alerts?.map(
-    withAlertTimestampsInSeconds
-  )
+  data.alerts = data.matchingItinerary?.alerts
   data.hasMoreThanOneAlert = !!(data.alerts?.length > 0)
   data.shouldRenderAlerts = data.hasMoreThanOneAlert
 

lib/util/i18n.js

@@ -97,8 +97,9 @@ async function loadOtpUiLocaleData(matchedLocale) {
       .filter((pkg) => pkg.startsWith('@opentripplanner'))
       .map(async (pkg) => {
         try {
+          const packagePath = pkg.replace('@opentripplanner/', '')
           const msgs = await import(
-            `../../node_modules/${pkg}/i18n/${matchedLocale}.yml`
+            `@opentripplanner/${packagePath}/i18n/${matchedLocale}.yml`
           )
           if (msgs) return msgs.default
         } catch (ex) {