From 1a9c1c6a6af4baae7ec78e7d8dc2cddbda8ae56b Mon Sep 17 00:00:00 2001 From: Landon Reed Date: Thu, 8 Oct 2020 14:49:48 -0400 Subject: [PATCH 1/2] fix(mobile): fix results screen when planning trip fix #250 --- lib/components/mobile/results-screen.js | 8 +++----- lib/components/narrative/itinerary-carousel.js | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/components/mobile/results-screen.js b/lib/components/mobile/results-screen.js index 209bacca4..ef3290e77 100644 --- a/lib/components/mobile/results-screen.js +++ b/lib/components/mobile/results-screen.js @@ -16,7 +16,7 @@ import MobileNavigationBar from './navigation-bar' import { MobileScreens, setMobileScreen } from '../../actions/ui' import { setUseRealtimeResponse } from '../../actions/narrative' import { clearActiveSearch } from '../../actions/form' -import { getActiveSearch, getRealtimeEffects } from '../../util/state' +import { getActiveItineraries, getActiveSearch, getRealtimeEffects } from '../../util/state' const LocationContainer = styled.div` font-weight: 300; @@ -235,7 +235,7 @@ const mapStateToProps = (state, ownProps) => { : useRealtime ? activeSearch.response : activeSearch.nonRealtimeResponse const realtimeEffects = getRealtimeEffects(state.otp) - + const itineraries = getActiveItineraries(state.otp) return { query: state.otp.currentQuery, realtimeEffects, @@ -243,9 +243,7 @@ const mapStateToProps = (state, ownProps) => { resultCount: response ? activeSearch.query.routingType === 'ITINERARY' - ? response.plan - ? response.plan.itineraries.length - : 0 + ? itineraries.length : response.otp.profile.length : null, useRealtime, diff --git a/lib/components/narrative/itinerary-carousel.js b/lib/components/narrative/itinerary-carousel.js index 2b0e91736..25cd26e54 100644 --- a/lib/components/narrative/itinerary-carousel.js +++ b/lib/components/narrative/itinerary-carousel.js @@ -102,9 +102,7 @@ class ItineraryCarousel extends Component { const mapStateToProps = (state, ownProps) => { const activeSearch = getActiveSearch(state.otp) - const itineraries = activeSearch && activeSearch.response && activeSearch.response.plan - ? getActiveItineraries(state.otp) - : null + const itineraries = getActiveItineraries(state.otp) return { itineraries, From 15edca1d04e49d27c0e128dfc9e8485cf7cc8d15 Mon Sep 17 00:00:00 2001 From: Landon Reed Date: Thu, 8 Oct 2020 15:21:38 -0400 Subject: [PATCH 2/2] refactor(types): change pending from bool -> number --- lib/components/narrative/itinerary-carousel.js | 2 +- lib/components/narrative/narrative-itineraries.js | 2 +- lib/components/narrative/tabbed-itineraries.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/components/narrative/itinerary-carousel.js b/lib/components/narrative/itinerary-carousel.js index 25cd26e54..d49d26498 100644 --- a/lib/components/narrative/itinerary-carousel.js +++ b/lib/components/narrative/itinerary-carousel.js @@ -15,7 +15,7 @@ class ItineraryCarousel extends Component { state = {} static propTypes = { itineraries: PropTypes.array, - pending: PropTypes.bool, + pending: PropTypes.number, activeItinerary: PropTypes.number, hideHeader: PropTypes.bool, itineraryClass: PropTypes.func, diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js index 297d21fbe..76a450dfe 100644 --- a/lib/components/narrative/narrative-itineraries.js +++ b/lib/components/narrative/narrative-itineraries.js @@ -38,7 +38,7 @@ class NarrativeItineraries extends Component { static propTypes = { itineraries: PropTypes.array, itineraryClass: PropTypes.func, - pending: PropTypes.bool, + pending: PropTypes.number, activeItinerary: PropTypes.number, setActiveItinerary: PropTypes.func, setActiveLeg: PropTypes.func, diff --git a/lib/components/narrative/tabbed-itineraries.js b/lib/components/narrative/tabbed-itineraries.js index 02dc0f2ee..991c454f7 100644 --- a/lib/components/narrative/tabbed-itineraries.js +++ b/lib/components/narrative/tabbed-itineraries.js @@ -15,7 +15,7 @@ class TabbedItineraries extends Component { static propTypes = { itineraries: PropTypes.array, itineraryClass: PropTypes.func, - pending: PropTypes.bool, + pending: PropTypes.number, activeItinerary: PropTypes.number, setActiveItinerary: PropTypes.func, setActiveLeg: PropTypes.func,