From 046a3c55c6adb4ef69cd5474ad2622431af9f35b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:39:36 +0000
Subject: [PATCH 01/18] chore(deps): bump decode-uri-component from 0.2.0 to
 0.2.2

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7f2e9858a..01cb7cfa6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6953,9 +6953,9 @@ decimal.js@^10.2.1:
   integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@0.7.0, dedent@^0.7.0:
   version "0.7.0"

From 1ec6dce4b87cd9873e0bdff15822875cc85ffb71 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 16 Nov 2023 16:31:11 -0500
Subject: [PATCH 02/18] fallback for when pattern filtering filters all
 patterns

---
 lib/actions/apiV2.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index d8de7a73a..7010dac83 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -13,8 +13,8 @@ import { generateModeSettingValues } from '../util/api'
 import {
   getActiveItineraries,
   getActiveItinerary,
-  isValidSubsequence,
   getRouteOperator,
+  isValidSubsequence,
   queryIsValid
 } from '../util/state'
 import { getRouteColorBasedOnSettings } from '../util/viewer'
@@ -682,7 +682,12 @@ export const findRoute = (params) =>
                 })
               })
 
-            filteredPatterns.forEach((pattern) => {
+            // Fallback for if the filtering removes all patterns
+            // If this happens, it is not possible to know which pattern to keep
+            ;(filteredPatterns.length > 0
+              ? filteredPatterns
+              : newRoute.patterns
+            ).forEach((pattern) => {
               const patternStops = pattern.stops.map((stop) => {
                 const color =
                   stop.routes?.length > 0 &&
@@ -995,7 +1000,8 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                       }
                     })
                     ?.map(convertGraphQLResponseToLegacy)
-                }))
+                })
+              )
 
               /* It is possible for a NO_TRANSIT_CONNECTION error to be
                 returned even if trips were returned, since it is on a mode-by-mode basis.

From 56f43aa60534bba0c4769c2ddff3140480ec04e2 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 17 Nov 2023 11:17:01 -0500
Subject: [PATCH 03/18] potential approach for restoring auto-highlight
 behavior

---
 lib/actions/api.js                            |  4 ---
 .../narrative/narrative-itineraries.js        | 32 +++++++++++++++++--
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/actions/api.js b/lib/actions/api.js
index dafc7cc42..7dafff4d4 100644
--- a/lib/actions/api.js
+++ b/lib/actions/api.js
@@ -12,7 +12,6 @@ import { getSecureFetchOptions } from '../util/middleware'
 import { getStopViewerConfig } from '../util/state'
 
 import { MainPanelContent } from './ui-constants'
-import { setVisibleItinerary } from './narrative'
 import v1Actions from './apiV1'
 import v2Actions from './apiV2'
 
@@ -139,9 +138,6 @@ export function updateOtpUrlParams(state, searchId) {
     params.ui_activeItinerary = -1
     // At the same time, reset/delete the ui_itineraryView param.
     params.ui_itineraryView = undefined
-    if (config.itinerary?.showFirstResultByDefault) {
-      dispatch(setVisibleItinerary({ index: 0 }))
-    }
     // Merge in the provided OTP params and update the URL.
     dispatch(setUrlSearch(Object.assign(params, otpParams)))
   }
diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 6d20a2437..80eec5c36 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -331,13 +331,16 @@ class NarrativeItineraries extends Component {
     )
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps) {
     // If set in URL, set the active itinerary in the state, once.
     const {
       activeItinerary,
       activeSearch,
+      itineraryConfig,
+      mergedItineraries,
       setActiveItinerary,
-      setVisibleItinerary
+      setVisibleItinerary,
+      visibleItinerary
     } = this.props
     const { ui_activeItinerary: uiActiveItinerary } =
       coreUtils.query.getUrlParams() || {}
@@ -350,6 +353,28 @@ class NarrativeItineraries extends Component {
       setActiveItinerary({ index: +uiActiveItinerary })
       setVisibleItinerary({ index: +uiActiveItinerary })
     }
+
+    /**
+     * Show first result by default is a lot more complicated now that we have
+     * fixed indeces. We must update the visible itinerary here instead of in the redux state.
+     * Also, we need to update whenever new items arrive, to make sure that the highlighted
+     * itinerary is indeed the first one.
+     *
+     * Finally, we need to make sure we only update if the data changes, not if the user actually
+     * highlighted something else on their own.
+     */
+    if (itineraryConfig?.showFirstResultByDefault) {
+      const firstSortedItin =
+        mergedItineraries?.length > 0 && mergedItineraries?.[0].index
+
+      if (
+        activeItinerary === -1 &&
+        (visibleItinerary === null || visibleItinerary === false) &&
+        prevProps.mergedItineraries.length !== mergedItineraries.length
+      ) {
+        setVisibleItinerary({ index: firstSortedItin })
+      }
+    }
   }
 
   // eslint-disable-next-line complexity
