OD-16658 Fix rebase conflicts

client-html/src/js/common/components/form/formFields/EditInPlaceQuerySelect.tsx

@@ -1171,7 +1171,7 @@ class EditInPlaceQuerySelect extends React.PureComponent<Props, State> {
 
     const label = this.getOptionLabel(data);
 
-    const content = getHighlightedPartLabel(label, searchValue, optionProps);
+    const content = getHighlightedPartLabel(label, searchValue);
 
     let option = content;
 

client-html/src/js/common/components/form/formFields/EditInPlaceSearchSelect.tsx

@@ -14,7 +14,6 @@ import { withStyles, createStyles } from "@mui/styles";
 import React, {
  useContext, useEffect, useMemo, useRef, useState
 } from "react";
-import { withStyles } from "@mui/styles";
 import CloseIcon from '@mui/icons-material//Close';
 import clsx from "clsx";
 import Typography from "@mui/material/Typography";
@@ -456,7 +455,7 @@ const EditInPlaceSearchSelect: React.FC<Props & WrappedFieldProps> = ({
   };
 
   const renderOption = (optionProps, data) => {
-    const option = getHighlightedPartLabel(getOptionLabel(data), searchValue, optionProps);
+    const option = getHighlightedPartLabel(getOptionLabel(data), searchValue);
 
     if (typeof itemRenderer === "function") {
       return itemRenderer(option, data, searchValue) as any;
@@ -526,7 +525,7 @@ const EditInPlaceSearchSelect: React.FC<Props & WrappedFieldProps> = ({
             loading={loading}
             freeSolo={creatable}
             disableClearable={!allowEmpty}
-            getOptionSelected={getOptionSelected}
+            isOptionEqualToValue={getOptionSelected}
             onChange={handleChange}
             classes={{
               root: clsx("d-inline-flex", classes.root),

client-html/src/js/common/components/form/simpleTagListComponent/SimpleTagList.tsx

@@ -248,7 +248,7 @@ const SimpleTagList: React.FC<Props> = props => {
 
   const renderOption = (optionProps, option) => {
     const label = option?.tagBody?.name;
-    const highlightedLabel = getHighlightedPartLabel(label, currentInputString, optionProps);
+    const highlightedLabel = getHighlightedPartLabel(label, currentInputString);
     return getOptionText(option, highlightedLabel);
   };
 

client-html/src/js/containers/entities/messages/components/SendMessageEditView.tsx

@@ -15,7 +15,7 @@ import debounce from "lodash.debounce";
 import clsx from "clsx";
 import createStyles from "@mui/styles/createStyles";
 import withStyles from "@mui/styles/withStyles";
-import Button from "@mui/material/Button";icons-material
+import Button from "@mui/material/Button";
 import Card from "@mui/material/Card";
 import CardContent from "@mui/material/CardContent";
 import Grid from "@mui/material/Grid";

client-html/src/js/containers/entities/sites/components/SitesGeneral.tsx

@@ -17,7 +17,7 @@ import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import Collapse from "@mui/material/Collapse";
 import Tooltip from "@mui/material/Tooltip";
-import InfoOutlinedIcon from "@material-ui/icons/InfoOutlined";
+import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
 import FormField from "../../../../common/components/form/formFields/FormField";
 import { normalizeNumber } from "../../../../common/utils/numbers/numbersNormalizing";
 import { validateSingleMandatoryField, greaterThanNullValidation } from "../../../../common/utils/validation";

client-html/src/js/containers/preferences/components/SideBar.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState, useEffect } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { MenuItem } from "@mui/material";
 import { connect } from "react-redux";
 import Menu from "@mui/material/Menu/Menu";