Merge branch 'rename-add-trip-component' into edit-trip-modal-infra

googleinterns · Jul 16, 2020 · 8c5d98a · 8c5d98a
2 parents 3e6ff4d + fae464f
commit 8c5d98a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/frontend/src/components/ViewTrips/create-new-trip.js b/frontend/src/components/ViewTrips/create-new-trip.js
@@ -81,8 +81,8 @@ function formatTripData(rawTripObj) {
   {
     trip_creation_time: firebase.firestore.Timestamp.now(),
     name:               getTripName(rawTripObj.name),
-    description:        getTripDestination(rawTripObj.destination),
-    destination:        rawTripObj.description,
+    description:        rawTripObj.description,
+    destination:        getTripDestination(rawTripObj.destination),
     start_date:         getTimestampFromDateString(rawTripObj.startDate),
     end_date:           getTimestampFromDateString(rawTripObj.endDate),
     collaborators:      getCollaboratorUidArray(rawTripObj.collaboratorEmails)

diff --git a/frontend/src/components/ViewTrips/trip.js b/frontend/src/components/ViewTrips/trip.js
@@ -44,9 +44,9 @@ const Trip = (props) => {
   return (
     <div>
       <h2>{props.tripObj.name}</h2>
-      <p>{props.tripObj.description}</p>
-      <p>{getDateRange(props.tripObj)}</p>
       <p>{props.tripObj.destination}</p>
+      <p>{getDateRange(props.tripObj)}</p>
+      <p>{props.tripObj.description}</p>
       <p>{getCollaboratorEmails(props.tripObj.collaborators)}</p>
 
       {/* TODO(Issue 15): Add edit trip page. */}