no message

src/pages/PublicNotice/Details_GLD/ClientDetailCard.js

@@ -73,7 +73,7 @@ const ClientDetailCard = (
         window.open('/indUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer");
         window.addEventListener("focus", onFocus)
     };
-
+    
     const onFocus = () => {
         window.removeEventListener("focus", onFocus)
         location.reload();

src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js

@@ -307,9 +307,13 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                         );
                                         return displayOptions;
                                     },
+<<<<<<< Updated upstream
                                     getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? 
                                         <div>BR No.: {item["brNo"]}<div>Org. Name(Eng): {item["enCompanyName"] === null ? "N/A" : item["enCompanyName"]}</div><div>Org. Name(CH): {item["chCompanyName"] === null ? "N/A" : item["chCompanyName"]}</div></div>: "") 
                                         : "",
+=======
+                                    getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? `BR No: ${item["brNo"]} \n Org Name: ${item["enCompanyName"]} BR Expiry Date: ${item["brExpiryDate"]}`: "") : "",
+>>>>>>> Stashed changes
                                     isOptionEqualToValue: (option, newValue, setValue, setInputValue) => {
                                         if (option.id == newValue || option.id == newValue.id) {
                                             setValue(option);
@@ -319,7 +323,12 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                         return option == newValue || option.id == newValue.id;
                                     },
                                     onInputChange: (event, newValue, setInputValue) => {
+<<<<<<< Updated upstream
                                         if (newValue !== "[object Object]" ) {
+=======
+                                        console.log(newValue)
+                                        if (newValue != null) {
+>>>>>>> Stashed changes
                                             setInputValue(newValue);
                                         }
                                     },

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -62,7 +62,7 @@ const CustomFormWizard = (props) => {
     const [checkUpload, setCheckUpload] = useState(false);
     const [isLoading, setLoding] = useState(true);
     const [updateRows, setUpdateRows] = useState([]);
-    const [userNameList, setUserNameList] = useState();
+    const [userNameList, setUserNameList] = useState([]);
 
     const [captcha, setCaptcha] = useState([]);
     const [captchaImg, setCaptchaImage] = useState([]);