Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/components/AutoLogoutProvider.js

@@ -1,8 +1,8 @@
 import React, { createContext, useState, useEffect } from 'react';
 import {useNavigate} from "react-router-dom";
 //import axios from "axios";
-import {getUserData} from "../auth/utils";
-import {isObjEmpty} from "../utils/Utils";
+// import {getUserData} from "../auth/utils";
+// import {isObjEmpty} from "../utils/Utils";
 import {useIdleTimer} from "react-idle-timer";
 import { handleLogoutFunction } from 'auth/index';
 import { useDispatch } from "react-redux";
@@ -52,8 +52,8 @@ const AutoLogoutProvider = ({ children }) => {
     //const tabId = getTabId() === null ? 'loading' : getTabId().toString()
 
     useEffect(() => {
-        const userData = getUserData();
-        if(!isObjEmpty(userData)){
+        // const userData = getUserData();
+        if(isUserLoggedIn()){
             //TODO: get auto logout time here
             if(isGLDLoggedIn()){
                 setLogoutInterval(240);

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

@@ -323,7 +323,7 @@ const BusCustomFormWizard = (props) => {
     const { handleSubmit } = useForm({})
     const _onSubmit = () => {
         setLoding(true);
-        values.address4 = selectedAddress4.key
+        values.address4 = selectedAddress4==null?"":selectedAddress4.key
         values.address5 = selectedAddress5.key
         // console.log(values)
         const busUserAddress = {

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

@@ -89,7 +89,7 @@ const CustomFormWizard = (props) => {
     const [selectedIdDocInputType, setSelectedIdDocInputType] = useState("");
     // const [selectedIdDocLabel, setSelectedIdDocLabel] = useState(null);
     const [selectedAddress4, setSelectedAddress4] = useState(null);
-    console.log(ComboData.country[0]);
+    // console.log(ComboData.country[0]);
     const [selectedAddress5, setSelectedAddress5] = useState(ComboData.country[0]);
     const [termsAndConAccept, setTermsAndConAccept] = useState(false);
     const [termsAndConNotAccept, setTermsAndConNotAccept] = useState(false);
@@ -314,8 +314,9 @@ const CustomFormWizard = (props) => {
     const _onSubmit = () => {
         setLoding(true);
         values.idDocType = selectedIdDocType.type
-        values.address4 = selectedAddress4.key
+        values.address4 = selectedAddress4==null?"":selectedAddress4.key
         values.address5 = selectedAddress5.key
+        console.log(values)
         const userAddress = {
             "addressLine1": "",
             "addressLine2": "",