@@ -531,7 +556,7 @@ const reduceErrorsFromResponse = (acc, cur) => {
 
 const mapStateToProps = (state) => {
   const { config, filter } = state.otp
-  const { co2, errorMessages, modes } = config
+  const { co2, errorMessages, itinerary, modes } = config
   const { sort } = filter
 
   const activeSearch = getActiveSearch(state)
@@ -590,6 +615,7 @@ const mapStateToProps = (state) => {
     groupItineraries,
     groupTransitModes,
     itineraries: allItineraries,
+    itineraryConfig: itinerary,
     itineraryIsExpanded,
     // use a key so that the NarrativeItineraries component and its state is
     // reset each time a new search is shown

From b12a1327b34e700885fa44e2e875c6ba3e053a33 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 17 Nov 2023 11:26:21 -0500
Subject: [PATCH 04/18] appease codespell

---
 lib/components/narrative/narrative-itineraries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 80eec5c36..4fa12dbad 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -356,7 +356,7 @@ class NarrativeItineraries extends Component {
 
     /**
      * Show first result by default is a lot more complicated now that we have
-     * fixed indeces. We must update the visible itinerary here instead of in the redux state.
+     * fixed indices. We must update the visible itinerary here instead of in the redux state.
      * Also, we need to update whenever new items arrive, to make sure that the highlighted
      * itinerary is indeed the first one.
      *

From e98645abc031d462332e12de3bb35fb95d680503 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:15:13 -0500
Subject: [PATCH 05/18] fix(PhoneNumberEditor): Prevent flashing "Verified"
 when sending number for verif.

---
 lib/components/user/phone-number-editor.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/components/user/phone-number-editor.tsx b/lib/components/user/phone-number-editor.tsx
index fd5e8b972..6366e5928 100644
--- a/lib/components/user/phone-number-editor.tsx
+++ b/lib/components/user/phone-number-editor.tsx
@@ -247,9 +247,11 @@ class PhoneNumberEditor extends Component<Props, State> {
                   <FormattedMessage id="components.PhoneNumberEditor.pending" />
                 </BsLabel>
               ) : (
-                <BsLabel style={{ background: 'green' }}>
-                  <FormattedMessage id="components.PhoneNumberEditor.verified" />
-                </BsLabel>
+                phoneNumberVerified && (
+                  <BsLabel style={{ background: 'green' }}>
+                    <FormattedMessage id="components.PhoneNumberEditor.verified" />
+                  </BsLabel>
+                )
               )}
               <InvisibleA11yLabel>)</InvisibleA11yLabel>
               <button

From 5fbd2473f4014147e153c860270131d8cdc368f1 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 21 Nov 2023 14:34:27 +0100
Subject: [PATCH 06/18] support hiding mode icons

---
 example-config.yml                 | 1 +
 lib/components/viewers/RouteRow.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/example-config.yml b/example-config.yml
index e820d7b34..554c8ee6a 100644
--- a/example-config.yml
+++ b/example-config.yml
@@ -414,6 +414,7 @@ itinerary:
 #       BUS: # Any OTP mode
 #         color: 00FF00 # HEX color without the # (like GTFS)
 #         textColor: FFFFFF # HEX color without the # (like GTFS)
+#     routeIcons: false # If set to false, no mode icons in the route viewer
 #   - feedId: TriMet
 #     agencyId: TRIMET
 #     name: TriMet
diff --git a/lib/components/viewers/RouteRow.js b/lib/components/viewers/RouteRow.js
index 9bc8631a2..93ad0634a 100644
--- a/lib/components/viewers/RouteRow.js
+++ b/lib/components/viewers/RouteRow.js
@@ -176,7 +176,7 @@ export class RouteRow extends PureComponent {
         >
           <RouteDetailsContainer>
             <OperatorLogo operator={operator} />
-            {route.mode && (
+            {route.mode && operator.routeIcons !== false && (
               <ModeIconElement>
                 <ModeIcon
                   aria-label={getFormattedMode(

From d9867ba2ddbe15620294318a0f11634da73acc1e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 21 Nov 2023 17:17:30 +0100
Subject: [PATCH 07/18] remove bike tolerance slider

---
 .../form/call-taker/advanced-options.js       | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/lib/components/form/call-taker/advanced-options.js b/lib/components/form/call-taker/advanced-options.js
index b755d11a7..07c9a5796 100644
--- a/lib/components/form/call-taker/advanced-options.js
+++ b/lib/components/form/call-taker/advanced-options.js
@@ -167,9 +167,9 @@ class AdvancedOptions extends Component {
     })
   }
 
-  _setBikeTolerance = ({ bikeTolerance }) => {
+  _setBikeReluctance = ({ bikeReluctance }) => {
     this.props.setUrlSearch({
-      bikeTolerance
+      bikeReluctance
     })
   }
 
@@ -221,6 +221,10 @@ class AdvancedOptions extends Component {
         title: modeObj.label
       }
     })
+    const bikeEnabled = hasBike(
+      currentModes?.map((m) => m.mode).join(',') || ''
+    )
+    const bikeString = bikeEnabled ? 'Biking' : 'Walking'
     return (
       <div>
         <div
@@ -231,34 +235,32 @@ class AdvancedOptions extends Component {
           }}
         >
           <DropdownSelector
-            label={intl.formatMessage({
-              id: 'components.AdvancedOptions.walkTolerance'
-            })}
-            name="walkReluctance"
-            onChange={this._setWalkTolerance}
+            label={
+              bikeEnabled
+                ? intl.formatMessage({
+                    id: 'components.AdvancedOptions.bikeTolerance'
+                  })
+                : intl.formatMessage({
+                    id: 'components.AdvancedOptions.walkTolerance'
+                  })
+            }
+            name={bikeEnabled ? 'bikeReluctance' : 'walkReluctance'}
+            onChange={
+              bikeEnabled ? this._setBikeReluctance : this._setWalkTolerance
+            }
             options={[
-              { text: 'Normal Walking', value: 3 },
-              { text: 'Avoid Walking', value: 15 },
-              { text: 'Prefer walking', value: 1 }
+              { text: `Normal ${bikeString}`, value: 3 },
+              { text: `Avoid ${bikeString}`, value: 15 },
+              { text: `Prefer ${bikeString}`, value: 1 }
             ]}
             style={{ display: 'block', width: '33ch' }}
-            value={this.props.modeSettingValues.walkReluctance}
+            value={
+              bikeEnabled
+                ? this.props.modeSettingValues.bikeReluctance
+                : this.props.modeSettingValues.walkReluctance
+            }
           />
 
-          {hasBike(currentModes?.map((m) => m.mode).join(',') || '') ? (
-            <SliderSelector
-              label={intl.formatMessage({
-                id: 'components.AdvancedOptions.bikeTolerance'
-              })}
-              max={5}
-              min={0}
-              name="bikeTolerance"
-              onChange={this._setBikeTolerance}
-              step={1}
-              style={{ display: 'block', marginRight: '10px', width: '150px' }}
-              value={this.props.modeSettingValues.bikeTolerance}
-            />
-          ) : null}
           <StyledSubmodeSelector
             modes={transitModes}
             onChange={this._onSubModeChange}

From 23d80c1a72ebc8c78cebc00e29ea415bf80a1fbf Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 14:28:44 -0500
Subject: [PATCH 08/18] fix(TripBasicsPane): Use monitored trip's itin
 existence before doing new existence check.

---
 .../user/monitored-trip/trip-basics-pane.tsx  | 31 ++++++++-----------
 lib/components/user/types.ts                  | 18 +++++++++++
 lib/util/state-types.ts                       | 10 +++++-
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/lib/components/user/monitored-trip/trip-basics-pane.tsx b/lib/components/user/monitored-trip/trip-basics-pane.tsx
index b2aa897cc..7b150244a 100644
--- a/lib/components/user/monitored-trip/trip-basics-pane.tsx
+++ b/lib/components/user/monitored-trip/trip-basics-pane.tsx
@@ -18,6 +18,8 @@ import styled from 'styled-components'
 import type { IntlShape, WrappedComponentProps } from 'react-intl'
 
 import * as userActions from '../../../actions/user'
+import { ALL_DAYS, ItineraryExistence } from '../types'
+import { AppReduxState } from '../../../util/state-types'
 import { FieldSet } from '../styled'
 import { getErrorStates } from '../../../util/ui'
 import { getFormattedDayOfWeekPlural } from '../../../util/monitored-trip'
@@ -32,6 +34,7 @@ import TripSummary from './trip-summary'
 interface Fields {
   friday: boolean
   itinerary: Itinerary
+  itineraryExistence?: ItineraryExistence
   monday: boolean
   saturday: boolean
   sunday: boolean
@@ -47,23 +50,12 @@ type TripBasicsProps = WrappedComponentProps &
     checkItineraryExistence: (monitoredTrip: unknown, intl: IntlShape) => void
     clearItineraryExistence: () => void
     isCreating: boolean
-    itineraryExistence: Record<string, { valid: boolean }>
+    itineraryExistence?: ItineraryExistence
   }
 
 // FIXME: move to shared types file
 type ErrorStates = 'success' | 'warning' | 'error' | null | undefined
 
-// FIXME: combine back with monitored trips when that is typed.
-const ALL_DAYS = [
-  'monday',
-  'tuesday',
-  'wednesday',
-  'thursday',
-  'friday',
-  'saturday',
-  'sunday'
-] as const
-
 // Styles.
 const AvailableDays = styled(FieldSet)`
   & > span {
@@ -144,9 +136,11 @@ class TripBasicsPane extends Component<TripBasicsProps> {
   }
 
   componentDidMount() {
-    // Check itinerary availability (existence) for all days.
+    // Check itinerary availability (existence) for all days if not already done.
     const { checkItineraryExistence, intl, values: monitoredTrip } = this.props
-    checkItineraryExistence(monitoredTrip, intl)
+    if (!monitoredTrip.itineraryExistence) {
+      checkItineraryExistence(monitoredTrip, intl)
+    }
   }
 
   componentDidUpdate(prevProps: TripBasicsProps) {
@@ -169,6 +163,8 @@ class TripBasicsPane extends Component<TripBasicsProps> {
       values: monitoredTrip
     } = this.props
     const { itinerary } = monitoredTrip
+    const finalItineraryExistence =
+      monitoredTrip.itineraryExistence || itineraryExistence
 
     // Prevent user from leaving when form has been changed,
     // but don't show it when they click submit or cancel.
@@ -237,8 +233,7 @@ class TripBasicsPane extends Component<TripBasicsProps> {
                 <FormattedMessage id="components.TripBasicsPane.tripDaysPrompt" />
               </legend>
               {ALL_DAYS.map((day) => {
-                const isDayDisabled =
-                  itineraryExistence && !itineraryExistence[day].valid
+                const isDayDisabled = !finalItineraryExistence?.[day]?.valid
                 const boxClass = isDayDisabled
                   ? 'alert-danger'
                   : monitoredTrip[day]
@@ -278,7 +273,7 @@ class TripBasicsPane extends Component<TripBasicsProps> {
               })}
             </AvailableDays>
             <HelpBlock role="status">
-              {itineraryExistence ? (
+              {finalItineraryExistence ? (
                 <FormattedMessage id="components.TripBasicsPane.tripIsAvailableOnDaysIndicated" />
               ) : (
                 <ProgressBar
@@ -307,7 +302,7 @@ class TripBasicsPane extends Component<TripBasicsProps> {
 
 // Connect to redux store
 
-const mapStateToProps = (state: any) => {
+const mapStateToProps = (state: AppReduxState) => {
   const { itineraryExistence } = state.user
   return {
     itineraryExistence
diff --git a/lib/components/user/types.ts b/lib/components/user/types.ts
index cc375710d..3940b19b5 100644
--- a/lib/components/user/types.ts
+++ b/lib/components/user/types.ts
@@ -30,3 +30,21 @@ export interface User {
 export type EditedUser = Omit<User, 'notificationChannel'> & {
   notificationChannel: string[]
 }
+
+export const ALL_DAYS = [
+  'monday',
+  'tuesday',
+  'wednesday',
+  'thursday',
+  'friday',
+  'saturday',
+  'sunday'
+] as const
+
+export type DaysOfWeek = typeof ALL_DAYS[number]
+
+export interface ItineraryExistenceDay {
+  valid: boolean
+}
+
+export type ItineraryExistence = Record<DaysOfWeek, ItineraryExistenceDay>
diff --git a/lib/util/state-types.ts b/lib/util/state-types.ts
index ae33c020e..2087746bc 100644
--- a/lib/util/state-types.ts
+++ b/lib/util/state-types.ts
@@ -1,3 +1,5 @@
+import { ItineraryExistence, User } from '../components/user/types'
+
 import { AppConfig } from './config-types'
 
 export interface OtpState {
@@ -11,8 +13,14 @@ export interface OtpState {
   ui: any // TODO
 }
 
+export interface UserState {
+  itineraryExistence?: ItineraryExistence
+  loggedInUser: User
+  // TODO: Add other user states.
+}
+
 export interface AppReduxState {
   calltaker?: any // TODO
   otp: OtpState
-  user: any // TODO
+  user: UserState
 }

From 52dec79e6263c61692790cd7a4427f3623ce39b7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 14:57:43 -0500
Subject: [PATCH 09/18] fix(TripBasicsPane): Restore previous behavior not
 disabling days prior to check.

---
 lib/components/user/monitored-trip/trip-basics-pane.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/components/user/monitored-trip/trip-basics-pane.tsx b/lib/components/user/monitored-trip/trip-basics-pane.tsx
index 7b150244a..d34ec5a0f 100644
--- a/lib/components/user/monitored-trip/trip-basics-pane.tsx
+++ b/lib/components/user/monitored-trip/trip-basics-pane.tsx
@@ -233,7 +233,9 @@ class TripBasicsPane extends Component<TripBasicsProps> {
                 <FormattedMessage id="components.TripBasicsPane.tripDaysPrompt" />
               </legend>
               {ALL_DAYS.map((day) => {
-                const isDayDisabled = !finalItineraryExistence?.[day]?.valid
+                const isDayDisabled =
+                  finalItineraryExistence &&
+                  !finalItineraryExistence[day]?.valid
                 const boxClass = isDayDisabled
                   ? 'alert-danger'
                   : monitoredTrip[day]

From e185a80928ba6ef6baac2483b67c2d757a003219 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 15:19:21 -0500
Subject: [PATCH 10/18] refactor(monitored-trip/*): Introduce new MonitoredTrip
 type.

---
 .../user/monitored-trip/saved-trip-editor.tsx |  4 ++--
 .../user/monitored-trip/trip-basics-pane.tsx  | 23 +++++--------------
 .../trip-notifications-pane.tsx               |  8 ++-----
 .../user/monitored-trip/trip-summary.tsx      | 10 ++------
 lib/components/user/types.ts                  | 16 +++++++++++++
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/lib/components/user/monitored-trip/saved-trip-editor.tsx b/lib/components/user/monitored-trip/saved-trip-editor.tsx
index 2dbd00a1c..874932780 100644
--- a/lib/components/user/monitored-trip/saved-trip-editor.tsx
+++ b/lib/components/user/monitored-trip/saved-trip-editor.tsx
@@ -1,6 +1,7 @@
 import { FormattedMessage, useIntl } from 'react-intl'
 import React, { ComponentType } from 'react'
 
+import { MonitoredTrip } from '../types'
 import BackLink from '../back-link'
 import PageTitle from '../../util/page-title'
 import StackedPanesWithSave from '../stacked-panes-with-save'
@@ -9,8 +10,7 @@ interface Props {
   isCreating: boolean
   onCancel: () => void
   panes: Record<string, ComponentType>
-  // TODO: Combine monitored trip types
-  values: Record<string, unknown>
+  values: MonitoredTrip
 }
 
 /**
diff --git a/lib/components/user/monitored-trip/trip-basics-pane.tsx b/lib/components/user/monitored-trip/trip-basics-pane.tsx
index d34ec5a0f..6a29628d8 100644
--- a/lib/components/user/monitored-trip/trip-basics-pane.tsx
+++ b/lib/components/user/monitored-trip/trip-basics-pane.tsx
@@ -9,7 +9,6 @@ import {
 } from 'react-bootstrap'
 import { Field, FormikProps } from 'formik'
 import { FormattedMessage, injectIntl } from 'react-intl'
-import { Itinerary } from '@opentripplanner/types'
 import { Prompt } from 'react-router'
 // @ts-expect-error FormikErrorFocus does not support TypeScript yet.
 import FormikErrorFocus from 'formik-error-focus'
@@ -18,7 +17,7 @@ import styled from 'styled-components'
 import type { IntlShape, WrappedComponentProps } from 'react-intl'
 
 import * as userActions from '../../../actions/user'
-import { ALL_DAYS, ItineraryExistence } from '../types'
+import { ALL_DAYS, ItineraryExistence, MonitoredTrip } from '../types'
 import { AppReduxState } from '../../../util/state-types'
 import { FieldSet } from '../styled'
 import { getErrorStates } from '../../../util/ui'
@@ -31,23 +30,13 @@ import InvisibleA11yLabel from '../../util/invisible-a11y-label'
 import TripStatus from './trip-status'
 import TripSummary from './trip-summary'
 
-interface Fields {
-  friday: boolean
-  itinerary: Itinerary
-  itineraryExistence?: ItineraryExistence
-  monday: boolean
-  saturday: boolean
-  sunday: boolean
-  thursday: boolean
-  tripName: string
-  tuesday: boolean
-  wednesday: boolean
-}
-
 type TripBasicsProps = WrappedComponentProps &
-  FormikProps<Fields> & {
+  FormikProps<MonitoredTrip> & {
     canceled: boolean
-    checkItineraryExistence: (monitoredTrip: unknown, intl: IntlShape) => void
+    checkItineraryExistence: (
+      monitoredTrip: MonitoredTrip,
+      intl: IntlShape
+    ) => void
     clearItineraryExistence: () => void
     isCreating: boolean
     itineraryExistence?: ItineraryExistence
diff --git a/lib/components/user/monitored-trip/trip-notifications-pane.tsx b/lib/components/user/monitored-trip/trip-notifications-pane.tsx
index 50145d780..dd8077a83 100644
--- a/lib/components/user/monitored-trip/trip-notifications-pane.tsx
+++ b/lib/components/user/monitored-trip/trip-notifications-pane.tsx
@@ -7,6 +7,7 @@ import styled from 'styled-components'
 
 import { FieldSet } from '../styled'
 import { IconWithText } from '../../util/styledIcon'
+import { MonitoredTrip } from '../types'
 
 // Element styles
 const SettingsList = styled.ul`
@@ -152,12 +153,7 @@ function DurationOptions({
   return <Options defaultValue={defaultValue} options={options} />
 }
 
-interface Fields {
-  arrivalVarianceMinutesThreshold: number
-  departureVarianceMinutesThreshold: number
-}
-
-interface Props extends FormikProps<Fields> {
+interface Props extends FormikProps<MonitoredTrip> {
   notificationChannel: string
 }
 
diff --git a/lib/components/user/monitored-trip/trip-summary.tsx b/lib/components/user/monitored-trip/trip-summary.tsx
index a0b077739..9090bd0ba 100644
--- a/lib/components/user/monitored-trip/trip-summary.tsx
+++ b/lib/components/user/monitored-trip/trip-summary.tsx
@@ -3,6 +3,7 @@ import React, { useContext } from 'react'
 import styled from 'styled-components'
 
 import { ComponentContext } from '../../../util/contexts'
+import { MonitoredTrip } from '../types'
 import FormattedDuration from '../../util/formatted-duration'
 import InvisibleA11yLabel from '../../util/invisible-a11y-label'
 
@@ -11,14 +12,7 @@ const SummaryContainer = styled.div`
 `
 
 interface Props {
-  // TODO: use a more complete definition of monitored trip.
-  monitoredTrip: {
-    itinerary: {
-      duration: number
-      endTime: number
-      startTime: number
-    }
-  }
+  monitoredTrip: MonitoredTrip
 }
 
 const TripSummary = ({ monitoredTrip }: Props): JSX.Element => {
diff --git a/lib/components/user/types.ts b/lib/components/user/types.ts
index 3940b19b5..aff79eb54 100644
--- a/lib/components/user/types.ts
+++ b/lib/components/user/types.ts
@@ -1,3 +1,5 @@
+import { Itinerary } from '@opentripplanner/types'
+
 /**
  * A user-saved, favorite location.
  */
@@ -48,3 +50,17 @@ export interface ItineraryExistenceDay {
 }
 
 export type ItineraryExistence = Record<DaysOfWeek, ItineraryExistenceDay>
+
+export interface MonitoredTrip extends Record<DaysOfWeek, boolean> {
+  arrivalVarianceMinutesThreshold: number
+  departureVarianceMinutesThreshold: number
+  excludeFederalHolidays?: boolean
+  id: string
+  isActive: boolean
+  itinerary: Itinerary
+  itineraryExistence?: ItineraryExistence
+  leadTimeInMinutes: number
+  queryParams: string
+  tripName: string
+  userId: string
+}

From 348ec3b39506d13d5419ac72f9c52809d6f22397 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 15:29:16 -0500
Subject: [PATCH 11/18] refactor(TripSummaryPane): Convert to TypeScript

---
 ...-summary-pane.js => trip-summary-pane.tsx} | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)
 rename lib/components/user/monitored-trip/{trip-summary-pane.js => trip-summary-pane.tsx} (59%)

diff --git a/lib/components/user/monitored-trip/trip-summary-pane.js b/lib/components/user/monitored-trip/trip-summary-pane.tsx
similarity index 59%
rename from lib/components/user/monitored-trip/trip-summary-pane.js
rename to lib/components/user/monitored-trip/trip-summary-pane.tsx
index 697a2582c..7cd0bc11d 100644
--- a/lib/components/user/monitored-trip/trip-summary-pane.js
+++ b/lib/components/user/monitored-trip/trip-summary-pane.tsx
@@ -1,31 +1,36 @@
-import React from 'react'
 import { FormattedList, FormattedMessage } from 'react-intl'
+import React from 'react'
 
 import { dayFieldsToArray } from '../../../util/monitored-trip'
+import { MonitoredTrip } from '../types'
 import FormattedDayOfWeek from '../../util/formatted-day-of-week'
 import Strong from '../../util/strong-text'
 
 import TripSummary from './trip-summary'
 
+interface Props {
+  monitoredTrip: MonitoredTrip
+}
+
 /**
  * Displays the summary information of a monitored trip.
  */
-const TripSummaryPane = ({ monitoredTrip }) => {
+const TripSummaryPane = ({ monitoredTrip }: Props): JSX.Element => {
   const { itinerary, leadTimeInMinutes } = monitoredTrip
 
   if (!itinerary) {
     return (
       <div>
-        <FormattedMessage id='common.itineraryDescriptions.noItineraryToDisplay' />
+        <FormattedMessage id="common.itineraryDescriptions.noItineraryToDisplay" />
       </div>
     )
   } else {
     const days = (
       <FormattedList
-        type='conjunction'
-        value={dayFieldsToArray(monitoredTrip).map(
-          d => <FormattedDayOfWeek day={d} key={d} />
-        )}
+        type="conjunction"
+        value={dayFieldsToArray(monitoredTrip).map((d) => (
+          <FormattedDayOfWeek day={d} key={d} />
+        ))}
       />
     )
 
@@ -35,21 +40,22 @@ const TripSummaryPane = ({ monitoredTrip }) => {
         <TripSummary monitoredTrip={monitoredTrip} />
         <p>
           <FormattedMessage
-            id='components.TripSummaryPane.happensOnDays'
+            id="components.TripSummaryPane.happensOnDays"
             values={{ days, strong: Strong }}
           />
         </p>
         <p>
-          {monitoredTrip.isActive
-            ? <FormattedMessage
-              id={'components.TripSummaryPane.notifications'}
+          {monitoredTrip.isActive ? (
+            <FormattedMessage
+              id="components.TripSummaryPane.notifications"
               values={{ leadTimeInMinutes, strong: Strong }}
             />
-            : <FormattedMessage
-              id={'components.TripSummaryPane.notificationsDisabled'}
+          ) : (
+            <FormattedMessage
+              id="components.TripSummaryPane.notificationsDisabled"
               values={{ leadTimeInMinutes, strong: Strong }}
             />
-          }
+          )}
         </p>
       </>
     )

From 0de59c12623e68bab91be8789400efc3da9cef7d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:45:35 -0500
Subject: [PATCH 12/18] refactor(SavedTripList): Convert to TypeScript

---
 ...saved-trip-list.js => saved-trip-list.tsx} | 40 ++++++++++++++-----
 lib/util/state-types.ts                       |  7 +++-
 2 files changed, 35 insertions(+), 12 deletions(-)
 rename lib/components/user/monitored-trip/{saved-trip-list.js => saved-trip-list.tsx} (87%)

diff --git a/lib/components/user/monitored-trip/saved-trip-list.js b/lib/components/user/monitored-trip/saved-trip-list.tsx
similarity index 87%
rename from lib/components/user/monitored-trip/saved-trip-list.js
rename to lib/components/user/monitored-trip/saved-trip-list.tsx
index bdcf1336c..135884db1 100644
--- a/lib/components/user/monitored-trip/saved-trip-list.js
+++ b/lib/components/user/monitored-trip/saved-trip-list.tsx
@@ -1,7 +1,6 @@
-/* eslint-disable react/prop-types */
 import { Button, Panel } from 'react-bootstrap'
 import { connect } from 'react-redux'
-import { FormattedMessage, injectIntl, useIntl } from 'react-intl'
+import { FormattedMessage, injectIntl, IntlShape, useIntl } from 'react-intl'
 import { Pause } from '@styled-icons/fa-solid/Pause'
 import { PencilAlt } from '@styled-icons/fa-solid/PencilAlt'
 import { Play } from '@styled-icons/fa-solid/Play'
@@ -11,8 +10,10 @@ import React, { Component } from 'react'
 
 import * as uiActions from '../../../actions/ui'
 import * as userActions from '../../../actions/user'
+import { AppReduxState } from '../../../util/state-types'
 import { IconWithText } from '../../util/styledIcon'
 import { InlineLoading } from '../../narrative/loading'
+import { MonitoredTrip } from '../types'
 import {
   PageHeading,
   TripHeader,
@@ -29,15 +30,34 @@ import withLoggedInUserSupport from '../with-logged-in-user-support'
 
 import TripSummaryPane from './trip-summary-pane'
 
+interface ItemProps {
+  confirmAndDeleteUserMonitoredTrip: (id: string, intl: IntlShape) => void
+  intl: IntlShape
+  routeTo: (url: any) => void
+  togglePauseTrip: (trip: MonitoredTrip, intl: IntlShape) => void
+  trip: MonitoredTrip
+}
+
+interface ItemState {
+  pendingRequest: 'pause' | 'delete' | false
+}
+
+interface Props {
+  trips?: MonitoredTrip[]
+}
+
 /**
  * This class manages events and rendering for one item in the saved trip list.
  */
-class TripListItem extends Component {
-  state = {
-    pendingRequest: false
+class TripListItem extends Component<ItemProps, ItemState> {
+  constructor(props: ItemProps) {
+    super(props)
+    this.state = {
+      pendingRequest: false
+    }
   }
 
-  componentDidUpdate = (prevProps) => {
+  componentDidUpdate = (prevProps: ItemProps) => {
     if (prevProps.trip.isActive !== this.props.trip.isActive) {
       this.setState({ pendingRequest: false })
     }
@@ -160,7 +180,7 @@ const ConnectedTripListItem = connect(
 /**
  * This component displays the list of saved trips for the logged-in user.
  */
-const SavedTripList = ({ trips }) => {
+const SavedTripList = ({ trips }: Props) => {
   const intl = useIntl()
   let content
 
@@ -212,17 +232,15 @@ const SavedTripList = ({ trips }) => {
 
 // connect to the redux store
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state: AppReduxState) => {
   return {
     trips: state.user.loggedInUserMonitoredTrips
   }
 }
 
-const mapDispatchToProps = {}
-
 export default withLoggedInUserSupport(
   withAuthenticationRequired(
-    connect(mapStateToProps, mapDispatchToProps)(SavedTripList),
+    connect(mapStateToProps)(SavedTripList),
     RETURN_TO_CURRENT_ROUTE
   ),
   true
diff --git a/lib/util/state-types.ts b/lib/util/state-types.ts
index 2087746bc..ac6107a01 100644
--- a/lib/util/state-types.ts
+++ b/lib/util/state-types.ts
@@ -1,4 +1,8 @@
-import { ItineraryExistence, User } from '../components/user/types'
+import {
+  ItineraryExistence,
+  MonitoredTrip,
+  User
+} from '../components/user/types'
 
 import { AppConfig } from './config-types'
 
@@ -16,6 +20,7 @@ export interface OtpState {
 export interface UserState {
   itineraryExistence?: ItineraryExistence
   loggedInUser: User
+  loggedInUserMonitoredTrips?: MonitoredTrip[]
   // TODO: Add other user states.
 }
 

From 9861ceb67efde0787299b502eb50beaac1d579b8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:46:26 -0500
Subject: [PATCH 13/18] refactor(TripSummary*): Reuse prop type.

---
 .../user/monitored-trip/trip-summary-pane.tsx          | 10 ++++------
 lib/components/user/monitored-trip/trip-summary.tsx    |  8 ++------
 lib/components/user/types.ts                           |  4 ++++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/components/user/monitored-trip/trip-summary-pane.tsx b/lib/components/user/monitored-trip/trip-summary-pane.tsx
index 7cd0bc11d..d1fb81f03 100644
--- a/lib/components/user/monitored-trip/trip-summary-pane.tsx
+++ b/lib/components/user/monitored-trip/trip-summary-pane.tsx
@@ -2,20 +2,18 @@ import { FormattedList, FormattedMessage } from 'react-intl'
 import React from 'react'
 
 import { dayFieldsToArray } from '../../../util/monitored-trip'
-import { MonitoredTrip } from '../types'
+import { MonitoredTripProps } from '../types'
 import FormattedDayOfWeek from '../../util/formatted-day-of-week'
 import Strong from '../../util/strong-text'
 
 import TripSummary from './trip-summary'
 
-interface Props {
-  monitoredTrip: MonitoredTrip
-}
-
 /**
  * Displays the summary information of a monitored trip.
  */
-const TripSummaryPane = ({ monitoredTrip }: Props): JSX.Element => {
+const TripSummaryPane = ({
+  monitoredTrip
+}: MonitoredTripProps): JSX.Element => {
   const { itinerary, leadTimeInMinutes } = monitoredTrip
 
   if (!itinerary) {
diff --git a/lib/components/user/monitored-trip/trip-summary.tsx b/lib/components/user/monitored-trip/trip-summary.tsx
index 9090bd0ba..ca5c700c9 100644
--- a/lib/components/user/monitored-trip/trip-summary.tsx
+++ b/lib/components/user/monitored-trip/trip-summary.tsx
@@ -3,7 +3,7 @@ import React, { useContext } from 'react'
 import styled from 'styled-components'
 
 import { ComponentContext } from '../../../util/contexts'
-import { MonitoredTrip } from '../types'
+import { MonitoredTripProps } from '../types'
 import FormattedDuration from '../../util/formatted-duration'
 import InvisibleA11yLabel from '../../util/invisible-a11y-label'
 
@@ -11,11 +11,7 @@ const SummaryContainer = styled.div`
   margin-bottom: 10px;
 `
 
-interface Props {
-  monitoredTrip: MonitoredTrip
-}
-
-const TripSummary = ({ monitoredTrip }: Props): JSX.Element => {
+const TripSummary = ({ monitoredTrip }: MonitoredTripProps): JSX.Element => {
   const { itinerary } = monitoredTrip
   const { duration, endTime, startTime } = itinerary
   // @ts-expect-error TODO: add ModesAndRoutes to ItineraryBody attribute of ComponentContext
diff --git a/lib/components/user/types.ts b/lib/components/user/types.ts
index aff79eb54..a6b0a8ebd 100644
--- a/lib/components/user/types.ts
+++ b/lib/components/user/types.ts
@@ -64,3 +64,7 @@ export interface MonitoredTrip extends Record<DaysOfWeek, boolean> {
   tripName: string
   userId: string
 }
+
+export interface MonitoredTripProps {
+  monitoredTrip: MonitoredTrip
+}

From 46db98b119bc3516bfe814b10be5645242a41090 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:14:09 -0500
Subject: [PATCH 14/18] refactor(util/monitored-trip): Convert to TypeScript.

---
 .../user/monitored-trip/trip-basics-pane.tsx  |  7 +++++--
 lib/components/user/types.ts                  | 16 +++-----------
 .../{monitored-trip.js => monitored-trip.ts}  | 21 ++++++++++++++-----
 3 files changed, 24 insertions(+), 20 deletions(-)
 rename lib/util/{monitored-trip.js => monitored-trip.ts} (74%)

diff --git a/lib/components/user/monitored-trip/trip-basics-pane.tsx b/lib/components/user/monitored-trip/trip-basics-pane.tsx
index 6a29628d8..6a2adf6dc 100644
--- a/lib/components/user/monitored-trip/trip-basics-pane.tsx
+++ b/lib/components/user/monitored-trip/trip-basics-pane.tsx
@@ -17,11 +17,14 @@ import styled from 'styled-components'
 import type { IntlShape, WrappedComponentProps } from 'react-intl'
 
 import * as userActions from '../../../actions/user'
-import { ALL_DAYS, ItineraryExistence, MonitoredTrip } from '../types'
+import {
+  ALL_DAYS,
+  getFormattedDayOfWeekPlural
+} from '../../../util/monitored-trip'
 import { AppReduxState } from '../../../util/state-types'
 import { FieldSet } from '../styled'
 import { getErrorStates } from '../../../util/ui'
-import { getFormattedDayOfWeekPlural } from '../../../util/monitored-trip'
+import { ItineraryExistence, MonitoredTrip } from '../types'
 import FormattedDayOfWeek from '../../util/formatted-day-of-week'
 import FormattedDayOfWeekCompact from '../../util/formatted-day-of-week-compact'
 import FormattedValidationError from '../../util/formatted-validation-error'
diff --git a/lib/components/user/types.ts b/lib/components/user/types.ts
index a6b0a8ebd..187e3c586 100644
--- a/lib/components/user/types.ts
+++ b/lib/components/user/types.ts
@@ -1,5 +1,7 @@
 import { Itinerary } from '@opentripplanner/types'
 
+import { DaysOfWeek } from '../../util/monitored-trip'
+
 /**
  * A user-saved, favorite location.
  */
@@ -33,25 +35,13 @@ export type EditedUser = Omit<User, 'notificationChannel'> & {
   notificationChannel: string[]
 }
 
-export const ALL_DAYS = [
-  'monday',
-  'tuesday',
-  'wednesday',
-  'thursday',
-  'friday',
-  'saturday',
-  'sunday'
-] as const
-
-export type DaysOfWeek = typeof ALL_DAYS[number]
-
 export interface ItineraryExistenceDay {
   valid: boolean
 }
 
 export type ItineraryExistence = Record<DaysOfWeek, ItineraryExistenceDay>
 
-export interface MonitoredTrip extends Record<DaysOfWeek, boolean> {
+export type MonitoredTrip = Record<DaysOfWeek, boolean> & {
   arrivalVarianceMinutesThreshold: number
   departureVarianceMinutesThreshold: number
   excludeFederalHolidays?: boolean
diff --git a/lib/util/monitored-trip.js b/lib/util/monitored-trip.ts
similarity index 74%
rename from lib/util/monitored-trip.js
rename to lib/util/monitored-trip.ts
index 71c3289d7..d97c89745 100644
--- a/lib/util/monitored-trip.js
+++ b/lib/util/monitored-trip.ts
@@ -1,12 +1,18 @@
+import { IntlShape } from 'react-intl'
+
+import { MonitoredTrip } from '../components/user/types'
+
 export const WEEKDAYS = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday']
 export const WEEKEND_DAYS = ['saturday', 'sunday']
-export const ALL_DAYS = [...WEEKDAYS, ...WEEKEND_DAYS]
+export const ALL_DAYS = [...WEEKDAYS, ...WEEKEND_DAYS] as const
+
+export type DaysOfWeek = typeof ALL_DAYS[number]
 
 /**
  * Extracts the day of week fields of an object (e.g. a monitoredTrip) to an array.
  * Example: { monday: truthy, tuesday: falsey, wednesday: truthy ... } => ['monday', 'wednesday' ...]
  */
-export function dayFieldsToArray(monitoredTrip) {
+export function dayFieldsToArray(monitoredTrip: MonitoredTrip): DaysOfWeek[] {
   return ALL_DAYS.filter((day) => monitoredTrip[day])
 }
 
@@ -14,8 +20,10 @@ export function dayFieldsToArray(monitoredTrip) {
  * Converts an array of day of week values into an object with those fields.
  * Example: ['monday', 'wednesday' ...] => { monday: true, tuesday: false, wednesday: true ... }
  */
-export function arrayToDayFields(arrayOfDayTypes) {
-  const result = {}
+export function arrayToDayFields(
+  arrayOfDayTypes: DaysOfWeek[]
+): Record<DaysOfWeek, boolean> {
+  const result = {} as Record<DaysOfWeek, boolean>
   ALL_DAYS.forEach((day) => {
     result[day] = arrayOfDayTypes.includes(day)
   })
@@ -26,7 +34,10 @@ export function arrayToDayFields(arrayOfDayTypes) {
  * Returns a FormattedMessage string for the pluralised day of week via the react-intl imperative API
  * such that i18n IDs are hardcoded and can be kept track of by format.js tools
  */
-export function getFormattedDayOfWeekPlural(day, intl) {
+export function getFormattedDayOfWeekPlural(
+  day: DaysOfWeek,
+  intl: IntlShape
+): string | null {
   switch (day) {
     case 'monday':
       return intl.formatMessage({ id: 'common.daysOfWeekPlural.monday' })

From f1161015fd5035f478f237ae6d1fd91b96b76d46 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup
 <86619099+miles-grant-ibigroup@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:58:35 -0500
Subject: [PATCH 15/18] address pr feedback

Co-authored-by: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
---
 lib/components/narrative/narrative-itineraries.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 4fa12dbad..d9f12359a 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -355,7 +355,7 @@ class NarrativeItineraries extends Component {
     }
 
     /**
-     * Show first result by default is a lot more complicated now that we have
+     * Showing the first result by default is a lot more complicated now that we have
      * fixed indices. We must update the visible itinerary here instead of in the redux state.
      * Also, we need to update whenever new items arrive, to make sure that the highlighted
      * itinerary is indeed the first one.
@@ -364,15 +364,14 @@ class NarrativeItineraries extends Component {
      * highlighted something else on their own.
      */
     if (itineraryConfig?.showFirstResultByDefault) {
-      const firstSortedItin =
-        mergedItineraries?.length > 0 && mergedItineraries?.[0].index
-
       if (
         activeItinerary === -1 &&
         (visibleItinerary === null || visibleItinerary === false) &&
         prevProps.mergedItineraries.length !== mergedItineraries.length
       ) {
-        setVisibleItinerary({ index: firstSortedItin })
+        setVisibleItinerary({
+          index: mergedItineraries?.length > 0 && mergedItineraries?.[0].index
+        })
       }
     }
   }

From 01fcffa3b080cc2eb646707174536699889a9a39 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 28 Nov 2023 10:02:59 -0500
Subject: [PATCH 16/18] update config type

---
 lib/util/config-types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/util/config-types.ts b/lib/util/config-types.ts
index 32ec6a200..a0d46c3d1 100644
--- a/lib/util/config-types.ts
+++ b/lib/util/config-types.ts
@@ -300,6 +300,7 @@ export interface ModeColorConfig {
 export interface TransitOperatorConfig extends TransitOperator {
   colorMode?: 'gtfs' | 'gtfs-softened' | 'disabled'
   modeColors?: Record<string, ModeColorConfig>
+  routeIcons?: boolean
 }
 
 /** Route Viewer config */

From 55103f4c7e339f6c5bee19c50410bd4f43d7051a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:34:55 +0000
Subject: [PATCH 17/18] chore(deps): bump url-parse from 1.5.3 to 1.5.10

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 675a1619b..f56458e88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18186,9 +18186,9 @@ url-loader@4.1.1:
     schema-utils "^3.0.0"
 
 url-parse@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

From d80a67f009ed9c6e98032b1b9008ad4070e31b69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:55:31 +0000
Subject: [PATCH 18/18] chore(deps): bump object-path from 0.11.5 to 0.11.8

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.8.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index aac9c4d8c..b6ffec169 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "lodash.memoize": "^4.1.2",
     "maplibre-gl": "^2.1.9",
     "object-hash": "^1.3.1",
-    "object-path": "^0.11.5",
+    "object-path": "^0.11.8",
     "object-to-formdata": "^4.1.0",
     "pdfkit": "^0.12.1",
     "prop-types": "^15.6.0",
diff --git a/yarn.lock b/yarn.lock
index f56458e88..5048477c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13255,10 +13255,10 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-path@^0.11.5:
-  version "0.11.7"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.7.tgz#5f211161f34bb395e4b13a5f565b79d933b6f65d"
-  integrity sha512-T4evaK9VfGGQskXBDILcn6F90ZD+WO3OwRFFQ2rmZdUH4vQeDBpiolTpVlPY2yj5xSepyILTjDyM6UvbbdHMZw==
+object-path@^0.11.8:
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742"
+  integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==
 
 object-to-formdata@^4.1.0:
   version "4.1.0"