Replace deprecated injectIntl HOC with useIntl-based shim

src/components/CustomLoadingAnimation.js

@@ -1,5 +1,5 @@
 import { Box, Typography } from "@mui/material";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../utils/injectIntl";
 
 const CustomLoadingAnimation = ({ intl }) => {
   const { formatMessage } = intl;

src/components/Dialogs/AddAdjacentStopsDialog.js

@@ -22,8 +22,8 @@ import {
 } from "@mui/material";
 import PropTypes from "prop-types";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
+import { injectIntl } from "../../utils/injectIntl";
 import AddStopPlaceSuggestionListItem from "./AddStopPlaceSuggestionListItem";
 
 class AddAdjacentStopDialog extends React.Component {

src/components/Dialogs/AddMemberToGroup.js

@@ -24,9 +24,9 @@ import {
 } from "@mui/material";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { getGroupMemberSuggestions } from "../../modelUtils/leafletUtils";
+import { injectIntl } from "../../utils/injectIntl";
 import AddStopPlaceSuggestionList from "./AddStopPlaceSuggestionList";
 
 class AddMemberToGroup extends Component {

src/components/Dialogs/AddStopPlaceSuggestionListItem.js

@@ -16,7 +16,7 @@ import { FormControlLabel } from "@mui/material";
 import Checkbox from "@mui/material/Checkbox";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import HasExpiredInfo from "../MainPage/HasExpiredInfo";
 import ModalityIconImg from "../MainPage/ModalityIconImg";
 

src/components/Dialogs/AddStopPlaceToParent.js

@@ -23,9 +23,9 @@ import {
 } from "@mui/material";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { getChildStopPlaceSuggestions } from "../../modelUtils/leafletUtils";
+import { injectIntl } from "../../utils/injectIntl";
 import AddStopPlaceSuggestionList from "./AddStopPlaceSuggestionList";
 
 class AddStopPlaceToParent extends Component {

src/components/Dialogs/FavoriteNameDialog.js

@@ -21,9 +21,9 @@ import {
   TextField,
 } from "@mui/material";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { UserActions } from "../../actions/";
+import { injectIntl } from "../../utils/injectIntl";
 
 class FavoriteNameDialog extends React.Component {
   constructor(props) {

src/components/Dialogs/GroupErrorDialog.js

@@ -20,7 +20,7 @@ import {
   DialogTitle,
 } from "@mui/material";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 
 class GroupErrorDialog extends Component {
   getErrorText(type, formatMessage) {

src/components/Dialogs/SaveGroupDialog.js

@@ -20,7 +20,7 @@ import {
   DialogTitle,
 } from "@mui/material";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 
 class SaveGroupDialog extends Component {
   render() {

src/components/Dialogs/SessionExpiredDialog.tsx

@@ -5,8 +5,9 @@ import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 import DialogTitle from "@mui/material/DialogTitle";
 import { useEffect, useState } from "react";
-import { injectIntl, IntlShape } from "react-intl";
+import { IntlShape } from "react-intl";
 import { useAuth } from "../../auth/auth";
+import { injectIntl } from "../../utils/injectIntl";
 
 interface SessionExpiredDialogProps {
   intl: IntlShape;

src/components/EditParentStopPage/AdjacentStopConnection.js

@@ -17,7 +17,7 @@ import EditorInsertLink from "@mui/icons-material/InsertLink";
 import IconButton from "@mui/material/IconButton";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 
 class AdjacentStopConnection extends Component {
   handleRemoveAdjacentConnection = () => {

src/components/EditParentStopPage/AdjacentStopList.js

@@ -14,7 +14,7 @@ limitations under the Licence. */
 
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import AdjacentStopConnection from "./AdjacentStopConnection";
 
 class AdjacentStopList extends Component {

src/components/EditParentStopPage/EditParentGeneral.js

@@ -17,7 +17,6 @@ import MdSave from "@mui/icons-material/Save";
 import MdUndo from "@mui/icons-material/Undo";
 import FlatButton from "@mui/material/Button";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { StopPlaceActions, UserActions } from "../../actions/";
 import {
@@ -36,6 +35,7 @@ import mapToMutationVariables from "../../modelUtils/mapToQueryVariables";
 import Routes from "../../routes";
 import SettingsManager from "../../singletons/SettingsManager";
 import { getIsCurrentVersionMax } from "../../utils/";
+import { injectIntl } from "../../utils/injectIntl";
 import { getStopPermissions } from "../../utils/permissionsUtils";
 import AddAdjacentStopsDialog from "../Dialogs/AddAdjacentStopsDialog";
 import ConfirmDialog from "../Dialogs/ConfirmDialog";

src/components/EditParentStopPage/ParentStopDetails.js

@@ -19,7 +19,6 @@ import Divider from "@mui/material/Divider";
 import IconButton from "@mui/material/IconButton";
 import TextField from "@mui/material/TextField";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { StopPlaceActions } from "../../actions/";
 import {
@@ -33,6 +32,7 @@ import {
 import UserActions from "../../actions/UserActions";
 import { ConfigContext } from "../../config/ConfigContext";
 import { getPrimaryDarkerColor } from "../../config/themeConfig";
+import { injectIntl } from "../../utils/injectIntl";
 import AddStopPlaceToParent from "../Dialogs/AddStopPlaceToParent";
 import AltNamesDialog from "../Dialogs/AltNamesDialog";
 import CoordinatesDialog from "../Dialogs/CoordinatesDialog";

src/components/EditParentStopPage/StopPlaceList.js

@@ -16,10 +16,10 @@ import ContentAdd from "@mui/icons-material/Add";
 import Fab from "@mui/material/Fab";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { StopPlaceActions, UserActions } from "../../actions/";
 import { getPrimaryColor } from "../../config/themeConfig";
+import { injectIntl } from "../../utils/injectIntl";
 import Loader from "../Dialogs/Loader";
 import StopPlaceListItem from "./StopPlaceListItem";
 

src/components/EditParentStopPage/StopPlaceListItemDetails.js

@@ -17,7 +17,7 @@ import MdWarning from "@mui/icons-material/Warning";
 import IconButton from "@mui/material/IconButton";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import AdjacentStopList from "./AdjacentStopList";
 import StopPlaceChildrenItems from "./StopPlaceChildrenItems";
 import StopPlaceListItemQuays from "./StopPlaceListItemQuays";

src/components/EditParentStopPage/StopPlaceListItemQuayItem.js

@@ -15,7 +15,7 @@ limitations under the Licence. */
 import Divider from "@mui/material/Divider";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import Code from "../EditStopPage/Code";
 import CopyIdButton from "../Shared/CopyIdButton";
 

src/components/EditStopPage/AcceptChanges.js

@@ -2,8 +2,8 @@ import WarningIcon from "@mui/icons-material/Warning";
 import Checkbox from "@mui/material/Checkbox";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { getPrimaryColor } from "../../config/themeConfig";
+import { injectIntl } from "../../utils/injectIntl";
 
 class AcceptChanges extends React.Component {
   render() {

src/components/EditStopPage/AddTagAutoComplete.js

@@ -16,8 +16,8 @@ import AutoComplete from "@mui/material/Autocomplete";
 import TextField from "@mui/material/TextField";
 import debounce from "lodash.debounce";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { toCamelCase } from "../../utils/";
+import { injectIntl } from "../../utils/injectIntl";
 
 class AddTagAutoComplete extends Component {
   constructor(props) {

src/components/EditStopPage/BoardingPositionItem.tsx

@@ -1,7 +1,7 @@
 import MdDelete from "@mui/icons-material/DeleteForever";
 import { IconButton } from "@mui/material";
 import TextField from "@mui/material/TextField";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import CopyIdButton from "../Shared/CopyIdButton";
 import { BoardingPosition } from "./BoardingPositionsTab";
 import Code from "./Code";

src/components/EditStopPage/CreateKeyValuePair.js

@@ -15,7 +15,7 @@ limitations under the Licence. */
 import FlatButton from "@mui/material/Button";
 import TextField from "@mui/material/TextField";
 import React from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 
 class CreateKeyValuePair extends React.Component {
   constructor(props) {

src/components/EditStopPage/EditKeyValuePair.js

@@ -1,7 +1,7 @@
 import FlatButton from "@mui/material/Button";
 import TextField from "@mui/material/TextField";
 import React from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 
 class EditKeyValuePair extends React.Component {
   constructor(props) {

src/components/EditStopPage/EditQuayAdditional.js

@@ -15,8 +15,8 @@ limitations under the Licence. */
 import Tab from "@mui/material/Tab";
 import Tabs from "@mui/material/Tabs";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
+import { injectIntl } from "../../utils/injectIntl";
 import AccessibilityQuayTab from "./AccessibilityAssessment/AccessibilityQuayTab";
 import BoardingPositionsTab from "./BoardingPositionsTab";
 import FacilitiesQuayTab from "./Facility/FacilitiesQuayTab";

src/components/EditStopPage/EditStopAdditional.js

@@ -15,7 +15,7 @@ limitations under the Licence. */
 import Tab from "@mui/material/Tab";
 import Tabs from "@mui/material/Tabs";
 import React from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import AccessibilityStopTab from "./AccessibilityAssessment/AccessibilityStopTab";
 import AssistanceStopTab from "./Assistance/AssistanceStopTab";
 import FacilitiesStopTab from "./Facility/FacilitiesStopTab";

src/components/EditStopPage/EditStopGeneral.js

@@ -14,9 +14,9 @@ limitations under the Licence. */
 
 // React and Redux
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { replace } from "redux-first-history";
+import { injectIntl } from "../../utils/injectIntl";
 
 // Material UI Icons
 import MdBack from "@mui/icons-material/ArrowBack";

src/components/EditStopPage/Item.js

@@ -1,6 +1,6 @@
 import Divider from "@mui/material/Divider";
 import React from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import CoordinatesDialog from "../Dialogs/CoordinatesDialog";
 
 class Item extends React.Component {

src/components/EditStopPage/ModalitiesMenuItems.js

@@ -14,12 +14,12 @@ limitations under the Licence. */
 
 import MenuItem from "@mui/material/MenuItem";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { ConfigContext } from "../../config/ConfigContext";
 import {
   getInverseSubmodesWhitelist,
   getStopTypesForSubmodes,
 } from "../../modelUtils/modeUtils";
+import { injectIntl } from "../../utils/injectIntl";
 import ModalityIconSvg from "../MainPage/ModalityIconSvg";
 import MoreMenuItem from "../MainPage/MoreMenuItem";
 

src/components/EditStopPage/NewElementsBox.js

@@ -13,10 +13,10 @@ See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { StopPlaceActions } from "../../actions";
 import { setDecimalPrecision } from "../../utils";
+import { injectIntl } from "../../utils/injectIntl";
 import ConfirmDialog from "../Dialogs/ConfirmDialog";
 
 import newStopIcon from "../../static/icons/new-stop-icon-2x.png";

src/components/EditStopPage/NewStopPlaceInfo.js

@@ -15,11 +15,11 @@ limitations under the Licence. */
 import InformationIcon from "@mui/icons-material/Info";
 import FlatButton from "@mui/material/Button";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { UserActions } from "../../actions/";
 import { getPrimaryDarkerColor } from "../../config/themeConfig";
 import { createStopPlaceHref } from "../../utils/";
+import { injectIntl } from "../../utils/injectIntl";
 
 class NewStopPlaceInfo extends React.Component {
   handleClose() {

src/components/EditStopPage/ParkingItem.js

@@ -18,7 +18,6 @@ import FlatButton from "@mui/material/Button";
 import TextField from "@mui/material/TextField";
 import PropTypes from "prop-types";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { StopPlaceActions, UserActions } from "../../actions/";
 import { deleteParking } from "../../actions/TiamatActions";
@@ -29,6 +28,7 @@ import {
 } from "../../models/AccessibilityLimitation";
 import PARKING_TYPE from "../../models/parkingType";
 import { getIn } from "../../utils";
+import { injectIntl } from "../../utils/injectIntl";
 import ConfirmDialog from "../Dialogs/ConfirmDialog";
 import CopyIdButton from "../Shared/CopyIdButton";
 import { accessibilityLimitationsKeys } from "./AccessibilityAssessment/types";

src/components/EditStopPage/ParkingItemPayAndRideExpandedFields.js

@@ -24,11 +24,11 @@ import ListItemText from "@mui/material/ListItemText";
 import MenuItem from "@mui/material/MenuItem";
 import Select from "@mui/material/Select";
 import { styled } from "@mui/material/styles";
-import { injectIntl } from "react-intl";
 import { AccessibilityLimitation as AccessibilityLimitationEnum } from "../../models/AccessibilityLimitation";
 import { parkingLayouts } from "../../models/parkingLayout";
 import { parkingPaymentProcesses } from "../../models/parkingPaymentProcess";
 import StairsIcon from "../../static/icons/accessibility/Stairs";
+import { injectIntl } from "../../utils/injectIntl";
 import AccessibilityLimitationPopover from "./AccessibilityAssessment/AccessibilityLimitationPopover";
 import PlaceFeatures from "./PlaceFeatures/PlaceFeatures";
 import RechargingAvailablePopover from "./RechargingAvailablePopover";

src/components/EditStopPage/QuayDetails.js

@@ -13,7 +13,7 @@ See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
 import React from "react";
-import { injectIntl } from "react-intl";
+import { injectIntl } from "../../utils/injectIntl";
 import Code from "./Code";
 import CompassBearingInfo from "./CompassBearingInfo";
 

src/components/EditStopPage/QuayItem.js

@@ -29,12 +29,12 @@ import ContentCopy from "@mui/icons-material/ContentCopy";
 import MdLess from "@mui/icons-material/ExpandLess";
 import FlatButton from "@mui/material/Button";
 import Tooltip from "@mui/material/Tooltip";
-import { injectIntl } from "react-intl";
 import equipmentHelpers from "../../modelUtils/equipmentHelpers";
 import BusShelter from "../../static/icons/facilities/BusShelter";
 import { TicketMachine } from "../../static/icons/facilities/TicketMachine";
 import Sign512 from "../../static/icons/TransportSign";
 import { getIn } from "../../utils/";
+import { injectIntl } from "../../utils/injectIntl";
 import EditQuayAdditional from "./EditQuayAdditional";
 import ImportedId from "./ImportedId";
 

src/components/EditStopPage/RechargingAvailablePopover.js

@@ -5,8 +5,8 @@ import ListItemIcon from "@mui/material/ListItemIcon";
 import ListItemText from "@mui/material/ListItemText";
 import MenuItem from "@mui/material/MenuItem";
 import React from "react";
-import { injectIntl } from "react-intl";
 import { colors as rechargingAvailableColors } from "../../models/rechargingAvailable";
+import { injectIntl } from "../../utils/injectIntl";
 
 class RechargingAvailablePopover extends React.Component {
   constructor(props) {

src/components/EditStopPage/VersionsPopover.js

@@ -16,8 +16,8 @@ import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import PropTypes from "prop-types";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { sortVersions } from "../../utils";
+import { injectIntl } from "../../utils/injectIntl";
 
 class VersionsPopover extends Component {
   constructor(props) {

src/components/EditStopPage/WeightingPopover.js

@@ -18,8 +18,8 @@ import ListItemText from "@mui/material/ListItemText";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import React from "react";
-import { injectIntl } from "react-intl";
 import weightTypes, { weightColors } from "../../models/weightTypes";
+import { injectIntl } from "../../utils/injectIntl";
 
 class WeightingPopover extends React.Component {
   render() {

src/components/GroupOfStopPlaces/EditGroupOfStopPlaces.js

@@ -17,7 +17,6 @@ import MdSave from "@mui/icons-material/Save";
 import MdUndo from "@mui/icons-material/Undo";
 import FlatButton from "@mui/material/Button";
 import { Component } from "react";
-import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
 import { StopPlacesGroupActions, UserActions } from "../../actions/";
 import {
@@ -27,6 +26,7 @@ import {
 import * as types from "../../actions/Types";
 import mapHelper from "../../modelUtils/mapToQueryVariables";
 import Routes from "../../routes/";
+import { injectIntl } from "../../utils/injectIntl";
 import ConfirmDialog from "../Dialogs/ConfirmDialog";
 import SaveGroupDialog from "../Dialogs/SaveGroupDialog";
 import CopyIdButton from "../Shared/CopyIdButton";