From 67d3b603eea14f8e9c44668df4940f2787034599 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:28:14 -0400
Subject: [PATCH 01/35] fix(actions/ui): Delete ui_itineraryView URL param if
 same as default.

---
 lib/actions/ui.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index 1da4359f2..76ac04f9f 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -308,7 +308,12 @@ export function setItineraryView(value) {
     // set the desired ui query param
     // and store the current view as previousItineraryView.
     if (value !== urlParams.ui_itineraryView) {
-      urlParams.ui_itineraryView = value
+      if (value !== ItineraryView.LIST) {
+        urlParams.ui_itineraryView = value
+      } else if (urlParams.ui_itineraryView) {
+        // Remove the ui_itineraryView param if it is set to LIST (default).
+        delete urlParams.ui_itineraryView
+      }
 
       dispatch(setUrlSearch(urlParams))
       dispatch(setPreviousItineraryView(prevItineraryView))

From d7b242de78a66483f0907c13f7cf37d9e0d5d84a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 28 Jun 2023 09:00:18 -0400
Subject: [PATCH 02/35] improvement(DepartureTimesList): Set time interaction
 based on allStarttimes+expanded prop.

---
 .../narrative/metro/departure-times-list.tsx  | 139 +++++++++++-------
 .../narrative/metro/metro-itinerary.tsx       |   7 +-
 lib/components/narrative/utils.tsx            |  21 ---
 3 files changed, 88 insertions(+), 79 deletions(-)

diff --git a/lib/components/narrative/metro/departure-times-list.tsx b/lib/components/narrative/metro/departure-times-list.tsx
index ac33038eb..be754892a 100644
--- a/lib/components/narrative/metro/departure-times-list.tsx
+++ b/lib/components/narrative/metro/departure-times-list.tsx
@@ -1,9 +1,8 @@
-import { FormattedList, FormattedTime, useIntl } from 'react-intl'
+import { FormattedList, useIntl } from 'react-intl'
 import { Itinerary, Leg } from '@opentripplanner/types'
-import React, { MouseEvent } from 'react'
+import React, { MouseEvent, useCallback } from 'react'
 
 import { firstTransitLegIsRealtime } from '../../../util/viewer'
-import { getDepartureLabelText } from '../utils'
 import {
   getFirstLegStartTime,
   getLastLegEndTime
@@ -14,44 +13,86 @@ interface ItineraryWithIndex extends Itinerary {
   index: number
 }
 
+interface StartTime {
+  itinerary: ItineraryWithIndex
+  legs: Leg[]
+  realtime: boolean
+}
+
+export type SetActiveItineraryHandler = (payload: { index: number }) => void
+
 type DepartureTimesProps = {
+  expanded?: boolean
   itinerary: ItineraryWithIndex & {
-    allStartTimes?: {
-      itinerary: ItineraryWithIndex
-      legs: Leg[]
-      realtime: boolean
-    }[]
+    allStartTimes?: StartTime[]
   }
-  setActiveItinerary: (payload: { index: number }) => void
+  setActiveItinerary: SetActiveItineraryHandler
   showArrivals?: boolean
 }
 
-export const DepartureTimesList = ({
+interface TimeButtonProps {
+  active?: boolean
+  displayedTime: number
+  itinerary: ItineraryWithIndex
+  realTime?: boolean
+  setActiveItinerary?: SetActiveItineraryHandler
+}
+
+const TimeButton = ({
+  active,
+  displayedTime,
+  itinerary,
+  realTime,
+  setActiveItinerary
+}: TimeButtonProps) => {
+  const intl = useIntl()
+  const classNames = []
+  if (realTime) classNames.push('realtime')
+  if (active) classNames.push('active')
+  const timeString = intl.formatTime(displayedTime)
+  const realtimeStatus = realTime
+    ? intl.formatMessage({ id: 'components.StopTimeCell.realtime' })
+    : intl.formatMessage({ id: 'components.StopTimeCell.scheduled' })
+  const label = `${timeString} (${realtimeStatus})`
+
+  const handleClick = useCallback(
+    (e: MouseEvent) => {
+      setActiveItinerary && setActiveItinerary(itinerary)
+      // Don't let MetroItinerary.handleClick execute, it will set another itinerary as active.
+      e.stopPropagation()
+    },
+    [itinerary, setActiveItinerary]
+  )
+  // If setActiveItinerary is set, use a button, otherwise render the time as span without interaction.
+  const Wrapper = setActiveItinerary ? 'button' : 'span'
+
+  return (
+    <Wrapper
+      className={classNames.length ? classNames.join(' ') : undefined}
+      onClick={setActiveItinerary ? handleClick : undefined}
+      title={label}
+    >
+      {timeString}
+      <InvisibleA11yLabel> ({realtimeStatus})</InvisibleA11yLabel>
+    </Wrapper>
+  )
+}
+
+const DepartureTimesList = ({
+  expanded,
   itinerary,
   setActiveItinerary,
   showArrivals
 }: DepartureTimesProps): JSX.Element => {
-  const intl = useIntl()
-  const isRealTime = firstTransitLegIsRealtime(itinerary)
-  const itineraryButtonLabel = getDepartureLabelText(
-    intl,
-    itinerary.startTime,
-    isRealTime
-  )
   if (!itinerary.allStartTimes) {
     return (
-      <>
-        <span
-          aria-hidden
-          className={isRealTime ? 'realtime active' : 'active'}
-          title={itineraryButtonLabel}
-        >
-          <FormattedTime
-            value={showArrivals ? itinerary.endTime : itinerary.startTime}
-          />
-        </span>
-        <InvisibleA11yLabel>{itineraryButtonLabel}</InvisibleA11yLabel>
-      </>
+      <TimeButton
+        active
+        displayedTime={showArrivals ? itinerary.endTime : itinerary.startTime}
+        itinerary={itinerary}
+        realTime={firstTransitLegIsRealtime(itinerary)}
+        setActiveItinerary={expanded ? undefined : setActiveItinerary}
+      />
     )
   }
 
@@ -60,36 +101,22 @@ export const DepartureTimesList = ({
       type="disjunction"
       value={itinerary.allStartTimes.map((time, index) => {
         const { itinerary: itinOption, legs, realtime } = time
-        const classNames = []
-        if (realtime) classNames.push('realtime')
-        if (itinOption.index === itinerary.index) classNames.push('active')
-        const singleItinLabel = getDepartureLabelText(
-          intl,
-          getFirstLegStartTime(legs),
-          realtime
-        )
+        const displayedTime = showArrivals
+          ? getLastLegEndTime(legs)
+          : getFirstLegStartTime(legs)
         return (
-          <button
-            aria-label={singleItinLabel}
-            className={classNames.join(' ')}
-            key={getFirstLegStartTime(legs)}
-            onClick={(e: MouseEvent) => {
-              setActiveItinerary(itinOption)
-              // Don't let MetroItinerary.handleClick execute, it will set another itinerary as active.
-              e.stopPropagation()
-            }}
-            title={singleItinLabel}
-          >
-            <FormattedTime
-              value={
-                showArrivals
-                  ? getLastLegEndTime(legs)
-                  : getFirstLegStartTime(legs)
-              }
-            />
-          </button>
+          <TimeButton
+            active={itinOption.index === itinerary.index}
+            displayedTime={displayedTime}
+            itinerary={itinOption}
+            key={displayedTime}
+            realTime={realtime}
+            setActiveItinerary={setActiveItinerary}
+          />
         )
       })}
     />
   )
 }
+
+export default DepartureTimesList
diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index bcf87d9fb..3e81f9d3d 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -28,12 +28,14 @@ import ItineraryBody from '../line-itin/connected-itinerary-body'
 import NarrativeItinerary from '../narrative-itinerary'
 import SimpleRealtimeAnnotation from '../simple-realtime-annotation'
 
-import { DepartureTimesList } from './departure-times-list'
 import {
   getFirstTransitLegStop,
   getFlexAttirbutes,
   removeInsignifigantWalkLegs
 } from './attribute-utils'
+import DepartureTimesList, {
+  SetActiveItineraryHandler
+} from './departure-times-list'
 import MetroItineraryRoutes from './metro-itinerary-routes'
 import RouteBlock from './route-block'
 
@@ -191,7 +193,7 @@ type Props = {
   intl: IntlShape
   itinerary: Itinerary
   mini?: boolean
-  setActiveItinerary: () => void
+  setActiveItinerary: SetActiveItineraryHandler
   setActiveLeg: (leg: Leg) => void
   setItineraryView: (view: string) => void
   showRealtimeAnnotation: () => void
@@ -428,6 +430,7 @@ class MetroItinerary extends NarrativeItinerary {
                     <FormattedMessage id="components.MetroUI.leaveAt" />
                   )}{' '}
                   <DepartureTimesList
+                    expanded={expanded}
                     itinerary={itinerary}
                     setActiveItinerary={setActiveItinerary}
                     showArrivals={arrivesAt}
diff --git a/lib/components/narrative/utils.tsx b/lib/components/narrative/utils.tsx
index 35f15d441..247406dfc 100644
--- a/lib/components/narrative/utils.tsx
+++ b/lib/components/narrative/utils.tsx
@@ -42,24 +42,3 @@ export function localizeGradationMap(
   })
   return newGradationMap
 }
-
-/**
- * Takes the itinerary start time and returns a label for button title and
- * screen readers that indicates whether the departure time is based on realtime
- * or scheduled data.
- * @param intl React-Intl object
- * @param time Itinerary start time
- * @param realTime Whether the itinerary is based on realtime data
- * @returns string with time and realtime/schedule status
- */
-export const getDepartureLabelText = (
-  intl: IntlShape,
-  time: any,
-  realTime: boolean
-): string => {
-  return `${intl.formatTime(time)} ${
-    realTime
-      ? `(${intl.formatMessage({ id: 'components.StopTimeCell.realtime' })})`
-      : `(${intl.formatMessage({ id: 'components.StopTimeCell.scheduled' })})`
-  }`
-}

From 6a00e9a7a18af632204b9d9938572679334e60c9 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 28 Jun 2023 11:56:09 -0500
Subject: [PATCH 03/35] fix: restore walk icon to short trips

---
 lib/components/narrative/metro/metro-itinerary.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index c212ebc8a..32ff43113 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -29,11 +29,7 @@ import NarrativeItinerary from '../narrative-itinerary'
 import SimpleRealtimeAnnotation from '../simple-realtime-annotation'
 
 import { DepartureTimesList } from './departure-times-list'
-import {
-  getFirstTransitLegStop,
-  getFlexAttirbutes,
-  removeInsignifigantWalkLegs
-} from './attribute-utils'
+import { getFirstTransitLegStop, getFlexAttirbutes } from './attribute-utils'
 import MetroItineraryRoutes from './metro-itinerary-routes'
 import RouteBlock from './route-block'
 
@@ -308,7 +304,6 @@ class MetroItinerary extends NarrativeItinerary {
     )
 
     const firstTransitStop = getFirstTransitLegStop(itinerary)
-    const routeLegs = itinerary.legs.filter(removeInsignifigantWalkLegs)
 
     const handleClick = () => {
       setActiveItinerary(itinerary)
@@ -445,7 +440,7 @@ class MetroItinerary extends NarrativeItinerary {
                 <SecondaryInfo as="span">
                   <ItineraryDescription itinerary={itinerary} />
                 </SecondaryInfo>
-                {this._renderMainRouteBlock(routeLegs)}
+                {this._renderMainRouteBlock(itinerary.legs)}
               </ItineraryGridSmall>
             )}
           </ItineraryWrapper>

From e5a751a1003a8dc4f017462882d784abac3ffe07 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 28 Jun 2023 15:57:26 -0400
Subject: [PATCH 04/35] fix(actions/narrative): Unset ui_itinearyView when
 changing the active itin.

---
 lib/actions/narrative.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/actions/narrative.js b/lib/actions/narrative.js
index bc0057ae9..88418392c 100644
--- a/lib/actions/narrative.js
+++ b/lib/actions/narrative.js
@@ -12,6 +12,12 @@ export function setActiveItinerary(payload) {
     // Update URL params.
     const urlParams = coreUtils.query.getUrlParams()
     urlParams.ui_activeItinerary = payload.index
+    if (payload.index === -1 || payload.index === '-1') {
+      // Remove the ui_itineraryView param if changing to another itinerary.
+      // Note: set to undefined instead of deleting so that it merges with the other search params.
+      urlParams.ui_itineraryView = undefined
+    }
+
     dispatch(setUrlSearch(urlParams))
   }
 }

From cf614f1e93482e437b36c356702c0088e995fb61 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 28 Jun 2023 18:33:08 -0400
Subject: [PATCH 05/35] fix: time picker more expected behavior

---
 .../form/call-taker/date-time-picker.tsx      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/components/form/call-taker/date-time-picker.tsx b/lib/components/form/call-taker/date-time-picker.tsx
index 963da6548..fcfde0aac 100644
--- a/lib/components/form/call-taker/date-time-picker.tsx
+++ b/lib/components/form/call-taker/date-time-picker.tsx
@@ -102,6 +102,7 @@ const DateTimeOptions = ({
   )
   const [date, setDate] = useState<string | undefined>(initialDate)
   const [time, setTime] = useState<string | undefined>(initialTime)
+  const [typedTime, setTypedTime] = useState<string | undefined>(initialTime)
 
   const intl = useIntl()
 
@@ -134,7 +135,16 @@ const DateTimeOptions = ({
   // Update state when external state is updated
   useEffect(() => {
     if (initialDate !== date) setDate(initialDate)
-    if (initialTime !== time) setTime(initialTime)
+    if (initialTime !== time) {
+      setTime(initialTime)
+      setTypedTime(
+        safeFormat(dateTime, timeFormat, {
+          timeZone: homeTimezone
+        }) ||
+          // TODO: there doesn't seem to be an intl object present?
+          'Invalid Time'
+      )
+    }
   }, [initialTime, initialDate])
 
   useEffect(() => {
@@ -201,13 +211,9 @@ const DateTimeOptions = ({
           className="datetime-slim"
           // TODO: Why does this no longer work when set as `value`? Is this a
           // date-fns issue?
-          defaultValue={
-            time && time?.length > 1
-              ? time || format(dateTime, 'H:mm', { timeZone: homeTimezone })
-              : time
-          }
           onChange={(e) => {
             setTime(e.target.value)
+            setTypedTime(e.target.value)
             unsetNow()
           }}
           onFocus={(e) => e.target.select()}
@@ -217,8 +223,9 @@ const DateTimeOptions = ({
             lineHeight: '.8em',
             marginLeft: '3px',
             padding: '0px',
-            width: '50px'
+            width: '65px'
           }}
+          value={typedTime}
         />
       </OverlayTrigger>
       <input

From 71cb9e97d1bb751a45ee79ac2410bc84ca2af70b Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 28 Jun 2023 18:41:10 -0400
Subject: [PATCH 06/35] test: update snapshots

---
 .../__snapshots__/date-time-options.js.snap   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/__tests__/components/__snapshots__/date-time-options.js.snap b/__tests__/components/__snapshots__/date-time-options.js.snap
index bd88def98..3b13e8182 100644
--- a/__tests__/components/__snapshots__/date-time-options.js.snap
+++ b/__tests__/components/__snapshots__/date-time-options.js.snap
@@ -78,7 +78,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="12a"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -91,9 +90,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="12a"
           />
         </OverlayTrigger>
         <input
@@ -195,7 +195,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="12p"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -208,9 +207,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="12p"
           />
         </OverlayTrigger>
         <input
@@ -312,7 +312,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="133"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -325,9 +324,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="133"
           />
         </OverlayTrigger>
         <input
@@ -429,7 +429,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="133p"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -442,9 +441,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="133p"
           />
         </OverlayTrigger>
         <input
@@ -546,7 +546,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="135p"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -559,9 +558,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="135p"
           />
         </OverlayTrigger>
         <input
@@ -663,7 +663,6 @@ exports[`components > form > call-taker > date time options should correctly han
         >
           <input
             className="datetime-slim"
-            defaultValue="1335"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -676,9 +675,10 @@ exports[`components > form > call-taker > date time options should correctly han
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="1335"
           />
         </OverlayTrigger>
         <input
@@ -780,7 +780,6 @@ exports[`components > form > call-taker > date time options should render 1`] =
         >
           <input
             className="datetime-slim"
-            defaultValue="12:34"
             onBlur={[Function]}
             onChange={[Function]}
             onClick={null}
@@ -793,9 +792,10 @@ exports[`components > form > call-taker > date time options should render 1`] =
                 "lineHeight": ".8em",
                 "marginLeft": "3px",
                 "padding": "0px",
-                "width": "50px",
+                "width": "65px",
               }
             }
+            value="12:34"
           />
         </OverlayTrigger>
         <input

From 61e0c184e5dab45ef1b9649d75311417b80d94ce Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 29 Jun 2023 11:37:11 -0400
Subject: [PATCH 07/35] refactor(connect-location-field): support
 `suggestionCount`

---
 lib/components/form/connect-location-field.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/components/form/connect-location-field.js b/lib/components/form/connect-location-field.js
index 74acd4b6e..d7091ee9b 100644
--- a/lib/components/form/connect-location-field.js
+++ b/lib/components/form/connect-location-field.js
@@ -94,6 +94,7 @@ export default function connectLocationField(
       sessionSearches,
       showUserSettings: getShowUserSettings(state),
       stopsIndex: transitIndex.stops,
+      suggestionCount: config.geocoder?.resultsCount,
       UserLocationIconComponent: UserLocationIcon,
       userLocationsAndRecentPlaces: [...userSavedLocations, ...recentPlaces]
     }

From e3fb56e799c9ca9bba37406e68ed2278a5ceddc4 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 29 Jun 2023 12:50:06 -0700
Subject: [PATCH 08/35] fix(apiv2): adds 'headsign' to pattern request

---
 lib/actions/apiV2.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index 67436afe6..1470c41bd 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -609,6 +609,7 @@ export const findRoute = (params) =>
       
           patterns {
             id
+            headsign
             name
             patternGeometry {
               points

From 573656524293ecd87769f6529eb435967a074529 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 30 Jun 2023 06:53:47 -0400
Subject: [PATCH 09/35] fix(NarrativeItineraries): Display itinerary indicated
 in ui_activeItinerary.

---
 lib/components/narrative/narrative-itineraries.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 67e6f6c6e..be04aa9f4 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -368,6 +368,21 @@ class NarrativeItineraries extends Component {
     )
   }
 
+  componentDidUpdate() {
+    // If set in URL, set the active itinerary in the state, once.
+    const { activeItinerary, activeSearch, setActiveItinerary } = this.props
+    const { ui_activeItinerary: uiActiveItinerary } =
+      coreUtils.query.getUrlParams() || {}
+    if (
+      activeSearch &&
+      uiActiveItinerary !== undefined &&
+      uiActiveItinerary !== '-1' &&
+      activeItinerary !== +uiActiveItinerary
+    ) {
+      setActiveItinerary({ index: +uiActiveItinerary })
+    }
+  }
+
   // eslint-disable-next-line complexity
   render() {
     const {

From 7e7831b170c77c8bce54ca2772ae32ac75c5a7be Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:22:57 -0500
Subject: [PATCH 10/35] a11y button fixes

---
 lib/components/narrative/trip-tools.js | 7 +++++++
 lib/components/viewers/RouteRow.js     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/lib/components/narrative/trip-tools.js b/lib/components/narrative/trip-tools.js
index 06f0cdbd6..f204e6aee 100644
--- a/lib/components/narrative/trip-tools.js
+++ b/lib/components/narrative/trip-tools.js
@@ -17,6 +17,7 @@ import React, { Component, useContext, useMemo } from 'react'
 import * as uiActions from '../../actions/ui'
 import { ComponentContext } from '../../util/contexts'
 import { IconWithText } from '../util/styledIcon'
+import InvisibleA11yLabel from '../util/invisible-a11y-label'
 import PopupTriggerText from '../app/popup-trigger-text'
 import startOver from '../util/start-over'
 
@@ -55,6 +56,12 @@ class CopyUrlButton extends Component {
   render() {
     return (
       <div>
+        {/* Announces copy button status to AT */}
+        <InvisibleA11yLabel aria-live="assertive">
+          {this.state.showCopied && (
+            <FormattedMessage id="components.TripTools.linkCopied" />
+          )}
+        </InvisibleA11yLabel>
         <Button
           aria-live={this.state.showCopied ? 'assertive' : undefined}
           className="tool-button"
diff --git a/lib/components/viewers/RouteRow.js b/lib/components/viewers/RouteRow.js
index 9cf9a1967..41dbd0bd7 100644
--- a/lib/components/viewers/RouteRow.js
+++ b/lib/components/viewers/RouteRow.js
@@ -187,6 +187,7 @@ export class RouteRow extends PureComponent {
                   routeShortName: route?.shortName
                 }}
                 mode={getModeFromRoute(route)}
+                role="image"
                 width={28}
               />
             </ModeIconElement>

From 2e2cb14e40a7666562e50934e3d108c57fc0af66 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:30:48 -0500
Subject: [PATCH 11/35] remove unnecessary aria-live

---
 lib/components/narrative/trip-tools.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/components/narrative/trip-tools.js b/lib/components/narrative/trip-tools.js
index f204e6aee..449e63f3c 100644
--- a/lib/components/narrative/trip-tools.js
+++ b/lib/components/narrative/trip-tools.js
@@ -62,11 +62,7 @@ class CopyUrlButton extends Component {
             <FormattedMessage id="components.TripTools.linkCopied" />
           )}
         </InvisibleA11yLabel>
-        <Button
-          aria-live={this.state.showCopied ? 'assertive' : undefined}
-          className="tool-button"
-          onClick={this._onClick}
-        >
+        <Button className="tool-button" onClick={this._onClick}>
           {this.state.showCopied ? (
             <span>
               <IconWithText Icon={Check}>

From f28dc50e4fd1c6121512d0732dfd225347f5e10a Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 30 Jun 2023 13:00:00 -0400
Subject: [PATCH 12/35] =?UTF-8?q?refactor:=20don=E2=80=99t=20update=20time?=
 =?UTF-8?q?=20picker=20if=20still=20typing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/call-taker/date-time-picker.tsx      | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/components/form/call-taker/date-time-picker.tsx b/lib/components/form/call-taker/date-time-picker.tsx
index fcfde0aac..2ed43c70f 100644
--- a/lib/components/form/call-taker/date-time-picker.tsx
+++ b/lib/components/form/call-taker/date-time-picker.tsx
@@ -5,7 +5,7 @@ import { IntlShape, useIntl } from 'react-intl'
 import { isMatch, parse } from 'date-fns'
 import { OverlayTrigger, Tooltip } from 'react-bootstrap'
 import coreUtils from '@opentripplanner/core-utils'
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 
 const { getCurrentDate, OTP_API_DATE_FORMAT, OTP_API_TIME_FORMAT } =
   coreUtils.time
@@ -104,6 +104,8 @@ const DateTimeOptions = ({
   const [time, setTime] = useState<string | undefined>(initialTime)
   const [typedTime, setTypedTime] = useState<string | undefined>(initialTime)
 
+  const timeRef = useRef(null)
+
   const intl = useIntl()
 
   /**
@@ -137,13 +139,17 @@ const DateTimeOptions = ({
     if (initialDate !== date) setDate(initialDate)
     if (initialTime !== time) {
       setTime(initialTime)
-      setTypedTime(
-        safeFormat(dateTime, timeFormat, {
-          timeZone: homeTimezone
-        }) ||
-          // TODO: there doesn't seem to be an intl object present?
-          'Invalid Time'
-      )
+
+      // Don't update if still typing
+      if (timeRef.current !== document.activeElement) {
+        setTypedTime(
+          safeFormat(dateTime, timeFormat, {
+            timeZone: homeTimezone
+          }) ||
+            // TODO: there doesn't seem to be an intl object present?
+            'Invalid Time'
+        )
+      }
     }
   }, [initialTime, initialDate])
 
@@ -153,6 +159,10 @@ const DateTimeOptions = ({
     }
   }, [initialDepartArrive])
 
+  useEffect(() => {
+    if (departArrive === 'NOW') setTypedTime('')
+  }, [departArrive])
+
   // Handler for setting the query parameters
   useEffect(() => {
     if (safeFormat(dateTime, OTP_API_DATE_FORMAT, {}) !== '' && setQueryParam) {
@@ -218,6 +228,7 @@ const DateTimeOptions = ({
           }}
           onFocus={(e) => e.target.select()}
           onKeyDown={onKeyDown}
+          ref={timeRef}
           style={{
             fontSize: 'inherit',
             lineHeight: '.8em',

From 3ccd8d2381d159d2ffdf0a6da7ea8d64462332bb Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 3 Jul 2023 17:33:09 -0400
Subject: [PATCH 13/35] refactor: address pr feedback

---
 .../form/call-taker/date-time-picker.tsx      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/components/form/call-taker/date-time-picker.tsx b/lib/components/form/call-taker/date-time-picker.tsx
index 2ed43c70f..7594fa694 100644
--- a/lib/components/form/call-taker/date-time-picker.tsx
+++ b/lib/components/form/call-taker/date-time-picker.tsx
@@ -139,20 +139,22 @@ const DateTimeOptions = ({
     if (initialDate !== date) setDate(initialDate)
     if (initialTime !== time) {
       setTime(initialTime)
-
-      // Don't update if still typing
-      if (timeRef.current !== document.activeElement) {
-        setTypedTime(
-          safeFormat(dateTime, timeFormat, {
-            timeZone: homeTimezone
-          }) ||
-            // TODO: there doesn't seem to be an intl object present?
-            'Invalid Time'
-        )
-      }
     }
   }, [initialTime, initialDate])
 
+  useEffect(() => {
+    // Don't update if still typing
+    if (timeRef.current !== document.activeElement) {
+      setTypedTime(
+        safeFormat(dateTime, timeFormat, {
+          timeZone: homeTimezone
+        }) ||
+          // TODO: there doesn't seem to be an intl object present?
+          'Invalid Time'
+      )
+    }
+  }, [time])
+
   useEffect(() => {
     if (initialDepartArrive && departArrive !== initialDepartArrive) {
       setDepartArrive(initialDepartArrive)

From f16f7cb6711c2963f73d17b52f19abd15168ddbf Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 3 Jul 2023 17:49:18 -0400
Subject: [PATCH 14/35] test: update snapshots

---
 .../__snapshots__/date-time-options.js.snap        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/__tests__/components/__snapshots__/date-time-options.js.snap b/__tests__/components/__snapshots__/date-time-options.js.snap
index 3b13e8182..b6c3fb84f 100644
--- a/__tests__/components/__snapshots__/date-time-options.js.snap
+++ b/__tests__/components/__snapshots__/date-time-options.js.snap
@@ -93,7 +93,7 @@ exports[`components > form > call-taker > date time options should correctly han
                 "width": "65px",
               }
             }
-            value="12a"
+            value="12:00 AM"
           />
         </OverlayTrigger>
         <input
@@ -210,7 +210,7 @@ exports[`components > form > call-taker > date time options should correctly han
                 "width": "65px",
               }
             }
-            value="12p"
+            value="12:00 PM"
           />
         </OverlayTrigger>
         <input
@@ -327,7 +327,7 @@ exports[`components > form > call-taker > date time options should correctly han
                 "width": "65px",
               }
             }
-            value="133"
+            value="1:03 PM"
           />
         </OverlayTrigger>
         <input
@@ -444,7 +444,7 @@ exports[`components > form > call-taker > date time options should correctly han
                 "width": "65px",
               }
             }
-            value="133p"
+            value="1:33 PM"
           />
         </OverlayTrigger>
         <input
@@ -561,7 +561,7 @@ exports[`components > form > call-taker > date time options should correctly han
                 "width": "65px",
               }
             }
-            value="135p"
+            value="1:35 PM"
           />
         </OverlayTrigger>
         <input
@@ -678,7 +678,7 @@ exports[`components > form > call-taker > date time options should correctly han
                 "width": "65px",
               }
             }
-            value="1335"
+            value="1:35 PM"
           />
         </OverlayTrigger>
         <input
@@ -795,7 +795,7 @@ exports[`components > form > call-taker > date time options should render 1`] =
                 "width": "65px",
               }
             }
-            value="12:34"
+            value="12:34 PM"
           />
         </OverlayTrigger>
         <input

From 2566901f17f9c30fdadb5032e85aae82c412e921 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 5 Jul 2023 07:39:28 -0400
Subject: [PATCH 15/35] address pr feedback

---
 example-config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/example-config.yml b/example-config.yml
index 7e1a771a2..232a616fc 100644
--- a/example-config.yml
+++ b/example-config.yml
@@ -177,6 +177,8 @@ geocoder:
   # This allows the location field dropdown headers to be colored based on Pelias layer
   #resultsColors:
   #  stops: "#007fae"
+  # Override the default number (3) of suggestions returned per category
+  #resultsCount: 5
 
 # example config for an ArcGIS geocoder
 # (https://developers.arcgis.com/rest/geocode/api-reference/overview-world-geocoding-service.htm)

From f9902b71643d95de17ed255662418ff2c286273e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 6 Jul 2023 10:39:02 -0400
Subject: [PATCH 16/35] refactor: address pr feedback

---
 lib/components/form/call-taker/date-time-picker.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/components/form/call-taker/date-time-picker.tsx b/lib/components/form/call-taker/date-time-picker.tsx
index 7594fa694..d1be99a3e 100644
--- a/lib/components/form/call-taker/date-time-picker.tsx
+++ b/lib/components/form/call-taker/date-time-picker.tsx
@@ -221,8 +221,6 @@ const DateTimeOptions = ({
       >
         <input
           className="datetime-slim"
-          // TODO: Why does this no longer work when set as `value`? Is this a
-          // date-fns issue?
           onChange={(e) => {
             setTime(e.target.value)
             setTypedTime(e.target.value)

From b5be5596620944bac5842b4b31115e928805da11 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 7 Jul 2023 15:38:25 -0400
Subject: [PATCH 17/35] =?UTF-8?q?refactor(amenities-panel):=20don=E2=80=99?=
 =?UTF-8?q?t=20show=20vehicles=20not=20configured?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/components/viewers/amenities-panel.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/components/viewers/amenities-panel.tsx b/lib/components/viewers/amenities-panel.tsx
index cb57f515c..a8df6aae3 100644
--- a/lib/components/viewers/amenities-panel.tsx
+++ b/lib/components/viewers/amenities-panel.tsx
@@ -246,7 +246,7 @@ class AmenitiesPanel extends Component<Props, State> {
   }
 
   render() {
-    const { intl } = this.props
+    const { configCompanies, intl } = this.props
     const { expanded } = this.state
     return (
       <RelatedPanel
@@ -259,8 +259,16 @@ class AmenitiesPanel extends Component<Props, State> {
       >
         <ul className="related-items-list list-unstyled">
           {this._renderParkAndRides()}
-          {this._renderBikeRentalStations()}
-          {this._renderVehicleRentalStations()}
+          {!configCompanies ||
+            (configCompanies.find((company) =>
+              company.modes.includes('BICYCLE_RENT')
+            ) &&
+              this._renderBikeRentalStations())}
+          {!configCompanies ||
+            (configCompanies.find((company) =>
+              company.modes.includes('SCOOTER_RENT')
+            ) &&
+              this._renderVehicleRentalStations())}
         </ul>
       </RelatedPanel>
     )

From bba80a3f655ff7804d05bda1499363bf5cddc3eb Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:12:28 -0500
Subject: [PATCH 18/35] Return focus to feedback button on modal close

---
 lib/components/app/app-menu-item.tsx |  1 +
 lib/components/app/app-menu.tsx      |  1 -
 lib/components/app/popup.tsx         | 17 ++++++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/components/app/app-menu-item.tsx b/lib/components/app/app-menu-item.tsx
index bab4f3632..f3a8e533b 100644
--- a/lib/components/app/app-menu-item.tsx
+++ b/lib/components/app/app-menu-item.tsx
@@ -75,6 +75,7 @@ export default class AppMenuItem extends Component<Props, State> {
         <Element
           aria-controls={subItems && containerId}
           aria-expanded={subItems && isExpanded}
+          className="navItem"
           id={id}
           onClick={subItems ? this._toggleSubmenu : onClick}
           onKeyDown={this._handleKeyDown}
diff --git a/lib/components/app/app-menu.tsx b/lib/components/app/app-menu.tsx
index aaedd7842..3df15b4a6 100644
--- a/lib/components/app/app-menu.tsx
+++ b/lib/components/app/app-menu.tsx
@@ -87,7 +87,6 @@ class AppMenu extends Component<
   _triggerPopup = () => {
     const { popupTarget, setPopupContent } = this.props
     setPopupContent(popupTarget)
-    this._togglePane()
   }
 
   _togglePane = () => {
diff --git a/lib/components/app/popup.tsx b/lib/components/app/popup.tsx
index 4608b9abc..445fc6957 100644
--- a/lib/components/app/popup.tsx
+++ b/lib/components/app/popup.tsx
@@ -62,6 +62,21 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
 
   const title = intl.formatMessage({ id: `config.popups.${id}` })
 
+  /* HACK: Since Bootstrap 3.x does not support adding id or name to navItem, 
+  we have to grab a list of all navItems by className and find the correct button.
+  Since the sliding pane "Leave Feedback" button will always be in the DOM after
+  the navbar button, reverse + find should always find the correct button to return to. */
+
+  const navItemList = Array.from(
+    document.getElementsByClassName('navItem')
+  ).reverse() as HTMLElement[]
+  const focusElement = navItemList.find((el) => el.innerText === title)
+
+  const closeModal = () => {
+    hideModal()
+    focusElement?.focus()
+  }
+
   return (
     <Modal
       aria-label={title}
@@ -74,7 +89,7 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
       <CloseModalButton
         aria-label={closeText}
         className="clear-button-formatting close-button"
-        onClick={hideModal}
+        onClick={closeModal}
         title={closeText}
       >
         <StyledIconWrapper>

From c1ae6ce77785d823f001d1dc19186e316b59cb17 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:14:15 -0500
Subject: [PATCH 19/35] Reset focus on esc & hide

---
 lib/components/app/popup.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/components/app/popup.tsx b/lib/components/app/popup.tsx
index 445fc6957..89a63ef12 100644
--- a/lib/components/app/popup.tsx
+++ b/lib/components/app/popup.tsx
@@ -81,8 +81,8 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
     <Modal
       aria-label={title}
       dialogClassName="fullscreen-modal"
-      onEscapeKeyDown={hideModal}
-      onHide={hideModal}
+      onEscapeKeyDown={closeModal}
+      onHide={closeModal}
       role="presentation"
       show={shown}
     >

From 34a9d51a3998c8e54e6d7d598319dfb34ca7e84a Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 11 Jul 2023 13:01:51 -0500
Subject: [PATCH 20/35] Add useCallback to closeModal

---
 lib/components/app/popup.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/components/app/popup.tsx b/lib/components/app/popup.tsx
index 89a63ef12..a65ce068d 100644
--- a/lib/components/app/popup.tsx
+++ b/lib/components/app/popup.tsx
@@ -1,7 +1,7 @@
 import { Modal } from 'react-bootstrap'
 import { useIntl } from 'react-intl'
 import coreUtils from '@opentripplanner/core-utils'
-import React, { useEffect } from 'react'
+import React, { useCallback, useEffect } from 'react'
 
 import { StyledIconWrapper } from '../util/styledIcon'
 import { Times } from '@styled-icons/fa-solid'
@@ -58,8 +58,6 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
     }
   }, [compiledUrl, hideModal, useIframe, shown])
 
-  if (!compiledUrl || !useIframe) return null
-
   const title = intl.formatMessage({ id: `config.popups.${id}` })
 
   /* HACK: Since Bootstrap 3.x does not support adding id or name to navItem, 
@@ -72,10 +70,12 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
   ).reverse() as HTMLElement[]
   const focusElement = navItemList.find((el) => el.innerText === title)
 
-  const closeModal = () => {
+  const closeModal = useCallback(() => {
     hideModal()
     focusElement?.focus()
-  }
+  }, [focusElement, hideModal])
+
+  if (!compiledUrl || !useIframe) return null
 
   return (
     <Modal

From c2843d9e020465a6d01092f5d938bcb576e6a6ea Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:37:46 -0500
Subject: [PATCH 21/35] Remove duplicate import

---
 lib/components/narrative/metro/metro-itinerary.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx
index 4471fb666..5c4663481 100644
--- a/lib/components/narrative/metro/metro-itinerary.tsx
+++ b/lib/components/narrative/metro/metro-itinerary.tsx
@@ -28,13 +28,10 @@ import ItineraryBody from '../line-itin/connected-itinerary-body'
 import NarrativeItinerary from '../narrative-itinerary'
 import SimpleRealtimeAnnotation from '../simple-realtime-annotation'
 
-
-import { DepartureTimesList } from './departure-times-list'
 import { getFirstTransitLegStop, getFlexAttirbutes } from './attribute-utils'
 import DepartureTimesList, {
   SetActiveItineraryHandler
 } from './departure-times-list'
-
 import MetroItineraryRoutes from './metro-itinerary-routes'
 import RouteBlock from './route-block'
 

From 8b7009a277ca655413ab0005c1c863d0beed8270 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:54:49 -0500
Subject: [PATCH 22/35] Fix: Add legend to mode selector fieldset

---
 i18n/en-US.yml                         | 1 +
 lib/components/form/batch-settings.tsx | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/i18n/en-US.yml b/i18n/en-US.yml
index 6de6da15c..35dba8a60 100644
--- a/i18n/en-US.yml
+++ b/i18n/en-US.yml
@@ -223,6 +223,7 @@ components:
     shortTitle: Plan Trip
   BatchSearchScreen:
     header: Plan Your Trip
+    modeSelectorLabel: Select a transit mode
   BatchSettings:
     dateTimeSettingsLabel: Date/Time Settings
     destination: destination
diff --git a/lib/components/form/batch-settings.tsx b/lib/components/form/batch-settings.tsx
index 4d4d8525d..bb6f6d051 100644
--- a/lib/components/form/batch-settings.tsx
+++ b/lib/components/form/batch-settings.tsx
@@ -211,6 +211,9 @@ function BatchSettings({
             accentColor={baseColor}
             activeHoverColor={accentColor.toHexString()}
             fillModeIcons={fillModeIcons}
+            label={intl.formatMessage({
+              id: 'components.BatchSearchScreen.modeSelectorLabel'
+            })}
             modeButtons={processedModeButtons}
             onSettingsUpdate={setUrlSearch}
             onToggleModeButton={_toggleModeButton}

From ae37b8b90f8a548882c307feaaebd2b0810a11df Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 12 Jul 2023 15:09:52 -0500
Subject: [PATCH 23/35] fix: remove role from locale li

---
 lib/components/app/locale-selector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/app/locale-selector.tsx b/lib/components/app/locale-selector.tsx
index da0e9d01d..a3681fe86 100644
--- a/lib/components/app/locale-selector.tsx
+++ b/lib/components/app/locale-selector.tsx
@@ -30,7 +30,7 @@ const LocaleSelector = (props: LocaleSelectorProps): JSX.Element | null => {
         style={{ display: 'block ruby' }}
       >
         {Object.keys(languageOptions).map((locale: string) => (
-          <li key={locale} lang={locale} role="none">
+          <li key={locale} lang={locale}>
             <UnstyledButton
               aria-selected={locale === currentLocale || undefined}
               onClick={() => setLocale(locale)}

From b10ea9205112a51d8400bf6d81026ab914080100 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 12 Jul 2023 15:14:19 -0500
Subject: [PATCH 24/35] Add French translation string

---
 i18n/fr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i18n/fr.yml b/i18n/fr.yml
index 2b7204081..77c068e1a 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -234,6 +234,7 @@ components:
     shortTitle: Planifier un trajet
   BatchSearchScreen:
     header: Votre trajet
+    modeSelectorLabel: Sélectionnez un mode de transport
   BatchSettings:
     dateTimeSettingsLabel: Paramètres Date/Heure
     destination: destination

From 446ad08ecb49b4dcb0bb065756c2abd2ec6034e8 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Thu, 13 Jul 2023 08:51:11 -0500
Subject: [PATCH 25/35] chore: add todo

---
 lib/components/app/popup.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/components/app/popup.tsx b/lib/components/app/popup.tsx
index a65ce068d..f87f9eb71 100644
--- a/lib/components/app/popup.tsx
+++ b/lib/components/app/popup.tsx
@@ -65,6 +65,8 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
   Since the sliding pane "Leave Feedback" button will always be in the DOM after
   the navbar button, reverse + find should always find the correct button to return to. */
 
+  // TODO: Replace this method with refs
+
   const navItemList = Array.from(
     document.getElementsByClassName('navItem')
   ).reverse() as HTMLElement[]

From a34c0bc81d52a61d3effaf9e94053a86e6d8e26c Mon Sep 17 00:00:00 2001
From: Binh Dam <binh.dam@ibigroup.com>
Date: Mon, 5 Jun 2023 14:28:11 +0000
Subject: [PATCH 26/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (498 of 498 strings)

Translation: OTP-react-redux/OTP-RR Main UI
Translate-URL: https://hosted.weblate.org/projects/otp-react-redux/otp-rr-main-ui/es/
---
 i18n/es.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/i18n/es.yml b/i18n/es.yml
index a8bd93b91..91b4ca5a5 100644
--- a/i18n/es.yml
+++ b/i18n/es.yml
@@ -30,7 +30,8 @@ actions:
       No se puede guardar el plan: este plan no se pudo guardar debido a la
       falta de capacidad en uno o más vehículos. Por favor, vuelva a planificar
       su viaje.
-    maxTripRequestsExceeded: Número de solicitudes de viaje superadas sin resultados válidos
+    maxTripRequestsExceeded: Número de solicitudes de viaje superadas sin resultados
+      válidos
     saveItinerariesError: "No se pudieron guardar los itinerarios: {err}"
     setDateError: "Error al establecer la fecha:"
     setGroupSizeError: "No se pudo establecer el tamaño del grupo:"
@@ -46,9 +47,11 @@ actions:
     authTokenError: Error al obtener un token de autorización.
     confirmDeleteMonitoredTrip: ¿Desea eliminar este viaje?
     confirmDeletePlace: ¿Quiere eliminar este lugar?
-    emailVerificationResent: El mensaje de verificación de correo electrónico ha sido reenviado.
+    emailVerificationResent: El mensaje de verificación de correo electrónico ha sido
+      reenviado.
     genericError: "Se ha encontrado un error: {err}"
-    itineraryExistenceCheckFailed: Comprobación de errores para ver si el viaje seleccionado es posible.
+    itineraryExistenceCheckFailed: Comprobación de errores para ver si el viaje seleccionado
+      es posible.
     preferencesSaved: Sus preferencias se han guardado.
     smsInvalidCode: El código introducido no es válido. Por favor, inténtelo de nuevo.
     smsResendThrottled: >-
@@ -234,7 +237,8 @@ components:
     origin: origen
     planTripTooltip: Planificar viaje
     settings: Preferencias de viaje
-    validationMessage: "Por favor, defina los siguientes campos para planificar un viaje: {issues}"
+    validationMessage: "Por favor, defina los siguientes campos para planificar un
+      viaje: {issues}"
   BeforeSignInScreen:
     mainTitle: Iniciando sesión
     message: >
@@ -365,7 +369,8 @@ components:
     description: Puede recibir notificaciones sobre los viajes que realiza con frecuencia.
     noneSelect: No enviar notificaciones
     notificationChannelPrompt: ¿Cómo desea recibir las notificaciones?
-    notificationEmailDetail: "Los correos electrónicos de notificación se enviarán a:"
+    notificationEmailDetail: "Los correos electrónicos de notificación se enviarán
+      a:"
   PhoneNumberEditor:
     changeNumber: Cambiar número de teléfono
     invalidCode: Introduzca 6 dígitos para el código de validación.
@@ -463,8 +468,8 @@ components:
       Sólo se pueden controlar los itinerarios que incluyan ride hailing y no
       los alquileres o los viajes en coche.
     saveTripText: Salvar el viaje
-    signInText: Iniciar sesión para guardar el viaje
-    signInTooltip: Por favor, inicie sesión para guardar un viaje.
+    signInText: Inicia sesión para guardar el viaje
+    signInTooltip: Por favor, inicia sesión para guardar el viaje.
   SavedTripEditor:
     editSavedTrip: Editar el viaje guardado
     saveNewTrip: Guardar un nuevo viaje
@@ -498,7 +503,8 @@ components:
       Opciones
       y Preferencias del viaje
   SimpleRealtimeAnnotation:
-    usingRealtimeInfo: Este viaje utiliza información de tráfico y retrasos en tiempo real
+    usingRealtimeInfo: Este viaje utiliza información de tráfico y retrasos en tiempo
+      real
   StackedPaneDisplay:
     savePreferences: Guardar preferencias
   StopScheduleTable:
@@ -561,16 +567,19 @@ components:
     travelingAt: Viajando a {milesPerHour}
     vehicleName: Vehículo {vehicleNumber}
   TripBasicsPane:
-    checkingItineraryExistence: Comprobación de la existencia de itinerarios para cada día de la semana…
+    checkingItineraryExistence: Comprobación de la existencia de itinerarios para
+      cada día de la semana…
     selectAtLeastOneDay: Por favor, seleccione al menos un día para el seguimiento.
     tripDaysPrompt: ¿Qué días hace este viaje?
-    tripIsAvailableOnDaysIndicated: Su viaje está disponible en los días de la semana indicados anteriormente.
+    tripIsAvailableOnDaysIndicated: Su viaje está disponible en los días de la semana
+      indicados anteriormente.
     tripNamePrompt: "Por favor, indique un nombre para este viaje:"
     tripNotAvailableOnDay: El viaje no está disponible el {repeatedDay}
     unsavedChangesExistingTrip: >-
       Todavía no ha guardado su viaje. Si abandona la página, los cambios se
       perderán.
-    unsavedChangesNewTrip: Todavía no ha guardado su nuevo viaje. Si abandona la página, se perderá.
+    unsavedChangesNewTrip: Todavía no ha guardado su nuevo viaje. Si abandona la página,
+      se perderá.
   TripNotificationsPane:
     advancedSettings: Configuración avanzada
     altRouteRecommended: Se recomienda una ruta alternativa o un punto de transferencia

From 3c3b244a11c59c1b3483035b95825a759637537a Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 7 Jun 2023 15:59:21 +0000
Subject: [PATCH 27/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (501 of 501 strings)

Translation: OTP-react-redux/OTP-RR Main UI
Translate-URL: https://hosted.weblate.org/projects/otp-react-redux/otp-rr-main-ui/es/
---
 i18n/es.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/i18n/es.yml b/i18n/es.yml
index 91b4ca5a5..93d78d523 100644
--- a/i18n/es.yml
+++ b/i18n/es.yml
@@ -351,6 +351,10 @@ components:
     selectDuration: Duración
     selectWalkTime: Tiempo de caminata
     viewAll: Ver todas las opciones
+    resultsSortedBy: Los resultados del viaje están actualmente ordenados por {sortSelected}.
+      Para cambiar la forma en que se ordenan los resultados, utiliza el botón "Ordenar
+      resultados" que aparece a continuación.
+    sortResults: Ordenar los resultados
   NavLoginButton:
     help: Ayuda
     myAccount: Mi cuenta
@@ -492,6 +496,8 @@ components:
       Otro viaje guardado ya utiliza este nombre. Por favor, elija un nombre
       diferente.
     tripNameRequired: Por favor, introduzca el nombre del viaje.
+    itineraryLoaded: Itinerario cargado
+    itineraryLoading: Cargando el itinerario
   SessionTimeout:
     body: >-
       Su sesión expirará en un minuto. Pulse 'Continuar sesión' para mantener su

From 43864f73118b9049b41bc2e7c21ef7429acb67ec Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 26 Jun 2023 16:43:35 +0200
Subject: [PATCH 28/35] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: OTP-react-redux/OTP-RR Main UI
Translate-URL: https://hosted.weblate.org/projects/otp-react-redux/otp-rr-main-ui/
---
 i18n/ko.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/i18n/ko.yml b/i18n/ko.yml
index 088fb6f9b..7f31387da 100644
--- a/i18n/ko.yml
+++ b/i18n/ko.yml
@@ -22,7 +22,8 @@ actions:
     fetchFieldTripsError: "트립을 가져오는 중에 오류가 발생했습니다: {err}"
     fetchTripsForDateError: "필트 트립 날짜에 대한 트립을 가져오는 중에 오류가 발생했습니다: {err}"
     incompatibleTripDateError: 계획한 트립 날짜({tripDate})가 요청한 트립 날짜({requestDate})가 아닙니다
-    itineraryCapacityError: "플랜을 저장할 수 없습니다: 하나 이상의 차량의 용량이 부족하여 이 플랜을 저장할 수 없습니다. 트립을 다시 계획하세요."
+    itineraryCapacityError: "플랜을 저장할 수 없습니다: 하나 이상의 차량의 용량이 부족하여 이 플랜을 저장할 수 없습니다.
+      트립을 다시 계획하세요."
     maxTripRequestsExceeded: 유효한 결과없이 초과된 트립 요청의 개수
     saveItinerariesError: "트립을 저장하는 데 실패했습니다: {err}"
     setDateError: "날짜를 설정하는 중에 오류가 발생했습니다:"
@@ -291,7 +292,6 @@ components:
     stops: 대중 교통 정류장
     streets: 거리
   MetroUI:
-    arriveAtTime: 도착
     fromStop: "{stop}에서부터"
     itineraryDescription: "{routes}을(를) 이용한 {time} 일정"
     leaveAt: 출발
@@ -657,5 +657,6 @@ util:
     networkUnavailable: 현재 {network} 네트워크를 사용할 수 없습니다.
     noTripFound: 트립을 찾을 수 없습니다.
     noTripFoundForMode: "{modes}의 트립을 찾을 수 없습니다."
-    noTripFoundReason: 지정된 최대 거리 내 또는 지정된 시간에 대중 교통 서비스가 없거나, 출발지 또는 도착지가 안전하게 접근가능하지 못할 수 있습니다.
+    noTripFoundReason: 지정된 최대 거리 내 또는 지정된 시간에 대중 교통 서비스가 없거나, 출발지 또는 도착지가 안전하게 접근가능하지
+      못할 수 있습니다.
     noTripFoundWithReason: "{noTripFound} {reason}"

From 5ff4a74d265e1d150c96bc769f25d3a33e0a4bd2 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 27 Jun 2023 18:04:15 +0200
Subject: [PATCH 29/35] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: OTP-react-redux/OTP-RR Main UI
Translate-URL: https://hosted.weblate.org/projects/otp-react-redux/otp-rr-main-ui/
---
 i18n/es.yml    |  6 ------
 i18n/ko.yml    |  5 -----
 i18n/nb_NO.yml |  2 --
 i18n/vi.yml    | 51 +++++++++++++++++++++++++++++---------------------
 i18n/zh.yml    |  5 -----
 5 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/i18n/es.yml b/i18n/es.yml
index 93d78d523..35157ad80 100644
--- a/i18n/es.yml
+++ b/i18n/es.yml
@@ -172,10 +172,8 @@ components:
     tooManyPlaces: Se alcanzó el máximo de lugares intermedios
   AdvancedOptions:
     bannedRoutes: Seleccionar rutas prohibidas…
-    maxBike: Máx de bicicleta {unitsString}
     maxWalk: Máx caminando {unitsString}
     preferredRoutes: Seleccionar rutas preferidas…
-    walkReluctance: Evasión de caminata
   AfterSignInScreen:
     mainTitle: Redirigiendo…
     message: >-
@@ -233,10 +231,8 @@ components:
     header: Planifique su viaje
   BatchSettings:
     destination: destino
-    modeSelector: Selector de modos
     origin: origen
     planTripTooltip: Planificar viaje
-    settings: Preferencias de viaje
     validationMessage: "Por favor, defina los siguientes campos para planificar un
       viaje: {issues}"
   BeforeSignInScreen:
@@ -332,8 +328,6 @@ components:
     timeWalking: "{time} caminando"
   MobileOptions:
     header: Configurar las opciones de búsqueda
-  ModeDropdown:
-    exclusiveMode: Solo {mode}
   NarrativeItinerariesHeader:
     changeSortDir: Cambiar la dirección de clasificación
     howToFindResults: >-
diff --git a/i18n/ko.yml b/i18n/ko.yml
index 7f31387da..e4eb0ba86 100644
--- a/i18n/ko.yml
+++ b/i18n/ko.yml
@@ -156,10 +156,8 @@ components:
     tooManyPlaces: 중간 경유지의 최대 수에 도달함
   AdvancedOptions:
     bannedRoutes: 금지된 경로 선택…
-    maxBike: 최대 자전거 {unitsString}
     maxWalk: 최대 도보 {unitsString}
     preferredRoutes: 선호 경로 선택…
-    walkReluctance: 걷기 제외
   AfterSignInScreen:
     mainTitle: 경로 재설정 중...
     message: 몇 초 후에도 페이지가 로드되지 않는 경우, <redirectLink>여기를 클릭</redirectLink>하십시오.
@@ -217,7 +215,6 @@ components:
     destination: 목적지
     origin: 출발지
     planTripTooltip: 트립 계획
-    settings: 여행 설정
     validationMessage: "트립 계획을 위해 다음 필드를 정의하세요: {issues}"
   BeforeSignInScreen:
     mainTitle: 로그인 중
@@ -300,8 +297,6 @@ components:
     timeWalking: "{time} 걷기"
   MobileOptions:
     header: 검색 옵션 설정
-  ModeDropdown:
-    exclusiveMode: "{mode} 전용"
   NarrativeItinerariesHeader:
     changeSortDir: 정렬 방향 변경
     itinerariesFound: "{itineraryNum} 개의 여정을 찾았습니다"
diff --git a/i18n/nb_NO.yml b/i18n/nb_NO.yml
index 21cca97e2..8bc2acc78 100644
--- a/i18n/nb_NO.yml
+++ b/i18n/nb_NO.yml
@@ -67,7 +67,6 @@ components:
   BatchSettings:
     destination: mål
     planTripTooltip: Planlegg tur
-    settings: Turinnstillinger
   CallTakerPanel:
     advancedOptions: Avanserte innstillinger
     groupSize: "Gruppestørrelse:"
@@ -102,7 +101,6 @@ components:
   NewAccountWizard:
     createNewAccount: Opprett ny konto
     places: Legg til dine steder
-    terms: Opprett ny konto
     verify: Bekreft din e-postadresse
   PhoneNumberEditor:
     invalidPhone: Skriv inn et gyldig telefonnummer.
diff --git a/i18n/vi.yml b/i18n/vi.yml
index 234ffe2ba..efea89cc6 100644
--- a/i18n/vi.yml
+++ b/i18n/vi.yml
@@ -5,7 +5,8 @@ actions:
     callQuerySaveError: "Lỗi khi lưu trữ các truy vấn cuộc gọi: {err}"
     callSaveError: "Không thể lưu cuộc gọi: {err}"
     checkSessionError: "Lỗi khi thiết lập phiên ủy quyền: {err}"
-    couldNotFindCallError: Không thể tìm thấy cuộc gọi. Đang hủy yêu cầu lưu truy vấn.
+    couldNotFindCallError: Không thể tìm thấy cuộc gọi. Đang hủy yêu cầu lưu truy
+      vấn.
     fetchCallsError: "Lỗi khi tìm nạp cuộc gọi: {err}"
     queryFetchError: "Lỗi khi tìm nạp các truy vấn: {err}"
   fieldTrip:
@@ -28,14 +29,16 @@ actions:
       Không thể lưu kế hoạch chuyến đi: Không thể lưu kế hoạch chuyến đi này do
       thiếu sức chứa trên một hoặc nhiều xe. Vui lòng lên kế hoạch lại chuyến đi
       của bạn.
-    maxTripRequestsExceeded: Đã vượt quá số lượng yêu cầu chuyến đi mà không có kết quả hợp lệ
+    maxTripRequestsExceeded: Đã vượt quá số lượng yêu cầu chuyến đi mà không có kết
+      quả hợp lệ
     saveItinerariesError: "Không lưu được hành trình: {err}"
     setDateError: "Lỗi khi cài đặt ngày:"
     setGroupSizeError: "Lỗi khi cài đặt kích thước nhóm:"
     setPaymentError: "Lỗi khi cài đặt thông tin thanh toán:"
     setRequestStatusError: "Lỗi khi cài đặt trạng thái yêu cầu:"
   location:
-    geolocationNotSupportedError: Định vị địa lý không được hỗ trợ bởi trình duyệt của bạn
+    geolocationNotSupportedError: Định vị địa lý không được hỗ trợ bởi trình duyệt
+      của bạn
     unknownPositionError: Lỗi không xác định khi tìm vị trí
   map:
     currentLocation: (Vị trí hiện tại)
@@ -46,7 +49,8 @@ actions:
     confirmDeletePlace: Bạn có muốn loại bỏ nơi này không?
     emailVerificationResent: Thông báo xác minh email đã được gửi lại.
     genericError: "Phát sinh lỗi: {err}"
-    itineraryExistenceCheckFailed: Lỗi kiểm tra xem chuyến đi được chọn của bạn là có thể.
+    itineraryExistenceCheckFailed: Lỗi kiểm tra xem chuyến đi được chọn của bạn là
+      có thể.
     preferencesSaved: Những sở thích của bạn đã được lưu lại.
     smsInvalidCode: Mã bạn nhập không hợp lệ. Vui lòng thử lại.
     smsResendThrottled: >-
@@ -103,7 +107,6 @@ common:
   itineraryDescriptions:
     calories: "{calories, number} calo"
     noItineraryToDisplay: Không có hành trình để hiển thị.
-    noTransitFareProvided: Không có thông tin giá vé
     relativeCo2: |
       {co2} CO₂ {isMore, select, true {nhiều} other {ít} } hơn so với xe hơi
     transfers: "{transfers, plural, =0 {} other {# chuyển}}"
@@ -156,19 +159,19 @@ common:
       {} other {# giây}}
 components:
   A11yPrefs:
-    accessibilityRoutingByDefault: Thích những chuyến đi có thể truy cập theo mặc định
+    accessibilityRoutingByDefault: Thích những chuyến đi có thể truy cập theo mặc
+      định
   AccountSetupFinishPane:
     message: Bạn đã sẵn sàng để bắt đầu lên kế hoạch cho các chuyến đi của bạn.
   AddPlaceButton:
     addPlace: Thêm địa điểm
-    needOriginDestination: Xác định nguồn gốc hoặc đích đến để thêm các địa điểm trung gian
+    needOriginDestination: Xác định nguồn gốc hoặc đích đến để thêm các địa điểm trung
+      gian
     tooManyPlaces: Địa điểm trung gian tối đa đạt được
   AdvancedOptions:
     bannedRoutes: Chọn các tuyến đường bị cấm…
-    maxBike: Đạp xe tối đa {unitsString}
     maxWalk: Đi bộ tối đa {unitsString}
     preferredRoutes: Chọn các tuyến đường ưa thích…
-    walkReluctance: Tránh đi bộ
   AfterSignInScreen:
     mainTitle: Chuyển hướng...
     message: >-
@@ -224,7 +227,6 @@ components:
     destination: điểm đến
     origin: điểm xuất phát
     planTripTooltip: Lên kế hoạch cho chuyến đi
-    settings: Cài đặt chuyến đi
     validationMessage: >-
       Vui lòng xác định các khu vực sau để lên kế hoạch cho một chuyến đi:
       {issues}
@@ -280,7 +282,8 @@ components:
     editPlaceGeneric: Chỉnh sửa vị trí
     invalidAddress: Vui lòng cài đặt một vị trí cho nơi này.
     invalidName: Vui lòng nhập tên cho nơi này.
-    nameAlreadyUsed: Bạn đã sử dụng tên này cho một nơi khác. Vui lòng nhập một tên khác.
+    nameAlreadyUsed: Bạn đã sử dụng tên này cho một nơi khác. Vui lòng nhập một tên
+      khác.
     placeNotFound: Không tìm thấy địa điểm
     placeNotFoundDescription: Xin lỗi, địa điểm được yêu cầu không được tìm thấy.
   FormNavigationButtons:
@@ -313,8 +316,6 @@ components:
     timeWalking: "{time} đi bộ"
   MobileOptions:
     header: Cài đặt tùy chọn tìm kiếm
-  ModeDropdown:
-    exclusiveMode: Chỉ {mode}
   NarrativeItinerariesHeader:
     changeSortDir: Thay đổi hướng sắp xếp
     itinerariesFound: "{itineraryNum} hành trình được tìm thấy"
@@ -533,17 +534,22 @@ components:
     travelingAt: di chuyển với tốc độ {milesPerHour}
     vehicleName: Phương tiện giao thông {vehicleNumber}
   TripBasicsPane:
-    checkingItineraryExistence: Kiểm tra sự tồn tại của hành trình cho mỗi ngày trong tuần…
+    checkingItineraryExistence: Kiểm tra sự tồn tại của hành trình cho mỗi ngày trong
+      tuần…
     selectAtLeastOneDay: Vui lòng chọn ít nhất một ngày để theo dõi.
     tripDaysPrompt: Bạn thực hiện chuyến đi này vào những ngày nào?
-    tripIsAvailableOnDaysIndicated: Chuyến đi của bạn có sẵn vào những ngày trong tuần như đã nêu ở trên.
+    tripIsAvailableOnDaysIndicated: Chuyến đi của bạn có sẵn vào những ngày trong
+      tuần như đã nêu ở trên.
     tripNamePrompt: "Vui lòng cung cấp tên cho chuyến đi này:"
     tripNotAvailableOnDay: Chuyến đi không có sẵn vào {repeatedDay}
-    unsavedChangesExistingTrip: Bạn chưa lưu chuyến đi của mình. Nếu bạn rời đi, những thay đổi sẽ bị mất.
-    unsavedChangesNewTrip: Bạn chưa lưu chuyến đi mới của mình. Nếu bạn rời đi, nó sẽ bị mất.
+    unsavedChangesExistingTrip: Bạn chưa lưu chuyến đi của mình. Nếu bạn rời đi, những
+      thay đổi sẽ bị mất.
+    unsavedChangesNewTrip: Bạn chưa lưu chuyến đi mới của mình. Nếu bạn rời đi, nó
+      sẽ bị mất.
   TripNotificationsPane:
     advancedSettings: Cài đặt nâng cao
-    altRouteRecommended: Một tuyến đường hoặc điểm trung chuyển thay thế được khuyến nghị
+    altRouteRecommended: Một tuyến đường hoặc điểm trung chuyển thay thế được khuyến
+      nghị
     delaysAboveThreshold: Có sự chậm trễ hoặc gián đoạn của hơn
     howToReceiveAlerts: >
       Để nhận thông báo cho các chuyến đi đã lưu của bạn, bật thông báo trong
@@ -552,7 +558,8 @@ components:
     notificationsTurnedOff: Thông báo được tắt cho tài khoản của bạn.
     notifyViaChannelWhen: "Thông báo cho tôi qua {channel} khi:"
     oneHour: 1 tiếng
-    realtimeAlertFlagged: Có một cảnh báo thời gian thực được gắn cờ trên hành trình của tôi
+    realtimeAlertFlagged: Có một cảnh báo thời gian thực được gắn cờ trên hành trình
+      của tôi
     timeBefore: "{time} trước"
   TripStatus:
     alerts: "{alerts, plural, one {# cảnh báo!} other {# cảnh báo!}}"
@@ -565,7 +572,8 @@ components:
       earlyHeading: >-
         Chuyến đi đang diễn ra và sẽ đến sớm hơn {formattedDuration} so với dự
         kiến!
-      noDataHeading: Chuyến đi đang được tiến hành (không có cập nhật thời gian thực có sẵn).
+      noDataHeading: Chuyến đi đang được tiến hành (không có cập nhật thời gian thực
+        có sẵn).
       onTimeHeading: Chuyến đi đang được tiến hành và đúng giờ.
     base:
       lastCheckedDefaultText: Thời gian được kiểm tra lần cuối không xác định
@@ -608,7 +616,8 @@ components:
       tripStartIsEarly: >-
         Thời gian bắt đầu chuyến đi đang diễn ra sớm hơn ${duration} so với dự
         kiến!
-      tripStartsSoonNoUpdates: Chuyến đi đang bắt đầu sớm (không có cập nhật về thời gian thực).
+      tripStartsSoonNoUpdates: Chuyến đi đang bắt đầu sớm (không có cập nhật về thời
+        gian thực).
       tripStartsSoonOnTime: Chuyến đi đang bắt đầu sớm và sắp đúng giờ.
   TripSummary:
     arriveAt: "Đến nơi "
diff --git a/i18n/zh.yml b/i18n/zh.yml
index 84aa77631..1b372bf3d 100644
--- a/i18n/zh.yml
+++ b/i18n/zh.yml
@@ -155,10 +155,8 @@ components:
     tooManyPlaces: 已达到最多中途地点
   AdvancedOptions:
     bannedRoutes: 选择禁行路线…
-    maxBike: 最大骑自行车 {unitsString}
     maxWalk: 最大步行 {unitsString}
     preferredRoutes: 选择首选路线…
-    walkReluctance: 避免步行
   AfterSignInScreen:
     mainTitle: 重新定向…
     message: 如果几秒钟后页面没有加载, 请 <redirectLink>点击这里</redirectLink>.
@@ -216,7 +214,6 @@ components:
     destination: 目的地
     origin: 出发地
     planTripTooltip: 计划行程
-    settings: 行程设置
     validationMessage: "请定义以下字段来计划旅行: {issues}"
   BeforeSignInScreen:
     mainTitle: 签到
@@ -300,8 +297,6 @@ components:
     timeWalking: "{time} 步行"
   MobileOptions:
     header: 设置搜索选项
-  ModeDropdown:
-    exclusiveMode: 仅 {mode}
   NarrativeItinerariesHeader:
     changeSortDir: 改变排序方向
     itinerariesFound: 发现{itineraryNum}条行程

From 04137db116ecea99bebf1c553ab29aaf3dbf70c2 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 30 Jun 2023 19:15:46 +0200
Subject: [PATCH 30/35] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: OTP-react-redux/OTP-RR Main UI
Translate-URL: https://hosted.weblate.org/projects/otp-react-redux/otp-rr-main-ui/
---
 i18n/es.yml | 1 -
 i18n/ko.yml | 1 -
 i18n/vi.yml | 1 -
 i18n/zh.yml | 1 -
 4 files changed, 4 deletions(-)

diff --git a/i18n/es.yml b/i18n/es.yml
index 35157ad80..dc769ecd2 100644
--- a/i18n/es.yml
+++ b/i18n/es.yml
@@ -172,7 +172,6 @@ components:
     tooManyPlaces: Se alcanzó el máximo de lugares intermedios
   AdvancedOptions:
     bannedRoutes: Seleccionar rutas prohibidas…
-    maxWalk: Máx caminando {unitsString}
     preferredRoutes: Seleccionar rutas preferidas…
   AfterSignInScreen:
     mainTitle: Redirigiendo…
diff --git a/i18n/ko.yml b/i18n/ko.yml
index e4eb0ba86..4c93e56b1 100644
--- a/i18n/ko.yml
+++ b/i18n/ko.yml
@@ -156,7 +156,6 @@ components:
     tooManyPlaces: 중간 경유지의 최대 수에 도달함
   AdvancedOptions:
     bannedRoutes: 금지된 경로 선택…
-    maxWalk: 최대 도보 {unitsString}
     preferredRoutes: 선호 경로 선택…
   AfterSignInScreen:
     mainTitle: 경로 재설정 중...
diff --git a/i18n/vi.yml b/i18n/vi.yml
index efea89cc6..e28daff52 100644
--- a/i18n/vi.yml
+++ b/i18n/vi.yml
@@ -170,7 +170,6 @@ components:
     tooManyPlaces: Địa điểm trung gian tối đa đạt được
   AdvancedOptions:
     bannedRoutes: Chọn các tuyến đường bị cấm…
-    maxWalk: Đi bộ tối đa {unitsString}
     preferredRoutes: Chọn các tuyến đường ưa thích…
   AfterSignInScreen:
     mainTitle: Chuyển hướng...
diff --git a/i18n/zh.yml b/i18n/zh.yml
index 1b372bf3d..33ec8473f 100644
--- a/i18n/zh.yml
+++ b/i18n/zh.yml
@@ -155,7 +155,6 @@ components:
     tooManyPlaces: 已达到最多中途地点
   AdvancedOptions:
     bannedRoutes: 选择禁行路线…
-    maxWalk: 最大步行 {unitsString}
     preferredRoutes: 选择首选路线…
   AfterSignInScreen:
     mainTitle: 重新定向…

From 7bac4c9e58488b480e0ee0be4005b57c86e809e3 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 13 Jul 2023 15:45:54 -0400
Subject: [PATCH 31/35] refactor(actions/ui): Check locale change before
 loading locale data.

---
 lib/actions/ui.js | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/lib/actions/ui.js b/lib/actions/ui.js
index 76ac04f9f..28c03e244 100644
--- a/lib/actions/ui.js
+++ b/lib/actions/ui.js
@@ -362,35 +362,37 @@ export function showMobileSearchScreen() {
  */
 export function setLocale(locale) {
   return async function (dispatch, getState) {
-    const { config } = getState().otp
-    const { loggedInUser } = getState().user
+    const { otp, user } = getState()
+    const { config, ui } = otp
+    const { loggedInUser } = user
     const { language: customMessages } = config
     const configLocales = getConfigLocales(customMessages)
-    const effectiveLocale = locale || getDefaultLocale(config, loggedInUser)
     const matchedLocale = getMatchingLocaleString(
-      effectiveLocale,
+      locale || getDefaultLocale(config, loggedInUser),
       'en-US',
       configLocales
     )
-    const messages = await loadLocaleData(
-      matchedLocale,
-      customMessages,
-      configLocales
-    )
+    if (matchedLocale !== ui.locale) {
+      const messages = await loadLocaleData(
+        matchedLocale,
+        customMessages,
+        configLocales
+      )
 
-    // Update the redux state, only with a matched locale
-    dispatch(updateLocale({ locale: matchedLocale, messages }))
+      // Update the redux state, only with a matched locale
+      dispatch(updateLocale({ locale: matchedLocale, messages }))
 
-    // Update the lang attribute in the root <html> element.
-    // (The lang is the first portion of the locale.)
-    const lang = effectiveLocale.split('-')[0]
-    document.documentElement.lang = lang
+      // Update the lang attribute in the root <html> element.
+      // (The lang is the first portion of the locale.)
+      const lang = matchedLocale.split('-')[0]
+      document.documentElement.lang = lang
 
-    window.localStorage.setItem('lang', matchedLocale)
+      window.localStorage.setItem('lang', matchedLocale)
 
-    if (loggedInUser) {
-      loggedInUser.preferredLocale = matchedLocale
-      dispatch(createOrUpdateUser(loggedInUser, false))
+      if (loggedInUser) {
+        loggedInUser.preferredLocale = matchedLocale
+        dispatch(createOrUpdateUser(loggedInUser, false))
+      }
     }
   }
 }

From 5e4fc45572d037d34771218c48cd4889152482c5 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 13 Jul 2023 16:25:04 -0400
Subject: [PATCH 32/35] refactor(Popup): Prevent rendering i18n if popup id is
 null.

---
 lib/components/app/popup.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/components/app/popup.tsx b/lib/components/app/popup.tsx
index f87f9eb71..7033223f6 100644
--- a/lib/components/app/popup.tsx
+++ b/lib/components/app/popup.tsx
@@ -1,14 +1,13 @@
 import { Modal } from 'react-bootstrap'
+import { Times } from '@styled-icons/fa-solid'
 import { useIntl } from 'react-intl'
 import coreUtils from '@opentripplanner/core-utils'
 import React, { useCallback, useEffect } from 'react'
+import styled from 'styled-components'
 
 import { StyledIconWrapper } from '../util/styledIcon'
-import { Times } from '@styled-icons/fa-solid'
 import PageTitle from '../util/page-title'
 
-import styled from 'styled-components'
-
 type Props = {
   content?: {
     appendLocale?: boolean
@@ -58,7 +57,7 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
     }
   }, [compiledUrl, hideModal, useIframe, shown])
 
-  const title = intl.formatMessage({ id: `config.popups.${id}` })
+  const title = id && intl.formatMessage({ id: `config.popups.${id}` })
 
   /* HACK: Since Bootstrap 3.x does not support adding id or name to navItem, 
   we have to grab a list of all navItems by className and find the correct button.

From 2ac235f2b8d249fd0162593ac1260a4dac7e09b6 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 13 Jul 2023 16:37:17 -0400
Subject: [PATCH 33/35] refactor(DefaultMap): Suppress console warning for otp2
 layer type.

---
 lib/components/map/default-map.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/components/map/default-map.tsx b/lib/components/map/default-map.tsx
index 8adc129ff..500f7bcbc 100644
--- a/lib/components/map/default-map.tsx
+++ b/lib/components/map/default-map.tsx
@@ -113,6 +113,9 @@ function getLayerName(overlay, config, intl) {
         return getCompanyNames([overlay.network], config, intl)
 
       return intl.formatMessage({ id: 'components.MapLayers.shared-vehicles' })
+    case 'otp2':
+      // The otp2 type will result in multiple layers, so don't show a warning.
+      return type
     default:
       console.warn(`No name found for overlay type ${type}.`)
       return type

From 9e7555211cd8d20e9ff5344804e79e5b055e2869 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 13 Jul 2023 16:38:09 -0400
Subject: [PATCH 34/35] refactor(ElevationPointMarker): Create styled component
 outside of render.

---
 lib/components/map/elevation-point-marker.tsx | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/components/map/elevation-point-marker.tsx b/lib/components/map/elevation-point-marker.tsx
index 816cc6a0b..4a0a0c4f4 100644
--- a/lib/components/map/elevation-point-marker.tsx
+++ b/lib/components/map/elevation-point-marker.tsx
@@ -11,6 +11,14 @@ type Props = {
   showElevationProfile?: boolean
 }
 
+const ElevationMarker = styled.div`
+  background-color: #87cefa;
+  border: 2px solid #fff;
+  border-radius: 50%;
+  height: 15px;
+  width: 15px;
+`
+
 /**
  * As the OTP user moves the cursor over the elevation tracking chart
  * of a walking or biking leg (to see which point of their itinerary is at which elevation),
@@ -21,14 +29,6 @@ type Props = {
 const ElevationPointMarker = (props: Props) => {
   const { diagramLeg, elevationPoint, showElevationProfile } = props
 
-  const ElevationMarker = styled.div`
-    background-color: #87cefa;
-    border: 2px solid #fff;
-    border-radius: 50%;
-    height: 15px;
-    width: 15px;
-  `
-
   // Compute the elevation point marker, if activeLeg and elevation profile is enabled.
   let elevationPointMarker = null
   if (showElevationProfile && diagramLeg && elevationPoint) {
@@ -56,9 +56,4 @@ const mapStateToProps = (state: any) => {
   }
 }
 
-const mapDispatchToProps = {}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ElevationPointMarker)
+export default connect(mapStateToProps)(ElevationPointMarker)

From 098da4a41587ac3716df08c5f8db48d33196b41d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 13 Jul 2023 18:11:46 -0400
Subject: [PATCH 35/35] refactor(Popup): Fix type errors

---
 lib/components/app/popup.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/app/popup.tsx b/lib/components/app/popup.tsx
index 7033223f6..d506ea5c1 100644
--- a/lib/components/app/popup.tsx
+++ b/lib/components/app/popup.tsx
@@ -57,7 +57,7 @@ const PopupWrapper = ({ content, hideModal }: Props): JSX.Element | null => {
     }
   }, [compiledUrl, hideModal, useIframe, shown])
 
-  const title = id && intl.formatMessage({ id: `config.popups.${id}` })
+  const title = id ? intl.formatMessage({ id: `config.popups.${id}` }) : ''
 
   /* HACK: Since Bootstrap 3.x does not support adding id or name to navItem, 
   we have to grab a list of all navItems by className and find the correct button.