From 601706cc5ff4bb006d38f771b3a47abac04f9a39 Mon Sep 17 00:00:00 2001 From: Jenni Nurmi Date: Thu, 29 Aug 2019 15:26:56 +0300 Subject: [PATCH] Use react-intl through util file --- src/components/ActivityFeed/ActivityFeed.js | 2 +- src/components/Avatar/Avatar.js | 2 +- .../BookingBreakdown/BookingBreakdown.js | 2 +- .../BookingBreakdown/LineItemBookingPeriod.js | 2 +- .../LineItemCustomerCommissionMaybe.js | 2 +- .../LineItemCustomerCommissionRefundMaybe.js | 2 +- .../LineItemProviderCommissionMaybe.js | 2 +- .../LineItemProviderCommissionRefundMaybe.js | 2 +- .../BookingBreakdown/LineItemRefundMaybe.js | 2 +- .../BookingBreakdown/LineItemSubTotalMaybe.js | 2 +- .../BookingBreakdown/LineItemTotalPrice.js | 2 +- .../LineItemUnitPriceMaybe.js | 2 +- .../BookingBreakdown/LineItemUnitsMaybe.js | 2 +- .../LineItemUnknownItemsMaybe.js | 2 +- .../BookingDateRangeFilter.js | 2 +- src/components/BookingPanel/BookingPanel.js | 3 +-- src/components/CookieConsent/CookieConsent.js | 2 +- .../EditListingAvailabilityPanel.js | 2 +- .../EditListingDescriptionPanel.js | 2 +- .../EditListingFeaturesPanel.js | 2 +- .../EditListingLocationPanel.js | 2 +- .../EditListingPhotosPanel.js | 2 +- .../EditListingPoliciesPanel.js | 2 +- .../EditListingPricingPanel.js | 2 +- .../EditListingWizard/EditListingWizard.js | 2 +- .../EditListingWizard/EditListingWizardTab.js | 2 +- .../FieldBirthdayInput/FieldBirthdayInput.js | 2 +- src/components/FieldBoolean/FieldBoolean.js | 2 +- .../FieldCurrencyInput/FieldCurrencyInput.js | 2 +- src/components/FieldDateInput/DateInput.js | 2 +- .../FieldDateRangeInput/DateRangeInput.js | 2 +- .../FieldReviewRating/FieldReviewRating.js | 2 +- src/components/FilterPlain/FilterPlain.js | 2 +- src/components/FilterPopup/FilterPopup.js | 2 +- src/components/Footer/Footer.js | 2 +- src/components/ImageCarousel/ImageCarousel.js | 2 +- src/components/ImageFromFile/ImageFromFile.js | 2 +- src/components/KeywordFilter/KeywordFilter.js | 2 +- .../LayoutWrapperAccountSettingsSideNav.js | 2 +- src/components/ListingCard/ListingCard.js | 2 +- .../LocationAutocompleteInputImpl.js | 2 +- .../ManageListingCard/ManageListingCard.js | 2 +- src/components/Modal/Modal.js | 2 +- .../ModalMissingInformation/EmailReminder.js | 2 +- .../ModalMissingInformation.js | 2 +- .../StripeAccountReminder.js | 2 +- src/components/Page/Page.js | 2 +- .../PaginationLinks/PaginationLinks.js | 2 +- .../PriceFilter/PriceFilterPlain.js | 2 +- .../PriceFilter/PriceFilterPopup.js | 2 +- .../ResponsiveImage/ResponsiveImage.js | 2 +- src/components/ReviewModal/ReviewModal.js | 2 +- src/components/Reviews/Reviews.js | 2 +- .../SavedCardDetails/SavedCardDetails.js | 2 +- src/components/SearchFilters/SearchFilters.js | 2 +- .../SearchFiltersMobile.js | 2 +- .../SearchFiltersPanel/SearchFiltersPanel.js | 2 +- .../SearchMap/ReusableMapContainer.js | 4 +-- .../SearchMapInfoCard/SearchMapInfoCard.js | 2 +- .../SearchMapPriceLabel.js | 2 +- src/components/SectionHero/SectionHero.js | 2 +- .../SectionHowItWorks/SectionHowItWorks.js | 2 +- .../SectionLocations/SectionLocations.js | 2 +- .../SelectMultipleFilter.js | 2 +- .../SelectSingleFilterPlain.js | 2 +- .../SelectSingleFilterPopup.js | 2 +- .../StripeBankAccountRequiredInput.js | 2 +- .../StripeBankAccountTokenInputField.js | 2 +- .../StripePaymentAddress.js | 2 +- src/components/Topbar/Topbar.js | 2 +- src/components/TopbarDesktop/TopbarDesktop.js | 2 +- .../TopbarMobileMenu/TopbarMobileMenu.js | 2 +- .../TransactionPanel/BreakdownMaybe.js | 2 +- .../TransactionPanel/FeedSection.js | 2 +- .../TransactionPanel/PanelHeading.js | 2 +- .../SaleActionButtonsMaybe.js | 2 +- .../TransactionPanel/TransactionPanel.js | 2 +- src/components/UserCard/UserCard.js | 2 +- src/components/UserNav/UserNav.js | 2 +- .../AuthenticationPage/AuthenticationPage.js | 2 +- src/containers/CheckoutPage/CheckoutPage.js | 2 +- .../ContactDetailsPage/ContactDetailsPage.js | 2 +- .../EditListingPage/EditListingPage.js | 2 +- src/containers/InboxPage/InboxPage.js | 2 +- src/containers/LandingPage/LandingPage.js | 2 +- src/containers/ListingPage/ActionBarMaybe.js | 2 +- src/containers/ListingPage/ListingPage.js | 2 +- .../ListingPage/ListingPage.test.js | 2 +- .../ListingPage/SectionDescriptionMaybe.js | 2 +- .../ListingPage/SectionFeaturesMaybe.js | 2 +- src/containers/ListingPage/SectionHeading.js | 2 +- .../ListingPage/SectionHostMaybe.js | 2 +- src/containers/ListingPage/SectionImages.js | 2 +- src/containers/ListingPage/SectionMapMaybe.js | 2 +- src/containers/ListingPage/SectionReviews.js | 2 +- .../ListingPage/SectionRulesMaybe.js | 2 +- .../ManageListingsPage/ManageListingsPage.js | 2 +- src/containers/NotFoundPage/NotFoundPage.js | 2 +- .../PasswordChangePage/PasswordChangePage.js | 2 +- .../PasswordRecoveryPage.js | 2 +- .../PasswordResetPage/PasswordResetPage.js | 2 +- .../PaymentMethodsPage/PaymentMethodsPage.js | 2 +- .../PayoutPreferencesPage.js | 2 +- .../PrivacyPolicyPage/PrivacyPolicyPage.js | 2 +- src/containers/ProfilePage/ProfilePage.js | 2 +- .../ProfileSettingsPage.js | 2 +- src/containers/SearchPage/MainPanel.js | 2 +- src/containers/SearchPage/SearchPage.js | 2 +- .../TermsOfServicePage/TermsOfServicePage.js | 2 +- .../TransactionPage/TransactionPage.js | 2 +- .../BookingDatesForm/BookingDatesForm.js | 2 +- .../ContactDetailsForm/ContactDetailsForm.js | 2 +- .../EditListingAvailabilityForm.js | 2 +- .../ManageAvailabilityCalendar.js | 2 +- .../EditListingDescriptionForm.js | 2 +- .../EditListingFeaturesForm.js | 2 +- .../EditListingLocationForm.js | 2 +- .../EditListingPhotosForm.js | 2 +- .../EditListingPoliciesForm.js | 2 +- .../EditListingPricingForm.js | 2 +- .../EmailVerificationForm.js | 2 +- src/forms/EnquiryForm/EnquiryForm.js | 2 +- src/forms/FilterForm/FilterForm.js | 2 +- .../LocationSearchForm/LocationSearchForm.js | 2 +- src/forms/LoginForm/LoginForm.js | 2 +- .../PasswordChangeForm/PasswordChangeForm.js | 2 +- .../PasswordRecoveryForm.js | 2 +- .../PasswordResetForm/PasswordResetForm.js | 2 +- .../PaymentMethodsForm/PaymentMethodsForm.js | 2 +- .../PayoutDetailsAccountOpener.js | 2 +- .../PayoutDetailsAdditionalPersons.js | 2 +- .../PayoutDetailsForm/PayoutDetailsAddress.js | 2 +- .../PayoutDetailsBankDetails.js | 2 +- .../PayoutDetailsBusinessProfile.js | 2 +- .../PayoutDetailsForm/PayoutDetailsCompany.js | 2 +- .../PayoutDetailsCompanyAccount.js | 2 +- .../PayoutDetailsForm/PayoutDetailsForm.js | 2 +- .../PayoutDetailsIndividualAccount.js | 2 +- .../PayoutDetailsPersonalDetails.js | 2 +- src/forms/PriceFilterForm/PriceFilterForm.js | 2 +- .../ProfileSettingsForm.js | 2 +- src/forms/ReviewForm/ReviewForm.js | 2 +- src/forms/SendMessageForm/SendMessageForm.js | 2 +- src/forms/SignupForm/SignupForm.js | 2 +- .../StripePaymentForm/StripePaymentForm.js | 2 +- .../TopbarSearchForm/TopbarSearchForm.js | 2 +- src/util/reactIntl.js | 26 +++++++++++++++++++ 147 files changed, 173 insertions(+), 148 deletions(-) create mode 100644 src/util/reactIntl.js diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 7795d2ea..9d4ee91b 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -1,6 +1,6 @@ import React from 'react'; import { string, arrayOf, bool, func, number } from 'prop-types'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import dropWhile from 'lodash/dropWhile'; import classNames from 'classnames'; import { Avatar, InlineTextButton, ReviewRating, UserDisplayName } from '../../components'; diff --git a/src/components/Avatar/Avatar.js b/src/components/Avatar/Avatar.js index d96bd622..81d0306d 100644 --- a/src/components/Avatar/Avatar.js +++ b/src/components/Avatar/Avatar.js @@ -1,6 +1,6 @@ import React from 'react'; import { string, oneOfType, bool } from 'prop-types'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { diff --git a/src/components/BookingBreakdown/BookingBreakdown.js b/src/components/BookingBreakdown/BookingBreakdown.js index 2cfadf25..6d5cee30 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.js +++ b/src/components/BookingBreakdown/BookingBreakdown.js @@ -4,7 +4,7 @@ */ import React from 'react'; import { oneOf, string } from 'prop-types'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes, diff --git a/src/components/BookingBreakdown/LineItemBookingPeriod.js b/src/components/BookingBreakdown/LineItemBookingPeriod.js index bd018c54..f76c3221 100644 --- a/src/components/BookingBreakdown/LineItemBookingPeriod.js +++ b/src/components/BookingBreakdown/LineItemBookingPeriod.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage, FormattedHTMLMessage, FormattedDate } from 'react-intl'; +import { FormattedMessage, FormattedHTMLMessage, FormattedDate } from '../../util/reactIntl'; import moment from 'moment'; import { LINE_ITEM_NIGHT, LINE_ITEM_DAY, propTypes } from '../../util/types'; import { daysBetween, dateFromAPIToLocalNoon } from '../../util/dates'; diff --git a/src/components/BookingBreakdown/LineItemCustomerCommissionMaybe.js b/src/components/BookingBreakdown/LineItemCustomerCommissionMaybe.js index d926e292..5157c59e 100644 --- a/src/components/BookingBreakdown/LineItemCustomerCommissionMaybe.js +++ b/src/components/BookingBreakdown/LineItemCustomerCommissionMaybe.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_CUSTOMER_COMMISSION, propTypes } from '../../util/types'; diff --git a/src/components/BookingBreakdown/LineItemCustomerCommissionRefundMaybe.js b/src/components/BookingBreakdown/LineItemCustomerCommissionRefundMaybe.js index f101c639..179578da 100644 --- a/src/components/BookingBreakdown/LineItemCustomerCommissionRefundMaybe.js +++ b/src/components/BookingBreakdown/LineItemCustomerCommissionRefundMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { propTypes, LINE_ITEM_CUSTOMER_COMMISSION } from '../../util/types'; diff --git a/src/components/BookingBreakdown/LineItemProviderCommissionMaybe.js b/src/components/BookingBreakdown/LineItemProviderCommissionMaybe.js index 8016e641..4c468dff 100644 --- a/src/components/BookingBreakdown/LineItemProviderCommissionMaybe.js +++ b/src/components/BookingBreakdown/LineItemProviderCommissionMaybe.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { types as sdkTypes } from '../../util/sdkLoader'; import { LINE_ITEM_PROVIDER_COMMISSION, propTypes } from '../../util/types'; diff --git a/src/components/BookingBreakdown/LineItemProviderCommissionRefundMaybe.js b/src/components/BookingBreakdown/LineItemProviderCommissionRefundMaybe.js index 79cf6c9d..f0023397 100644 --- a/src/components/BookingBreakdown/LineItemProviderCommissionRefundMaybe.js +++ b/src/components/BookingBreakdown/LineItemProviderCommissionRefundMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { propTypes, LINE_ITEM_PROVIDER_COMMISSION } from '../../util/types'; diff --git a/src/components/BookingBreakdown/LineItemRefundMaybe.js b/src/components/BookingBreakdown/LineItemRefundMaybe.js index 77eb994c..04653bd2 100644 --- a/src/components/BookingBreakdown/LineItemRefundMaybe.js +++ b/src/components/BookingBreakdown/LineItemRefundMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import Decimal from 'decimal.js'; import { formatMoney } from '../../util/currency'; import { types as sdkTypes } from '../../util/sdkLoader'; diff --git a/src/components/BookingBreakdown/LineItemSubTotalMaybe.js b/src/components/BookingBreakdown/LineItemSubTotalMaybe.js index 0e957316..f60da782 100644 --- a/src/components/BookingBreakdown/LineItemSubTotalMaybe.js +++ b/src/components/BookingBreakdown/LineItemSubTotalMaybe.js @@ -1,6 +1,6 @@ import React from 'react'; import { string } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import Decimal from 'decimal.js'; import { formatMoney } from '../../util/currency'; import config from '../../config'; diff --git a/src/components/BookingBreakdown/LineItemTotalPrice.js b/src/components/BookingBreakdown/LineItemTotalPrice.js index c55a036d..5a373a00 100644 --- a/src/components/BookingBreakdown/LineItemTotalPrice.js +++ b/src/components/BookingBreakdown/LineItemTotalPrice.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { txIsCanceled, txIsDelivered, txIsDeclined } from '../../util/transaction'; import { propTypes } from '../../util/types'; diff --git a/src/components/BookingBreakdown/LineItemUnitPriceMaybe.js b/src/components/BookingBreakdown/LineItemUnitPriceMaybe.js index 29549016..18850bf9 100644 --- a/src/components/BookingBreakdown/LineItemUnitPriceMaybe.js +++ b/src/components/BookingBreakdown/LineItemUnitPriceMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { LINE_ITEM_NIGHT, LINE_ITEM_DAY, propTypes } from '../../util/types'; diff --git a/src/components/BookingBreakdown/LineItemUnitsMaybe.js b/src/components/BookingBreakdown/LineItemUnitsMaybe.js index a46118c2..f8b221bf 100644 --- a/src/components/BookingBreakdown/LineItemUnitsMaybe.js +++ b/src/components/BookingBreakdown/LineItemUnitsMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { LINE_ITEM_UNITS, propTypes } from '../../util/types'; import css from './BookingBreakdown.css'; diff --git a/src/components/BookingBreakdown/LineItemUnknownItemsMaybe.js b/src/components/BookingBreakdown/LineItemUnknownItemsMaybe.js index 3e5f3894..e96b0ea0 100644 --- a/src/components/BookingBreakdown/LineItemUnknownItemsMaybe.js +++ b/src/components/BookingBreakdown/LineItemUnknownItemsMaybe.js @@ -10,7 +10,7 @@ * component for them that can be used in the `BookingBreakdown` component. */ import React from 'react'; -import { intlShape } from 'react-intl'; +import { intlShape } from '../../util/reactIntl'; import { formatMoney } from '../../util/currency'; import { humanizeLineItemCode } from '../../util/data'; import { LINE_ITEMS, propTypes } from '../../util/types'; diff --git a/src/components/BookingDateRangeFilter/BookingDateRangeFilter.js b/src/components/BookingDateRangeFilter/BookingDateRangeFilter.js index b1d39683..fb3c77d7 100644 --- a/src/components/BookingDateRangeFilter/BookingDateRangeFilter.js +++ b/src/components/BookingDateRangeFilter/BookingDateRangeFilter.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { bool, func, number, object, string } from 'prop-types'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { FieldDateRangeController, FilterPopup, FilterPlain } from '../../components'; import css from './BookingDateRangeFilter.css'; diff --git a/src/components/BookingPanel/BookingPanel.js b/src/components/BookingPanel/BookingPanel.js index 2de05a3e..5f655286 100644 --- a/src/components/BookingPanel/BookingPanel.js +++ b/src/components/BookingPanel/BookingPanel.js @@ -1,9 +1,8 @@ import React from 'react'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; 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'; import { propTypes, LISTING_STATE_CLOSED, LINE_ITEM_NIGHT, LINE_ITEM_DAY } from '../../util/types'; diff --git a/src/components/CookieConsent/CookieConsent.js b/src/components/CookieConsent/CookieConsent.js index 47694d58..a8e88923 100644 --- a/src/components/CookieConsent/CookieConsent.js +++ b/src/components/CookieConsent/CookieConsent.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { ExternalLink } from '../../components'; import classNames from 'classnames'; diff --git a/src/components/EditListingAvailabilityPanel/EditListingAvailabilityPanel.js b/src/components/EditListingAvailabilityPanel/EditListingAvailabilityPanel.js index 1ffef499..19b41e5f 100644 --- a/src/components/EditListingAvailabilityPanel/EditListingAvailabilityPanel.js +++ b/src/components/EditListingAvailabilityPanel/EditListingAvailabilityPanel.js @@ -1,7 +1,7 @@ import React from 'react'; import { bool, func, object, shape, string } from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { ensureOwnListing } from '../../util/data'; import { LISTING_STATE_DRAFT } from '../../util/types'; import { ListingLink } from '../../components'; diff --git a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js index 3b1dc8cf..3af8ac4f 100644 --- a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js +++ b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js @@ -1,7 +1,7 @@ import React from 'react'; import { bool, func, object, string } from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { ensureOwnListing } from '../../util/data'; import { ListingLink } from '../../components'; import { LISTING_STATE_DRAFT } from '../../util/types'; diff --git a/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js b/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js index f64e8b94..ac436762 100644 --- a/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js +++ b/src/components/EditListingFeaturesPanel/EditListingFeaturesPanel.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { LISTING_STATE_DRAFT } from '../../util/types'; import { ensureListing } from '../../util/data'; diff --git a/src/components/EditListingLocationPanel/EditListingLocationPanel.js b/src/components/EditListingLocationPanel/EditListingLocationPanel.js index 67a1d48f..587a24e7 100644 --- a/src/components/EditListingLocationPanel/EditListingLocationPanel.js +++ b/src/components/EditListingLocationPanel/EditListingLocationPanel.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { LISTING_STATE_DRAFT } from '../../util/types'; import { ensureOwnListing } from '../../util/data'; import { ListingLink } from '../../components'; diff --git a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js index 282f0946..cc706def 100644 --- a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js +++ b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { array, bool, func, object, string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { LISTING_STATE_DRAFT } from '../../util/types'; import { EditListingPhotosForm } from '../../forms'; diff --git a/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js b/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js index 44ac7b7c..90e692a1 100644 --- a/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js +++ b/src/components/EditListingPoliciesPanel/EditListingPoliciesPanel.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { LISTING_STATE_DRAFT } from '../../util/types'; import { ensureOwnListing } from '../../util/data'; import { ListingLink } from '../../components'; diff --git a/src/components/EditListingPricingPanel/EditListingPricingPanel.js b/src/components/EditListingPricingPanel/EditListingPricingPanel.js index de457593..92552864 100644 --- a/src/components/EditListingPricingPanel/EditListingPricingPanel.js +++ b/src/components/EditListingPricingPanel/EditListingPricingPanel.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { LISTING_STATE_DRAFT } from '../../util/types'; import { ListingLink } from '../../components'; import { EditListingPricingForm } from '../../forms'; diff --git a/src/components/EditListingWizard/EditListingWizard.js b/src/components/EditListingWizard/EditListingWizard.js index 29e92709..bcbb6699 100644 --- a/src/components/EditListingWizard/EditListingWizard.js +++ b/src/components/EditListingWizard/EditListingWizard.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { array, bool, func, number, object, oneOf, shape, string } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import config from '../../config'; import { withViewport } from '../../util/contextHelpers'; diff --git a/src/components/EditListingWizard/EditListingWizardTab.js b/src/components/EditListingWizard/EditListingWizardTab.js index 622c88bb..a0bd0604 100644 --- a/src/components/EditListingWizard/EditListingWizardTab.js +++ b/src/components/EditListingWizard/EditListingWizardTab.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { intlShape } from 'react-intl'; +import { intlShape } from '../../util/reactIntl'; import routeConfiguration from '../../routeConfiguration'; import { LISTING_PAGE_PARAM_TYPE_DRAFT, diff --git a/src/components/FieldBirthdayInput/FieldBirthdayInput.js b/src/components/FieldBirthdayInput/FieldBirthdayInput.js index cd61a6cc..811e1355 100644 --- a/src/components/FieldBirthdayInput/FieldBirthdayInput.js +++ b/src/components/FieldBirthdayInput/FieldBirthdayInput.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { func, instanceOf, object, node, string, bool } from 'prop-types'; import { Field } from 'react-final-form'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import range from 'lodash/range'; import { ValidationError } from '../../components'; diff --git a/src/components/FieldBoolean/FieldBoolean.js b/src/components/FieldBoolean/FieldBoolean.js index 3f19edcc..72253e1d 100644 --- a/src/components/FieldBoolean/FieldBoolean.js +++ b/src/components/FieldBoolean/FieldBoolean.js @@ -1,5 +1,5 @@ import React from 'react'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { FieldSelect } from '../../components'; const FieldBoolean = props => { diff --git a/src/components/FieldCurrencyInput/FieldCurrencyInput.js b/src/components/FieldCurrencyInput/FieldCurrencyInput.js index 19050c2e..cddfc6f0 100644 --- a/src/components/FieldCurrencyInput/FieldCurrencyInput.js +++ b/src/components/FieldCurrencyInput/FieldCurrencyInput.js @@ -5,7 +5,7 @@ */ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import { Field } from 'react-final-form'; import classNames from 'classnames'; import Decimal from 'decimal.js'; diff --git a/src/components/FieldDateInput/DateInput.js b/src/components/FieldDateInput/DateInput.js index d31ce489..57d0caa9 100644 --- a/src/components/FieldDateInput/DateInput.js +++ b/src/components/FieldDateInput/DateInput.js @@ -12,7 +12,7 @@ import { isInclusivelyBeforeDay, isSameDay, } from 'react-dates'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import moment from 'moment'; import config from '../../config'; diff --git a/src/components/FieldDateRangeInput/DateRangeInput.js b/src/components/FieldDateRangeInput/DateRangeInput.js index 2925349c..a503ac8d 100644 --- a/src/components/FieldDateRangeInput/DateRangeInput.js +++ b/src/components/FieldDateRangeInput/DateRangeInput.js @@ -7,7 +7,7 @@ import React, { Component } from 'react'; import { bool, func, instanceOf, oneOf, shape, string, arrayOf } from 'prop-types'; import { DateRangePicker, isInclusivelyAfterDay, isInclusivelyBeforeDay } from 'react-dates'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import moment from 'moment'; import { START_DATE, END_DATE } from '../../util/dates'; diff --git a/src/components/FieldReviewRating/FieldReviewRating.js b/src/components/FieldReviewRating/FieldReviewRating.js index 25698b16..3a4be5e1 100644 --- a/src/components/FieldReviewRating/FieldReviewRating.js +++ b/src/components/FieldReviewRating/FieldReviewRating.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import { Field } from 'react-final-form'; import classNames from 'classnames'; import { IconReviewStar, ValidationError } from '../../components'; diff --git a/src/components/FilterPlain/FilterPlain.js b/src/components/FilterPlain/FilterPlain.js index 30839e3d..96a3e840 100644 --- a/src/components/FilterPlain/FilterPlain.js +++ b/src/components/FilterPlain/FilterPlain.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { bool, func, node, object, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { FilterForm } from '../../forms'; import css from './FilterPlain.css'; diff --git a/src/components/FilterPopup/FilterPopup.js b/src/components/FilterPopup/FilterPopup.js index 6f54a0e2..78c441c8 100644 --- a/src/components/FilterPopup/FilterPopup.js +++ b/src/components/FilterPopup/FilterPopup.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { bool, func, node, number, object, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { OutsideClickHandler } from '../../components'; import { FilterForm } from '../../forms'; diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js index 623775ac..44437cfe 100644 --- a/src/components/Footer/Footer.js +++ b/src/components/Footer/Footer.js @@ -1,6 +1,6 @@ import React from 'react'; import { string } from 'prop-types'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { twitterPageURL } from '../../util/urlHelpers'; import config from '../../config'; diff --git a/src/components/ImageCarousel/ImageCarousel.js b/src/components/ImageCarousel/ImageCarousel.js index dfe40577..c01b30d9 100644 --- a/src/components/ImageCarousel/ImageCarousel.js +++ b/src/components/ImageCarousel/ImageCarousel.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { ResponsiveImage, IconSpinner } from '../../components'; import { propTypes } from '../../util/types'; diff --git a/src/components/ImageFromFile/ImageFromFile.js b/src/components/ImageFromFile/ImageFromFile.js index a1fbed48..5fad1cdd 100644 --- a/src/components/ImageFromFile/ImageFromFile.js +++ b/src/components/ImageFromFile/ImageFromFile.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { Promised } from '../../components'; diff --git a/src/components/KeywordFilter/KeywordFilter.js b/src/components/KeywordFilter/KeywordFilter.js index ab16a317..80f8728d 100644 --- a/src/components/KeywordFilter/KeywordFilter.js +++ b/src/components/KeywordFilter/KeywordFilter.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { func, number, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import debounce from 'lodash/debounce'; import { FieldTextInput } from '../../components'; diff --git a/src/components/LayoutWrapperAccountSettingsSideNav/LayoutWrapperAccountSettingsSideNav.js b/src/components/LayoutWrapperAccountSettingsSideNav/LayoutWrapperAccountSettingsSideNav.js index 0dbf9019..86d62d9b 100644 --- a/src/components/LayoutWrapperAccountSettingsSideNav/LayoutWrapperAccountSettingsSideNav.js +++ b/src/components/LayoutWrapperAccountSettingsSideNav/LayoutWrapperAccountSettingsSideNav.js @@ -5,7 +5,7 @@ import React from 'react'; import { node, number, string, shape } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { withViewport } from '../../util/contextHelpers'; import { LayoutWrapperSideNav } from '../../components'; diff --git a/src/components/ListingCard/ListingCard.js b/src/components/ListingCard/ListingCard.js index d8fdb0f0..0ef61c62 100644 --- a/src/components/ListingCard/ListingCard.js +++ b/src/components/ListingCard/ListingCard.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { string, func } from 'prop-types'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import { lazyLoadWithDimensions } from '../../util/contextHelpers'; import { LINE_ITEM_DAY, LINE_ITEM_NIGHT, propTypes } from '../../util/types'; diff --git a/src/components/LocationAutocompleteInput/LocationAutocompleteInputImpl.js b/src/components/LocationAutocompleteInput/LocationAutocompleteInputImpl.js index eb9140b1..2c2327ed 100644 --- a/src/components/LocationAutocompleteInput/LocationAutocompleteInputImpl.js +++ b/src/components/LocationAutocompleteInput/LocationAutocompleteInputImpl.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { any, arrayOf, bool, func, number, shape, string, oneOfType, object } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import debounce from 'lodash/debounce'; import { IconSpinner } from '../../components'; diff --git a/src/components/ManageListingCard/ManageListingCard.js b/src/components/ManageListingCard/ManageListingCard.js index 6d2bd786..0789f748 100644 --- a/src/components/ManageListingCard/ManageListingCard.js +++ b/src/components/ManageListingCard/ManageListingCard.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import routeConfiguration from '../../routeConfiguration'; import { diff --git a/src/components/Modal/Modal.js b/src/components/Modal/Modal.js index 08db33e0..b4875992 100644 --- a/src/components/Modal/Modal.js +++ b/src/components/Modal/Modal.js @@ -11,7 +11,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import { Button, IconClose } from '../../components'; import css from './Modal.css'; diff --git a/src/components/ModalMissingInformation/EmailReminder.js b/src/components/ModalMissingInformation/EmailReminder.js index 86fe45f1..6a53a46f 100644 --- a/src/components/ModalMissingInformation/EmailReminder.js +++ b/src/components/ModalMissingInformation/EmailReminder.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { isTooManyEmailVerificationRequestsError } from '../../util/errors'; import { IconEmailAttention, InlineTextButton, NamedLink } from '../../components'; diff --git a/src/components/ModalMissingInformation/ModalMissingInformation.js b/src/components/ModalMissingInformation/ModalMissingInformation.js index 5094e9af..83ce894d 100644 --- a/src/components/ModalMissingInformation/ModalMissingInformation.js +++ b/src/components/ModalMissingInformation/ModalMissingInformation.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { bool, func, string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import routeConfiguration from '../../routeConfiguration'; import { ensureCurrentUser } from '../../util/data'; diff --git a/src/components/ModalMissingInformation/StripeAccountReminder.js b/src/components/ModalMissingInformation/StripeAccountReminder.js index fae1c657..4b1f2181 100644 --- a/src/components/ModalMissingInformation/StripeAccountReminder.js +++ b/src/components/ModalMissingInformation/StripeAccountReminder.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { NamedLink } from '../../components'; import css from './ModalMissingInformation.css'; diff --git a/src/components/Page/Page.js b/src/components/Page/Page.js index d0046a6b..05a3119a 100644 --- a/src/components/Page/Page.js +++ b/src/components/Page/Page.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Helmet } from 'react-helmet-async'; import { withRouter } from 'react-router-dom'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import routeConfiguration from '../../routeConfiguration'; import config from '../../config'; diff --git a/src/components/PaginationLinks/PaginationLinks.js b/src/components/PaginationLinks/PaginationLinks.js index 68c127ee..6d3eeb07 100644 --- a/src/components/PaginationLinks/PaginationLinks.js +++ b/src/components/PaginationLinks/PaginationLinks.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import range from 'lodash/range'; import { IconArrowHead, NamedLink } from '../../components'; diff --git a/src/components/PriceFilter/PriceFilterPlain.js b/src/components/PriceFilter/PriceFilterPlain.js index 560a652e..ce7d8553 100644 --- a/src/components/PriceFilter/PriceFilterPlain.js +++ b/src/components/PriceFilter/PriceFilterPlain.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { func, number, shape, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { formatCurrencyMajorUnit } from '../../util/currency'; import config from '../../config'; diff --git a/src/components/PriceFilter/PriceFilterPopup.js b/src/components/PriceFilter/PriceFilterPopup.js index b50e84eb..b707cc3d 100644 --- a/src/components/PriceFilter/PriceFilterPopup.js +++ b/src/components/PriceFilter/PriceFilterPopup.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { func, number, shape, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { formatCurrencyMajorUnit } from '../../util/currency'; import config from '../../config'; diff --git a/src/components/ResponsiveImage/ResponsiveImage.js b/src/components/ResponsiveImage/ResponsiveImage.js index 05446138..550743e5 100644 --- a/src/components/ResponsiveImage/ResponsiveImage.js +++ b/src/components/ResponsiveImage/ResponsiveImage.js @@ -36,7 +36,7 @@ import React from 'react'; import { arrayOf, string } from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import NoImageIcon from './NoImageIcon'; diff --git a/src/components/ReviewModal/ReviewModal.js b/src/components/ReviewModal/ReviewModal.js index 7290725a..213adcf7 100644 --- a/src/components/ReviewModal/ReviewModal.js +++ b/src/components/ReviewModal/ReviewModal.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { IconReviewUser, Modal } from '../../components'; diff --git a/src/components/Reviews/Reviews.js b/src/components/Reviews/Reviews.js index 9233b6b7..a69a48cf 100644 --- a/src/components/Reviews/Reviews.js +++ b/src/components/Reviews/Reviews.js @@ -1,5 +1,5 @@ import React from 'react'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { arrayOf, string } from 'prop-types'; import classNames from 'classnames'; import { Avatar, ReviewRating, UserDisplayName } from '../../components'; diff --git a/src/components/SavedCardDetails/SavedCardDetails.js b/src/components/SavedCardDetails/SavedCardDetails.js index 5e417eb6..7497d3c1 100644 --- a/src/components/SavedCardDetails/SavedCardDetails.js +++ b/src/components/SavedCardDetails/SavedCardDetails.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import ReactDOM from 'react-dom'; import { bool, func, number, shape, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { IconArrowHead, IconCard, diff --git a/src/components/SearchFilters/SearchFilters.js b/src/components/SearchFilters/SearchFilters.js index d9a7a66d..189663df 100644 --- a/src/components/SearchFilters/SearchFilters.js +++ b/src/components/SearchFilters/SearchFilters.js @@ -1,7 +1,7 @@ import React from 'react'; import { compose } from 'redux'; import { object, string, bool, number, func, shape } from 'prop-types'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { withRouter } from 'react-router-dom'; import omit from 'lodash/omit'; diff --git a/src/components/SearchFiltersMobile/SearchFiltersMobile.js b/src/components/SearchFiltersMobile/SearchFiltersMobile.js index b582e049..4a4fba3b 100644 --- a/src/components/SearchFiltersMobile/SearchFiltersMobile.js +++ b/src/components/SearchFiltersMobile/SearchFiltersMobile.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { object, string, bool, number, func, shape, array } from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { withRouter } from 'react-router-dom'; import omit from 'lodash/omit'; diff --git a/src/components/SearchFiltersPanel/SearchFiltersPanel.js b/src/components/SearchFiltersPanel/SearchFiltersPanel.js index 4a1946c6..436bb4ee 100644 --- a/src/components/SearchFiltersPanel/SearchFiltersPanel.js +++ b/src/components/SearchFiltersPanel/SearchFiltersPanel.js @@ -29,7 +29,7 @@ import React, { Component } from 'react'; import { array, func, object, shape, string } from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { withRouter } from 'react-router-dom'; import omit from 'lodash/omit'; diff --git a/src/components/SearchMap/ReusableMapContainer.js b/src/components/SearchMap/ReusableMapContainer.js index 2cc2aabd..4a507a78 100644 --- a/src/components/SearchMap/ReusableMapContainer.js +++ b/src/components/SearchMap/ReusableMapContainer.js @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { node, string, object } from 'prop-types'; -import { IntlProvider } from 'react-intl'; +import { IntlProvider } from '../../util/reactIntl'; import config from '../../config'; import css from './SearchMap.css'; @@ -59,7 +59,7 @@ class ReusableMapContainer extends React.Component { // You need to provide onClick functions and URLs as props. const renderChildren = () => { const children = ( - + {this.props.children} ); diff --git a/src/components/SearchMapInfoCard/SearchMapInfoCard.js b/src/components/SearchMapInfoCard/SearchMapInfoCard.js index 1761d8ac..c96936e6 100644 --- a/src/components/SearchMapInfoCard/SearchMapInfoCard.js +++ b/src/components/SearchMapInfoCard/SearchMapInfoCard.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { arrayOf, bool, func, string } from 'prop-types'; import { compose } from 'redux'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import config from '../../config'; import { propTypes } from '../../util/types'; diff --git a/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js b/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js index 3e19f37d..22ef1e4d 100644 --- a/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js +++ b/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { formatMoney } from '../../util/currency'; diff --git a/src/components/SectionHero/SectionHero.js b/src/components/SectionHero/SectionHero.js index e3cd6482..c914f476 100644 --- a/src/components/SectionHero/SectionHero.js +++ b/src/components/SectionHero/SectionHero.js @@ -1,6 +1,6 @@ import React from 'react'; import { string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { NamedLink } from '../../components'; diff --git a/src/components/SectionHowItWorks/SectionHowItWorks.js b/src/components/SectionHowItWorks/SectionHowItWorks.js index 770fa08c..07cac80b 100644 --- a/src/components/SectionHowItWorks/SectionHowItWorks.js +++ b/src/components/SectionHowItWorks/SectionHowItWorks.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { NamedLink } from '../../components'; diff --git a/src/components/SectionLocations/SectionLocations.js b/src/components/SectionLocations/SectionLocations.js index c748e298..d8463f1c 100644 --- a/src/components/SectionLocations/SectionLocations.js +++ b/src/components/SectionLocations/SectionLocations.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { lazyLoadWithDimensions } from '../../util/contextHelpers'; diff --git a/src/components/SelectMultipleFilter/SelectMultipleFilter.js b/src/components/SelectMultipleFilter/SelectMultipleFilter.js index d8429f76..09c868d2 100644 --- a/src/components/SelectMultipleFilter/SelectMultipleFilter.js +++ b/src/components/SelectMultipleFilter/SelectMultipleFilter.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { array, arrayOf, func, number, string } from 'prop-types'; import classNames from 'classnames'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { FieldCheckbox } from '../../components'; import { FilterPopup, FilterPlain } from '../../components'; diff --git a/src/components/SelectSingleFilter/SelectSingleFilterPlain.js b/src/components/SelectSingleFilter/SelectSingleFilterPlain.js index e99cfb07..1a1a0fd2 100644 --- a/src/components/SelectSingleFilter/SelectSingleFilterPlain.js +++ b/src/components/SelectSingleFilter/SelectSingleFilterPlain.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { arrayOf, bool, func, shape, string } from 'prop-types'; import classNames from 'classnames'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import css from './SelectSingleFilterPlain.css'; diff --git a/src/components/SelectSingleFilter/SelectSingleFilterPopup.js b/src/components/SelectSingleFilter/SelectSingleFilterPopup.js index bcce2899..d4062a1f 100644 --- a/src/components/SelectSingleFilter/SelectSingleFilterPopup.js +++ b/src/components/SelectSingleFilter/SelectSingleFilterPopup.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { string, func, arrayOf, shape, number } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { Menu, MenuContent, MenuItem, MenuLabel } from '..'; diff --git a/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js b/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js index 43dd9d78..155ba94d 100644 --- a/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js +++ b/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import css from './StripeBankAccountTokenInputField.css'; diff --git a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js index 96f7cf0d..201b75c8 100644 --- a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js +++ b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle */ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; import { Field } from 'react-final-form'; import classNames from 'classnames'; import debounce from 'lodash/debounce'; diff --git a/src/components/StripePaymentAddress/StripePaymentAddress.js b/src/components/StripePaymentAddress/StripePaymentAddress.js index b31dce65..294436a9 100644 --- a/src/components/StripePaymentAddress/StripePaymentAddress.js +++ b/src/components/StripePaymentAddress/StripePaymentAddress.js @@ -1,5 +1,5 @@ import React from 'react'; -import { intlShape } from 'react-intl'; +import { intlShape } from '../../util/reactIntl'; import { bool, object, string } from 'prop-types'; import config from '../../config'; import * as validators from '../../util/validators'; diff --git a/src/components/Topbar/Topbar.js b/src/components/Topbar/Topbar.js index 13d7b8de..9c5f09aa 100644 --- a/src/components/Topbar/Topbar.js +++ b/src/components/Topbar/Topbar.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import pickBy from 'lodash/pickBy'; import classNames from 'classnames'; import config from '../../config'; diff --git a/src/components/TopbarDesktop/TopbarDesktop.js b/src/components/TopbarDesktop/TopbarDesktop.js index 632e3faf..e38cec90 100644 --- a/src/components/TopbarDesktop/TopbarDesktop.js +++ b/src/components/TopbarDesktop/TopbarDesktop.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { ACCOUNT_SETTINGS_PAGES } from '../../routeConfiguration'; import { propTypes } from '../../util/types'; diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.js b/src/components/TopbarMobileMenu/TopbarMobileMenu.js index 8c1ed145..f966ad21 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.js +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.js @@ -4,7 +4,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { ACCOUNT_SETTINGS_PAGES } from '../../routeConfiguration'; import { propTypes } from '../../util/types'; diff --git a/src/components/TransactionPanel/BreakdownMaybe.js b/src/components/TransactionPanel/BreakdownMaybe.js index c2dc26d1..109af9ee 100644 --- a/src/components/TransactionPanel/BreakdownMaybe.js +++ b/src/components/TransactionPanel/BreakdownMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import config from '../../config'; import { BookingBreakdown } from '../../components'; diff --git a/src/components/TransactionPanel/FeedSection.js b/src/components/TransactionPanel/FeedSection.js index 51d7ccfb..9cf9705d 100644 --- a/src/components/TransactionPanel/FeedSection.js +++ b/src/components/TransactionPanel/FeedSection.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { ActivityFeed } from '../../components'; diff --git a/src/components/TransactionPanel/PanelHeading.js b/src/components/TransactionPanel/PanelHeading.js index 86a45dd0..189be529 100644 --- a/src/components/TransactionPanel/PanelHeading.js +++ b/src/components/TransactionPanel/PanelHeading.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { createSlug, stringify } from '../../util/urlHelpers'; import { NamedLink } from '../../components'; diff --git a/src/components/TransactionPanel/SaleActionButtonsMaybe.js b/src/components/TransactionPanel/SaleActionButtonsMaybe.js index 6951afd9..1d998af2 100644 --- a/src/components/TransactionPanel/SaleActionButtonsMaybe.js +++ b/src/components/TransactionPanel/SaleActionButtonsMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { PrimaryButton, SecondaryButton } from '../../components'; diff --git a/src/components/TransactionPanel/TransactionPanel.js b/src/components/TransactionPanel/TransactionPanel.js index 363e18f6..3f35870a 100644 --- a/src/components/TransactionPanel/TransactionPanel.js +++ b/src/components/TransactionPanel/TransactionPanel.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { array, arrayOf, bool, func, number, string } from 'prop-types'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import { TRANSITION_REQUEST_PAYMENT_AFTER_ENQUIRY, diff --git a/src/components/UserCard/UserCard.js b/src/components/UserCard/UserCard.js index 1a72e494..38d060fb 100644 --- a/src/components/UserCard/UserCard.js +++ b/src/components/UserCard/UserCard.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { string, func, oneOfType } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import truncate from 'lodash/truncate'; import classNames from 'classnames'; import { AvatarLarge, NamedLink, InlineTextButton } from '../../components'; diff --git a/src/components/UserNav/UserNav.js b/src/components/UserNav/UserNav.js index 890d84f3..e1d42b74 100644 --- a/src/components/UserNav/UserNav.js +++ b/src/components/UserNav/UserNav.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { ACCOUNT_SETTINGS_PAGES } from '../../routeConfiguration'; import { LinkTabNavHorizontal } from '../../components'; diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index 783b7759..44fb476f 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter, Redirect } from 'react-router-dom'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import classNames from 'classnames'; import config from '../../config'; import { propTypes } from '../../util/types'; diff --git a/src/containers/CheckoutPage/CheckoutPage.js b/src/containers/CheckoutPage/CheckoutPage.js index 48202d8c..9f4ddfd7 100644 --- a/src/containers/CheckoutPage/CheckoutPage.js +++ b/src/containers/CheckoutPage/CheckoutPage.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { bool, func, instanceOf, object, oneOfType, shape, string } from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { withRouter } from 'react-router-dom'; import classNames from 'classnames'; import config from '../../config'; diff --git a/src/containers/ContactDetailsPage/ContactDetailsPage.js b/src/containers/ContactDetailsPage/ContactDetailsPage.js index d2584bec..576ccd2e 100644 --- a/src/containers/ContactDetailsPage/ContactDetailsPage.js +++ b/src/containers/ContactDetailsPage/ContactDetailsPage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { ensureCurrentUser } from '../../util/data'; import { fetchCurrentUser, sendVerificationEmail } from '../../ducks/user.duck'; diff --git a/src/containers/EditListingPage/EditListingPage.js b/src/containers/EditListingPage/EditListingPage.js index 04dede19..4c48832e 100644 --- a/src/containers/EditListingPage/EditListingPage.js +++ b/src/containers/EditListingPage/EditListingPage.js @@ -2,7 +2,7 @@ import React from 'react'; import { bool, func, object, shape, string, oneOf } from 'prop-types'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import { connect } from 'react-redux'; import { types as sdkTypes } from '../../util/sdkLoader'; import { diff --git a/src/containers/InboxPage/InboxPage.js b/src/containers/InboxPage/InboxPage.js index 3034d8db..42072964 100644 --- a/src/containers/InboxPage/InboxPage.js +++ b/src/containers/InboxPage/InboxPage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import moment from 'moment'; import classNames from 'classnames'; import { diff --git a/src/containers/LandingPage/LandingPage.js b/src/containers/LandingPage/LandingPage.js index d87a1ac9..af2bc5df 100644 --- a/src/containers/LandingPage/LandingPage.js +++ b/src/containers/LandingPage/LandingPage.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { isScrollingDisabled } from '../../ducks/UI.duck'; import config from '../../config'; import { diff --git a/src/containers/ListingPage/ActionBarMaybe.js b/src/containers/ListingPage/ActionBarMaybe.js index 5b07d19a..8465555e 100644 --- a/src/containers/ListingPage/ActionBarMaybe.js +++ b/src/containers/ListingPage/ActionBarMaybe.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, oneOfType, object } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { LISTING_STATE_PENDING_APPROVAL, diff --git a/src/containers/ListingPage/ListingPage.js b/src/containers/ListingPage/ListingPage.js index b956fe28..68eec5e5 100644 --- a/src/containers/ListingPage/ListingPage.js +++ b/src/containers/ListingPage/ListingPage.js @@ -1,7 +1,7 @@ /* eslint-disable jsx-a11y/no-static-element-interactions */ import React, { Component } from 'react'; import { array, arrayOf, bool, func, shape, string, oneOf } from 'prop-types'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/ListingPage/ListingPage.test.js b/src/containers/ListingPage/ListingPage.test.js index b4c3d1fe..bedf83c3 100644 --- a/src/containers/ListingPage/ListingPage.test.js +++ b/src/containers/ListingPage/ListingPage.test.js @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { types as sdkTypes } from '../../util/sdkLoader'; import { createUser, diff --git a/src/containers/ListingPage/SectionDescriptionMaybe.js b/src/containers/ListingPage/SectionDescriptionMaybe.js index 099da686..d06d30ad 100644 --- a/src/containers/ListingPage/SectionDescriptionMaybe.js +++ b/src/containers/ListingPage/SectionDescriptionMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { richText } from '../../util/richText'; import css from './ListingPage.css'; diff --git a/src/containers/ListingPage/SectionFeaturesMaybe.js b/src/containers/ListingPage/SectionFeaturesMaybe.js index f1779203..48fc0bc0 100644 --- a/src/containers/ListingPage/SectionFeaturesMaybe.js +++ b/src/containers/ListingPage/SectionFeaturesMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { PropertyGroup } from '../../components'; import css from './ListingPage.css'; diff --git a/src/containers/ListingPage/SectionHeading.js b/src/containers/ListingPage/SectionHeading.js index 90b2d954..f64a9851 100644 --- a/src/containers/ListingPage/SectionHeading.js +++ b/src/containers/ListingPage/SectionHeading.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { InlineTextButton } from '../../components'; import { LINE_ITEM_NIGHT, LINE_ITEM_DAY } from '../../util/types'; import config from '../../config'; diff --git a/src/containers/ListingPage/SectionHostMaybe.js b/src/containers/ListingPage/SectionHostMaybe.js index 6bdefb31..2c958134 100644 --- a/src/containers/ListingPage/SectionHostMaybe.js +++ b/src/containers/ListingPage/SectionHostMaybe.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { UserCard, Modal } from '../../components'; import { EnquiryForm } from '../../forms'; diff --git a/src/containers/ListingPage/SectionImages.js b/src/containers/ListingPage/SectionImages.js index 675e09dc..a8b5227a 100644 --- a/src/containers/ListingPage/SectionImages.js +++ b/src/containers/ListingPage/SectionImages.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { ResponsiveImage, Modal, ImageCarousel } from '../../components'; import ActionBarMaybe from './ActionBarMaybe'; diff --git a/src/containers/ListingPage/SectionMapMaybe.js b/src/containers/ListingPage/SectionMapMaybe.js index 40037c4e..5458c20d 100644 --- a/src/containers/ListingPage/SectionMapMaybe.js +++ b/src/containers/ListingPage/SectionMapMaybe.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { obfuscatedCoordinates } from '../../util/maps'; diff --git a/src/containers/ListingPage/SectionReviews.js b/src/containers/ListingPage/SectionReviews.js index 29d6fc42..4d6eb937 100644 --- a/src/containers/ListingPage/SectionReviews.js +++ b/src/containers/ListingPage/SectionReviews.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { Reviews } from '../../components'; import css from './ListingPage.css'; diff --git a/src/containers/ListingPage/SectionRulesMaybe.js b/src/containers/ListingPage/SectionRulesMaybe.js index b7085be7..8fc462c7 100644 --- a/src/containers/ListingPage/SectionRulesMaybe.js +++ b/src/containers/ListingPage/SectionRulesMaybe.js @@ -1,6 +1,6 @@ import React from 'react'; import { shape, string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import css from './SectionRulesMaybe.css'; diff --git a/src/containers/ManageListingsPage/ManageListingsPage.js b/src/containers/ManageListingsPage/ManageListingsPage.js index af650d6e..90dcb85d 100644 --- a/src/containers/ManageListingsPage/ManageListingsPage.js +++ b/src/containers/ManageListingsPage/ManageListingsPage.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { parse } from '../../util/urlHelpers'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/NotFoundPage/NotFoundPage.js b/src/containers/NotFoundPage/NotFoundPage.js index a94cb40d..15a04ac0 100644 --- a/src/containers/NotFoundPage/NotFoundPage.js +++ b/src/containers/NotFoundPage/NotFoundPage.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/PasswordChangePage/PasswordChangePage.js b/src/containers/PasswordChangePage/PasswordChangePage.js index ec7eeb45..ea8b5479 100644 --- a/src/containers/PasswordChangePage/PasswordChangePage.js +++ b/src/containers/PasswordChangePage/PasswordChangePage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { isScrollingDisabled } from '../../ducks/UI.duck'; import { diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js index 0f2ff664..7a7c02a9 100644 --- a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js +++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { isPasswordRecoveryEmailNotFoundError } from '../../util/errors'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/PasswordResetPage/PasswordResetPage.js b/src/containers/PasswordResetPage/PasswordResetPage.js index 4d49862b..1fc0dba3 100644 --- a/src/containers/PasswordResetPage/PasswordResetPage.js +++ b/src/containers/PasswordResetPage/PasswordResetPage.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { parse } from '../../util/urlHelpers'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/PaymentMethodsPage/PaymentMethodsPage.js b/src/containers/PaymentMethodsPage/PaymentMethodsPage.js index 4f50334c..1d0d4288 100644 --- a/src/containers/PaymentMethodsPage/PaymentMethodsPage.js +++ b/src/containers/PaymentMethodsPage/PaymentMethodsPage.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { bool, func, object } from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { ensureCurrentUser, ensureStripeCustomer, ensurePaymentMethodCard } from '../../util/data'; import { propTypes } from '../../util/types'; import { savePaymentMethod, deletePaymentMethod } from '../../ducks/paymentMethods.duck'; diff --git a/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js b/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js index 15120fc5..ee5cda05 100644 --- a/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js +++ b/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js @@ -2,7 +2,7 @@ import React from 'react'; import { bool, func } from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { ensureCurrentUser } from '../../util/data'; import { propTypes } from '../../util/types'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/PrivacyPolicyPage/PrivacyPolicyPage.js b/src/containers/PrivacyPolicyPage/PrivacyPolicyPage.js index 464ece07..d9a919c7 100644 --- a/src/containers/PrivacyPolicyPage/PrivacyPolicyPage.js +++ b/src/containers/PrivacyPolicyPage/PrivacyPolicyPage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { isScrollingDisabled } from '../../ducks/UI.duck'; import { TopbarContainer } from '../../containers'; import { diff --git a/src/containers/ProfilePage/ProfilePage.js b/src/containers/ProfilePage/ProfilePage.js index 71f009ce..ca0298df 100644 --- a/src/containers/ProfilePage/ProfilePage.js +++ b/src/containers/ProfilePage/ProfilePage.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { compose } from 'redux'; import { connect } from 'react-redux'; import classNames from 'classnames'; diff --git a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js index db8918a2..bd8ddd39 100644 --- a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js +++ b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import { ensureCurrentUser } from '../../util/data'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/SearchPage/MainPanel.js b/src/containers/SearchPage/MainPanel.js index cf52c449..a06e4730 100644 --- a/src/containers/SearchPage/MainPanel.js +++ b/src/containers/SearchPage/MainPanel.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { array, bool, func, number, object, objectOf, string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import merge from 'lodash/merge'; import { propTypes } from '../../util/types'; diff --git a/src/containers/SearchPage/SearchPage.js b/src/containers/SearchPage/SearchPage.js index 9cad11f2..0e0bf575 100644 --- a/src/containers/SearchPage/SearchPage.js +++ b/src/containers/SearchPage/SearchPage.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { array, bool, func, number, oneOf, object, shape, string } from 'prop-types'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { connect } from 'react-redux'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/TermsOfServicePage/TermsOfServicePage.js b/src/containers/TermsOfServicePage/TermsOfServicePage.js index 015c28ea..74b54f13 100644 --- a/src/containers/TermsOfServicePage/TermsOfServicePage.js +++ b/src/containers/TermsOfServicePage/TermsOfServicePage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { isScrollingDisabled } from '../../ducks/UI.duck'; import { TopbarContainer } from '../../containers'; import { diff --git a/src/containers/TransactionPage/TransactionPage.js b/src/containers/TransactionPage/TransactionPage.js index 02106187..804a3510 100644 --- a/src/containers/TransactionPage/TransactionPage.js +++ b/src/containers/TransactionPage/TransactionPage.js @@ -4,7 +4,7 @@ import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; import classNames from 'classnames'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import { createResourceLocatorString, findRouteByRouteName } from '../../util/routes'; import routeConfiguration from '../../routeConfiguration'; import { propTypes } from '../../util/types'; diff --git a/src/forms/BookingDatesForm/BookingDatesForm.js b/src/forms/BookingDatesForm/BookingDatesForm.js index 1f978cd2..5c022e12 100644 --- a/src/forms/BookingDatesForm/BookingDatesForm.js +++ b/src/forms/BookingDatesForm/BookingDatesForm.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { string, bool, arrayOf } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm } from 'react-final-form'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import moment from 'moment'; import { required, bookingDatesRequired, composeValidators } from '../../util/validators'; diff --git a/src/forms/ContactDetailsForm/ContactDetailsForm.js b/src/forms/ContactDetailsForm/ContactDetailsForm.js index b4ae414d..a2b0caa0 100644 --- a/src/forms/ContactDetailsForm/ContactDetailsForm.js +++ b/src/forms/ContactDetailsForm/ContactDetailsForm.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import isEqual from 'lodash/isEqual'; import classNames from 'classnames'; diff --git a/src/forms/EditListingAvailabilityForm/EditListingAvailabilityForm.js b/src/forms/EditListingAvailabilityForm/EditListingAvailabilityForm.js index 12a076f8..6324cdd0 100644 --- a/src/forms/EditListingAvailabilityForm/EditListingAvailabilityForm.js +++ b/src/forms/EditListingAvailabilityForm/EditListingAvailabilityForm.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { bool, func, object, string } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm } from 'react-final-form'; -import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { Form, Button } from '../../components'; diff --git a/src/forms/EditListingAvailabilityForm/ManageAvailabilityCalendar.js b/src/forms/EditListingAvailabilityForm/ManageAvailabilityCalendar.js index 41efae9f..4b270b2e 100644 --- a/src/forms/EditListingAvailabilityForm/ManageAvailabilityCalendar.js +++ b/src/forms/EditListingAvailabilityForm/ManageAvailabilityCalendar.js @@ -6,7 +6,7 @@ import { isInclusivelyBeforeDay, isInclusivelyAfterDay, } from 'react-dates'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import memoize from 'lodash/memoize'; import classNames from 'classnames'; import moment from 'moment'; diff --git a/src/forms/EditListingDescriptionForm/EditListingDescriptionForm.js b/src/forms/EditListingDescriptionForm/EditListingDescriptionForm.js index 6d94f725..f2dc009f 100644 --- a/src/forms/EditListingDescriptionForm/EditListingDescriptionForm.js +++ b/src/forms/EditListingDescriptionForm/EditListingDescriptionForm.js @@ -2,7 +2,7 @@ import React from 'react'; import { arrayOf, bool, func, shape, string } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm } from 'react-final-form'; -import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { maxLength, required, composeValidators } from '../../util/validators'; diff --git a/src/forms/EditListingFeaturesForm/EditListingFeaturesForm.js b/src/forms/EditListingFeaturesForm/EditListingFeaturesForm.js index 1820910d..c92da320 100644 --- a/src/forms/EditListingFeaturesForm/EditListingFeaturesForm.js +++ b/src/forms/EditListingFeaturesForm/EditListingFeaturesForm.js @@ -3,7 +3,7 @@ import { bool, func, shape, string } from 'prop-types'; import classNames from 'classnames'; import { Form as FinalForm } from 'react-final-form'; import arrayMutators from 'final-form-arrays'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import { propTypes } from '../../util/types'; import config from '../../config'; diff --git a/src/forms/EditListingLocationForm/EditListingLocationForm.js b/src/forms/EditListingLocationForm/EditListingLocationForm.js index c4126c9a..108d8da2 100644 --- a/src/forms/EditListingLocationForm/EditListingLocationForm.js +++ b/src/forms/EditListingLocationForm/EditListingLocationForm.js @@ -2,7 +2,7 @@ import React from 'react'; import { bool, func, shape, string } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm } from 'react-final-form'; -import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { diff --git a/src/forms/EditListingPhotosForm/EditListingPhotosForm.js b/src/forms/EditListingPhotosForm/EditListingPhotosForm.js index b5f77c06..67b62697 100644 --- a/src/forms/EditListingPhotosForm/EditListingPhotosForm.js +++ b/src/forms/EditListingPhotosForm/EditListingPhotosForm.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { array, bool, func, shape, string } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm, Field } from 'react-final-form'; -import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; +import { FormattedMessage, intlShape, injectIntl } from '../../util/reactIntl'; import isEqual from 'lodash/isEqual'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; diff --git a/src/forms/EditListingPoliciesForm/EditListingPoliciesForm.js b/src/forms/EditListingPoliciesForm/EditListingPoliciesForm.js index af62bc3c..1099274e 100644 --- a/src/forms/EditListingPoliciesForm/EditListingPoliciesForm.js +++ b/src/forms/EditListingPoliciesForm/EditListingPoliciesForm.js @@ -2,7 +2,7 @@ import React from 'react'; import { bool, func, shape, string } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm } from 'react-final-form'; -import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import { propTypes } from '../../util/types'; import { Form, Button, FieldTextInput } from '../../components'; diff --git a/src/forms/EditListingPricingForm/EditListingPricingForm.js b/src/forms/EditListingPricingForm/EditListingPricingForm.js index 19fad266..9149bd44 100644 --- a/src/forms/EditListingPricingForm/EditListingPricingForm.js +++ b/src/forms/EditListingPricingForm/EditListingPricingForm.js @@ -2,7 +2,7 @@ import React from 'react'; import { bool, func, shape, string } from 'prop-types'; import { compose } from 'redux'; import { Form as FinalForm } from 'react-final-form'; -import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; +import { intlShape, injectIntl, FormattedMessage } from '../../util/reactIntl'; import classNames from 'classnames'; import config from '../../config'; import { LINE_ITEM_NIGHT, LINE_ITEM_DAY, propTypes } from '../../util/types'; diff --git a/src/forms/EmailVerificationForm/EmailVerificationForm.js b/src/forms/EmailVerificationForm/EmailVerificationForm.js index 41b670fb..a2302798 100644 --- a/src/forms/EmailVerificationForm/EmailVerificationForm.js +++ b/src/forms/EmailVerificationForm/EmailVerificationForm.js @@ -1,7 +1,7 @@ import React from 'react'; import { bool } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl } from 'react-intl'; +import { FormattedMessage, injectIntl } from '../../util/reactIntl'; import { Form as FinalForm, Field } from 'react-final-form'; import { Form, diff --git a/src/forms/EnquiryForm/EnquiryForm.js b/src/forms/EnquiryForm/EnquiryForm.js index ac3831f5..0bc44b57 100644 --- a/src/forms/EnquiryForm/EnquiryForm.js +++ b/src/forms/EnquiryForm/EnquiryForm.js @@ -1,7 +1,7 @@ import React from 'react'; import { string, bool } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import { Form, PrimaryButton, FieldTextInput, IconEnquiry } from '../../components'; diff --git a/src/forms/FilterForm/FilterForm.js b/src/forms/FilterForm/FilterForm.js index 3b8cfc6f..cd825200 100644 --- a/src/forms/FilterForm/FilterForm.js +++ b/src/forms/FilterForm/FilterForm.js @@ -3,7 +3,7 @@ import { bool, func, node, object } from 'prop-types'; import classNames from 'classnames'; import { Form as FinalForm, FormSpy } from 'react-final-form'; import arrayMutators from 'final-form-arrays'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import { Form } from '../../components'; import css from './FilterForm.css'; diff --git a/src/forms/LocationSearchForm/LocationSearchForm.js b/src/forms/LocationSearchForm/LocationSearchForm.js index 0d0d619e..84edf7f9 100644 --- a/src/forms/LocationSearchForm/LocationSearchForm.js +++ b/src/forms/LocationSearchForm/LocationSearchForm.js @@ -1,7 +1,7 @@ import React from 'react'; import { func, string } from 'prop-types'; import { Form as FinalForm, Field } from 'react-final-form'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import { Form, LocationAutocompleteInput } from '../../components'; diff --git a/src/forms/LoginForm/LoginForm.js b/src/forms/LoginForm/LoginForm.js index 17e5dece..c596e1f3 100644 --- a/src/forms/LoginForm/LoginForm.js +++ b/src/forms/LoginForm/LoginForm.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import { Form, PrimaryButton, FieldTextInput, NamedLink } from '../../components'; diff --git a/src/forms/PasswordChangeForm/PasswordChangeForm.js b/src/forms/PasswordChangeForm/PasswordChangeForm.js index 5df3eaa8..3b103913 100644 --- a/src/forms/PasswordChangeForm/PasswordChangeForm.js +++ b/src/forms/PasswordChangeForm/PasswordChangeForm.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import isEqual from 'lodash/isEqual'; import classNames from 'classnames'; diff --git a/src/forms/PasswordRecoveryForm/PasswordRecoveryForm.js b/src/forms/PasswordRecoveryForm/PasswordRecoveryForm.js index 8c7b823d..796e548c 100644 --- a/src/forms/PasswordRecoveryForm/PasswordRecoveryForm.js +++ b/src/forms/PasswordRecoveryForm/PasswordRecoveryForm.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import isEqual from 'lodash/isEqual'; import classNames from 'classnames'; diff --git a/src/forms/PasswordResetForm/PasswordResetForm.js b/src/forms/PasswordResetForm/PasswordResetForm.js index d300b2a2..3967d071 100644 --- a/src/forms/PasswordResetForm/PasswordResetForm.js +++ b/src/forms/PasswordResetForm/PasswordResetForm.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import { Form, PrimaryButton, FieldTextInput } from '../../components'; diff --git a/src/forms/PaymentMethodsForm/PaymentMethodsForm.js b/src/forms/PaymentMethodsForm/PaymentMethodsForm.js index 632f2c5c..46b3cf58 100644 --- a/src/forms/PaymentMethodsForm/PaymentMethodsForm.js +++ b/src/forms/PaymentMethodsForm/PaymentMethodsForm.js @@ -5,7 +5,7 @@ */ import React, { Component } from 'react'; import { bool, func, object, string } from 'prop-types'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import config from '../../config'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsAccountOpener.js b/src/forms/PayoutDetailsForm/PayoutDetailsAccountOpener.js index d73e7f19..72780596 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsAccountOpener.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsAccountOpener.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, object, string } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import PayoutDetailsAddress from './PayoutDetailsAddress'; import PayoutDetailsPersonalDetails from './PayoutDetailsPersonalDetails'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsAdditionalPersons.js b/src/forms/PayoutDetailsForm/PayoutDetailsAdditionalPersons.js index 9ee6bcac..b6a35194 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsAdditionalPersons.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsAdditionalPersons.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, func, object, string } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import { FieldArray } from 'react-final-form-arrays'; import { ExternalLink, IconAdd, IconClose, InlineTextButton } from '../../components'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsAddress.js b/src/forms/PayoutDetailsForm/PayoutDetailsAddress.js index 51a63184..89e2e0b4 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsAddress.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsAddress.js @@ -1,5 +1,5 @@ import React from 'react'; -import { intlShape } from 'react-intl'; +import { intlShape } from '../../util/reactIntl'; import { bool, object, string } from 'prop-types'; import * as validators from '../../util/validators'; import { FieldSelect, FieldTextInput } from '../../components'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsBankDetails.js b/src/forms/PayoutDetailsForm/PayoutDetailsBankDetails.js index 0243a827..014617f2 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsBankDetails.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsBankDetails.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, string } from 'prop-types'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage } from '../../util/reactIntl'; import * as validators from '../../util/validators'; import { StripeBankAccountTokenInputField } from '../../components'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsBusinessProfile.js b/src/forms/PayoutDetailsForm/PayoutDetailsBusinessProfile.js index 08dae1fb..27214f25 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsBusinessProfile.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsBusinessProfile.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, string } from 'prop-types'; -import { intlShape } from 'react-intl'; +import { intlShape } from '../../util/reactIntl'; import * as validators from '../../util/validators'; import { FieldSelect, FieldTextInput } from '../../components'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsCompany.js b/src/forms/PayoutDetailsForm/PayoutDetailsCompany.js index e0f5385d..82670689 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsCompany.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsCompany.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, string } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import * as validators from '../../util/validators'; import { FieldPhoneNumberInput, FieldTextInput } from '../../components'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsCompanyAccount.js b/src/forms/PayoutDetailsForm/PayoutDetailsCompanyAccount.js index 5a82addf..b3fa7a56 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsCompanyAccount.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsCompanyAccount.js @@ -1,7 +1,7 @@ import React from 'react'; import { bool, object, shape } from 'prop-types'; import { compose } from 'redux'; -import { injectIntl, intlShape } from 'react-intl'; +import { injectIntl, intlShape } from '../../util/reactIntl'; import PayoutDetailsAddress from './PayoutDetailsAddress'; import PayoutDetailsCompany from './PayoutDetailsCompany'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsForm.js b/src/forms/PayoutDetailsForm/PayoutDetailsForm.js index acbd2e32..0930b7b0 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsForm.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsForm.js @@ -1,7 +1,7 @@ import React from 'react'; import { bool, func, object, shape, string } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import arrayMutators from 'final-form-arrays'; import classNames from 'classnames'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsIndividualAccount.js b/src/forms/PayoutDetailsForm/PayoutDetailsIndividualAccount.js index bbaa2a6a..4558d9ff 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsIndividualAccount.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsIndividualAccount.js @@ -1,7 +1,7 @@ import React from 'react'; import { bool, object, shape } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import config from '../../config'; import routeConfiguration from '../../routeConfiguration'; import { propTypes } from '../../util/types'; diff --git a/src/forms/PayoutDetailsForm/PayoutDetailsPersonalDetails.js b/src/forms/PayoutDetailsForm/PayoutDetailsPersonalDetails.js index 372cada2..51da8339 100644 --- a/src/forms/PayoutDetailsForm/PayoutDetailsPersonalDetails.js +++ b/src/forms/PayoutDetailsForm/PayoutDetailsPersonalDetails.js @@ -1,6 +1,6 @@ import React from 'react'; import { bool, node, object, oneOf, string } from 'prop-types'; -import { FormattedMessage, intlShape } from 'react-intl'; +import { FormattedMessage, intlShape } from '../../util/reactIntl'; import * as validators from '../../util/validators'; import { FieldBirthdayInput, FieldCheckbox, FieldTextInput } from '../../components'; diff --git a/src/forms/PriceFilterForm/PriceFilterForm.js b/src/forms/PriceFilterForm/PriceFilterForm.js index 5981123d..efedfa14 100644 --- a/src/forms/PriceFilterForm/PriceFilterForm.js +++ b/src/forms/PriceFilterForm/PriceFilterForm.js @@ -3,7 +3,7 @@ import { bool, func, number, object, string } from 'prop-types'; import classNames from 'classnames'; import debounce from 'lodash/debounce'; import { Field, Form as FinalForm, FormSpy } from 'react-final-form'; -import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form, RangeSlider } from '../../components'; import css from './PriceFilterForm.css'; diff --git a/src/forms/ProfileSettingsForm/ProfileSettingsForm.js b/src/forms/ProfileSettingsForm/ProfileSettingsForm.js index 6e8fb664..9bac23ca 100644 --- a/src/forms/ProfileSettingsForm/ProfileSettingsForm.js +++ b/src/forms/ProfileSettingsForm/ProfileSettingsForm.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { bool, string } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Field, Form as FinalForm } from 'react-final-form'; import isEqual from 'lodash/isEqual'; import classNames from 'classnames'; diff --git a/src/forms/ReviewForm/ReviewForm.js b/src/forms/ReviewForm/ReviewForm.js index caf7c5e3..ccb38df0 100644 --- a/src/forms/ReviewForm/ReviewForm.js +++ b/src/forms/ReviewForm/ReviewForm.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import { isTransactionsTransitionAlreadyReviewed } from '../../util/errors'; diff --git a/src/forms/SendMessageForm/SendMessageForm.js b/src/forms/SendMessageForm/SendMessageForm.js index 821802d8..d996aa68 100644 --- a/src/forms/SendMessageForm/SendMessageForm.js +++ b/src/forms/SendMessageForm/SendMessageForm.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { string, bool, func } from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import { Form, FieldTextInput, SecondaryButton } from '../../components'; diff --git a/src/forms/SignupForm/SignupForm.js b/src/forms/SignupForm/SignupForm.js index becfb7af..4ff6f788 100644 --- a/src/forms/SignupForm/SignupForm.js +++ b/src/forms/SignupForm/SignupForm.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose } from 'redux'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import * as validators from '../../util/validators'; diff --git a/src/forms/StripePaymentForm/StripePaymentForm.js b/src/forms/StripePaymentForm/StripePaymentForm.js index bf5e1059..ba001d71 100644 --- a/src/forms/StripePaymentForm/StripePaymentForm.js +++ b/src/forms/StripePaymentForm/StripePaymentForm.js @@ -5,7 +5,7 @@ */ import React, { Component } from 'react'; import { bool, func, object, string } from 'prop-types'; -import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; +import { FormattedMessage, injectIntl, intlShape } from '../../util/reactIntl'; import { Form as FinalForm } from 'react-final-form'; import classNames from 'classnames'; import config from '../../config'; diff --git a/src/forms/TopbarSearchForm/TopbarSearchForm.js b/src/forms/TopbarSearchForm/TopbarSearchForm.js index 65c93057..4ec26bdf 100644 --- a/src/forms/TopbarSearchForm/TopbarSearchForm.js +++ b/src/forms/TopbarSearchForm/TopbarSearchForm.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Form as FinalForm, Field } from 'react-final-form'; -import { intlShape, injectIntl } from 'react-intl'; +import { intlShape, injectIntl } from '../../util/reactIntl'; import classNames from 'classnames'; import { Form, LocationAutocompleteInput } from '../../components'; diff --git a/src/util/reactIntl.js b/src/util/reactIntl.js new file mode 100644 index 00000000..398b8a4f --- /dev/null +++ b/src/util/reactIntl.js @@ -0,0 +1,26 @@ +import { func, shape } from 'prop-types'; +import { + IntlProvider, + FormattedMessage, + FormattedDate, + FormattedHTMLMessage, + injectIntl, +} from 'react-intl'; + +const intlShape = shape({ + formatDate: func.isRequired, + formatHTMLMessage: func.isRequired, + formatMessage: func.isRequired, + formatNumber: func.isRequired, + formatPlural: func.isRequired, + formatRelativeTime: func.isRequired, + formatTime: func.isRequired, +}); +export { + IntlProvider, + FormattedMessage, + FormattedDate, + FormattedHTMLMessage, + injectIntl, + intlShape, +};