Change formatted title and sub title type

Change formatted title and sub title type to node in BookingPanel. Also remove FormattedText component which renders a redundant span element.
sharetribe · Dec 19, 2018 · f7407da · f7407da
1 parent 2b46956
commit f7407da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/components/BookingPanel/BookingPanel.js b/src/components/BookingPanel/BookingPanel.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
 import { intlShape, injectIntl } from 'react-intl';
-import { arrayOf, bool, func, object, oneOfType, shape, string } from 'prop-types';
+import { arrayOf, bool, func, node, oneOfType, shape, string } from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import omit from 'lodash/omit';
@@ -168,8 +168,8 @@ BookingPanel.propTypes = {
   isOwnListing: bool,
   unitType: propTypes.bookingUnitType,
   handleBookingSubmit: func.isRequired,
-  title: oneOfType([object, string]).isRequired,
-  subTitle: oneOfType([object, string]),
+  title: oneOfType([node, string]).isRequired,
+  subTitle: oneOfType([node, string]),
   authorDisplayName: string.isRequired,
   onManageDisableScrolling: func.isRequired,
   timeSlots: arrayOf(propTypes.timeSlot),

diff --git a/src/containers/ListingPage/ListingPage.js b/src/containers/ListingPage/ListingPage.js
@@ -229,9 +229,7 @@ export class ListingPageComponent extends Component {
       </span>
     );
 
-    const bookingTitle = (
-      <FormattedMessage id="ListingPage.bookingTitle" values={{ title: richTitle }} />
-    );
+    const bookingTitle = intl.formatMessage({ id: 'ListingPage.bookingSubTitle' }, { title: richTitle });
     const bookingSubTitle = intl.formatMessage({ id: 'ListingPage.bookingSubTitle' });
 
     const topbar = <TopbarContainer />;