From 5d411e6b754bb43d0b8a9af61edaef2d3c21ce80 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 1 Jul 2020 20:02:49 -0400
Subject: [PATCH 1/3] fix(line-itin/itinerary-body): Use setActiveLeg as passed
 by NarrativeItineraries.

---
 .../narrative/line-itin/connected-itinerary-body.js    |  2 --
 lib/components/narrative/line-itin/line-itinerary.js   | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/components/narrative/line-itin/connected-itinerary-body.js b/lib/components/narrative/line-itin/connected-itinerary-body.js
index 5d36ac58f..d1cef245a 100644
--- a/lib/components/narrative/line-itin/connected-itinerary-body.js
+++ b/lib/components/narrative/line-itin/connected-itinerary-body.js
@@ -10,7 +10,6 @@ import { connect } from 'react-redux'
 import styled from 'styled-components'
 
 import { showLegDiagram } from '../../../actions/map'
-import { setActiveLeg } from '../../../actions/narrative'
 import { setViewedTrip } from '../../../actions/ui'
 import TransitLegSubheader from './connected-transit-leg-subheader'
 import TripDetails from '../connected-trip-details'
@@ -82,7 +81,6 @@ const mapStateToProps = (state, ownProps) => {
 }
 
 const mapDispatchToProps = {
-  setActiveLeg,
   setViewedTrip,
   showLegDiagram
 }
diff --git a/lib/components/narrative/line-itin/line-itinerary.js b/lib/components/narrative/line-itin/line-itinerary.js
index d0550d1f0..872d8df99 100644
--- a/lib/components/narrative/line-itin/line-itinerary.js
+++ b/lib/components/narrative/line-itin/line-itinerary.js
@@ -50,6 +50,7 @@ export default class LineItinerary extends NarrativeItinerary {
       itinerary,
       itineraryFooter,
       LegIcon,
+      setActiveLeg,
       showRealtimeAnnotation,
       onClick,
       timeFormat
@@ -75,7 +76,14 @@ export default class LineItinerary extends NarrativeItinerary {
         />
         {showRealtimeAnnotation && <SimpleRealtimeAnnotation />}
         {active || expanded
-          ? <ItineraryBody itinerary={itinerary} LegIcon={LegIcon} />
+          ? <ItineraryBody
+            itinerary={itinerary}
+            LegIcon={LegIcon}
+            // Don't use setActiveLeg as an import
+            // (will cause error when clicking on itinerary suymmary).
+            // Use the one passed by NarrativeItineraries instead.
+            setActiveLeg={setActiveLeg}
+          />
           : null}
         {itineraryFooter}
       </LineItineraryContainer>

From 07410de61d62f4e9f051ec75aa89037e64388fd7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 2 Jul 2020 18:15:30 -0400
Subject: [PATCH 2/3] docs(narrative-itineraries): Add comment to unify
 dispatched method signature.

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

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
index 318c107ee..904653ccb 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -100,6 +100,9 @@ const mapStateToProps = (state, ownProps) => {
 }
 
 const mapDispatchToProps = (dispatch, ownProps) => {
+  // FIXME: update signature of these methods,
+  // so that only one argument is passed,
+  // e.g. setActiveLeg({ index, leg }) 
   return {
     setActiveItinerary: index => {
       dispatch(setActiveItinerary({index}))

From d694c3a506346ea1c1cd767ca7adb467005bb9bf Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 6 Jul 2020 09:59:17 -0400
Subject: [PATCH 3/3] style(NarrativeItineraries): Fix lint.

---
 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 904653ccb..a690b7fa8 100644
--- a/lib/components/narrative/narrative-itineraries.js
+++ b/lib/components/narrative/narrative-itineraries.js
@@ -102,7 +102,7 @@ const mapStateToProps = (state, ownProps) => {
 const mapDispatchToProps = (dispatch, ownProps) => {
   // FIXME: update signature of these methods,
   // so that only one argument is passed,
-  // e.g. setActiveLeg({ index, leg }) 
+  // e.g. setActiveLeg({ index, leg })
   return {
     setActiveItinerary: index => {
       dispatch(setActiveItinerary({index}))