From 77c455d733cf9d5a9ee4f6d88295d92ab975d8b7 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:22:06 -0600
Subject: [PATCH 01/11] feat(routingQuery): Add banned routes to routing query

---
 lib/actions/apiV2.js                   |  8 +++++++-
 lib/components/form/batch-settings.tsx | 14 ++++++++++----
 lib/reducers/create-otp-reducer.js     | 10 ++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index 5bca59ad8..03fbade87 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -1,5 +1,6 @@
 import {
   aggregateModes,
+  getBannedRoutesFromSubmodes,
   populateSettingWithValue
 } from '@opentripplanner/trip-form'
 import { createAction } from 'redux-actions'
@@ -909,7 +910,6 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
     const modeSettings = modeSettingDefinitions?.map(
       populateSettingWithValue(modeSettingValues)
     )
-
     // Get the raw query param strings to save for the rider's search history
     const rawModeButtonQP = urlSearchParams.get('modeButtons')
     const queryParamData = {
@@ -917,9 +917,15 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       ...modeSettingValues
     }
 
+    const excludedRoutes = getBannedRoutesFromSubmodes(
+      modeSettings,
+      config.routeModeOverrides
+    ).toString()
+
     const baseQuery = {
       arriveBy,
       banned: {
+        routes: excludedRoutes || undefined,
         trips: bannedTrips
       },
       date,
diff --git a/lib/components/form/batch-settings.tsx b/lib/components/form/batch-settings.tsx
index 15e3f95e8..962588ca8 100644
--- a/lib/components/form/batch-settings.tsx
+++ b/lib/components/form/batch-settings.tsx
@@ -115,13 +115,19 @@ function BatchSettings({
   )
 
   const addCustomSettingLabels = useCallback(
-    (msd: ModeSetting) =>
-      msd.type === 'SUBMODE'
+    (msd: ModeSetting) => {
+      let modeLabel
+      // If we're using route mode overrides, make sure we're using the custom mode name
+      if (msd.type === 'SUBMODE') {
+        modeLabel = msd.modeOverride || msd.addTransportMode.mode
+      }
+      return msd.type === 'SUBMODE'
         ? {
             ...msd,
-            label: getFormattedMode(msd.addTransportMode.mode, intl)
+            label: getFormattedMode(modeLabel, intl)
           }
-        : msd,
+        : msd
+    },
     [intl]
   )
 
diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index 472598ab7..aed8c54ad 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -137,13 +137,19 @@ export function getInitialState(userDefinedConfig) {
   }
 
   const transitModeSettings = config?.modes?.transitModes.map((transitMode) => {
-    const { mode } = transitMode
+    const { gtfsMode, mode } = transitMode
+    /**
+     * If we're using custom route mode overrides, we pass both the
+     * custom mode name (mode) and the gtfs mode to the modeSetting.
+     */
+    const modeSetting = gtfsMode || mode
     return {
-      addTransportMode: { mode },
+      addTransportMode: { mode: modeSetting },
       applicableMode: 'TRANSIT',
       default: true,
       iconName: mode.toLowerCase(),
       key: mode.toLowerCase(),
+      modeOverride: gtfsMode && mode,
       type: 'SUBMODE'
     }
   })

From 668b074cede931b31bc34045c198ac081f8acdb6 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 24 Jan 2024 15:31:32 -0800
Subject: [PATCH 02/11] implement changes for overridemode support

---
 lib/actions/apiV2.js                   |  1 +
 lib/components/form/batch-settings.tsx | 13 ++++++-------
 lib/reducers/create-otp-reducer.js     | 18 ++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index 03fbade87..cdb1e445d 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -921,6 +921,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       modeSettings,
       config.routeModeOverrides
     ).toString()
+    console.log(excludedRoutes)
 
     const baseQuery = {
       arriveBy,
diff --git a/lib/components/form/batch-settings.tsx b/lib/components/form/batch-settings.tsx
index 962588ca8..2ed424732 100644
--- a/lib/components/form/batch-settings.tsx
+++ b/lib/components/form/batch-settings.tsx
@@ -119,14 +119,13 @@ function BatchSettings({
       let modeLabel
       // If we're using route mode overrides, make sure we're using the custom mode name
       if (msd.type === 'SUBMODE') {
-        modeLabel = msd.modeOverride || msd.addTransportMode.mode
+        modeLabel = msd.overrideMode || msd.addTransportMode.mode
+        return {
+          ...msd,
+          label: getFormattedMode(modeLabel, intl)
+        }
       }
-      return msd.type === 'SUBMODE'
-        ? {
-            ...msd,
-            label: getFormattedMode(modeLabel, intl)
-          }
-        : msd
+      return msd
     },
     [intl]
   )
diff --git a/lib/reducers/create-otp-reducer.js b/lib/reducers/create-otp-reducer.js
index aed8c54ad..7f69d8dfd 100644
--- a/lib/reducers/create-otp-reducer.js
+++ b/lib/reducers/create-otp-reducer.js
@@ -137,19 +137,17 @@ export function getInitialState(userDefinedConfig) {
   }
 
   const transitModeSettings = config?.modes?.transitModes.map((transitMode) => {
-    const { gtfsMode, mode } = transitMode
-    /**
-     * If we're using custom route mode overrides, we pass both the
-     * custom mode name (mode) and the gtfs mode to the modeSetting.
-     */
-    const modeSetting = gtfsMode || mode
+    const { mode, overrideMode } = transitMode
+    const displayedMode = overrideMode || mode
     return {
-      addTransportMode: { mode: modeSetting },
+      // This is the mode that gets added to the actual query to OTP
+      addTransportMode: { mode },
       applicableMode: 'TRANSIT',
       default: true,
-      iconName: mode.toLowerCase(),
-      key: mode.toLowerCase(),
-      modeOverride: gtfsMode && mode,
+      iconName: displayedMode.toLowerCase(),
+      key: displayedMode.toLowerCase(),
+      // This overrideMode is used in case we need to filter routes out based on their overrideMode
+      overrideMode,
       type: 'SUBMODE'
     }
   })

From d47c9d6a9133bb1344d670a1704c12ba3940fb7b Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:19:15 -0600
Subject: [PATCH 03/11] replace toString with join

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

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index cdb1e445d..e1fed2368 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -920,7 +920,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
     const excludedRoutes = getBannedRoutesFromSubmodes(
       modeSettings,
       config.routeModeOverrides
-    ).toString()
+    ).join(',')
     console.log(excludedRoutes)
 
     const baseQuery = {

From b51769c80034da095adb02512657ef6d091ee3e5 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 30 Jan 2024 13:16:22 -0800
Subject: [PATCH 04/11] fix sticky highlighted location

---
 lib/components/viewers/nearby/nearby-view.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/components/viewers/nearby/nearby-view.tsx b/lib/components/viewers/nearby/nearby-view.tsx
index cdef99974..717fac30c 100644
--- a/lib/components/viewers/nearby/nearby-view.tsx
+++ b/lib/components/viewers/nearby/nearby-view.tsx
@@ -115,6 +115,13 @@ function NearbyView({
     setLocation(payload)
   }
 
+  // Make sure the highlighted location is cleaned up when leaving nearby
+  useEffect(() => {
+    return function cleanup() {
+      setHighlightedLocation(null)
+    }
+  })
+
   useEffect(() => {
     const listener = (e: any) => {
       if (e.geolocateSource) {

From 3cf1d70102be2f7fdae2316673c9ee6f344b5cfe Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 30 Jan 2024 15:17:06 -0800
Subject: [PATCH 05/11] fix crash on no OTP server

---
 lib/components/viewers/nearby/nearby-view.tsx | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/lib/components/viewers/nearby/nearby-view.tsx b/lib/components/viewers/nearby/nearby-view.tsx
index 717fac30c..66466f2ee 100644
--- a/lib/components/viewers/nearby/nearby-view.tsx
+++ b/lib/components/viewers/nearby/nearby-view.tsx
@@ -183,26 +183,29 @@ function NearbyView({
     setHighlightedLocation(null)
   }, [setHighlightedLocation])
 
-  const nearbyItemList = nearby?.map((n: any) => (
-    <li
-      className={
-        (n.place.gtfsId ?? n.place.id) === entityId ? 'highlighted' : ''
-      }
-      key={n.place.id}
-    >
-      {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
-      <div
-        onBlur={onMouseLeave}
-        onFocus={() => onMouseEnter(n.place)}
-        onMouseEnter={() => onMouseEnter(n.place)}
-        onMouseLeave={onMouseLeave}
-        /* eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex */
-        tabIndex={0}
+  const nearbyItemList =
+    nearby?.map &&
+    nearby?.map((n: any) => (
+      <li
+        className={
+          (n.place.gtfsId ?? n.place.id) === entityId ? 'highlighted' : ''
+        }
+        key={n.place.id}
       >
-        {getNearbyItem(n.place, onClickSetLocation)}
-      </div>
-    </li>
-  ))
+        {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+        <div
+          onBlur={onMouseLeave}
+          onFocus={() => onMouseEnter(n.place)}
+          onMouseEnter={() => onMouseEnter(n.place)}
+          onMouseLeave={onMouseLeave}
+          /* eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex */
+          tabIndex={0}
+        >
+          {getNearbyItem(n.place, onClickSetLocation)}
+        </div>
+      </li>
+    ))
+
   useEffect(() => {
     setLoading(false)
   }, [nearby])

From abdcfc4bd23715ba610b5b583a0af2c52bc3d86b Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:05:24 -0600
Subject: [PATCH 06/11] fix(DropdownOptions): Pass onChange to Field only when
 it exists

---
 .../user/common/dropdown-options.tsx          | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/lib/components/user/common/dropdown-options.tsx b/lib/components/user/common/dropdown-options.tsx
index 42ef7524f..be110d936 100644
--- a/lib/components/user/common/dropdown-options.tsx
+++ b/lib/components/user/common/dropdown-options.tsx
@@ -22,22 +22,29 @@ export const Select = ({
   label,
   name,
   onChange
-}: SelectProps): JSX.Element => (
-  // <Field> is kept outside of <label> to accommodate layout in table/grid cells.
-  <>
-    {label && <label htmlFor={name}>{label}</label>}
-    <Field
-      as={Control}
-      componentClass="select"
-      defaultValue={defaultValue}
-      id={name}
-      name={name}
-      onChange={onChange}
-    >
-      {children}
-    </Field>
-  </>
-)
+}: SelectProps): JSX.Element => {
+  const fieldProps = {
+    as: Control,
+    componentClass: 'select',
+    defaultValue,
+    id: name,
+    name
+  }
+  return (
+    // <Field> is kept outside of <label> to accommodate layout in table/grid cells.
+    <>
+      {label && <label htmlFor={name}>{label}</label>}
+      {/* passing an onChange will override Formik's onChange, so only pass if onChange exists. */}
+      {onChange ? (
+        <Field {...fieldProps} onChange={onChange}>
+          {children}
+        </Field>
+      ) : (
+        <Field {...fieldProps}>{children}</Field>
+      )}
+    </>
+  )
+}
 
 interface OptionsPropsBase<T> {
   defaultValue?: T

From f908cbdf9fea6b51412596a1f229849b7cbaac01 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:33:19 -0600
Subject: [PATCH 07/11] fix(NavigationBar): Adjust height calc on sliding pane
 to allow for scrolling on mobile

---
 index.css | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/index.css b/index.css
index 6999c2b2f..697d3b1b6 100644
--- a/index.css
+++ b/index.css
@@ -74,7 +74,7 @@ input[type="text"]::-ms-clear {
 .slide-pane_from_left {
   margin: 52px auto 0 0;
   /* Keep pane from overflowing on smaller screens */
-  height: calc(100vh - 52px);
+  height: calc(100% - 52px);
 }
 
 .slide-pane__content {
@@ -111,9 +111,12 @@ input[type="text"]::-ms-clear {
   width: 100%;
 }
 
-.app-menu a:hover,
-.app-menu button:hover {
-  color: #4c97f5;
+/* Prevents hover styles from getting triggered on mobile */
+@media (hover: hover) {
+  .app-menu a:hover,
+  .app-menu button:hover {
+    color: #4c97f5;
+  }
 }
 
 .app-menu a:focus,

From fb4d26006fa6ed698067c4c1f695f7b795a858d7 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Thu, 1 Feb 2024 12:42:47 -0600
Subject: [PATCH 08/11] Update packages to include getBannedRoutesFromSubmodes

---
 package.json |  4 ++--
 yarn.lock    | 36 +++++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 03fe38d46..e96f4caaa 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "@opentripplanner/transit-vehicle-overlay": "^4.0.8",
     "@opentripplanner/transitive-overlay": "^3.0.16",
     "@opentripplanner/trip-details": "^5.0.7",
-    "@opentripplanner/trip-form": "^3.3.7",
+    "@opentripplanner/trip-form": "^3.5.0",
     "@opentripplanner/trip-viewer-overlay": "^2.0.7",
     "@opentripplanner/vehicle-rental-overlay": "^2.1.3",
     "@styled-icons/fa-regular": "^10.34.0",
@@ -133,7 +133,7 @@
     "@craco/craco": "^6.3.0",
     "@jackwilsdon/craco-use-babelrc": "^1.0.0",
     "@opentripplanner/scripts": "^1.2.0",
-    "@opentripplanner/types": "^6.1.1",
+    "@opentripplanner/types": "^6.4.0",
     "@percy/cli": "^1.20.3",
     "@percy/puppeteer": "^2.0.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
diff --git a/yarn.lock b/yarn.lock
index 0930ae133..109e6032f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2459,6 +2459,24 @@
     lodash.isequal "^4.5.0"
     qs "^6.9.1"
 
+"@opentripplanner/core-utils@^11.1.3":
+  version "11.2.3"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.2.3.tgz#9047373afe5e94df3f115e529fda95d3327844ad"
+  integrity sha512-8aVPRDU1cmjsrWRTVyQWesPJymTWf9m9r9v2RyQoUxBUvNmzMY5pOt3puY2T8z2Pj1P0D8v6g74QR8cFS6kNJg==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^2.0.0"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
 "@opentripplanner/core-utils@^11.2.0":
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.2.0.tgz#fe73512247bb0dc67c88f83c7fb672c70a27be38"
@@ -2713,13 +2731,13 @@
     flat "^5.0.2"
     react-animate-height "^3.0.4"
 
-"@opentripplanner/trip-form@^3.3.7":
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.7.tgz#89cd45d132a86abbe9b1f264e520b43a3cbf4e5f"
-  integrity sha512-RTCiwKkZKv7TfyqWRySBOPPt86jRgSU3ebcHj4/UEQjkCG9zDW6lJH6+eTH0V9ZcEE0HFGHjvFfi+mxUmwh54g==
+"@opentripplanner/trip-form@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.5.0.tgz#6c6d1f984f501857fb873627613ad20b36f6b3b7"
+  integrity sha512-PZ+7vJMZME+jKYguoevyfWnluuH0SuDZrmh3Sx1fmEC4FVhyzkE3I0enwozRCYXag0hGipei/scxOVt7G4C9Sw==
   dependencies:
     "@floating-ui/react" "^0.19.2"
-    "@opentripplanner/core-utils" "^11.0.2"
+    "@opentripplanner/core-utils" "^11.1.3"
     "@styled-icons/bootstrap" "^10.34.0"
     "@styled-icons/boxicons-regular" "^10.38.0"
     "@styled-icons/fa-regular" "^10.37.0"
@@ -2738,10 +2756,10 @@
     "@opentripplanner/base-map" "^3.0.14"
     "@opentripplanner/core-utils" "^11.0.2"
 
-"@opentripplanner/types@^6.1.1":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.1.1.tgz#ed28406d71b48d5299edc7ac884583d00917edc9"
-  integrity sha512-VNqWQI8hQfQQZQZFHrUbxGZzldNODMls3wXM9aawUJ7OJRjjmNOhkgTjohMcpvA3Ed3wUAkzOXByBQO3MTVH6Q==
+"@opentripplanner/types@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.4.0.tgz#6f7a3475ea982c7b7d8b2f1383a6d775dfabe62a"
+  integrity sha512-PS+CUwETLf0WzAUZg3qiey+SBigaf0CfknKF1XMOM+zJVc2c8nN34hgnwV7sS+RKs030KZFAgIn8p035ErcBuQ==
 
 "@opentripplanner/vehicle-rental-overlay@^2.1.3":
   version "2.1.3"

From b6bfa8b22ce3f82bd82382949ab9a1c9904172c4 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Thu, 1 Feb 2024 13:46:51 -0600
Subject: [PATCH 09/11] Update yarn.lock

---
 yarn.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f1209cb19..b6b27e539 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3213,7 +3213,23 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@styled-icons/fa-regular@^10.34.0":
+"@styled-icons/bootstrap@^10.34.0":
+  version "10.47.0"
+  resolved "https://registry.yarnpkg.com/@styled-icons/bootstrap/-/bootstrap-10.47.0.tgz#c3e363dfe87b732a5da818f320f90f5ab4961b84"
+  integrity sha512-xpnPdrLhAhpTRE4iljQIEK73twVj7VPglwHSL+8nQdH7EsW5RJIOWsmlkZMyqhQHN0H7fGmT10F3/6OQhSpfGg==
+  dependencies:
+    "@babel/runtime" "^7.20.7"
+    "@styled-icons/styled-icon" "^10.7.0"
+
+"@styled-icons/boxicons-regular@^10.38.0":
+  version "10.47.0"
+  resolved "https://registry.yarnpkg.com/@styled-icons/boxicons-regular/-/boxicons-regular-10.47.0.tgz#6318dd8ba9bfbf143c3a32c9d1c72479d376bd3a"
+  integrity sha512-z8KczDp4VArXvOn8i2j66Xs4oX9oiiJEhMoHydY3uC9kdtImcxhZ/xHPrgTJLkbK6f5ikwB4CKVnSqQGzzAJNw==
+  dependencies:
+    "@babel/runtime" "^7.20.7"
+    "@styled-icons/styled-icon" "^10.7.0"
+
+"@styled-icons/fa-regular@^10.34.0", "@styled-icons/fa-regular@^10.37.0":
   version "10.47.0"
   resolved "https://registry.yarnpkg.com/@styled-icons/fa-regular/-/fa-regular-10.47.0.tgz#0c2e3196bec0706d2cb7fce5f7f49fdefc15e3b1"
   integrity sha512-UL/MwhwlJ5SbcioI+UBR8KocYt6i+20akKn1ZNj0Pjgm2kv2odEJSWWkHCxh8J7T7s0q/Wvs3CMsBTMrKdKDpQ==
@@ -3221,7 +3237,7 @@
     "@babel/runtime" "^7.20.7"
     "@styled-icons/styled-icon" "^10.7.0"
 
-"@styled-icons/fa-solid@^10.34.0":
+"@styled-icons/fa-solid@^10.34.0", "@styled-icons/fa-solid@^10.37.0":
   version "10.47.0"
   resolved "https://registry.yarnpkg.com/@styled-icons/fa-solid/-/fa-solid-10.47.0.tgz#011ffe890054f10957e247a798214c304e2f95c3"
   integrity sha512-8AJjbOAkvPlB/ypFzWo++CZxRDlFQfvWQSjWzVU/v/4kjGRWIiVB+rJrTB7joDUd5Oas/se4cSiDkSA+XR/Fqg==
@@ -5985,6 +6001,11 @@ classnames@^2.2.5, classnames@^2.3.1:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
+classnames@^2.2.6:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
+
 clean-css@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
@@ -7015,6 +7036,11 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
+debounce@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
+  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -7489,6 +7515,11 @@ earcut@^2.2.3:
   resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.3.tgz#d44ced2ff5a18859568e327dd9c7d46b16f55cf4"
   integrity sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==
 
+easy-bem@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz#1bfcc10425498090bcfddc0f9c000aba91399e03"
+  integrity sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A==
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -8337,10 +8368,10 @@ execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-exenv@^1.2.0:
+exenv@^1.2.0, exenv@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
-  integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=
+  integrity sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==
 
 exit@^0.1.2:
   version "0.1.2"
@@ -15306,6 +15337,11 @@ react-fast-compare@^2.0.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
+react-from-dom@^0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/react-from-dom/-/react-from-dom-0.6.2.tgz#9da903a508c91c013b55afcd59348b8b0a39bdb4"
+  integrity sha512-qvWWTL/4xw4k/Dywd41RBpLQUSq97csuv15qrxN+izNeLYlD9wn5W8LspbfYe5CWbaSdkZ72BsaYBPQf2x4VbQ==
+
 react-ga@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-3.3.0.tgz#c91f407198adcb3b49e2bc5c12b3fe460039b3ca"
@@ -15318,6 +15354,23 @@ react-hot-toast@^2.4.1:
   dependencies:
     goober "^2.1.10"
 
+react-indiana-drag-scroll@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/react-indiana-drag-scroll/-/react-indiana-drag-scroll-2.2.0.tgz#657e14bbdf4888cc738e9fa8dc4384d76c348c0b"
+  integrity sha512-+W/3B2OQV0FrbdnsoIo4dww/xpH0MUQJz6ziQb7H+oBko3OCbXuzDFYnho6v6yhGrYDNWYPuFUewb89IONEl/A==
+  dependencies:
+    classnames "^2.2.6"
+    debounce "^1.2.0"
+    easy-bem "^1.1.1"
+
+react-inlinesvg@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/react-inlinesvg/-/react-inlinesvg-2.3.0.tgz#62283c0ce7e9d11d8190ec3e89589102288830fd"
+  integrity sha512-fEGOdDf4k4bcveArbEpj01pJcH8pOCKLxmSj2POFdGvEk5YK0NZVnH6BXpW/PzACHPRsuh1YKAhNZyFnD28oxg==
+  dependencies:
+    exenv "^1.2.2"
+    react-from-dom "^0.6.0"
+
 react-input-autosize@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85"

From 2edcbb725394c5847073d9c7c62d0232f183d06a Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:49:30 -0600
Subject: [PATCH 10/11] Use delete instead of ternary

---
 lib/components/user/common/dropdown-options.tsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/components/user/common/dropdown-options.tsx b/lib/components/user/common/dropdown-options.tsx
index be110d936..70667915b 100644
--- a/lib/components/user/common/dropdown-options.tsx
+++ b/lib/components/user/common/dropdown-options.tsx
@@ -28,20 +28,16 @@ export const Select = ({
     componentClass: 'select',
     defaultValue,
     id: name,
-    name
+    name,
+    onChange
   }
+  /* Passing an onChange will override Formik's onChange, so only pass if onChange exists. */
+  if (!onChange) delete fieldProps.onChange
   return (
     // <Field> is kept outside of <label> to accommodate layout in table/grid cells.
     <>
       {label && <label htmlFor={name}>{label}</label>}
-      {/* passing an onChange will override Formik's onChange, so only pass if onChange exists. */}
-      {onChange ? (
-        <Field {...fieldProps} onChange={onChange}>
-          {children}
-        </Field>
-      ) : (
-        <Field {...fieldProps}>{children}</Field>
-      )}
+      <Field {...fieldProps}>{children}</Field>
     </>
   )
 }

From 86603ac01fe1c0350e5c43e3b653a24138fa9fc9 Mon Sep 17 00:00:00 2001
From: amy-corson-ibigroup
 <115499534+amy-corson-ibigroup@users.noreply.github.com>
Date: Fri, 2 Feb 2024 11:28:02 -0600
Subject: [PATCH 11/11] prevent crash when no routemodeoverrides

---
 lib/actions/apiV2.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/actions/apiV2.js b/lib/actions/apiV2.js
index 1870dd4a0..a81b77041 100644
--- a/lib/actions/apiV2.js
+++ b/lib/actions/apiV2.js
@@ -1049,11 +1049,12 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       ...modeSettingValues
     }
 
-    const excludedRoutes = getBannedRoutesFromSubmodes(
-      modeSettings,
-      config.routeModeOverrides
-    ).join(',')
-    console.log(excludedRoutes)
+    const excludedRoutes =
+      config.routeModeOverrides &&
+      getBannedRoutesFromSubmodes(
+        modeSettings,
+        config.routeModeOverrides
+      )?.join(',')
 
     const baseQuery = {
       arriveBy,