Merge pull request #421 from ibi-group/fare-by-leg

fix(trip-details): Revert accidental breaking change

Author: daniel-heppner-ibigroup

packages/trip-details/src/fare-table.tsx

@@ -7,7 +7,7 @@ import { Transfer } from "@styled-icons/boxicons-regular/Transfer";
 
 import { boldText, renderFare } from "./utils";
 
-import { FareDetailsProps, FareTableLayout, FareTableText } from "./types";
+import { FareLegTableProps, FareTableLayout, FareTableText } from "./types";
 
 // Load the default messages.
 import defaultEnglishMessages from "../i18n/en-US.yml";
@@ -180,10 +180,10 @@ const FareTypeTable = ({
 
 const FareLegDetails = ({
   layout,
+  legs,
   transitFareDetails,
-  transitFares,
-  legs
-}: FareDetailsProps): JSX.Element => {
+  transitFares
+}: FareLegTableProps): JSX.Element => {
   const fareKeys = Object.keys(transitFareDetails);
 
   const legsWithFares = legs

packages/trip-details/src/index.tsx

@@ -173,10 +173,10 @@ export function TripDetails({
           {fareDetailsLayout ? (
             // Show full ƒare details by leg
             <FareLegTable
-              transitFares={transitFares}
-              transitFareDetails={fareDetails}
-              legs={itinerary.legs}
               layout={fareDetailsLayout}
+              legs={itinerary.legs}
+              transitFareDetails={fareDetails}
+              transitFares={transitFares}
             />
           ) : (
             // Just show the fares for each payment type
@@ -276,7 +276,13 @@ export function TripDetails({
           <TripDetail
             // Any custom description for the transit fare needs to be handled by the slot.
             description={
-              FareDetails && <FareDetails transitFares={transitFares} />
+              FareDetails && (
+                <FareDetails
+                  maxTNCFare={maxTNCFare}
+                  minTNCFare={minTNCFare}
+                  transitFares={transitFares}
+                />
+              )
             }
             icon={<MoneyBillAlt size={17} />}
             summary={fare}

packages/trip-details/src/types.ts

@@ -34,6 +34,12 @@ export interface TransitFareData {
 }
 
 export interface FareDetailsProps {
+  maxTNCFare: number;
+  minTNCFare: number;
+  transitFares: TransitFareData;
+}
+
+export interface FareLegTableProps {
   layout?: FareTableLayout[];
   legs?: Leg[];
   transitFareDetails?: FareDetails;