@itilite/iui-user-management 0.5.11 → 1.0.0

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { IUIAsyncSelect, IUIBox, IUILabel, IUIFileUpload, IUICheckboxButton, IUIPhone, IUISelect, IUIDatePicker, IUIInput, IUIDivider, IUIGrid, IUITypography, IUIRadio, IUIButton, IUIModal, IUIAccordion, IUIAccordionSummary, IUIAccordionDetails, IUIIconButton, IUICard, IUIBackdrop, IUICircularProgress, IUIBreadCrumb, IUIDropzone, IUIStepper, IUIFormControlLabel, IUICheckBox, IUIPrimaryRadio, IUITable, IUISkeleton, IUIProfileBox, IUIFormGroup, IUISearch, IUIDropdownButton, IUITabs } from '@itilite/iuistyles';
+import { IUIAsyncSelect, IUIBox, IUILabel, IUIFileUpload, IUICheckboxButton, IUIPhone, IUISelect, IUIDatePicker, IUIInput, IUIDivider, IUIGrid, IUITypography, IUIRadio, IUIButton, IUIModal, IUIAccordion, IUIAccordionSummary, IUIAccordionDetails, IUIIconButton, IUICard, IUIBackdrop, IUICircularProgress, IUIBreadCrumb, IUIDropzone, IUIStepper, IUIFormControlLabel, IUICheckBox, IUIPrimaryRadio, IUITable, IUISkeleton, IUIProfileBox, IUIFormGroup, IUIDropdownButton, IUITabs } from '@itilite/iuistyles';
 import React, { useState, useEffect, useRef, Fragment as Fragment$1 } from 'react';
 import { configs, services, utilUrls } from '@itilite/utils';
 import axios from 'axios';
@@ -9,14 +9,12 @@ import { combineReducers, createStore, applyMiddleware } from 'redux';
 import thunk from 'redux-thunk';
 import moment from 'moment';
 import { composeWithDevTools } from 'redux-devtools-extension';
-import { useHistory, useLocation } from 'react-router-dom';
-import { withStyles, makeStyles } from '@material-ui/core/styles';
-import Tooltip from '@material-ui/core/Tooltip';
+import { useHistory } from 'react-router-dom';
+import { withStyles } from '@material-ui/core/styles';
 import Switch from '@material-ui/core/Switch';
 import MoreHorizIcon from '@material-ui/icons/MoreHoriz';
 import Button from '@material-ui/core/Button';
-import { Popper, Grow, Paper, ClickAwayListener, MenuList, MenuItem, Typography, Box } from '@material-ui/core';
-import { useScrollPosition } from '@n8tb1t/use-scroll-position';
+import { Popper, Grow, Paper, ClickAwayListener, MenuList, MenuItem, Typography } from '@material-ui/core';
 
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
@@ -69,6 +67,7 @@ var _Pact = /*#__PURE__*/function () {
   };
   return _Pact;
 }();
+
 function _settle(pact, state, value) {
   if (!pact.s) {
     if (value instanceof _Pact) {
@@ -97,6 +96,7 @@ function _settle(pact, state, value) {
 function _isSettledPact(thenable) {
   return thenable instanceof _Pact && thenable.s & 1;
 }
+
 function _forTo(array, body, check) {
   var i = -1,
     pact,
@@ -128,6 +128,7 @@ function _forTo(array, body, check) {
 }
 var _iteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
 var _asyncIteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
+
 function _catch(body, recover) {
   try {
     var result = body();
@@ -146,11 +147,17 @@ function r(e) {
   var t,
     f,
     n = "";
-  if ("string" == typeof e || "number" == typeof e) n += e;else if ("object" == typeof e) if (Array.isArray(e)) for (t = 0; t < e.length; t++) e[t] && (f = r(e[t])) && (n && (n += " "), n += f);else for (t in e) e[t] && (n && (n += " "), n += t);
+  if ("string" == typeof e || "number" == typeof e) n += e;else if ("object" == typeof e) if (Array.isArray(e)) for (t = 0; t < e.length; t++) {
+    e[t] && (f = r(e[t])) && (n && (n += " "), n += f);
+  } else for (t in e) {
+    e[t] && (n && (n += " "), n += t);
+  }
   return n;
 }
 function clsx() {
-  for (var e, t, f = 0, n = ""; f < arguments.length;) (e = arguments[f++]) && (t = r(e)) && (n && (n += " "), n += t);
+  for (var e, t, f = 0, n = ""; f < arguments.length;) {
+    (e = arguments[f++]) && (t = r(e)) && (n && (n += " "), n += t);
+  }
   return n;
 }
 
@@ -354,9 +361,6 @@ var userAddEditUrl = {
   approversSearch: function approversSearch() {
     return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/company-approvers";
   },
-  transferAppover: function transferAppover() {
-    return "api/v1/user-management/users/single-user/transfer-approver-role?";
-  },
   preSignedUrl: function preSignedUrl() {
     return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/presigned-url";
   },
@@ -444,23 +448,15 @@ var userPanelUrl = {
     return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?action=delete&table=" + tableName;
   },
   getUnit: function getUnit(tableName, length, sort) {
-    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&ordering=" + sort;
+    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&order=" + sort;
   },
   getPaginationUnit: function getPaginationUnit(tableName, length, page, sort) {
-    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&page=" + page + "&ordering=" + sort;
+    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/table?table_name=" + tableName + "&length=" + length + "&page=" + page + "&order=" + sort;
   },
   moveUnit: function moveUnit() {
     return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/transfer-users";
   }
 };
-var departmentUrl = {
-  departmentUrl: function departmentUrl() {
-    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/department";
-  },
-  getDepartmentHead: function getDepartmentHead(departmentId, page) {
-    return "api/v1/user-management/company/" + IUILocalStorageService.getCompanyId() + "/department/" + departmentId + "/users?page=" + page;
-  }
-};
 
 var api = configs.api;
 var NAoptionConfig = {
@@ -470,6 +466,7 @@ var NAoptionConfig = {
   },
   applyFor: ['employee_level', 'department']
 };
+
 var commonLoadOptions = function commonLoadOptions(search, loadedOptions, _ref) {
   var page = _ref.page,
     tabelName = _ref.tabelName,
@@ -602,53 +599,11 @@ var currencyLoadOptions = function currencyLoadOptions(search, loadedOptions, _r
     return Promise.reject(e);
   }
 };
-var transferRoleOptions = function transferRoleOptions(search, loadedOptions, _ref4) {
+var approversOptions = function approversOptions(search, loadedOptions, _ref4) {
   var page = _ref4.page,
     product = _ref4.product,
-    userId = _ref4.userId;
-  try {
-    return Promise.resolve(_catch(function () {
-      return Promise.resolve(api.get(userAddEditUrl.transferAppover() + "user_id=" + userId + "&page=" + page + "&search=" + search).then(function (res) {
-        return res.data;
-      })).then(function (response) {
-        var mappedValue = response.results.map(function (item) {
-          return {
-            value: item.email,
-            label: item.email,
-            type: 'detailed',
-            data: item
-          };
-        });
-        return {
-          options: mappedValue,
-          hasMore: !!response.next,
-          additional: {
-            page: page + 1,
-            product: product,
-            userId: userId
-          }
-        };
-      });
-    }, function () {
-      return {
-        options: [],
-        hasMore: false,
-        additional: {
-          page: 1,
-          product: product,
-          userId: userId
-        }
-      };
-    }));
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-var approversOptions = function approversOptions(search, loadedOptions, _ref5) {
-  var page = _ref5.page,
-    product = _ref5.product,
-    userId = _ref5.userId,
-    placeholder = _ref5.placeholder;
+    userId = _ref4.userId,
+    placeholder = _ref4.placeholder;
   try {
     return Promise.resolve(_catch(function () {
       return Promise.resolve(api.get(userAddEditUrl.approversSearch() + "?page=" + page + "&product=" + product + "&search=" + search + "&user_id=" + userId).then(function (res) {
@@ -694,9 +649,9 @@ var approversOptions = function approversOptions(search, loadedOptions, _ref5) {
     return Promise.reject(e);
   }
 };
-var countryOptions = function countryOptions(search, loadedOptions, _ref6) {
-  var page = _ref6.page,
-    tabelName = _ref6.tabelName;
+var countryOptions = function countryOptions(search, loadedOptions, _ref5) {
+  var page = _ref5.page,
+    tabelName = _ref5.tabelName;
   try {
     return Promise.resolve(_catch(function () {
       return Promise.resolve(api.get(userAddEditUrl.countryPaginated() + "&search=" + search + "&page=" + page + "&info=" + tabelName).then(function (res) {
@@ -708,6 +663,7 @@ var countryOptions = function countryOptions(search, loadedOptions, _ref6) {
             label: item[tabelName]
           };
         });
+
         return {
           options: mappedValue,
           hasMore: !!response.next,
@@ -731,45 +687,6 @@ var countryOptions = function countryOptions(search, loadedOptions, _ref6) {
     return Promise.reject(e);
   }
 };
-var departmentHeadOptions = function departmentHeadOptions(search, loadedOptions, _ref7) {
-  var page = _ref7.page,
-    departmentId = _ref7.departmentId;
-  try {
-    return Promise.resolve(_catch(function () {
-      return Promise.resolve(api.get(departmentUrl.getDepartmentHead(departmentId, page) + "&search=" + search).then(function (res) {
-        return res.data;
-      })).then(function (response) {
-        var mappedValue = response.results.map(function (item) {
-          return {
-            value: item.id,
-            label: item.first_name + ' ' + item.last_name,
-            type: 'detailed',
-            data: item
-          };
-        });
-        return {
-          options: mappedValue,
-          hasMore: !!response.next,
-          additional: {
-            page: page + 1,
-            departmentId: departmentId
-          }
-        };
-      });
-    }, function () {
-      return {
-        options: [],
-        hasMore: false,
-        additional: {
-          page: 1,
-          departmentId: departmentId
-        }
-      };
-    }));
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
 
 var UserRole = function UserRole(_ref) {
   var _ref$list = _ref.list,
@@ -848,6 +765,7 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
   if (userTags.length) {
     res.user_tags = userTags;
   }
+
   if (payload.productAccess.travel) {
     var _payload$passportInfo, _payload$passportInfo2, _payload$passportInfo3, _payload$passportInfo4, _payload$membershipIn, _payload$uploadedFile;
     res.approvers.travel = [];
@@ -859,12 +777,14 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
         });
       }
     }
+
     if (payload.travelFYI && payload.travelFYI.value) {
       res.approvers.travel.push({
         email: payload.travelFYI.value,
         sequence: 'fyi'
       });
     }
+
     res.user_travel_info = {
       passport_issue_country: payload !== null && payload !== void 0 && (_payload$passportInfo = payload.passportInfoInput) !== null && _payload$passportInfo !== void 0 && (_payload$passportInfo2 = _payload$passportInfo.passport_issue_country) !== null && _payload$passportInfo2 !== void 0 && _payload$passportInfo2.value ? payload.passportInfoInput.passport_issue_country.value : null,
       nationality: payload !== null && payload !== void 0 && (_payload$passportInfo3 = payload.passportInfoInput) !== null && _payload$passportInfo3 !== void 0 && (_payload$passportInfo4 = _payload$passportInfo3.nationality) !== null && _payload$passportInfo4 !== void 0 && _payload$passportInfo4.value ? payload.passportInfoInput.nationality.value : null,
@@ -903,6 +823,7 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
       res.files = [];
     }
   }
+
   if (payload.productAccess.expense) {
     res.approvers.expense = [];
     for (var _key2 in payload.expenseApproversInput) {
@@ -913,6 +834,7 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
         });
       }
     }
+
     if (payload.expenseFYI && payload.expenseFYI.value) {
       res.approvers.expense.push({
         email: payload.expenseFYI.value,
@@ -1020,6 +942,7 @@ var formatUpdateUserPayload = function formatUpdateUserPayload(payload, inputCha
           });
         }
       }
+
       if (payload.travelFYI && payload.travelFYI.value) {
         res.fields.approvers.travel.push({
           email: payload.travelFYI.value,
@@ -1096,6 +1019,7 @@ var formatUpdateUserPayload = function formatUpdateUserPayload(payload, inputCha
       res.fields.user_travel_info.redress_number = payload.secureTravelInputInfo.redress_number || null;
     }
   }
+
   if (payload.productAccess.expense) {
     if (!env$1.isProfilePage()) {
       res.fields.approvers.expense = [];
@@ -1107,6 +1031,7 @@ var formatUpdateUserPayload = function formatUpdateUserPayload(payload, inputCha
           });
         }
       }
+
       if (payload.expenseFYI && payload.expenseFYI.value) {
         res.fields.approvers.expense.push({
           email: payload.expenseFYI.value,
@@ -1238,19 +1163,10 @@ var updateTabValue = function updateTabValue(tabId) {
     payload: tabId
   };
 };
-var updateActiveStatus = function updateActiveStatus(activateVal, id, roleTransfer, newApproverUserId) {
-  if (roleTransfer === void 0) {
-    roleTransfer = false;
-  }
-  var _payload = {
-    role_transfer: roleTransfer
-  };
-  if (roleTransfer) {
-    _payload.new_approver_user_id = newApproverUserId;
-  }
+var updateActiveStatus = function updateActiveStatus(activateVal, id) {
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
-      api$1.put(userListUrl.updateActiveStatus + "user_id=" + id + "&activate=" + activateVal, _payload).then(function (res) {
+      api$1.get(userListUrl.updateActiveStatus + 'user_id=' + id + '&activate=' + activateVal).then(function (res) {
         dispatch(setUserActiveStatus({
           is_active: activateVal !== 0,
           id: id
@@ -1347,6 +1263,7 @@ var fetchRenderFileds = function fetchRenderFileds() {
           var _res$data;
           IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.message) || 'Opps, Something went wrong.');
           dispatch(stopLoader());
+          reject();
         }
       })["catch"](function (err) {
         reject(err);
@@ -1359,7 +1276,7 @@ var fetchCountryCodes = function fetchCountryCodes() {
     return new Promise(function (resolve, reject) {
       api$2.get(userAddEditUrl.countryCode()).then(function (res) {
         dispatch(setCountryCodes(res.data.country_code_details));
-        resolve(res.data.country_code_details);
+        resolve('success');
       })["catch"](function (err) {
         reject(err);
       })["finally"](function () {});
@@ -1518,9 +1435,11 @@ var createUser = function createUser(payload) {
         } else {
           if (res.data.errors && typeof res.data.errors === 'object') {
             reject(res.data.errors);
+            return;
           } else if (!Object.keys(res.data.errors).length) {
             IUIToastMessageService$1.warningNotify(res.data.message);
           }
+          reject();
         }
       })["catch"](function (err) {
         var _err$response6;
@@ -1566,13 +1485,17 @@ var uploadSingleDocumnet = function uploadSingleDocumnet(payload) {
     });
   };
 };
+
 var uploadFileToS3 = function uploadFileToS3(presignedPostData, file) {
   return new Promise(function (resolve, reject) {
     var formData = new FormData();
+
     Object.keys(presignedPostData.fields).forEach(function (key) {
       formData.append(key, presignedPostData.fields[key]);
     });
+
     formData.append('file', file);
+
     axios.post(presignedPostData.url, formData, {
       headers: {
         'Content-Type': 'multipart/form-data'
@@ -1617,43 +1540,20 @@ var makePrimaryAdmin = function makePrimaryAdmin(payload) {
     });
   };
 };
-var resetPasswordForUser = function resetPasswordForUser(data) {
-  return function (dispatch) {
-    return new Promise(function (resolve, reject) {
-      api$2.post("" + userAddEditUrl.resetPasswordForUserApi(), {
-        email: data.email
-      }).then(function (res) {
-        IUIToastMessageService$1.sNotify("The link to reset the password has been sent to the user's email address. Check your \"junk mail\" or \"spam\" folders in case it's not received.");
-        resolve();
-      })["catch"](function (err) {
-        var _err$response9, _err$response9$data;
-        if (!(err !== null && err !== void 0 && (_err$response9 = err.response) !== null && _err$response9 !== void 0 && (_err$response9$data = _err$response9.data) !== null && _err$response9$data !== void 0 && _err$response9$data.status)) {
-          var _err$response10, _err$response10$data, _err$response10$data$;
-          IUIToastMessageService$1.errNotify(err === null || err === void 0 ? void 0 : (_err$response10 = err.response) === null || _err$response10 === void 0 ? void 0 : (_err$response10$data = _err$response10.data) === null || _err$response10$data === void 0 ? void 0 : (_err$response10$data$ = _err$response10$data.message) === null || _err$response10$data$ === void 0 ? void 0 : _err$response10$data$.email[0]);
-          reject(err);
-          return;
-        }
-        reject(err);
-      });
-    });
-  };
-};
-var resendInviteForUser = function resendInviteForUser(data) {
+var undoneSignUpRejection = function undoneSignUpRejection(userId) {
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
-      api$2.post(userAddEditUrl.resendInviteForUserApi(), {
-        user_ids: data
-      }).then(function (res) {
-        IUIToastMessageService$1.sNotify(res.data.message);
+      api$2.patch(userAddEditUrl.undoRejectUserVerification(userId)).then(function (res) {
+        dispatch(fetchUserSignupRequests({
+          ordering: 'asc',
+          length: 5,
+          page: 1,
+          search: ''
+        }));
         resolve();
       })["catch"](function (err) {
-        var _err$response11, _err$response11$data;
-        if (!(err !== null && err !== void 0 && (_err$response11 = err.response) !== null && _err$response11 !== void 0 && (_err$response11$data = _err$response11.data) !== null && _err$response11$data !== void 0 && _err$response11$data.status)) {
-          var _err$response12, _err$response12$data, _err$response12$data$;
-          IUIToastMessageService$1.errNotify(err === null || err === void 0 ? void 0 : (_err$response12 = err.response) === null || _err$response12 === void 0 ? void 0 : (_err$response12$data = _err$response12.data) === null || _err$response12$data === void 0 ? void 0 : (_err$response12$data$ = _err$response12$data.message) === null || _err$response12$data$ === void 0 ? void 0 : _err$response12$data$.email[0]);
-          reject(err);
-          return;
-        }
+        var _err$response8, _err$response8$data;
+        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response8 = err.response) === null || _err$response8 === void 0 ? void 0 : (_err$response8$data = _err$response8.data) === null || _err$response8$data === void 0 ? void 0 : _err$response8$data.message) || 'Opps, Something went wrong.');
         reject(err);
       });
     });
@@ -1795,7 +1695,7 @@ var verifyUserInfo = function verifyUserInfo(userId) {
 var submitAddModalData = function submitAddModalData(tableName, data) {
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
-      api$2.post(tableName === 'department' ? departmentUrl.departmentUrl() : userAddEditUrl.dropdownList() + ("?action=add&table=" + tableName), data).then(function (res) {
+      api$2.post(userAddEditUrl.dropdownList() + ("?action=add&table=" + tableName), data).then(function (res) {
         resolve(res);
       })["catch"](function (err) {
         var _err$response17, _err$response17$data;
@@ -1831,7 +1731,6 @@ var OPEN_DIALOG = 'OPEN_DIALOG';
 var CLOSE_DIALOG = 'CLOSE_DIALOG';
 var FETCH_USERPANEL_DATA = 'FETCH_USERPANEL_DATA';
 var UNASSIGNED_USERS = 'Not assigned';
-var FETCH_DEPARTMENT_USERS_DATA = 'FETCH_DEPARTMENT_USERS_DATA';
 
 var api$3 = configs.api;
 var IUIToastMessageService$2 = services.IUIToastMessageService;
@@ -1878,17 +1777,18 @@ var getUserPanalData = function getUserPanalData(params) {
     });
   };
 };
+
 var addRecord = function addRecord(tableName, data, getParam) {
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
-      api$3.post(tableName === 'department' ? departmentUrl.departmentUrl() : userPanelUrl.addUnit(tableName), data).then(function (res) {
+      api$3.post(userPanelUrl.addUnit(tableName), data).then(function (res) {
         dispatch(getUserPanalData(getParam));
         dispatch(closeDialog());
         resolve(res);
       })["catch"](function (err) {
-        var _err$response3, _err$response3$data;
+        var _err$response2, _err$response2$data;
         dispatch(userPanelStopLoader());
-        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.message) || 'Opps, Something went wrong.');
+        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.message) || 'Opps, Something went wrong.');
       });
     });
   };
@@ -1902,37 +1802,25 @@ var deleteRecord = function deleteRecord(tableName, id, getParam) {
         dispatch(userPanelStopLoader());
         resolve();
       })["catch"](function (err) {
-        var _err$response4, _err$response4$data;
-        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.message) || 'Opps, Something went wrong.');
+        var _err$response3, _err$response3$data;
+        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.message) || 'Opps, Something went wrong.');
         dispatch(userPanelStopLoader());
       });
     });
   };
 };
-var editRecord = function editRecord(tableName, data, getParam, optionalParams) {
+var editRecord = function editRecord(tableName, data, getParam) {
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
-      if (tableName === 'department') {
-        api$3.put(departmentUrl.departmentUrl() + "/" + optionalParams, data).then(function (res) {
-          dispatch(getUserPanalData(getParam));
-          dispatch(closeDialog());
-          resolve();
-        })["catch"](function (err) {
-          var _err$response5, _err$response5$data;
-          dispatch(userPanelStopLoader());
-          IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.message) || 'Opps, Something went wrong.');
-        });
-      } else {
-        api$3.post(userPanelUrl.editUnit(tableName), data).then(function (res) {
-          dispatch(getUserPanalData(getParam));
-          dispatch(closeDialog());
-          resolve();
-        })["catch"](function (err) {
-          var _err$response6, _err$response6$data;
-          dispatch(userPanelStopLoader());
-          IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response6 = err.response) === null || _err$response6 === void 0 ? void 0 : (_err$response6$data = _err$response6.data) === null || _err$response6$data === void 0 ? void 0 : _err$response6$data.message) || 'Opps, Something went wrong.');
-        });
-      }
+      api$3.post(userPanelUrl.editUnit(tableName), data).then(function (res) {
+        dispatch(getUserPanalData(getParam));
+        dispatch(closeDialog());
+        resolve();
+      })["catch"](function (err) {
+        var _err$response4, _err$response4$data;
+        dispatch(userPanelStopLoader());
+        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.message) || 'Opps, Something went wrong.');
+      });
     });
   };
 };
@@ -1944,8 +1832,8 @@ var moveRecord = function moveRecord(tableName, data, getParam) {
         dispatch(closeDialog());
         resolve(res);
       })["catch"](function (err) {
-        var _err$response7, _err$response7$data;
-        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response7 = err.response) === null || _err$response7 === void 0 ? void 0 : (_err$response7$data = _err$response7.data) === null || _err$response7$data === void 0 ? void 0 : _err$response7$data.message) || 'Opps, Something went wrong.');
+        var _err$response5, _err$response5$data;
+        IUIToastMessageService$2.warningNotify((err === null || err === void 0 ? void 0 : (_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.message) || 'Opps, Something went wrong.');
       });
     });
   };
@@ -2433,6 +2321,7 @@ var TravelExpenseFields = function TravelExpenseFields(props) {
       setOpenEditAproverModalFlag(false);
     });
   };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IUIGrid, {
     container: true,
     className: (styles.headingPadding)
@@ -2580,7 +2469,8 @@ var TravelExpenseFields = function TravelExpenseFields(props) {
     headerText: "Edit approver field",
     cancelLabel: "Cancel",
     submitLabel: "Save",
-    submitHandler: handleEditAproverLabel,
+    submitHandler: handleEditAproverLabel
+    ,
     width: "420px",
     modalBodyStyle: {
       maxHeight: '600px',
@@ -3034,8 +2924,8 @@ var workInfo = [{
   validation: {
     regexOnChange: null,
     regexOnBlur: [{
-      regex: /^[(A-Z)(a-z)(0-9)\-_& ]*$/,
-      message: "Only alphabets, numbers, - and _ & are allowed."
+      regex: /^[(A-Z)(a-z)(0-9)\-& ]*$/,
+      message: "Only alphabets, numbers and - & are allowed."
     }],
     maxLimit: '',
     minLimit: '',
@@ -3123,8 +3013,8 @@ var workInfo = [{
   validation: {
     regexOnChange: null,
     regexOnBlur: [{
-      regex: /^[A-Za-z0-9 \-_.,&'()\/]*$/,
-      message: "Only alphabets, numbers & special characters . & ' ( ) _ - , / are allowed."
+      regex: /^[A-Za-z0-9 \-.,&'()\/]*$/,
+      message: "Only alphabets, numbers & special characters . & ' ( ) - , / are allowed."
     }, {
       regex: /^[a-zA-Z]/,
       message: 'Designation should start with alphabets'
@@ -3135,6 +3025,31 @@ var workInfo = [{
     minLength: 0
   },
   disableText: 'Please get in touch with your administrator to change this value.'
+}, {
+  id: 7,
+  label: 'Manager',
+  name: 'manager',
+  required: false,
+  type: 'async_select',
+  fullWidth: false,
+  visibility: true,
+  readOnly: false,
+  placeholder: 'Select manager',
+  tabelName: 'manager',
+  product: 'travel',
+  loadOption: approversOptions
+}, {
+  id: 8,
+  label: 'Skip manager',
+  name: 'skip manager',
+  required: false,
+  type: 'async_select',
+  fullWidth: false,
+  visibility: true,
+  readOnly: false,
+  placeholder: 'Select manager',
+  product: 'travel',
+  loadOption: approversOptions
 }, {
   id: 9,
   label: 'Base location',
@@ -3970,6 +3885,7 @@ var reducer$1 = function reducer(state, action) {
             _userListInfo.results[i].is_active = action.payload.is_active;
           }
         });
+
         var _deactivatedUsers = _userListInfo.results.length > 0 ? _userListInfo.results.filter(function (val) {
           return !val.is_active;
         }).map(function (obj) {
@@ -3992,6 +3908,7 @@ var reducer$1 = function reducer(state, action) {
             }
           });
         });
+
         var _deactivatedUsers2 = _userListInfo2.results.length > 0 ? _userListInfo2.results.filter(function (val) {
           return !val.is_active;
         }).map(function (obj) {
@@ -4045,7 +3962,6 @@ var initialState$2 = {
     previous: null,
     results: []
   },
-  deptUsers: [],
   loading: false
 };
 var reducer$2 = function reducer(state, action) {
@@ -4115,12 +4031,6 @@ var reducer$2 = function reducer(state, action) {
           loading: false
         });
       }
-    case FETCH_DEPARTMENT_USERS_DATA:
-      {
-        return _extends({}, state, {
-          deptUsers: action.payload
-        });
-      }
     default:
       return state;
   }
@@ -4307,7 +4217,8 @@ var rootReducer = combineReducers({
   customFields: reducer$5
 });
 
-var store = createStore(rootReducer, composeWithDevTools(applyMiddleware(thunk)));
+var store = createStore(rootReducer, composeWithDevTools(applyMiddleware(thunk)
+));
 
 function withStore(Component) {
   function WrappedComponent(props) {
@@ -4850,7 +4761,8 @@ function AddPanelDialog(_ref) {
     flexDirection: "column",
     padding: "8px 20px"
   }, /*#__PURE__*/React.createElement(IUIInput, {
-    label: name + " name",
+    label: name + " name"
+    ,
     name: "name",
     defaultValue: "",
     onValueChange: onValueChange,
@@ -4899,7 +4811,6 @@ var UserAddEdit = function UserAddEdit(props) {
     isILadmin = _useSelector2.isILadmin,
     companyName = _useSelector2.companyName;
   var history = useHistory();
-  var location = useLocation();
   var _useState = useState({
       travel: false,
       expense: false
@@ -4935,31 +4846,8 @@ var UserAddEdit = function UserAddEdit(props) {
     }
     setProductAccess(_productAccess);
   };
-  var _useState2 = useState(''),
-    newCountryCode = _useState2[0],
-    setNewCountryCode = _useState2[1];
-  var _useState3 = useState(),
-    countryDialCode = _useState3[0],
-    setCountryDialCode = _useState3[1];
-  var _useState4 = useState([]),
-    countryContactCode = _useState4[0],
-    setCountryContactCode = _useState4[1];
-  useEffect(function () {
-    var countryObject = countryContactCode.find(function (t) {
-      return t.dial_code === countryDialCode;
-    });
-    if (countryObject) {
-      setPersonalInfoInput(_extends({}, personalInfoInput, {
-        country_code: countryObject.code
-      }));
-    }
-  }, [countryDialCode]);
-  useEffect(function () {
-    var extractedNumber = newCountryCode.substring(1);
-    var convertedNumber = parseInt(extractedNumber);
-    setCountryDialCode(convertedNumber);
-  }, [newCountryCode]);
-  var _useState5 = useState({
+
+  var _useState2 = useState({
       first_name: '',
       last_name: '',
       email: '',
@@ -4970,9 +4858,9 @@ var UserAddEdit = function UserAddEdit(props) {
       contact_country_code: '',
       profile_pic: []
     }),
-    personalInfoInput = _useState5[0],
-    setPersonalInfoInput = _useState5[1];
-  var _useState6 = useState({
+    personalInfoInput = _useState2[0],
+    setPersonalInfoInput = _useState2[1];
+  var _useState3 = useState({
       emp_level: {
         value: '',
         label: 'Select employee level'
@@ -4992,72 +4880,62 @@ var UserAddEdit = function UserAddEdit(props) {
       },
       designation: '',
       base_location: '',
-      manager_id: {
-        value: '',
-        label: 'Select Manager'
-      },
-      skip_manager_id: {
-        value: '',
-        label: 'Select Manager'
-      },
       currency: {
         value: defaultCurrency,
         label: defaultCurrency
       }
     }),
-    employeeInfoInput = _useState6[0],
-    setEmployeeInfoInput = _useState6[1];
-  var _useState7 = useState({
+    employeeInfoInput = _useState3[0],
+    setEmployeeInfoInput = _useState3[1];
+  var _useState4 = useState({
       emp_level: 0,
       entity: 0,
       business_unit: 0,
       department: 0,
-      currency: 0,
-      manager_id: 0,
-      skip_manager_id: 0
+      currency: 0
     }),
-    cacheForAsyncDropdown = _useState7[0],
-    clearCacheForAsyncDropdown = _useState7[1];
-  var _useState8 = useState({}),
-    userTagType = _useState8[0],
-    setUserTagType = _useState8[1];
-  var _useState9 = useState(false),
-    scroll = _useState9[0],
-    setScroll = _useState9[1];
-  var _useState10 = useState({}),
-    customFieldsInput = _useState10[0],
-    setCustomFieldsInput = _useState10[1];
-  var _useState11 = useState('traveler'),
-    travelRole = _useState11[0],
-    setTravelRole = _useState11[1];
-  var _useState12 = useState({}),
-    travelApproversInput = _useState12[0],
-    setTravelApproversInput = _useState12[1];
-  var _useState13 = useState({
+    cacheForAsyncDropdown = _useState4[0],
+    clearCacheForAsyncDropdown = _useState4[1];
+  var _useState5 = useState({}),
+    userTagType = _useState5[0],
+    setUserTagType = _useState5[1];
+  var _useState6 = useState(false),
+    scroll = _useState6[0],
+    setScroll = _useState6[1];
+  var _useState7 = useState({}),
+    customFieldsInput = _useState7[0],
+    setCustomFieldsInput = _useState7[1];
+  var _useState8 = useState('traveler'),
+    travelRole = _useState8[0],
+    setTravelRole = _useState8[1];
+  var _useState9 = useState({}),
+    travelApproversInput = _useState9[0],
+    setTravelApproversInput = _useState9[1];
+  var _useState10 = useState({
       value: '',
       label: 'Select approver'
     }),
-    travelFYI = _useState13[0],
-    setTravelFYI = _useState13[1];
-  var _useState14 = useState([]),
-    membershipInfoInput = _useState14[0],
-    setMembershipInfoInput = _useState14[1];
-  var _useState15 = useState([]),
-    removedMembershipInfoInput = _useState15[0],
-    setRemovedMembershipInfoInput = _useState15[1];
-  var _useState16 = useState({
+    travelFYI = _useState10[0],
+    setTravelFYI = _useState10[1];
+  var _useState11 = useState([]),
+    membershipInfoInput = _useState11[0],
+    setMembershipInfoInput = _useState11[1];
+  var _useState12 = useState([]),
+    removedMembershipInfoInput = _useState12[0],
+    setRemovedMembershipInfoInput = _useState12[1];
+  var _useState13 = useState({
       flight_seat_preference: '',
       meal_preference: ''
     }),
-    travelPreferenceInfo = _useState16[0],
-    settravelPreferenceInfo = _useState16[1];
-  var _useState17 = useState({
+    travelPreferenceInfo = _useState13[0],
+    settravelPreferenceInfo = _useState13[1];
+  var _useState14 = useState({
       trusted_traveller: '',
       redress_number: ''
     }),
-    secureTravelInputInfo = _useState17[0],
-    setSecureTravelInputInfo = _useState17[1];
-  var _useState18 = useState({
+    secureTravelInputInfo = _useState14[0],
+    setSecureTravelInputInfo = _useState14[1];
+  var _useState15 = useState({
       passport_issue_country: {
         value: '',
         label: 'Select country'
@@ -5072,39 +4950,39 @@ var UserAddEdit = function UserAddEdit(props) {
       passport_photo: [],
       travel_docs: []
     }),
-    passportInfoInput = _useState18[0],
-    setPassportInfoInput = _useState18[1];
-  var _useState19 = useState([]),
-    filesForDelete = _useState19[0],
-    setFilesForDelete = _useState19[1];
-  var _useState20 = useState([]),
-    profilePicDelete = _useState20[0],
-    setProfilePicDelete = _useState20[1];
-  var _useState21 = useState(config.env.isTravelProduct && isProfile ? 'open' : ''),
-    isAdditionalInfoExpanded = _useState21[0],
-    setAdditionalInfoFlag = _useState21[1];
-  var _useState22 = useState('submitter'),
-    expenseRole = _useState22[0],
-    setExpenseRole = _useState22[1];
-  var _useState23 = useState({}),
-    expenseApproversInput = _useState23[0],
-    setExpenseApproversInput = _useState23[1];
-  var _useState24 = useState({
+    passportInfoInput = _useState15[0],
+    setPassportInfoInput = _useState15[1];
+  var _useState16 = useState([]),
+    filesForDelete = _useState16[0],
+    setFilesForDelete = _useState16[1];
+  var _useState17 = useState([]),
+    profilePicDelete = _useState17[0],
+    setProfilePicDelete = _useState17[1];
+  var _useState18 = useState(config.env.isTravelProduct && isProfile ? 'open' : ''),
+    isAdditionalInfoExpanded = _useState18[0],
+    setAdditionalInfoFlag = _useState18[1];
+  var _useState19 = useState('submitter'),
+    expenseRole = _useState19[0],
+    setExpenseRole = _useState19[1];
+  var _useState20 = useState({}),
+    expenseApproversInput = _useState20[0],
+    setExpenseApproversInput = _useState20[1];
+  var _useState21 = useState({
       value: '',
       label: 'Select approver'
     }),
-    expenseFYI = _useState24[0],
-    setExpenseFYI = _useState24[1];
+    expenseFYI = _useState21[0],
+    setExpenseFYI = _useState21[1];
   var asyncSelectRefs = useRef({
     emp_level: useRef(null),
     entity: useRef(null),
     business_unit: useRef(null),
     department: useRef(null)
   });
-  var _useState25 = useState([]),
-    errorArray = _useState25[0],
-    setErrorArray = _useState25[1];
-  var _useState26 = useState({
+  var _useState22 = useState([]),
+    errorArray = _useState22[0],
+    setErrorArray = _useState22[1];
+  var _useState23 = useState({
       first_name: '',
       last_name: '',
       email: '',
@@ -5134,9 +5012,9 @@ var UserAddEdit = function UserAddEdit(props) {
       userTagType: '',
       profile_pic: ''
     }),
-    errorMsgs = _useState26[0],
-    setErrorMsgs = _useState26[1];
-  var _useState27 = useState({
+    errorMsgs = _useState23[0],
+    setErrorMsgs = _useState23[1];
+  var _useState24 = useState({
       first_name: false,
       last_name: false,
       email: false,
@@ -5163,14 +5041,11 @@ var UserAddEdit = function UserAddEdit(props) {
       userTagType: false,
       profile_pic: false
     }),
-    inputChangeLog = _useState27[0],
-    updateInputChangeLog = _useState27[1];
-  var _useState28 = useState([]),
-    uploadedFiles = _useState28[0],
-    setUploadedFiles = _useState28[1];
-  var _useState29 = useState(70),
-    maxLengthForModal = _useState29[0],
-    setMaxLengthForModal = _useState29[1];
+    inputChangeLog = _useState24[0],
+    updateInputChangeLog = _useState24[1];
+  var _useState25 = useState([]),
+    uploadedFiles = _useState25[0],
+    setUploadedFiles = _useState25[1];
   var defaultAddModalData = {
     isOpen: false,
     isError: false,
@@ -5183,41 +5058,25 @@ var UserAddEdit = function UserAddEdit(props) {
     regexOnBlur: null,
     maxLimit: '',
     minLimit: '',
-    maxLength: maxLengthForModal,
+    maxLength: 70,
     minLength: 0
   };
-  var _useState30 = useState(defaultAddModalData),
-    addModalData = _useState30[0],
-    setAddModalData = _useState30[1];
+  var _useState26 = useState(defaultAddModalData),
+    addModalData = _useState26[0],
+    setAddModalData = _useState26[1];
   var onAddModalClose = function onAddModalClose() {
     setAddModalData(_extends({}, defaultAddModalData));
   };
-  useEffect(function () {
-    var _location$state, _location$state2;
-    if (location !== null && location !== void 0 && (_location$state = location.state) !== null && _location$state !== void 0 && _location$state.id && location !== null && location !== void 0 && (_location$state2 = location.state) !== null && _location$state2 !== void 0 && _location$state2.name) {
-      var _location$state3, _location$state4;
-      setEmployeeInfoInput(_extends({}, employeeInfoInput, {
-        department: {
-          value: location === null || location === void 0 ? void 0 : (_location$state3 = location.state) === null || _location$state3 === void 0 ? void 0 : _location$state3.id,
-          label: location === null || location === void 0 ? void 0 : (_location$state4 = location.state) === null || _location$state4 === void 0 ? void 0 : _location$state4.name
-        }
-      }));
-    }
-  }, []);
   var onModalOpen = function onModalOpen(e, id) {
     var title = '';
     if (id === 'entity') {
       title = 'Entity';
-      setMaxLengthForModal(70);
     } else if (id === 'department') {
       title = 'Department';
-      setMaxLengthForModal(70);
     } else if (id === 'business_unit') {
-      setMaxLengthForModal(150);
       title = 'Business unit';
     } else if (id === 'employee_level') {
       title = 'Employee level';
-      setMaxLengthForModal(70);
     }
     setAddModalData(_extends({}, addModalData, {
       isOpen: true,
@@ -5233,42 +5092,23 @@ var UserAddEdit = function UserAddEdit(props) {
       }));
     } else {
       dispatch(showLoader());
-      var dataObj;
-      if (addModalData.id === 'department') {
-        dataObj = {
-          name: validatedValue,
-          department_head_id: null
-        };
-      } else {
-        dataObj = {
-          names: [validatedValue]
-        };
-      }
-      dispatch(submitAddModalData(addModalData.id, dataObj)).then(function (res) {
-        var _extends4;
+      dispatch(submitAddModalData(addModalData.id, {
+        names: [validatedValue]
+      })).then(function (res) {
+        var _extends2;
         setAddModalData(_extends({}, addModalData, {
           isOpen: false
         }));
         IUIToastMessageService$4.sNotify(addModalData.title + " added successfully.");
         var tempKey = addModalData.id === 'employee_level' ? 'emp_level' : addModalData.id;
-        if (addModalData.id === 'department') {
-          var _extends2;
-          setEmployeeInfoInput(_extends({}, employeeInfoInput, (_extends2 = {}, _extends2[tempKey] = {
-            value: res.data.result.id,
-            label: res.data.result.name
-          }, _extends2)));
-        } else {
-          var _extends3;
-          setEmployeeInfoInput(_extends({}, employeeInfoInput, (_extends3 = {}, _extends3[tempKey] = {
-            value: res.data.value,
-            label: res.data.label
-          }, _extends3)));
-        }
-        updateInputChangeLog(_extends({}, inputChangeLog, (_extends4 = {}, _extends4[tempKey] = true, _extends4)));
+        setEmployeeInfoInput(_extends({}, employeeInfoInput, (_extends2 = {}, _extends2[tempKey] = {
+          value: res.data.value,
+          label: res.data.label
+        }, _extends2)));
         asyncSelectRefs.current[tempKey].current.blur();
         clearCacheForAsyncDropdown(function (prevState) {
-          var _extends5;
-          return _extends({}, prevState, (_extends5 = {}, _extends5[tempKey] = prevState[tempKey] + 1, _extends5));
+          var _extends3;
+          return _extends({}, prevState, (_extends3 = {}, _extends3[tempKey] = prevState[tempKey] + 1, _extends3));
         });
         dispatch(stopLoader());
       });
@@ -5285,10 +5125,10 @@ var UserAddEdit = function UserAddEdit(props) {
   };
   var onPersonalInfoChange = function onPersonalInfoChange(args) {
     try {
-      var _temp5 = function _temp5() {
+      var _temp6 = function _temp6() {
         if (Object.hasOwnProperty.call(inputChangeLog, _name)) {
-          var _extends6;
-          updateInputChangeLog(_extends({}, inputChangeLog, (_extends6 = {}, _extends6[_name] = true, _extends6)));
+          var _extends4;
+          updateInputChangeLog(_extends({}, inputChangeLog, (_extends4 = {}, _extends4[_name] = true, _extends4)));
         }
       };
       var _name = args._name,
@@ -5299,7 +5139,7 @@ var UserAddEdit = function UserAddEdit(props) {
         _errorMsg = _args$_errorMsg === void 0 ? '' : _args$_errorMsg,
         _args$_obj = args._obj,
         _obj = _args$_obj === void 0 ? {} : _args$_obj;
-      var _temp4 = function () {
+      var _temp7 = function () {
         if (_name === 'contact_number') {
           setPersonalInfoInput(_extends({}, personalInfoInput, {
             contact_number: _value.trim(),
@@ -5310,14 +5150,14 @@ var UserAddEdit = function UserAddEdit(props) {
           updateError('country_code', _isError, _errorMsg);
           updateError('contact_country_code', _isError, _errorMsg);
         } else {
-          var _temp3 = function _temp3() {
-            var _extends7;
-            setPersonalInfoInput(_extends({}, personalInfoInput, (_extends7 = {}, _extends7[_name] = _value, _extends7)));
+          var _temp8 = function _temp8() {
+            var _extends5;
+            setPersonalInfoInput(_extends({}, personalInfoInput, (_extends5 = {}, _extends5[_name] = _value, _extends5)));
             updateError(_name, _isError, _errorMsg);
           };
-          var _temp2 = function () {
+          var _temp9 = function () {
             if (_name === 'profile_pic') {
-              var _temp = function () {
+              var _temp10 = function () {
                 if (_obj.isUpload) {
                   return Promise.resolve(uploadDocs(_value, _name)).then(function (docsData) {
                     _value = _value.map(function (_val) {
@@ -5348,28 +5188,28 @@ var UserAddEdit = function UserAddEdit(props) {
                   setProfilePicDelete([].concat(profilePicDelete, _deletedFiles));
                 }
               }();
-              if (_temp && _temp.then) return _temp.then(function () {});
+              if (_temp10 && _temp10.then) return _temp10.then(function () {});
             }
           }();
-          return _temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2);
+          return _temp9 && _temp9.then ? _temp9.then(_temp8) : _temp8(_temp9);
         }
       }();
-      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4));
+      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp6) : _temp6(_temp7));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var onEmployeeInfoChange = function onEmployeeInfoChange(args) {
-    var _extends8;
+    var _extends6;
     var _name = args._name,
       _value = args._value,
       _isError = args._isError,
       _errorMsg = args._errorMsg;
-    setEmployeeInfoInput(_extends({}, employeeInfoInput, (_extends8 = {}, _extends8[_name] = _value, _extends8)));
+    setEmployeeInfoInput(_extends({}, employeeInfoInput, (_extends6 = {}, _extends6[_name] = _value, _extends6)));
     updateError(_name, _isError, _errorMsg);
     if (Object.hasOwnProperty.call(inputChangeLog, _name)) {
-      var _extends9;
-      updateInputChangeLog(_extends({}, inputChangeLog, (_extends9 = {}, _extends9[_name] = true, _extends9)));
+      var _extends7;
+      updateInputChangeLog(_extends({}, inputChangeLog, (_extends7 = {}, _extends7[_name] = true, _extends7)));
     }
   };
   var getUserTagTypeId = function getUserTagTypeId(name) {
@@ -5379,9 +5219,9 @@ var UserAddEdit = function UserAddEdit(props) {
     return tag.id;
   };
   var onUserTagTypeChange = function onUserTagTypeChange(args) {
-    var _extends10;
+    var _extends8;
     var e = args._event;
-    setUserTagType(_extends({}, userTagType, (_extends10 = {}, _extends10[e.target.name] = userTagType[e.target.name] ? false : getUserTagTypeId(e.target.name), _extends10)));
+    setUserTagType(_extends({}, userTagType, (_extends8 = {}, _extends8[e.target.name] = userTagType[e.target.name] ? false : getUserTagTypeId(e.target.name), _extends8)));
     if (Object.hasOwnProperty.call(inputChangeLog, 'userTagType')) {
       updateInputChangeLog(_extends({}, inputChangeLog, {
         userTagType: true
@@ -5389,26 +5229,30 @@ var UserAddEdit = function UserAddEdit(props) {
     }
   };
   var onCustomFieldsChange = function onCustomFieldsChange(_ref2) {
-    var _extends11;
+    var _extends9;
     var _name = _ref2._name,
       _value = _ref2._value;
-    setCustomFieldsInput(_extends({}, customFieldsInput, (_extends11 = {}, _extends11[_name] = _value, _extends11)));
+    setCustomFieldsInput(_extends({}, customFieldsInput, (_extends9 = {}, _extends9[_name] = _value, _extends9)));
   };
   var onTravelApproversInputChange = function onTravelApproversInputChange(_ref3) {
-    var _extends12;
+    var _extends10;
     var _name = _ref3._name,
       _value = _ref3._value;
-    setTravelApproversInput(_extends({}, travelApproversInput, (_extends12 = {}, _extends12[_name] = _value, _extends12)));
+    setTravelApproversInput(_extends({}, travelApproversInput, (_extends10 = {}, _extends10[_name] = _value, _extends10)));
   };
   var onExpenseApproversInputChange = function onExpenseApproversInputChange(_ref4) {
-    var _extends13;
+    var _extends11;
     var _name = _ref4._name,
       _value = _ref4._value;
-    setExpenseApproversInput(_extends({}, expenseApproversInput, (_extends13 = {}, _extends13[_name] = _value, _extends13)));
+    setExpenseApproversInput(_extends({}, expenseApproversInput, (_extends11 = {}, _extends11[_name] = _value, _extends11)));
   };
   var onMemInfoInputChange = function onMemInfoInputChange(index, key, val) {
     var _membershipInfoInput = [].concat(membershipInfoInput);
-    _membershipInfoInput[index][key] = val;
+    if (_membershipInfoInput[index].membership_type === 'flight' && key === 'name') {
+      _membershipInfoInput[index][key] = val.label;
+    } else {
+      _membershipInfoInput[index][key] = val;
+    }
     _membershipInfoInput[index].isEditMode = isEditMode;
     setMembershipInfoInput(_membershipInfoInput);
   };
@@ -5438,39 +5282,39 @@ var UserAddEdit = function UserAddEdit(props) {
     setMembershipInfoInput(_membershipInfoInputTemp);
   };
   var travelPreferenceOnChange = function travelPreferenceOnChange(args) {
-    var _extends14;
+    var _extends12;
     var _name = args._name,
       _value = args._value,
       _isError = args._isError,
       _errorMsg = args._errorMsg;
-    settravelPreferenceInfo(_extends({}, travelPreferenceInfo, (_extends14 = {}, _extends14[_name] = _value, _extends14)));
+    settravelPreferenceInfo(_extends({}, travelPreferenceInfo, (_extends12 = {}, _extends12[_name] = _value, _extends12)));
     if (Object.hasOwnProperty.call(inputChangeLog, _name)) {
-      var _extends15;
-      updateInputChangeLog(_extends({}, inputChangeLog, (_extends15 = {}, _extends15[_name] = true, _extends15)));
+      var _extends13;
+      updateInputChangeLog(_extends({}, inputChangeLog, (_extends13 = {}, _extends13[_name] = true, _extends13)));
     }
     updateError(_name, _isError, _errorMsg);
   };
   var onSecureTraveelerInfoInputChange = function onSecureTraveelerInfoInputChange(args) {
-    var _extends16;
+    var _extends14;
     var _name = args._name,
       _value = args._value,
       _isError = args._isError,
       _errorMsg = args._errorMsg;
-    setSecureTravelInputInfo(_extends({}, secureTravelInputInfo, (_extends16 = {}, _extends16[_name] = _value, _extends16)));
+    setSecureTravelInputInfo(_extends({}, secureTravelInputInfo, (_extends14 = {}, _extends14[_name] = _value, _extends14)));
     if (Object.hasOwnProperty.call(inputChangeLog, _name)) {
-      var _extends17;
-      updateInputChangeLog(_extends({}, inputChangeLog, (_extends17 = {}, _extends17[_name] = true, _extends17)));
+      var _extends15;
+      updateInputChangeLog(_extends({}, inputChangeLog, (_extends15 = {}, _extends15[_name] = true, _extends15)));
     }
     updateError(_name, _isError, _errorMsg);
   };
   var onPassportInfoInputChange = function onPassportInfoInputChange(args) {
     try {
-      var _temp8 = function _temp8() {
-        var _extends18;
-        setPassportInfoInput(_extends({}, passportInfoInput, (_extends18 = {}, _extends18[_name] = _value, _extends18)));
+      var _temp14 = function _temp14() {
+        var _extends16;
+        setPassportInfoInput(_extends({}, passportInfoInput, (_extends16 = {}, _extends16[_name] = _value, _extends16)));
         if (Object.hasOwnProperty.call(inputChangeLog, _name)) {
-          var _extends19;
-          updateInputChangeLog(_extends({}, inputChangeLog, (_extends19 = {}, _extends19[_name] = true, _extends19)));
+          var _extends17;
+          updateInputChangeLog(_extends({}, inputChangeLog, (_extends17 = {}, _extends17[_name] = true, _extends17)));
         }
         updateError(_name, _isError, _errorMsg);
       };
@@ -5508,9 +5352,9 @@ var UserAddEdit = function UserAddEdit(props) {
         }
         return Promise.resolve();
       }
-      var _temp7 = function () {
+      var _temp15 = function () {
         if (_name === 'passport_photo' || _name === 'travel_docs') {
-          var _temp6 = function () {
+          var _temp16 = function () {
             if (_obj.isUpload) {
               var checkAlreadyUploadedFiles = uploadedFiles.filter(function (_file) {
                 if (_name === 'passport_photo') {
@@ -5554,10 +5398,10 @@ var UserAddEdit = function UserAddEdit(props) {
               setFilesForDelete([].concat(filesForDelete, _deletedFiles));
             }
           }();
-          if (_temp6 && _temp6.then) return _temp6.then(function () {});
+          if (_temp16 && _temp16.then) return _temp16.then(function () {});
         }
       }();
-      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
+      return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5576,8 +5420,8 @@ var UserAddEdit = function UserAddEdit(props) {
       return _errorArray;
     });
     setErrorMsgs(function (prevState) {
-      var _extends20;
-      return _extends({}, prevState, (_extends20 = {}, _extends20[_name] = _errorMsg, _extends20));
+      var _extends18;
+      return _extends({}, prevState, (_extends18 = {}, _extends18[_name] = _errorMsg, _extends18));
     });
   };
   var dispatch = useDispatch();
@@ -5609,7 +5453,6 @@ var UserAddEdit = function UserAddEdit(props) {
         }
       }));
       dispatch(fetchCountryCodes()).then(function (_res) {
-        setCountryContactCode(_res);
         if (isEditMode) {
           if (!isProfile && !editUserId) return false;
           dispatch(setStaticFieldsVisibility({
@@ -5652,20 +5495,6 @@ var UserAddEdit = function UserAddEdit(props) {
                 value: '',
                 label: 'Select employee level'
               },
-              manager_id: res.employee_info.manager ? {
-                value: res.employee_info.manager,
-                label: res.employee_info.manager
-              } : {
-                value: '',
-                label: 'Select Manager'
-              },
-              skip_manager_id: res.employee_info.skip_manager ? {
-                value: res.employee_info.skip_manager,
-                label: res.employee_info.skip_manager
-              } : {
-                value: '',
-                label: 'Select Manager'
-              },
               employee_id: res.employee_info.employee_id || '',
               entity: res.employee_info.entity ? {
                 value: res.employee_info.entity.id,
@@ -5851,6 +5680,7 @@ var UserAddEdit = function UserAddEdit(props) {
               required: true
             }
           }));
+
           var _productAccess = _extends({}, productAccess);
           renderFields.products.forEach(function (product) {
             _productAccess[product.name] = true;
@@ -5898,7 +5728,7 @@ var UserAddEdit = function UserAddEdit(props) {
   }, [renderFields.expenseApprovers]);
   var uploadDocs = function uploadDocs(docToUpload, type) {
     try {
-      var _temp10 = function _temp10() {
+      var _temp19 = function _temp19() {
         setUploadedFiles([].concat(uploadedFiles, data));
         dispatch(stopLoader());
         return data;
@@ -5914,12 +5744,12 @@ var UserAddEdit = function UserAddEdit(props) {
           userID: editUserId
         });
       });
-      var _temp9 = _forTo(docs, function (i) {
+      var _temp20 = _forTo(docs, function (i) {
         return Promise.resolve(dispatch(uploadSingleDocumnet(docs[i]))).then(function (res) {
           data.push(res);
         });
       });
-      return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(_temp10) : _temp10(_temp9));
+      return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5931,12 +5761,6 @@ var UserAddEdit = function UserAddEdit(props) {
         IUIToastMessageService$4.warningNotify(checkAnyError);
         return Promise.resolve();
       }
-      if (employeeInfoInput.manager_id.value !== '') {
-        employeeInfoInput.manager_id = employeeInfoInput.manager.value;
-      }
-      if (employeeInfoInput.skip_manager_id.value !== '') {
-        employeeInfoInput.skip_manager_id = employeeInfoInput.skip_manager.value;
-      }
       var payload = {
         personalInfoInput: personalInfoInput,
         employeeInfoInput: employeeInfoInput,
@@ -6053,7 +5877,8 @@ var UserAddEdit = function UserAddEdit(props) {
           }
           _errorMsgs.passport_issue_date = '';
         }
-        if (passportInfoInput.passport_photo.length === 0 && userTravelInfo.file_name === false && fieldsVisibility.user_travel_info.file_name !== 2) {
+        if (passportInfoInput.passport_photo.length === 0 && userTravelInfo.file_name === false &&
+        fieldsVisibility.user_travel_info.file_name !== 2) {
           _isError = true;
           if (_errorArray.indexOf('passport_photo') === -1) {
             _errorArray.push('passport_photo');
@@ -6065,7 +5890,8 @@ var UserAddEdit = function UserAddEdit(props) {
           }
           _errorMsgs.passport_photo = '';
         }
-        if (passportInfoInput.travel_docs.length === 0 && userTravelInfo.file_name === false && fieldsVisibility.user_travel_info.file_name !== 2) {
+        if (passportInfoInput.travel_docs.length === 0 && userTravelInfo.file_name === false &&
+        fieldsVisibility.user_travel_info.file_name !== 2) {
           _isError = true;
           if (_errorArray.indexOf('travel_docs') === -1) {
             _errorArray.push('travel_docs');
@@ -6081,59 +5907,58 @@ var UserAddEdit = function UserAddEdit(props) {
       if (_isError) {
         setErrorArray(_errorArray);
         setErrorMsgs(_errorMsgs);
-        var _loop = function _loop() {
+        for (var _key3 in _errorMsgs) {
           if (Object.hasOwnProperty.call(_errorMsgs, _key3)) {
             if (_errorMsgs[_key3]) {
-              if (_key3 in passportInfoInput || _key3 in travelPreferenceInfo || _key3 in secureTravelInputInfo) {
-                setAdditionalInfoFlag('open');
-              }
-              var el = document.getElementById(_key3 === 'country_code' || _key3 === 'contact_country_code' ? 'contact_number' : _key3);
-              if (el) {
-                setTimeout(function () {
-                  el.scrollIntoView({
-                    behavior: 'smooth',
-                    block: 'center'
-                  });
-                }, 500);
-                return 1;
-              }
+              var _ret = function () {
+                if (_key3 in passportInfoInput || _key3 in travelPreferenceInfo || _key3 in secureTravelInputInfo) {
+                  setAdditionalInfoFlag('open');
+                }
+                var el = document.getElementById(_key3 === 'country_code' || _key3 === 'contact_country_code' ? 'contact_number' : _key3);
+                if (el) {
+                  setTimeout(function () {
+                    el.scrollIntoView({
+                      behavior: 'smooth',
+                      block: 'center'
+                    });
+                  }, 500);
+                  return "break";
+                }
+              }();
+              if (_ret === "break") break;
             }
           }
-        };
-        for (var _key3 in _errorMsgs) {
-          if (_loop()) break;
         }
+        return Promise.resolve();
       }
-      if (!_isError) {
-        if (isEditMode && editUserId || isProfile) {
-          dispatch(showLoader());
-          dispatch(updateUser(payload, isProfile ? id : editUserId, inputChangeLog)).then(function (res) {
-            if (isProfile) {
-              var _config$routes, _config$routes$profil, _config$routes$profil2;
-              (config === null || config === void 0 ? void 0 : (_config$routes = config.routes) === null || _config$routes === void 0 ? void 0 : (_config$routes$profil = _config$routes.profile) === null || _config$routes$profil === void 0 ? void 0 : (_config$routes$profil2 = _config$routes$profil.redirectUrl) === null || _config$routes$profil2 === void 0 ? void 0 : _config$routes$profil2.submit) && history.push(config.routes.profile.redirectUrl.submit);
-            } else {
-              var _config$routes2, _config$routes2$users, _config$routes2$users2;
-              (config === null || config === void 0 ? void 0 : (_config$routes2 = config.routes) === null || _config$routes2 === void 0 ? void 0 : (_config$routes2$users = _config$routes2.users) === null || _config$routes2$users === void 0 ? void 0 : (_config$routes2$users2 = _config$routes2$users.list) === null || _config$routes2$users2 === void 0 ? void 0 : _config$routes2$users2.path) && history.push(config.routes.users.list.path);
+      if (isEditMode && editUserId || isProfile) {
+        dispatch(showLoader());
+        dispatch(updateUser(payload, isProfile ? id : editUserId, inputChangeLog)).then(function (res) {
+          if (isProfile) {
+            var _config$routes, _config$routes$profil, _config$routes$profil2;
+            (config === null || config === void 0 ? void 0 : (_config$routes = config.routes) === null || _config$routes === void 0 ? void 0 : (_config$routes$profil = _config$routes.profile) === null || _config$routes$profil === void 0 ? void 0 : (_config$routes$profil2 = _config$routes$profil.redirectUrl) === null || _config$routes$profil2 === void 0 ? void 0 : _config$routes$profil2.submit) && history.push(config.routes.profile.redirectUrl.submit);
+          } else {
+            var _config$routes2, _config$routes2$users, _config$routes2$users2;
+            (config === null || config === void 0 ? void 0 : (_config$routes2 = config.routes) === null || _config$routes2 === void 0 ? void 0 : (_config$routes2$users = _config$routes2.users) === null || _config$routes2$users === void 0 ? void 0 : (_config$routes2$users2 = _config$routes2$users.list) === null || _config$routes2$users2 === void 0 ? void 0 : _config$routes2$users2.path) && history.push(config.routes.users.list.path);
+          }
+        })["catch"](function (err) {
+          if (typeof err === 'object') {
+            if (err.country_code) {
+              err.contact_number = err.country_code;
             }
-            setFilesForDelete([]);
-            setProfilePicDelete([]);
-          })["catch"](function (err) {
-            if (typeof err === 'object') {
-              if (err.country_code) {
-                err.contact_number = err.country_code;
-              }
-              if (err.contact_country_code) {
-                err.contact_number = err.contact_country_code;
-              }
-              if (err.passport) {
-                err.passport_photo = _extends({}, err.passport);
-                delete err.passport;
-              }
-              setErrorArray(Object.keys(err));
-              setErrorMsgs(err);
-              var _loop2 = function _loop2() {
-                if (Object.hasOwnProperty.call(err, _key4)) {
-                  if (err[_key4]) {
+            if (err.contact_country_code) {
+              err.contact_number = err.contact_country_code;
+            }
+            if (err.passport) {
+              err.passport_photo = _extends({}, err.passport);
+              delete err.passport;
+            }
+            setErrorArray(Object.keys(err));
+            setErrorMsgs(err);
+            for (var _key4 in err) {
+              if (Object.hasOwnProperty.call(err, _key4)) {
+                if (err[_key4]) {
+                  var _ret2 = function () {
                     if (_key4 in passportInfoInput || _key4 in travelPreferenceInfo || _key4 in secureTravelInputInfo) {
                       setAdditionalInfoFlag('open');
                     }
@@ -6145,44 +5970,44 @@ var UserAddEdit = function UserAddEdit(props) {
                           block: 'center'
                         });
                       }, 500);
-                      return 1;
+                      return "break";
                     }
-                  }
+                  }();
+                  if (_ret2 === "break") break;
                 }
-              };
-              for (var _key4 in err) {
-                if (_loop2()) break;
               }
-            } else if (typeof err === 'string') {
-              IUIToastMessageService$4.warningNotify(err);
-            } else {
-              IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
             }
-          })["finally"](function () {
-            dispatch(stopLoader());
-          });
-        } else {
-          dispatch(showLoader());
-          dispatch(createUser(payload)).then(function (res) {
-            var _config$routes3, _config$routes3$users, _config$routes3$users2;
-            (config === null || config === void 0 ? void 0 : (_config$routes3 = config.routes) === null || _config$routes3 === void 0 ? void 0 : (_config$routes3$users = _config$routes3.users) === null || _config$routes3$users === void 0 ? void 0 : (_config$routes3$users2 = _config$routes3$users.list) === null || _config$routes3$users2 === void 0 ? void 0 : _config$routes3$users2.path) && history.push(config.routes.users.list.path);
-          })["catch"](function (err) {
-            if (typeof err === 'object') {
-              if (err.country_code) {
-                err.contact_number = err.country_code;
-              }
-              if (err.contact_country_code) {
-                err.contact_number = err.contact_country_code;
-              }
-              if (err.passport) {
-                err.passport_photo = _extends({}, err.passport);
-                delete err.passport;
-              }
-              setErrorArray(Object.keys(err));
-              setErrorMsgs(err);
-              var _loop3 = function _loop3() {
-                if (Object.hasOwnProperty.call(err, _key5)) {
-                  if (err[_key5]) {
+          } else if (typeof err === 'string') {
+            IUIToastMessageService$4.warningNotify(err);
+          } else {
+            IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
+          }
+        })["finally"](function () {
+          dispatch(stopLoader());
+        });
+      } else {
+        dispatch(showLoader());
+        dispatch(createUser(payload)).then(function (res) {
+          var _config$routes3, _config$routes3$users, _config$routes3$users2;
+          (config === null || config === void 0 ? void 0 : (_config$routes3 = config.routes) === null || _config$routes3 === void 0 ? void 0 : (_config$routes3$users = _config$routes3.users) === null || _config$routes3$users === void 0 ? void 0 : (_config$routes3$users2 = _config$routes3$users.list) === null || _config$routes3$users2 === void 0 ? void 0 : _config$routes3$users2.path) && history.push(config.routes.users.list.path);
+        })["catch"](function (err) {
+          if (typeof err === 'object') {
+            if (err.country_code) {
+              err.contact_number = err.country_code;
+            }
+            if (err.contact_country_code) {
+              err.contact_number = err.contact_country_code;
+            }
+            if (err.passport) {
+              err.passport_photo = _extends({}, err.passport);
+              delete err.passport;
+            }
+            setErrorArray(Object.keys(err));
+            setErrorMsgs(err);
+            for (var _key5 in err) {
+              if (Object.hasOwnProperty.call(err, _key5)) {
+                if (err[_key5]) {
+                  var _ret3 = function () {
                     if (_key5 in passportInfoInput || _key5 in travelPreferenceInfo || _key5 in secureTravelInputInfo) {
                       setAdditionalInfoFlag('open');
                     }
@@ -6194,23 +6019,21 @@ var UserAddEdit = function UserAddEdit(props) {
                           block: 'center'
                         });
                       }, 500);
-                      return 1;
+                      return "break";
                     }
-                  }
+                  }();
+                  if (_ret3 === "break") break;
                 }
-              };
-              for (var _key5 in err) {
-                if (_loop3()) break;
               }
-            } else if (typeof err === 'string') {
-              IUIToastMessageService$4.warningNotify(err);
-            } else {
-              IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
             }
-          })["finally"](function () {
-            dispatch(stopLoader());
-          });
-        }
+          } else if (typeof err === 'string') {
+            IUIToastMessageService$4.warningNotify(err);
+          } else {
+            IUIToastMessageService$4.warningNotify('Opps, Something went wrong.');
+          }
+        })["finally"](function () {
+          dispatch(stopLoader());
+        });
       }
       return Promise.resolve();
     } catch (e) {
@@ -6226,7 +6049,8 @@ var UserAddEdit = function UserAddEdit(props) {
           window.location.href = config.routes.profile.redirectUrl.cancel;
         }
       }
-    } else {
+    }
+    else {
       var _config$routes4, _config$routes4$users, _config$routes4$users2;
       (config === null || config === void 0 ? void 0 : (_config$routes4 = config.routes) === null || _config$routes4 === void 0 ? void 0 : (_config$routes4$users = _config$routes4.users) === null || _config$routes4$users === void 0 ? void 0 : (_config$routes4$users2 = _config$routes4$users.list) === null || _config$routes4$users2 === void 0 ? void 0 : _config$routes4$users2.path) && history.push(config.routes.users.list.path);
     }
@@ -6248,13 +6072,18 @@ var UserAddEdit = function UserAddEdit(props) {
     if (verifyUserId) {
       dispatch(showLoader());
       dispatch(verifyUserInfo(verifyUserId)).then(function (res) {
-        setNewCountryCode(res === null || res === void 0 ? void 0 : res.country_contact_code);
         setPersonalInfoInput(function (prevState) {
           return _extends({}, prevState, {
-            first_name: res.first_name,
-            last_name: res.last_name,
+            first_name: res.fname,
+            last_name: res.lname,
             email: res.email,
-            contact_number: res === null || res === void 0 ? void 0 : res.contact_number,
+            contact_number: res.phone,
+            dob: function () {
+              var dt = new Date(res.dob);
+              var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+              return dt.getDate() + " " + months[dt.getMonth()] + " " + dt.getFullYear();
+            }(),
+
             gender: function () {
               if (res.gender === 'male') return 'Male';else if (res.gender === 'female') return 'Female';else if (res.gender === 'others') return 'Others';else return '';
             }()
@@ -6299,6 +6128,7 @@ var UserAddEdit = function UserAddEdit(props) {
             }()
           });
         });
+
         if (res.client_admin) {
           setTravelApproversInput(function (prevState) {
             var nextState = _extends({}, prevState);
@@ -6332,6 +6162,7 @@ var UserAddEdit = function UserAddEdit(props) {
       });
     }
   };
+
   return /*#__PURE__*/React.createElement(IUIBox, {
     component: "div",
     className: styles.UUIUserManagementAddEdit
@@ -6348,7 +6179,8 @@ var UserAddEdit = function UserAddEdit(props) {
     className: styles.breadcrumb
   }, /*#__PURE__*/React.createElement(IUIBreadCrumb, {
     breadCrumbs: [{
-      href: config.routes.users.list.path,
+      href:
+      config.routes.users.list.path,
       label: 'Users',
       hasLink: true
     }]
@@ -6417,9 +6249,6 @@ var UserAddEdit = function UserAddEdit(props) {
     if (!p.visibility) {
       return null;
     }
-    if (p.name === 'profile_pic' && config.env.isExpenseProduct) {
-      return null;
-    }
     return /*#__PURE__*/React.createElement(IUIGrid, {
       item: true,
       sm: 12,
@@ -6798,13 +6627,17 @@ var uploadBulkUsersFile = function uploadBulkUsersFile(payload) {
     });
   };
 };
+
 var uploadFileToS3$1 = function uploadFileToS3(presignedPostData, file) {
   return new Promise(function (resolve, reject) {
     var formData = new FormData();
+
     Object.keys(presignedPostData.fields).forEach(function (key) {
       formData.append(key, presignedPostData.fields[key]);
     });
+
     formData.append('file', file);
+
     axios.post(presignedPostData.url, formData, {
       headers: {
         'Content-Type': 'multipart/form-data'
@@ -6921,7 +6754,7 @@ var fetchBulkactionHistory = function fetchBulkactionHistory(url) {
   };
 };
 
-var styles$5 = {"UUIUserManagementList":"_3WNHx","scrollOverlayMenu":"_2_WEg","overlaysearch":"_1Pbhb","pageHeader":"_1WLpc","buttonWrapper":"_2egTG","headingWrapper":"_1He01","headingSignUpWrapper":"_Q8vqd","heading":"_1uPaO","headingLarge":"_2FsLd","headingMedium":"_nGXA9","headingSmall":"_2rpwF","description":"_25vb9","headerText":"_1Ny9J","letterImage":"_2hr3R","tablewrapper":"_1-RPw","rowText":"_1LXyO","textTransform":"_3kFQS","lightColor":"_3Ghgw","avatarClassName":"_2qO_X","tooltipText":"_151u_","tooltipTextDiv":"_1l4V-","tooltip":"_-LQNH","importModalBodyContainer":"_25xUk","dividerColor":"_2HZv9","w100":"_3vGmU","downloadTemplateContainer":"_3-Xu_","downloadTemplateDescContainer":"_tLw43","labelContainer":"_7TYUZ","downlTempHeader":"__CZpe","downlTempDescription":"_19jEe","downloadTemplateButton":"_1qXtq","fileUploaderContainer":"_1YVz2","colGap":"_3vnY5","deActivateModalContainer":"_28H9H","backdrop":"_1ky1x","errorText":"_26_if","deactivateAlert":"_3hvWz","warningSvg":"_2H6Bq","departmentHeadText":"_3pOsV","deactivateBtn":"_2v6e4","user_list_page_tabs":"_xWE7K","TabLabelCount":"_13pXn","deactivateSubmitBtn":"_1qxY-","deactivateCustomButtonClass":"_2YBWE"};
+var styles$5 = {"UUIUserManagementList":"_3WNHx","pageHeader":"_1WLpc","buttonWrapper":"_2egTG","headingWrapper":"_1He01","headingSignUpWrapper":"_Q8vqd","heading":"_1uPaO","headingLarge":"_2FsLd","headingMedium":"_nGXA9","headingSmall":"_2rpwF","description":"_25vb9","headerText":"_1Ny9J","letterImage":"_2hr3R","tablewrapper":"_1-RPw","rowText":"_1LXyO","textTransform":"_3kFQS","lightColor":"_3Ghgw","avatarClassName":"_2qO_X","tooltipText":"_151u_","tooltip":"_-LQNH","importModalBodyContainer":"_25xUk","dividerColor":"_2HZv9","w100":"_3vGmU","downloadTemplateContainer":"_3-Xu_","downloadTemplateDescContainer":"_tLw43","labelContainer":"_7TYUZ","downlTempHeader":"__CZpe","downlTempDescription":"_19jEe","downloadTemplateButton":"_1qXtq","fileUploaderContainer":"_1YVz2","colGap":"_3vnY5","deActivateModalContainer":"_28H9H","backdrop":"_1ky1x","errorText":"_26_if","user_list_page_tabs":"_xWE7K","TabLabelCount":"_13pXn"};
 
 var BulkUploadModal = function BulkUploadModal(props) {
   var isOpenImportUsersModal = props.isOpenImportUsersModal,
@@ -6990,7 +6823,7 @@ var BulkUploadModal = function BulkUploadModal(props) {
           file: doc
         });
       });
-      var _temp = _forTo(docs, function (i) {
+      var _temp2 = _forTo(docs, function (i) {
         return Promise.resolve(dispatch(uploadBulkUsersFile(docs[i]))).then(function (res) {
           return Promise.resolve(dispatch(validateUploadedFile(res.user_file_name)).then(function (validatedRes) {
             if (validatedRes.data.status) {
@@ -7030,7 +6863,7 @@ var BulkUploadModal = function BulkUploadModal(props) {
           })).then(function () {});
         });
       });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -7205,6 +7038,7 @@ var UserBulkUpload = function UserBulkUpload(_ref) {
     setOpenImportUsersModal(false);
     handleImportPagenavigation(jobId);
   };
+
   var handleDownloadRecords = function handleDownloadRecords(type) {
     try {
       setDownlStatus(true);
@@ -8230,6 +8064,7 @@ var DropdownBtn = function DropdownBtn(props) {
     if (val.disable) return false;
     if (val.handler && typeof val.handler === 'function') val.handler();
   };
+
   var prevOpen = React.useRef(open);
   React.useEffect(function () {
     if (prevOpen.current === true && open === false) {
@@ -8344,10 +8179,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
     selected = props.selected,
     _props$handleSingleCh = props.handleSingleCheckBoxClick,
     handleSingleCheckBoxClick = _props$handleSingleCh === void 0 ? function () {} : _props$handleSingleCh,
-    _props$onResetPasswor = props.onResetPasswordHandler,
-    onResetPasswordHandler = _props$onResetPasswor === void 0 ? function () {} : _props$onResetPasswor,
-    _props$toggleInviteMo = props.toggleInviteModal,
-    toggleInviteModal = _props$toggleInviteMo === void 0 ? function () {} : _props$toggleInviteMo,
     orderBy = props.orderBy,
     order = props.order,
     _props$onRequestSort = props.onRequestSort,
@@ -8365,21 +8196,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
     searchValue = props.searchValue,
     _props$isILadmin = props.isILadmin,
     isILadmin = _props$isILadmin === void 0 ? false : _props$isILadmin;
-  var useStyles = makeStyles(function (theme) {
-    return {
-      tooltip: {
-        background: '#1F2937',
-        fontSize: '14px',
-        color: '#ffffff',
-        padding: '12px 16px',
-        borderRadius: '6px'
-      },
-      arrow: {
-        color: '#1F2937'
-      }
-    };
-  });
-  var classes = useStyles();
   var columns = [{
     id: 'first_name',
     label: 'Name',
@@ -8399,27 +8215,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
         profilePath: row === null || row === void 0 ? void 0 : (_row$profile_pic = row.profile_pic) === null || _row$profile_pic === void 0 ? void 0 : _row$profile_pic.presigned_url
       }));
     }
-  }, {
-    id: 'first_name',
-    label: '',
-    minWidth: 60,
-    sortable: false,
-    cell: function cell(row) {
-      return /*#__PURE__*/React.createElement(IUIBox, {
-        component: "div",
-        width: 80
-      }, row && row.has_visited === 0 ? /*#__PURE__*/React.createElement(Tooltip, {
-        title: "This user hasn't logged in to the platform yet",
-        arrow: true,
-        classes: {
-          arrow: classes.arrow,
-          tooltip: classes.tooltip
-        },
-        placement: "top-start"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: clsx(styles$5.tooltipTextDiv)
-      }, "Invited")) : null);
-    }
   }, {
     id: 'emp_info__department__name',
     label: 'Department',
@@ -8507,21 +8302,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
           return onEditHandler(row.id);
         }
       }];
-      if (row && row.has_visited && row.is_active) {
-        options.push({
-          label: 'Reset password',
-          handler: function handler() {
-            return onResetPasswordHandler(row.email);
-          }
-        });
-      } else if (row && row.is_active) {
-        options.push({
-          label: 'Resend invite',
-          handler: function handler() {
-            return toggleInviteModal(row.id, 'single', row.first_name, row.last_name);
-          }
-        });
-      }
       if (isILadmin) {
         options.push({
           label: 'Make primary admin',
@@ -8545,7 +8325,6 @@ var StickyHeadTable = function StickyHeadTable(props) {
         endIcon: null,
         outlinedBtn: false,
         className: "threedotMenuBtn",
-        MoreHorizIcon: true,
         placement: "bottom-end"
       }));
     },
@@ -8553,6 +8332,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
       paddingLeft: '40px'
     }
   }];
+
   return /*#__PURE__*/React.createElement(IUITable, {
     searchPlaceholder: "Search by name, email & department",
     isCheckboxTable: true,
@@ -8575,8 +8355,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
     isDataFetching: isDataFetching,
     disableRowCheckbox: disableRowCheckbox,
     searchBoxWidth: "400px",
-    searchValue: searchValue,
-    hideTopPagination: false
+    searchValue: searchValue
   });
 };
 var SingupRequests = function SingupRequests(props) {
@@ -8607,18 +8386,20 @@ var SingupRequests = function SingupRequests(props) {
     var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
     return dt.getDate() + " " + months[dt.getMonth()] + " " + dt.getFullYear();
   };
+
   var columns = [{
-    id: 'first_name',
+    id: 'fname',
     label: 'Name',
     minWidth: 250,
     sortable: true,
     cell: function cell(row) {
       var _row$profile_pic2;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IUIProfileBox, {
-        firstName: row.first_name,
-        lastName: row.last_name,
-        isLetterAvatar: row.profile_pic && row.profile_pic.presigned_url ? false : true,
-        primaryText: row.first_name + ' ' + row.last_name,
+        firstName: row.fname,
+        lastName: row.lname,
+        isLetterAvatar:
+        row.profile_pic && row.profile_pic.presigned_url ? false : true,
+        primaryText: row.fname + ' ' + row.lname,
         secondaryText: row.email,
         letterAvatarTextColor: "black",
         letterAvatarBackgroundColor: "#d3d3d3",
@@ -8627,7 +8408,7 @@ var SingupRequests = function SingupRequests(props) {
       }));
     }
   }, {
-    id: 'created_at',
+    id: 'created',
     label: 'Requested on',
     minWidth: 100,
     sortable: true,
@@ -8637,7 +8418,7 @@ var SingupRequests = function SingupRequests(props) {
         width: 100
       }, /*#__PURE__*/React.createElement(IUITypography, {
         className: clsx(styles$5.rowText, styles$5.textTransform)
-      }, formatDate(row.created_at)));
+      }, formatDate(row.created)));
     }
   }, {
     id: 'actions',
@@ -8691,89 +8472,11 @@ var SingupRequests = function SingupRequests(props) {
   });
 };
 
-function InfoYellowIcon(props) {
-  return /*#__PURE__*/React.createElement("svg", {
-    width: props.width,
-    height: props.height,
-    viewBox: "0 0 20 20",
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M11 4.99951C11 5.5518 10.5523 5.99951 10 5.99951C9.44771 5.99951 9 5.5518 9 4.99951C9 4.44723 9.44771 3.99951 10 3.99951C10.5523 3.99951 11 4.44723 11 4.99951Z",
-    fill: "#CA8A04"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M8 7.99951C7.44772 7.99951 7 8.44723 7 8.99951C7 9.5518 7.44772 9.99951 8 9.99951H9V12.9995H8C7.44772 12.9995 7 13.4472 7 13.9995C7 14.5518 7.44772 14.9995 8 14.9995H12C12.5523 14.9995 13 14.5518 13 13.9995C13 13.4472 12.5523 12.9995 12 12.9995H11V8.99951C11 8.44723 10.5523 7.99951 10 7.99951H8Z",
-    fill: "#CA8A04"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M0 9.99951C0 15.5224 4.47715 19.9995 10 19.9995C15.5228 19.9995 20 15.5224 20 9.99951C20 4.47666 15.5228 -0.000488281 10 -0.000488281C4.47715 -0.000488281 0 4.47666 0 9.99951ZM10 1.99951C14.4183 1.99951 18 5.58123 18 9.99951C18 14.4178 14.4183 17.9995 10 17.9995C5.58172 17.9995 2 14.4178 2 9.99951C2 5.58123 5.58172 1.99951 10 1.99951Z",
-    fill: "#CA8A04"
-  }));
-}
-
-function RedWarningIcon(props) {
-  var _props$color = props.color,
-    color = _props$color === void 0 ? '#E11D48' : _props$color,
-    _props$size = props.size,
-    size = _props$size === void 0 ? '14' : _props$size;
-  return /*#__PURE__*/React.createElement("svg", {
-    width: size,
-    height: size,
-    viewBox: "0 0 14 14",
-    fill: color,
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M7 14C10.866 14 14 10.866 14 7C14 3.13401 10.866 0 7 0C3.13401 0 0 3.13401 0 7C0 10.866 3.13401 14 7 14ZM6 4C6 3.44772 6.44772 3 7 3C7.55229 3 8 3.44772 8 4V6C8 6.55229 7.55229 7 7 7C6.44772 7 6 6.55229 6 6V4ZM6 10C6 9.44771 6.44772 9 7 9C7.55229 9 8 9.44771 8 10C8 10.5523 7.55229 11 7 11C6.44772 11 6 10.5523 6 10Z",
-    fill: color
-  }));
-}
-
-function InviteInfoIcon() {
-  return /*#__PURE__*/React.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "20",
-    height: "20",
-    fill: "none",
-    viewBox: "0 0 20 20"
-  }, /*#__PURE__*/React.createElement("path", {
-    fill: "#CA8A04",
-    d: "M11 5a1 1 0 11-2 0 1 1 0 012 0zM8 8a1 1 0 000 2h1v3H8a1 1 0 100 2h4a1 1 0 100-2h-1V9a1 1 0 00-1-1H8z"
-  }), /*#__PURE__*/React.createElement("path", {
-    fill: "#CA8A04",
-    d: "M0 10c0 5.522 4.477 10 10 10s10-4.478 10-10c0-5.523-4.477-10-10-10S0 4.477 0 10zm10-8a8 8 0 110 16 8 8 0 010-16z"
-  }));
-}
-
 var IUIToastMessageService$7 = services.IUIToastMessageService;
-var env$7 = configs.env,
-  api$7 = configs.api;
-var UndoButton = function UndoButton(_ref) {
-  var onUndo = _ref.onUndo,
-    msg = _ref.msg;
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex',
-      flexDirection: 'row',
-      width: '270px',
-      justifyContent: 'space-between'
-    }
-  }, /*#__PURE__*/React.createElement("p", {
-    style: {
-      whiteSpace: 'nowrap',
-      paddingTop: '8px'
-    }
-  }, msg), /*#__PURE__*/React.createElement("p", {
-    onClick: onUndo,
-    style: {
-      whiteSpace: 'nowrap',
-      fontWeight: '600',
-      fontSize: '1rem',
-      padding: '8px 20px 0'
-    }
-  }, "UNDO"));
-};
-var UserList = function UserList(_ref2) {
-  var config = _ref2.config,
-    isProfile = _ref2.isProfile;
+var env$7 = configs.env;
+var UserList = function UserList(_ref) {
+  var config = _ref.config,
+    isProfile = _ref.isProfile;
   env$7.init(config, isProfile);
   var history = useHistory();
   var _useSelector = useSelector(function (state) {
@@ -8783,49 +8486,27 @@ var UserList = function UserList(_ref2) {
     isDataFetching = _useSelector.isDataFetching,
     deactivatedUsers = _useSelector.deactivatedUsers,
     tabValue = _useSelector.tabValue;
-  var newSelecteds = userListInfo.results;
-  var _React$useState = React.useState(''),
-    deactivateUser = _React$useState[0],
-    setDeactivateUser = _React$useState[1];
-  var _React$useState2 = React.useState(null),
-    defaultId = _React$useState2[0],
-    setDefaultId = _React$useState2[1];
-  var _React$useState3 = React.useState(1),
-    page = _React$useState3[0],
-    setPage = _React$useState3[1];
-  var _useState = useState([]),
-    selectedUsersNotApprover = _useState[0],
-    setSelectedUsersNotApprover = _useState[1];
-  var _useState2 = useState([]),
-    selectedUsersApprover = _useState2[0],
-    setSelectedUsersApprover = _useState2[1];
+  var _React$useState = React.useState(1),
+    page = _React$useState[0],
+    setPage = _React$useState[1];
+  var _useState = useState(5),
+    rowsPerPage = _useState[0],
+    setRowsPerPage = _useState[1];
+  var _React$useState2 = React.useState({}),
+    selected = _React$useState2[0],
+    setSelected = _React$useState2[1];
+  var _React$useState3 = React.useState('asc'),
+    order = _React$useState3[0],
+    setOrder = _React$useState3[1];
+  var _React$useState4 = React.useState('first_name'),
+    orderBy = _React$useState4[0],
+    setOrderBy = _React$useState4[1];
+  var _useState2 = useState(''),
+    searchValue = _useState2[0],
+    setSearchValue = _useState2[1];
   var _useState3 = useState(false),
-    isBulkDeactivateModalOpen = _useState3[0],
-    setIsBulkDeactivateModalOpen = _useState3[1];
-  var _React$useState4 = React.useState(''),
-    user = _React$useState4[0],
-    setUser = _React$useState4[1];
-  var _useState4 = useState(10),
-    rowsPerPage = _useState4[0],
-    setRowsPerPage = _useState4[1];
-  var _React$useState5 = React.useState({}),
-    selected = _React$useState5[0],
-    setSelected = _React$useState5[1];
-  var _React$useState6 = React.useState('asc'),
-    order = _React$useState6[0],
-    setOrder = _React$useState6[1];
-  var _React$useState7 = React.useState(false),
-    deactivateSingle = _React$useState7[0],
-    setDeactivateSingle = _React$useState7[1];
-  var _React$useState8 = React.useState('first_name'),
-    orderBy = _React$useState8[0],
-    setOrderBy = _React$useState8[1];
-  var _useState5 = useState(''),
-    searchValue = _useState5[0],
-    setSearchValue = _useState5[1];
-  var _useState6 = useState(false),
-    isOpenDeActivateModal = _useState6[0],
-    setOpenDeActivateModalFlag = _useState6[1];
+    isOpenDeActivateModal = _useState3[0],
+    setOpenDeActivateModalFlag = _useState3[1];
   var _useSelector2 = useSelector(function (state) {
       return state.common;
     }),
@@ -8833,140 +8514,69 @@ var UserList = function UserList(_ref2) {
     hasVerificationError = _useSelector2.hasVerificationError,
     isILadmin = _useSelector2.isILadmin,
     companyName = _useSelector2.companyName;
+  var _useState4 = useState(false),
+    isOpenImportUsersModal = _useState4[0],
+    setOpenImportUsersModal = _useState4[1];
+  var _useState5 = useState(false),
+    isFileDownloading = _useState5[0],
+    setDownlStatus = _useState5[1];
+  var _useState6 = useState(false),
+    isSortingChange = _useState6[0],
+    setSortingChange = _useState6[1];
   var _useState7 = useState(false),
-    isOpenImportUsersModal = _useState7[0],
-    setOpenImportUsersModal = _useState7[1];
+    isSearchingChange = _useState7[0],
+    setSearchingChange = _useState7[1];
   var _useState8 = useState(false),
-    approveeStatus = _useState8[0],
-    setApproveeStatus = _useState8[1];
+    isSortingChangeTemp = _useState8[0],
+    setSortingChangeTemp = _useState8[1];
   var _useState9 = useState(false),
-    isFileDownloading = _useState9[0],
-    setDownlStatus = _useState9[1];
+    isSearchingChangeTemp = _useState9[0],
+    setSearchingChangeTemp = _useState9[1];
   var _useState10 = useState(false),
-    isSortingChange = _useState10[0],
-    setSortingChange = _useState10[1];
-  var _useState11 = useState(false),
-    isSearchingChange = _useState11[0],
-    setSearchingChange = _useState11[1];
-  var _useState12 = useState(false),
-    isSortingChangeTemp = _useState12[0],
-    setSortingChangeTemp = _useState12[1];
+    isApiFetching = _useState10[0],
+    setisApiFetching = _useState10[1];
+
+  var _React$useState5 = React.useState(1),
+    signup_page = _React$useState5[0],
+    setSignUpPage = _React$useState5[1];
+  var _useState11 = useState(5),
+    signup_rowsPerPage = _useState11[0],
+    setSignUpRowsPerPage = _useState11[1];
+  var _React$useState6 = React.useState('asc'),
+    signup_order = _React$useState6[0],
+    setSignUpOrder = _React$useState6[1];
+  var _React$useState7 = React.useState('fname'),
+    signup_orderBy = _React$useState7[0],
+    setSignUpOrderBy = _React$useState7[1];
+  var _useState12 = useState(''),
+    signup_searchValue = _useState12[0],
+    set_signup_SearchValue = _useState12[1];
   var _useState13 = useState(false),
-    isSearchingChangeTemp = _useState13[0],
-    setSearchingChangeTemp = _useState13[1];
+    isSignUpSortingChange = _useState13[0],
+    setSignUpSortingChange = _useState13[1];
   var _useState14 = useState(false),
-    isApiFetching = _useState14[0],
-    setisApiFetching = _useState14[1];
-  var _useState15 = useState({
-      value: '',
-      label: 'Select approver'
-    }),
-    approverRole = _useState15[0],
-    setApproverRole = _useState15[1];
+    isSignUpSearchingChange = _useState14[0],
+    setSignUpSearchingChange = _useState14[1];
+  var _useState15 = useState(false),
+    isSignUpSortingChangeTemp = _useState15[0],
+    setSignUpSortingChangeTemp = _useState15[1];
   var _useState16 = useState(false),
-    showInviteModal = _useState16[0],
-    setToggleInviteModal = _useState16[1];
-  var _useState17 = useState(''),
-    userIds = _useState17[0],
-    setUserIds = _useState17[1];
-  var _React$useState9 = React.useState(false),
-    overlayMenu = _React$useState9[0],
-    setOverlayMenu = _React$useState9[1];
-  var _useState18 = useState(''),
-    userFirstName = _useState18[0],
-    setUserFirstName = _useState18[1];
-  var _useState19 = useState(''),
-    userLastName = _useState19[0],
-    setUserLastName = _useState19[1];
-  var _useState20 = useState(true),
-    isDisabledSubmitBtn = _useState20[0],
-    setIsDisabledSubmitBtn = _useState20[1];
-  useScrollPosition(function (_ref3) {
-    var prevPos = _ref3.prevPos,
-      currPos = _ref3.currPos;
-    if (prevPos.y - currPos.y > 0) {
-      if (currPos.y <= -275) {
-        setOverlayMenu(true);
-      }
-    } else {
-      if (currPos.y > -295) {
-        setOverlayMenu(false);
-      }
-    }
-  }, [overlayMenu]);
-  var scrollTo = function scrollTo(id) {
-    var el = document.getElementById(id);
-    window.scrollTo({
-      top: el.offsetTop,
-      behavior: 'smooth'
-    });
-  };
-  var _React$useState10 = React.useState(1),
-    signup_page = _React$useState10[0],
-    setSignUpPage = _React$useState10[1];
-  var _useState21 = useState(5),
-    signup_rowsPerPage = _useState21[0],
-    setSignUpRowsPerPage = _useState21[1];
-  var _React$useState11 = React.useState('asc'),
-    signup_order = _React$useState11[0],
-    setSignUpOrder = _React$useState11[1];
-  var _React$useState12 = React.useState('first_name'),
-    signup_orderBy = _React$useState12[0],
-    setSignUpOrderBy = _React$useState12[1];
-  var _useState22 = useState(''),
-    signup_searchValue = _useState22[0],
-    set_signup_SearchValue = _useState22[1];
-  var _useState23 = useState(false),
-    isSignUpSortingChange = _useState23[0],
-    setSignUpSortingChange = _useState23[1];
-  var _useState24 = useState(false),
-    isSignUpSearchingChange = _useState24[0],
-    setSignUpSearchingChange = _useState24[1];
-  var _useState25 = useState(false),
-    isSignUpSortingChangeTemp = _useState25[0],
-    setSignUpSortingChangeTemp = _useState25[1];
-  var _useState26 = useState(false),
-    isSignUpSearchingChangeTemp = _useState26[0],
-    setSignUpSearchingChangeTemp = _useState26[1];
+    isSignUpSearchingChangeTemp = _useState16[0],
+    setSignUpSearchingChangeTemp = _useState16[1];
   var _useSelector3 = useSelector(function (state) {
       return state.userList;
     }),
     signupRequestListInfo = _useSelector3.signupRequestListInfo;
-  var redirectToNotifications = function redirectToNotifications() {
-    if (config.routes.notification) {
-      history.push({
-        pathname: config.routes.notification.path
-      });
-    }
-  };
   var openDeactivateModal = function openDeactivateModal() {
     if (Object.values(selected).flat().length === 0 || Object.values(selected).flat() === undefined) {
       IUIToastMessageService$7.warningNotify('Select at least one user to deactivate.');
       return false;
     }
-    if (selectedUsersApprover.length) {
-      var _SelectedUsersNotApprover = [].concat(selectedUsersNotApprover);
-      var _SelectedUsersApprover = [].concat(selectedUsersApprover);
-      var _selected = Object.values(selected).flat();
-      _SelectedUsersNotApprover = _SelectedUsersNotApprover.filter(function (item) {
-        return _selected.includes(item.id.toString());
-      });
-      _SelectedUsersApprover = _SelectedUsersApprover.filter(function (item) {
-        return _selected.includes(item.id.toString());
-      });
-      setSelectedUsersNotApprover(_SelectedUsersNotApprover);
-      setSelectedUsersApprover(_SelectedUsersApprover);
-      setIsBulkDeactivateModalOpen(true);
-    } else {
-      setOpenDeActivateModalFlag(true);
-    }
+    setOpenDeActivateModalFlag(true);
   };
   var closeDeActivateModal = function closeDeActivateModal() {
     setOpenDeActivateModalFlag(false);
   };
-  var closeDeActiveModal = function closeDeActiveModal() {
-    setIsBulkDeactivateModalOpen(false);
-  };
   var handleAddPageNavigation = function handleAddPageNavigation() {
     history.push(config.routes.users.add.path);
   };
@@ -8979,32 +8589,50 @@ var UserList = function UserList(_ref2) {
   var handleVerifyUserClick = function handleVerifyUserClick(userId) {
     history.push(config.routes.users.add.path + "?" + config.routes.users.add.queryParamKeys.verifyUserId + "=" + userId);
   };
-  var handleRejectUserClick = function handleRejectUserClick(userId) {
-    IUIToastMessageService$7.undoNotify( /*#__PURE__*/React.createElement(UndoButton, {
-      onUndo: function onUndo() {
-        return IUIToastMessageService$7.setUndoClicked(true);
+  var UndoButton = function UndoButton(_ref2) {
+    var msg = _ref2.msg,
+      id = _ref2.id;
+    return /*#__PURE__*/React.createElement(IUIBox, {
+      display: "flex",
+      flexDirection: "row",
+      width: "270px"
+    }, /*#__PURE__*/React.createElement(IUITypography, {
+      style: {
+        whiteSpace: 'nowrap',
+        paddingTop: '8px'
+      }
+    }, msg), /*#__PURE__*/React.createElement(IUIButton, {
+      type: "text",
+      buttonText: "UNDO",
+      style: {
+        color: '#FFFFFF'
       },
-      msg: "Sign-up request rejected"
-    }), function (res) {
-      if (res === false) {
-        dispatch(rejectUserVerification(userId)).then(function (res) {
-          if (res.status === true) {
-            dispatch(showDataFetchingStatus());
-            dispatch(fetchUserSignupRequests({
-              ordering: signup_order === 'asc' ? signup_orderBy : "-" + signup_orderBy,
-              length: signup_rowsPerPage,
-              page: signup_page,
-              search: signup_searchValue.trim(),
-              pagename: 'company'
-            })).then(function () {
-              return dispatch(stopDataFetchingStatus());
-            });
-          }
-        })["catch"](function (err) {
-          console.log(err);
+      onClick: function onClick() {
+        return dispatch(undoneSignUpRejection(id));
+      }
+    }));
+  };
+  var handleRejectUserClick = function handleRejectUserClick(userId) {
+    dispatch(rejectUserVerification(userId)).then(function (res) {
+      var _res$data;
+      console.log(res);
+      IUIToastMessageService$7.undoNotify( /*#__PURE__*/React.createElement(UndoButton, {
+        msg: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.message) || 'Sign-up request rejected',
+        id: userId
+      }));
+      if (res.status === true) {
+        dispatch(showDataFetchingStatus());
+        dispatch(fetchUserSignupRequests({
+          ordering: signup_order === 'asc' ? signup_orderBy : "-" + signup_orderBy,
+          length: signup_rowsPerPage,
+          page: signup_page,
+          search: signup_searchValue.trim()
+        })).then(function () {
+          return dispatch(stopDataFetchingStatus());
         });
       }
-      IUIToastMessageService$7.setUndoClicked(false);
+    })["catch"](function (err) {
+      console.log(err);
     });
   };
   var handleBulkActionHistoryClick = function handleBulkActionHistoryClick() {
@@ -9017,25 +8645,12 @@ var UserList = function UserList(_ref2) {
   };
   var deselectingCheckboxHandler = function deselectingCheckboxHandler(page) {
     var _extends2;
-    var selectedId = [];
-    var _selectedUsersNotApprover = [].concat(selectedUsersNotApprover);
-    var _selectedUsersApprover = [].concat(selectedUsersApprover);
-    var _newSelecteds = newSelecteds.filter(function (n) {
+    var newSelecteds = userListInfo.results.filter(function (n) {
       return n.is_active;
+    }).map(function (obj) {
+      return obj.id.toString();
     });
-    _newSelecteds.map(function (obj) {
-      if (selected && !Object.values(selected).flat().includes(obj.id.toString())) {
-        if (obj.roles.is_approver === true) {
-          _selectedUsersApprover.push(obj);
-        } else if (obj.roles.is_approver === false) {
-          _selectedUsersNotApprover.push(obj);
-        }
-      }
-      selectedId.push(obj.id.toString());
-    });
-    setSelected(_extends({}, selected, (_extends2 = {}, _extends2[page] = selectedId, _extends2)));
-    setSelectedUsersNotApprover(_selectedUsersNotApprover);
-    setSelectedUsersApprover(_selectedUsersApprover);
+    setSelected(_extends({}, selected, (_extends2 = {}, _extends2[page] = newSelecteds, _extends2)));
   };
   var handleSelectAllClick = function handleSelectAllClick(event, page) {
     var _extends3;
@@ -9053,156 +8668,58 @@ var UserList = function UserList(_ref2) {
     setSortingChangeTemp(!isSortingChangeTemp);
   };
   var onSearchHandler = function onSearchHandler(value) {
-    setPage(1);
     setSearchValue(value);
     setSearchingChange(true);
     setSearchingChangeTemp(!isSearchingChangeTemp);
   };
   var onSignUpReqeustSearchHandler = function onSignUpReqeustSearchHandler(value) {
-    setPage(1);
     set_signup_SearchValue(value);
     setSignUpSearchingChange(true);
     setSignUpSearchingChangeTemp(!isSignUpSearchingChangeTemp);
   };
-  var handleSingleCheckBoxClick = function handleSingleCheckBoxClick(event, id, page, data) {
+  var handleSingleCheckBoxClick = function handleSingleCheckBoxClick(event, id, page) {
     var _extends4;
     var selectedTemp = _extends({}, selected);
     if (!(page in selectedTemp)) {
       selectedTemp[page] = [];
     }
     var selectedIndex = selectedTemp[page].indexOf(id);
-    var _newSelected = [];
+    var newSelected = [];
     if (selectedIndex === -1) {
-      _newSelected = _newSelected.concat(selectedTemp[page], id);
+      newSelected = newSelected.concat(selectedTemp[page], id);
     } else if (selectedIndex === 0) {
-      _newSelected = _newSelected.concat(selectedTemp[page].slice(1));
+      newSelected = newSelected.concat(selectedTemp[page].slice(1));
     } else if (selectedIndex === selectedTemp[page].length - 1) {
-      _newSelected = _newSelected.concat(selectedTemp[page].slice(0, -1));
+      newSelected = newSelected.concat(selectedTemp[page].slice(0, -1));
     } else if (selectedIndex > 0) {
-      _newSelected = _newSelected.concat(selectedTemp[page].slice(0, selectedIndex), selectedTemp[page].slice(selectedIndex + 1));
+      newSelected = newSelected.concat(selectedTemp[page].slice(0, selectedIndex), selectedTemp[page].slice(selectedIndex + 1));
     }
-    var _SelectedUsersNotApprover = [].concat(selectedUsersNotApprover);
-    var _SelectedUsersApprover = [].concat(selectedUsersApprover);
-    if (Object.values(selected).flat().includes(id.toString())) {
-      _SelectedUsersNotApprover = selectedUsersNotApprover.filter(function (item) {
-        return id !== item.id.toString();
-      });
-      _SelectedUsersApprover = selectedUsersApprover.filter(function (item) {
-        return item.id.toString() !== id;
-      });
-    } else if (data !== null && data !== void 0 && data.roles) {
-      if (data.roles.is_approver === true) {
-        _SelectedUsersApprover.push(data);
-      } else if (data.roles.is_approver === false) {
-        _SelectedUsersNotApprover.push(data);
-      }
-    }
-    setSelectedUsersNotApprover(_SelectedUsersNotApprover);
-    setSelectedUsersApprover(_SelectedUsersApprover);
-    setSelected(_extends({}, selected, (_extends4 = {}, _extends4[page] = _newSelected, _extends4)));
+    setSelected(_extends({}, selected, (_extends4 = {}, _extends4[page] = newSelected, _extends4)));
   };
-  useEffect(function () {
-    setApproverRole({
-      value: '',
-      label: 'Select approver'
-    });
-    setDefaultId(null);
-    setIsDisabledSubmitBtn(true);
-    setApproveeStatus(false);
-    if (deactivateSingle === true) {
-      api$7.get(userAddEditUrl.transferAppover() + "user_id=" + user.id + "&page=1").then(function (response) {
-        if (response.data["default"].id) {
-          setDefaultId(response.data["default"].id);
-          setApproverRole({
-            value: '',
-            label: response.data["default"].email
-          });
-          setIsDisabledSubmitBtn(false);
-          setApproveeStatus(response.data["default"].approvee_status);
-        }
-      });
-    }
-  }, [deactivateSingle]);
   var handleChangeRowsPerPage = function handleChangeRowsPerPage(event) {
     setRowsPerPage(+event.target.value);
     setPage(1);
     setSelected({});
-    setSelectedUsersNotApprover([]);
-    setSelectedUsersApprover([]);
     setSortingChange(true);
     setSortingChangeTemp(!isSortingChangeTemp);
   };
   var handleActiveUser = function handleActiveUser(e, id, page) {
     var isActive = e.target.checked;
-    var _isApprover;
-    newSelecteds.map(function (item) {
-      if (item.id === id) {
-        _isApprover = item.roles.is_approver;
-        if (_isApprover === true && isActive === false) {
-          setDeactivateSingle(true);
-          setDeactivateUser(item.first_name + ' ' + item.last_name);
-          setUser(item);
-        } else {
-          dispatch(updateActiveStatus(e.target.checked ? 1 : 0, e.target.id, _isApprover)).then(function () {
-            if (!isActive) {
-              if (Object.values(selected).flat().includes(id.toString())) {
-                var _extends5;
-                var selectedTemp = _extends({}, selected);
-                var _selectedUsersApprover = [].concat(selectedUsersApprover);
-                var _selectedUsersNotApprover = [].concat(selectedUsersNotApprover);
-                selectedTemp[page].splice(selectedTemp[page].indexOf(id.toString()), 1);
-                _selectedUsersApprover = _selectedUsersApprover.filter(function (item) {
-                  return item.id != id;
-                });
-                _selectedUsersNotApprover = _selectedUsersNotApprover.filter(function (item) {
-                  return item.id != id;
-                });
-                setSelected(_extends({}, selected, (_extends5 = {}, _extends5[page] = selectedTemp[page], _extends5)));
-                setSelectedUsersApprover(_selectedUsersApprover);
-                setSelectedUsersNotApprover(_selectedUsersNotApprover);
-              }
-            }
-          });
+    dispatch(updateActiveStatus(e.target.checked ? 1 : 0, e.target.id)).then(function () {
+      if (!isActive) {
+        if (Object.values(selected).flat().includes(id.toString())) {
+          var _extends5;
+          var selectedTemp = _extends({}, selected);
+          selectedTemp[page].splice(selectedTemp[page].indexOf(id.toString()), 1);
+          setSelected(_extends({}, selected, (_extends5 = {}, _extends5[page] = selectedTemp[page], _extends5)));
         }
       }
     });
   };
-  var selectApprover = function selectApprover(_ref4) {
-    var _value = _ref4._value;
-    if (_value.data.approvee_status) {
-      setApproveeStatus(true);
-    } else {
-      setApproveeStatus(false);
-    }
-    setDefaultId(_value.data.id);
-    setApproverRole(_value);
-    setIsDisabledSubmitBtn(false);
-  };
-  var handleDeactivateUser = function handleDeactivateUser() {
-    dispatch(updateActiveStatus(0, user.id, user.roles.is_approver, defaultId));
-    setOpenDeActivateModalFlag(false);
-    setDeactivateSingle(false);
-    setSelected({});
-    setSelectedUsersNotApprover([]);
-    setSelectedUsersApprover([]);
-  };
   var handleDeactivateUsers = function handleDeactivateUsers() {
     dispatch(deActivateUsers(Object.values(selected).flat()));
     setOpenDeActivateModalFlag(false);
     setSelected({});
-    setSelectedUsersNotApprover([]);
-    setSelectedUsersApprover([]);
-    setIsBulkDeactivateModalOpen(false);
-  };
-  var handleDeactivateSafeUsers = function handleDeactivateSafeUsers() {
-    var _selectedUsersNotApprover = selectedUsersNotApprover.map(function (item) {
-      return item.id;
-    });
-    dispatch(deActivateUsers(_selectedUsersNotApprover));
-    setIsBulkDeactivateModalOpen(false);
-    setSelected({});
-    setSelectedUsersNotApprover([]);
-    setSelectedUsersApprover([]);
   };
   var importUserHandler = function importUserHandler() {
     setOpenImportUsersModal(true);
@@ -9214,43 +8731,6 @@ var UserList = function UserList(_ref2) {
     setOpenImportUsersModal(false);
     handleImportPagenavigation(jobId);
   };
-  var onResetPasswordHandler = function onResetPasswordHandler(email) {
-    dispatch(resetPasswordForUser({
-      email: email
-    }));
-  };
-  var toggleInviteModal = function toggleInviteModal(ids, type, firstName, lastName) {
-    if (type === undefined) {
-      if (Object.values(selected).flat().length === 0 || Object.values(selected).flat() === undefined) {
-        IUIToastMessageService$7.warningNotify('Select at least one user to invite.');
-        return false;
-      }
-    }
-    setUserIds(ids);
-    setUserFirstName(firstName);
-    setUserLastName(lastName);
-    setToggleInviteModal(!showInviteModal);
-  };
-  var toggleInviteModalClose = function toggleInviteModalClose() {
-    setToggleInviteModal(!showInviteModal);
-  };
-  var onResendInviteHandler = function onResendInviteHandler() {
-    var userIdArr = [];
-    if (userIds && !isNaN(userIds)) {
-      userIdArr = [userIds];
-    } else if (Object.keys(selected).length) {
-      Object.values(selected).map(function (val, i) {
-        if (val.length) {
-          val.map(function (idx, i) {
-            userIdArr.push(idx);
-          });
-        }
-      });
-    }
-    setUserIds('');
-    dispatch(resendInviteForUser(userIdArr));
-    setToggleInviteModal(!showInviteModal);
-  };
   var handleExportUsers = function handleExportUsers() {
     try {
       setDownlStatus(true);
@@ -9290,9 +8770,6 @@ var UserList = function UserList(_ref2) {
   }, {
     label: 'Bulk action history',
     handler: handleBulkActionHistoryClick
-  }, {
-    label: 'Resend invite',
-    handler: toggleInviteModal
   }];
   useEffect(function () {
     var roleCanAccess = ['travel_itilite_admin', 'travel_admin', 'expense_itilite_admin', 'expense_admin'];
@@ -9304,9 +8781,6 @@ var UserList = function UserList(_ref2) {
       userId: userId
     }));
   };
-  var knowMore = function knowMore() {
-    window.open('https://itilite.notion.site/All-about-deactivating-users-77554de1fb494832ac7e344ca14277f0', '_blank');
-  };
   var dispatch = useDispatch();
   useEffect(function () {
     if (isTokenVerified === true) {
@@ -9320,7 +8794,6 @@ var UserList = function UserList(_ref2) {
           dispatch(fetchUsersList(url)).then(function () {
             setSearchingChange(false);
             setisApiFetching(false);
-            scrollTo('table-root');
           });
         }, 1000);
         return function () {
@@ -9334,8 +8807,7 @@ var UserList = function UserList(_ref2) {
             ordering: signup_order === 'asc' ? signup_orderBy : "-" + signup_orderBy,
             length: signup_rowsPerPage,
             page: signup_page,
-            search: signup_searchValue.trim(),
-            pagename: 'company'
+            search: signup_searchValue.trim()
           })).then(function () {
             setSignUpSearchingChange(false);
             setisApiFetching(false);
@@ -9347,7 +8819,6 @@ var UserList = function UserList(_ref2) {
       }
       if (isSortingChange) {
         setisApiFetching(true);
-        scrollTo('table-root');
         dispatch(fetchUsersList(url)).then(function () {
           setisApiFetching(false);
           setSortingChange(false);
@@ -9362,8 +8833,7 @@ var UserList = function UserList(_ref2) {
           ordering: signup_order === 'asc' ? signup_orderBy : "-" + signup_orderBy,
           length: signup_rowsPerPage,
           page: signup_page,
-          search: signup_searchValue.trim(),
-          pagename: 'company'
+          search: signup_searchValue.trim()
         })).then(function () {
           setisApiFetching(false);
           setSignUpSortingChange(false);
@@ -9379,8 +8849,7 @@ var UserList = function UserList(_ref2) {
             ordering: signup_order === 'asc' ? signup_orderBy : "-" + signup_orderBy,
             length: signup_rowsPerPage,
             page: signup_page,
-            search: signup_searchValue.trim(),
-            pagename: 'company'
+            search: signup_searchValue.trim()
           })).then(function () {
             return dispatch(stopDataFetchingStatus());
           });
@@ -9388,89 +8857,15 @@ var UserList = function UserList(_ref2) {
       }
     }
   }, [isTokenVerified, isSearchingChangeTemp, isSortingChangeTemp, isSignUpSearchingChangeTemp, isSignUpSortingChangeTemp]);
-  var topRightButtons = function topRightButtons() {
-    return /*#__PURE__*/React.createElement(IUIBox, {
-      component: "div",
-      className: styles$5.buttonWrapper,
-      display: "flex",
-      justifyContent: "space-between",
-      alignItems: "center",
-      alignSelf: "flex-start"
-    }, /*#__PURE__*/React.createElement(IUIBox, {
-      component: "div",
-      className: clsx(styles$5.buttonSingle, styles$5.buttonLeft)
-    }, /*#__PURE__*/React.createElement(IUIButton, {
-      buttonText: "Export all users",
-      type: "outlined",
-      startIcon: /*#__PURE__*/React.createElement(BulkDownloadIcon, {
-        width: "22",
-        height: "22"
-      }),
-      onClick: handleExportUsers
-    })), /*#__PURE__*/React.createElement(IUIBox, {
-      component: "div",
-      className: clsx(styles$5.buttonSingle, styles$5.buttonLeft)
-    }, /*#__PURE__*/React.createElement(IUIDropdownButton, {
-      buttonText: "Bulk actions",
-      type: "outlined",
-      menuListInfo: BulkUploadInfo
-    })), /*#__PURE__*/React.createElement(IUIBox, {
-      component: "div",
-      className: "pageHeader--button-single button-right"
-    }, /*#__PURE__*/React.createElement(IUIButton, {
-      buttonText: "Add user",
-      type: "contained",
-      startIcon: /*#__PURE__*/React.createElement(AddIcon, {
-        width: "9",
-        height: "9",
-        color: "white"
-      }),
-      onClick: handleAddPageNavigation
-    })));
-  };
   return /*#__PURE__*/React.createElement(IUIBox, {
     component: "div",
     className: styles$5.UUIUserManagementList
-  }, overlayMenu ? /*#__PURE__*/React.createElement(Box, {
-    className: styles$5.scrollOverlayMenu
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    component: "div",
-    className: clsx(styles$5.pageHeader)
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    component: "div",
-    display: "flex",
-    justifyContent: "space-between",
-    alignItems: "center",
-    flexWrap: "wrap",
-    style: {
-      gap: '1rem'
-    }
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    component: "div",
-    display: "flex",
-    flexDirection: "column",
-    style: {
-      gap: '0.5rem'
-    }
-  }, /*#__PURE__*/React.createElement(IUISearch, {
-    placeholder: "Search by name, email & department",
-    value: searchValue,
-    onChangeHandler: function onChangeHandler(e) {
-      return onSearchHandler(e.target.value);
-    },
-    className: styles$5.overlaysearch
-  })), topRightButtons()), /*#__PURE__*/React.createElement(IUIBox, {
-    component: "div",
-    display: "flex",
-    justifyContent: "space-between",
-    alignItems: "center"
-  }))) : '', !hasVerificationError ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IUIBackdrop, {
+  }, !hasVerificationError ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IUIBackdrop, {
     open: isFileDownloading || isApiFetching,
     className: styles$5.backdrop
   }, /*#__PURE__*/React.createElement(IUICircularProgress, {
     color: "inherit"
   })), isDataFetching ? /*#__PURE__*/React.createElement(SkeletonLoader, null) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IUIBox, {
-    id: "table-root",
     component: "div",
     className: clsx(styles$5.pageHeader)
   }, /*#__PURE__*/React.createElement(IUIBox, {
@@ -9495,7 +8890,44 @@ var UserList = function UserList(_ref2) {
   }, /*#__PURE__*/React.createElement(IUITypography, {
     variant: "h3",
     className: clsx(styles$5.heading, styles$5.headingLarge)
-  }, isILadmin && companyName ? companyName + " - Users" : 'Users'))), topRightButtons()), /*#__PURE__*/React.createElement(IUIBox, {
+  }, isILadmin && companyName ? companyName + " - Users" : 'Users'))), /*#__PURE__*/React.createElement(IUIBox, {
+    component: "div",
+    className: styles$5.buttonWrapper,
+    display: "flex",
+    justifyContent: "space-between",
+    alignItems: "center",
+    alignSelf: "flex-start"
+  }, /*#__PURE__*/React.createElement(IUIBox, {
+    component: "div",
+    className: clsx(styles$5.buttonSingle, styles$5.buttonLeft)
+  }, /*#__PURE__*/React.createElement(IUIButton, {
+    buttonText: "Export all users",
+    type: "outlined",
+    startIcon: /*#__PURE__*/React.createElement(BulkDownloadIcon, {
+      width: "22",
+      height: "22"
+    }),
+    onClick: handleExportUsers
+  })), /*#__PURE__*/React.createElement(IUIBox, {
+    component: "div",
+    className: clsx(styles$5.buttonSingle, styles$5.buttonLeft)
+  }, /*#__PURE__*/React.createElement(IUIDropdownButton, {
+    buttonText: "Bulk actions",
+    type: "outlined",
+    menuListInfo: BulkUploadInfo
+  })), /*#__PURE__*/React.createElement(IUIBox, {
+    component: "div",
+    className: "pageHeader--button-single button-right"
+  }, /*#__PURE__*/React.createElement(IUIButton, {
+    buttonText: "Add user",
+    type: "contained",
+    startIcon: /*#__PURE__*/React.createElement(AddIcon, {
+      width: "9",
+      height: "9",
+      color: "white"
+    }),
+    onClick: handleAddPageNavigation
+  })))), /*#__PURE__*/React.createElement(IUIBox, {
     component: "div",
     display: "flex",
     justifyContent: "space-between",
@@ -9540,9 +8972,7 @@ var UserList = function UserList(_ref2) {
         disableRowCheckbox: deactivatedUsers,
         searchValue: searchValue,
         isILadmin: isILadmin,
-        onPrimaryAdminHandler: onPrimaryAdminHandler,
-        onResetPasswordHandler: onResetPasswordHandler,
-        toggleInviteModal: toggleInviteModal
+        onPrimaryAdminHandler: onPrimaryAdminHandler
       }))
     }, {
       label: /*#__PURE__*/React.createElement(IUIBox, null, "Sign-up requests", ' ', /*#__PURE__*/React.createElement(TabLabelCount, {
@@ -9558,10 +8988,7 @@ var UserList = function UserList(_ref2) {
       }, /*#__PURE__*/React.createElement(IUITypography, {
         variant: "body2",
         className: clsx(styles$5.description)
-      }, "Verify and add users to allow them to start using ITILITE. Set up preferences for receiving sign up request updates in", ' ', /*#__PURE__*/React.createElement("span", {
-        onClick: redirectToNotifications,
-        className: clsx(config.routes.notification && 'iui__cursor-pointer iui__border--bottom_solid_black500-1')
-      }, "Notifications"))), /*#__PURE__*/React.createElement(SingupRequests, {
+      }, "Verify and add users to allow them to start using ITILITE. Set up preferences for receiving sign up request updates in Notifications.")), /*#__PURE__*/React.createElement(SingupRequests, {
         data: signupRequestListInfo,
         handleChangeRowsPerPage: function handleChangeRowsPerPage(event) {
           setSignUpRowsPerPage(+event.target.value);
@@ -9593,54 +9020,6 @@ var UserList = function UserList(_ref2) {
       }))
     }]
   }))), /*#__PURE__*/React.createElement(IUIModal, {
-    isOpen: deactivateSingle,
-    closeHandler: function closeHandler() {
-      setDeactivateSingle(false);
-    },
-    cancelLabel: "Cancel",
-    submitLabel: "Deactivate",
-    submitHandler: handleDeactivateUser,
-    headerText: "Deactivate this user?",
-    width: "400px",
-    subHanderText: "",
-    submitBtnClass: styles$5.deactivateBtn,
-    isDisabledSubmitBtn: isDisabledSubmitBtn,
-    modalClass: "deactivateSingleModal",
-    modalBodyStyle: {
-      overflowY: 'unset'
-    }
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: clsx(styles$5.deactivateSingle, 'iui__mb-16')
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: styles$5.deactivateAlert
-  }, /*#__PURE__*/React.createElement(InfoYellowIcon, {
-    width: "9",
-    height: "9"
-  }), /*#__PURE__*/React.createElement(IUITypography, {
-    variant: "body2"
-  }, /*#__PURE__*/React.createElement("b", null, deactivateUser), " is linked with following role. You can deactivate only once you transfer the role to another user. The changes will reflect subsequently.", ' ', /*#__PURE__*/React.createElement("span", {
-    onClick: knowMore,
-    className: "iui__cursor-pointer iui__border--bottom_solid_black500-1"
-  }, "Know more"))), /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__mt-15"
-  }, /*#__PURE__*/React.createElement(IUIAsyncSelect, {
-    isMove: true,
-    additional: {
-      page: 1,
-      product: 'travel',
-      userId: user.id
-    },
-    label: "Transfer approver role to",
-    value: approverRole,
-    onValueChange: selectApprover,
-    loadOption: transferRoleOptions,
-    disableText: "Please get in touch with your administrator to change this value.",
-    customLoadingText: "No results found"
-  }), approveeStatus && /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__d-flex iui__align-items-baseline iui__mr-5"
-  }, /*#__PURE__*/React.createElement(IUIBox, null, /*#__PURE__*/React.createElement(RedWarningIcon, null)), /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__font--para-normal iui__font--color-black500 iui__mt-5 iui__ml-5"
-  }, "The user you're deactivating is the approver of the user you're transferring the role to. If you continue, this user will become a self-approver"))))), /*#__PURE__*/React.createElement(IUIModal, {
     isOpen: Object.values(selected).flat().length > 0 && isOpenDeActivateModal,
     closeHandler: closeDeActivateModal,
     cancelLabel: "Cancel",
@@ -9666,124 +9045,7 @@ var UserList = function UserList(_ref2) {
     className: styles$5.headerText
   }, 'Are you sure you want to deactivate ' + Object.values(selected).flat().length.toString() + (Object.values(selected).flat().length === 1 ? ' user ?' : ' users ?')), /*#__PURE__*/React.createElement(IUITypography, {
     className: styles$5.description
-  }, "The", ' ', Object.values(selected).flat().length === 1 ? ' user ' : ' users ', "won\u2019t be able to access itilite platform"))), /*#__PURE__*/React.createElement(IUIModal, {
-    isOpen: isBulkDeactivateModalOpen,
-    closeHandler: closeDeActiveModal,
-    cancelLabel: "Cancel",
-    submitLabel: "Deactivate safe users",
-    isDisabledSubmitBtn: !((selectedUsersNotApprover === null || selectedUsersNotApprover === void 0 ? void 0 : selectedUsersNotApprover.length) > 0),
-    submitBtnClass: clsx(styles$5.deactivateSubmitBtn),
-    customButtonLabel: "Deactivate all users",
-    customButtonHandler: handleDeactivateUsers,
-    submitHandler: handleDeactivateSafeUsers,
-    width: "640px",
-    customButtonClass: clsx(styles$5.deactivateCustomButtonClass),
-    headerText: "Deactivate users?",
-    modalBodyStyle: {
-      maxHeight: 'calc(100vh - 50vh)'
-    }
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: clsx(styles$5.deactivateAlert, styles$5.warningSvg)
-  }, /*#__PURE__*/React.createElement(RedWarningIcon, {
-    color: "#9A6700",
-    size: "14"
-  }), /*#__PURE__*/React.createElement(IUITypography, {
-    variant: "body2"
-  }, "Some users are linked with approval roles. Deactivating these users will result in missing roles and approvers. Deactivate these users individually and transfer their roles to avoid missing roles. The changes will reflect subsequently.", ' ', /*#__PURE__*/React.createElement("span", {
-    onClick: knowMore,
-    className: "iui__cursor-pointer iui__border--bottom_solid_black500-1"
-  }, "Know more"))), /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__my-15"
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__font--para-large iui__font--weight-medium"
-  }, "Users with roles"), /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__font--color-black500 iui__font--size-sm iui__mt-2"
-  }, "Deactivating these users will affect the associated approval rules."), (selectedUsersApprover === null || selectedUsersApprover === void 0 ? void 0 : selectedUsersApprover.length) && selectedUsersApprover.map(function (item, index) {
-    var _item$data;
-    return /*#__PURE__*/React.createElement(IUIBox, {
-      key: index,
-      className: "iui__d-flex iui__justify-content-spaceBetween iui__align-items-center iui__mt-10"
-    }, /*#__PURE__*/React.createElement(IUIProfileBox, {
-      firstName: item.first_name,
-      lastName: item.last_name,
-      isLetterAvatar: "true",
-      primaryText: item.first_name + ' ' + item.last_name,
-      secondaryText: item.email,
-      letterAvatarTextColor: "black",
-      letterAvatarBackgroundColor: "#d3d3d3",
-      profilePath: (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data.profile_pic
-    }), /*#__PURE__*/React.createElement(RedWarningIcon, {
-      color: "#9A6700",
-      size: "14"
-    }));
-  })), selectedUsersNotApprover !== null && selectedUsersNotApprover !== void 0 && selectedUsersNotApprover.length ? /*#__PURE__*/React.createElement(IUIBox, null, /*#__PURE__*/React.createElement("hr", {
-    style: {
-      borderColor: '#E5E9ED'
-    }
-  }), /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__my-15"
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__font--para-large iui__font--weight-medium"
-  }, "Safe users"), /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__font--color-black500 iui__font--size-sm iui__mt-2"
-  }, "These users are not linked to any roles and can be deactivated safely."), (selectedUsersNotApprover === null || selectedUsersNotApprover === void 0 ? void 0 : selectedUsersNotApprover.length) && selectedUsersNotApprover.map(function (item, index) {
-    var _item$data2;
-    return /*#__PURE__*/React.createElement(IUIBox, {
-      key: index,
-      className: "iui__d-flex iui__justify-content-spaceBetween iui__align-items-center iui__mt-10"
-    }, /*#__PURE__*/React.createElement(IUIProfileBox, {
-      firstName: item.first_name,
-      lastName: item.last_name,
-      isLetterAvatar: "true",
-      primaryText: item.first_name + ' ' + item.last_name,
-      secondaryText: item.email,
-      letterAvatarTextColor: "black",
-      letterAvatarBackgroundColor: "#d3d3d3",
-      profilePath: (_item$data2 = item.data) === null || _item$data2 === void 0 ? void 0 : _item$data2.profile_pic
-    }));
-  }))) : null), /*#__PURE__*/React.createElement(IUIModal, {
-    isOpen: showInviteModal,
-    closeHandler: function closeHandler() {
-      return toggleInviteModalClose();
-    },
-    cancelLabel: "Cancel",
-    headerText: "Resend Invites?",
-    submitLabel: "Send",
-    submitHandler: function submitHandler() {
-      return onResendInviteHandler();
-    },
-    width: "400px",
-    modalBodyStyle: {
-      padding: '0px'
-    },
-    footerStyle: {
-      justifyContent: 'center'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex',
-      padding: '16px',
-      margin: '8px 24px',
-      border: '1px solid #FDE047',
-      background: '#FEFCE8',
-      borderRadius: '5px'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginRight: '5px'
-    }
-  }, /*#__PURE__*/React.createElement(InviteInfoIcon, null)), /*#__PURE__*/React.createElement("div", {
-    style: {
-      fontSize: '14px',
-      color: '#374151'
-    }
-  }, "This invitation will be sent to", ' ', /*#__PURE__*/React.createElement("span", {
-    style: {
-      fontSize: '14px',
-      color: '#374151',
-      fontWeight: 'bold'
-    }
-  }, userFirstName != null ? userFirstName + " " + userLastName : 'selected users'), ", who have not logged into the platform."))), /*#__PURE__*/React.createElement(BulkUploadModal, {
+  }, "The", ' ', Object.values(selected).flat().length === 1 ? ' user ' : ' users ', "won\u2019t be able to access itilite platform"))), /*#__PURE__*/React.createElement(BulkUploadModal, {
     isOpenImportUsersModal: isOpenImportUsersModal,
     closeImportUsersModal: closeImportUsersModal,
     closeImportModal: closeImportModal
@@ -9792,8 +9054,8 @@ var UserList = function UserList(_ref2) {
     errMsg: hasVerificationError
   }));
 };
-var TabLabelCount = function TabLabelCount(_ref5) {
-  var count = _ref5.count;
+var TabLabelCount = function TabLabelCount(_ref3) {
+  var count = _ref3.count;
   return /*#__PURE__*/React.createElement(IUIBox, {
     className: styles$5.TabLabelCount
   }, " ", count, " ");
@@ -9868,12 +9130,11 @@ function Header(props) {
   })));
 }
 
-var styles$7 = {"sidebar__container":"_1EFxC","sidebar__wrapper":"_3Mk3_","sidebar__navlinks":"_29KVG","sidebar__navlinks-title":"_2Eg7m","MuiListItem-button":"_3yWwI","Mui-selected":"_3Ou88","rowText":"_2XKxl","lightColor":"_3uyfh","buttonWidth":"_13tv0","readOnlyInput":"_3yYuQ","addUserButton":"_1zbr_","alertDescContainer":"_3h8DM","onBoardText":"_HUoW-","iconStyle":"_3k0Fb","iconLayout":"_v3GT2","baseAlert":"_12zY5","headingWrapper":"_20Qv9","pageHeader":"_36au5","description":"_tULrl","headerText":"_3W_ZV","tableContainer":"_3xdGF"};
+var styles$7 = {"sidebar__container":"_1EFxC","sidebar__wrapper":"_3Mk3_","sidebar__navlinks":"_29KVG","sidebar__navlinks-title":"_2Eg7m","MuiListItem-button":"_3yWwI","Mui-selected":"_3Ou88","buttonWidth":"_13tv0","onBoardText":"_HUoW-","iconStyle":"_3k0Fb","iconLayout":"_v3GT2","baseAlert":"_12zY5","headingWrapper":"_20Qv9","pageHeader":"_36au5","description":"_tULrl","headerText":"_3W_ZV","tableContainer":"_3xdGF"};
 
 function Listview(_ref) {
   var data = _ref.data,
     name = _ref.name,
-    tableName = _ref.tableName,
     handleEditDialog = _ref.handleEditDialog,
     handleDeleteDialog = _ref.handleDeleteDialog,
     orderBy = _ref.orderBy,
@@ -9886,87 +9147,21 @@ function Listview(_ref) {
     handleChangePage = _ref$handleChangePage === void 0 ? function () {} : _ref$handleChangePage,
     page = _ref.page,
     rowsPerPage = _ref.rowsPerPage;
-  var deptHeadDetails = function deptHeadDetails(data) {
-    var _data$dept_head_detai;
-    if ((data === null || data === void 0 ? void 0 : (_data$dept_head_detai = data.dept_head_details) === null || _data$dept_head_detai === void 0 ? void 0 : _data$dept_head_detai.length) > 0) {
-      return data.dept_head_details[0].first_name + ' ' + data.dept_head_details[0].last_name;
-    }
-  };
   var columns = [{
     id: 'name',
     label: name,
-    width: '40%',
-    sortable: true,
-    cell: function cell(row) {
-      return /*#__PURE__*/React.createElement(IUIBox, {
-        component: "div"
-      }, row.name);
-    }
-  }, {
-    id: 'no_of_users',
-    label: 'Number of users',
-    width: '40%',
-    sortable: true,
-    cell: function cell(row) {
-      return /*#__PURE__*/React.createElement(IUIBox, {
-        component: "div"
-      }, row.no_of_users);
-    }
-  }, {
-    id: 'actions',
-    label: 'Actions',
-    width: '20%',
-    cell: function cell(row) {
-      return row.code !== UNASSIGNED_USERS && /*#__PURE__*/React.createElement(IUIBox, {
-        display: "flex"
-      }, /*#__PURE__*/React.createElement(IUIButton, {
-        buttonText: "Edit",
-        className: styles$7.buttonWidth,
-        onClick: function onClick() {
-          return handleEditDialog(row);
-        }
-      }), row.no_of_users > 0 ? /*#__PURE__*/React.createElement(IUIButton, {
-        buttonText: "Delete",
-        className: styles$7.buttonWidth,
-        onClick: function onClick() {
-          return handleDeleteDialog(row, true);
-        }
-      }) : /*#__PURE__*/React.createElement(IUIButton, {
-        buttonText: "Delete",
-        className: styles$7.buttonWidth,
-        onClick: function onClick() {
-          return handleDeleteDialog(row, false);
-        }
-      }));
-    }
-  }];
-  var departmentColumns = [{
-    id: 'name',
-    label: name,
-    width: '30%',
+    width: '45%',
     sortable: true,
     cell: function cell(row) {
       return /*#__PURE__*/React.createElement(IUIBox, {
         component: "div"
       }, row.name);
     }
-  }, {
-    id: 'department_head',
-    label: 'Department head',
-    width: '30%',
-    sortable: true,
-    cell: function cell(row) {
-      return /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(IUIBox, {
-        component: "div"
-      }, deptHeadDetails(row)), row.is_default_dept_head && /*#__PURE__*/React.createElement(IUITypography, {
-        className: clsx(styles$7.rowText, styles$7.textTransform, styles$7.lightColor)
-      }, "Assigned by default"));
-    }
   }, {
     id: 'no_of_users',
     label: 'Number of users',
     width: '45%',
-    sortable: false,
+    sortable: true,
     cell: function cell(row) {
       return /*#__PURE__*/React.createElement(IUIBox, {
         component: "div"
@@ -9975,7 +9170,7 @@ function Listview(_ref) {
   }, {
     id: 'actions',
     label: 'Actions',
-    width: '15%',
+    width: '10%',
     cell: function cell(row) {
       return row.code !== UNASSIGNED_USERS && /*#__PURE__*/React.createElement(IUIBox, {
         display: "flex"
@@ -10008,7 +9203,7 @@ function Listview(_ref) {
     hasFilter: true,
     isCheckboxTable: false,
     count: data.count,
-    columns: tableName === 'department' ? departmentColumns : columns,
+    columns: columns,
     rows: data.results,
     page: page,
     handleChangePage: handleChangePage,
@@ -10065,43 +9260,16 @@ function EditPanelDialog(_ref) {
   var isOpen = _ref.isOpen,
     closeHandler = _ref.closeHandler,
     onValueChange = _ref.onValueChange,
-    _submitHandler = _ref.submitHandler,
+    submitHandler = _ref.submitHandler,
     isError = _ref.isError,
     name = _ref.name,
     isDisabledSubmitBtn = _ref.isDisabledSubmitBtn,
-    validation = _ref.validation,
-    rowData = _ref.rowData,
-    tableName = _ref.tableName,
-    config = _ref.config;
+    validation = _ref.validation;
   var _useSelector = useSelector(function (state) {
       return state.userPanel;
     }),
     dialogData = _useSelector.dialogData;
-  var deptHeadDetails = function deptHeadDetails(data) {
-    var _data$dept_head_detai;
-    if ((data === null || data === void 0 ? void 0 : (_data$dept_head_detai = data.dept_head_details) === null || _data$dept_head_detai === void 0 ? void 0 : _data$dept_head_detai.length) > 0) {
-      setHead({
-        value: data.dept_head_details[0].id,
-        label: data.dept_head_details[0].first_name + ' ' + data.dept_head_details[0].last_name
-      });
-    }
-  };
-  var _useState = useState({
-      value: '',
-      label: 'Select'
-    }),
-    head = _useState[0],
-    setHead = _useState[1];
-  useEffect(function () {
-    deptHeadDetails(rowData);
-  }, [rowData]);
-  var history = useHistory();
-  var handleAddPageNavigation = function handleAddPageNavigation() {
-    history.push({
-      pathname: config.routes.users.add.path,
-      state: rowData
-    });
-  };
+
   return /*#__PURE__*/React.createElement(IUIModal, {
     isDisabledSubmitBtn: isDisabledSubmitBtn,
     isOpen: isOpen,
@@ -10109,60 +9277,27 @@ function EditPanelDialog(_ref) {
     headerText: "Edit " + name.toLowerCase(),
     cancelLabel: (_dialogData$labels = dialogData.labels) === null || _dialogData$labels === void 0 ? void 0 : _dialogData$labels.cancelLabel,
     submitLabel: (_dialogData$labels2 = dialogData.labels) === null || _dialogData$labels2 === void 0 ? void 0 : _dialogData$labels2.submitLabel,
-    submitHandler: function submitHandler() {
-      return _submitHandler(head);
-    },
-    width: tableName === 'department' ? '400px' : '365px',
+    submitHandler: submitHandler,
+    width: "365px",
     hideCloseIcon: false,
     modalBodyStyle: {
-      overflowY: 'visible'
+      maxHeight: '400px',
+      overflow: 'auto',
+      margin: '0px'
     },
     footerStyle: {
       justifyContent: 'end'
     }
-  }, tableName === 'department' && rowData.no_of_users === 0 && /*#__PURE__*/React.createElement(IUIBox, {
-    display: "flex",
-    justifyContent: "center",
-    alignItems: "center",
-    flexDirection: "column",
-    style: {
-      marginBottom: '30px'
-    }
   }, /*#__PURE__*/React.createElement(IUIBox, {
+    component: "div",
     display: "flex",
     justifyContent: "center",
     alignItems: "center",
     flexDirection: "column",
-    className: styles$7.baseAlert
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: styles$7.alertDescContainer
-  }, /*#__PURE__*/React.createElement(IUIBox, {
-    className: styles$7.iconLayout,
-    style: {
-      paddingTop: '4px'
-    }
-  }, /*#__PURE__*/React.createElement(BoldInfoIcon, {
-    color: "#CA8A04",
-    width: "25",
-    height: "20",
-    className: styles$7.iconStyle
-  })), /*#__PURE__*/React.createElement(IUILabel, {
-    label: "By default, the primary admin gets assigned as the department head. This department has no users, so to change department head, add a new user.",
-    style: {
-      fontWeight: 'normal'
-    }
-  })), /*#__PURE__*/React.createElement(IUIButton, {
-    buttonText: "Add user",
-    type: "text",
-    startIcon: /*#__PURE__*/React.createElement(AddIcon, {
-      width: "9",
-      height: "9",
-      color: "#EC5D25"
-    }),
-    onClick: handleAddPageNavigation,
-    className: styles$7.addUserButton
-  }))), /*#__PURE__*/React.createElement(IUIInput, {
-    label: name + " name",
+    padding: "8px 24px"
+  }, /*#__PURE__*/React.createElement(IUIInput, {
+    label: name + " name"
+    ,
     name: "name",
     defaultValue: dialogData.data.name,
     onValueChange: onValueChange,
@@ -10170,49 +9305,7 @@ function EditPanelDialog(_ref) {
     isError: isError,
     validation: validation,
     errorMsg: "Please enter " + name.toLowerCase() + " name.",
-    required: true,
-    style: tableName === 'department' && {
-      width: '350px'
-    }
-  }), tableName === 'department' && rowData.no_of_users === 0 && /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__mt-15",
-    style: {
-      width: '100%'
-    }
-  }, /*#__PURE__*/React.createElement(IUIInput, {
-    label: "Department head",
-    name: "name",
-    defaultValue: head.label,
-    placeholder: "",
-    readOnly: true,
-    style: {
-      width: '350px'
-    }
-  })), tableName === 'department' && rowData.no_of_users > 0 && /*#__PURE__*/React.createElement(IUIBox, {
-    className: "iui__mt-15",
-    style: {
-      width: '100%'
-    }
-  }, /*#__PURE__*/React.createElement(IUIAsyncSelect, {
-    noResultsText: true,
-    isMove: true,
-    additional: {
-      page: 1,
-      departmentId: rowData.id
-    },
-    placeHolderCheck: head !== undefined && head.value === '',
-    label: "Department head",
-    value: head,
-    onValueChange: function onValueChange(_ref2) {
-      var _value = _ref2._value;
-      return setHead(_value);
-    },
-    loadOption: departmentHeadOptions,
-    disableText: "Please get in touch with your administrator to change this value.",
-    customLoadingText: "No users found in this department",
-    customLoadingTextStyle: {
-      color: '#374151'
-    }
+    required: true
   })));
 }
 
@@ -10391,15 +9484,12 @@ var UserPanel = function UserPanel(_ref) {
   var _useState13 = useState(false),
     isSortingChangeTemp = _useState13[0],
     setSortingChangeTemp = _useState13[1];
-  var _useState14 = useState([]),
-    rowData = _useState14[0],
-    setRowData = _useState14[1];
-  var _useState15 = useState(1),
-    page = _useState15[0],
-    setPage = _useState15[1];
-  var _useState16 = useState(5),
-    rowsPerPage = _useState16[0],
-    setRowsPerPage = _useState16[1];
+  var _useState14 = useState(1),
+    page = _useState14[0],
+    setPage = _useState14[1];
+  var _useState15 = useState(5),
+    rowsPerPage = _useState15[0],
+    setRowsPerPage = _useState15[1];
   var orderingParam = orderBy;
   var _useSelector = useSelector(function (state) {
       return state.userPanel;
@@ -10412,25 +9502,18 @@ var UserPanel = function UserPanel(_ref) {
     }),
     isTokenVerified = _useSelector2.isTokenVerified,
     hasVerificationError = _useSelector2.hasVerificationError;
+
   var onValueChange = function onValueChange(_ref2) {
     var _value = _ref2._value;
     var validatedValue = _value.replace(/\s+/g, ' ').trim();
     setDataList(validatedValue);
   };
-  var _useState17 = useState(70),
-    maxLengthForModal = _useState17[0],
-    setMaxLengthForModal = _useState17[1];
-  useEffect(function () {
-    if (title === 'Business unit') {
-      setMaxLengthForModal(150);
-    }
-  }, []);
   var validation = {
     regexOnChange: /^[(A-Z)(a-z)(0-9)&'\-_.,/: ]*$/,
     regexOnBlur: null,
     maxLimit: '',
     minLimit: '',
-    maxLength: maxLengthForModal,
+    maxLength: 70,
     minLength: 0
   };
   useEffect(function () {
@@ -10503,7 +9586,6 @@ var UserPanel = function UserPanel(_ref) {
       submitLabel: 'Save'
     }, '', data));
     setDataList(data.name);
-    setRowData(data);
     setEditModal(true);
   };
   var closeEditDialog = function closeEditDialog() {
@@ -10518,12 +9600,6 @@ var UserPanel = function UserPanel(_ref) {
       var payload = {
         names: [dataList]
       };
-      if (tableName === 'department') {
-        payload = {
-          name: dataList,
-          department_head_id: null
-        };
-      }
       var message = title + " added successfully.";
       handleApiCall(addRecord, payload, message, 'add');
     } else {
@@ -10537,12 +9613,10 @@ var UserPanel = function UserPanel(_ref) {
     var message = title + " deleted successfully.";
     handleApiCall(deleteRecord, payload, message, 'delete');
   };
-  var handleApiCall = function handleApiCall(dispatchFun, payload, message, type, optionalParams) {
-    if (optionalParams === void 0) {
-      optionalParams = null;
-    }
+
+  var handleApiCall = function handleApiCall(dispatchFun, payload, message, type) {
     dispatch(userPanelShowLoader());
-    dispatch(dispatchFun(tableName, payload, getApiData(), optionalParams)).then(function (res) {
+    dispatch(dispatchFun(tableName, payload, getApiData())).then(function (res) {
       IUIToastMessageService$8.sNotify(type === 'move' ? res.data.message : "" + message);
       dispatch(userPanelStopLoader());
       if (type === 'delete') {
@@ -10584,14 +9658,8 @@ var UserPanel = function UserPanel(_ref) {
           name: dataList
         }]
       };
-      if (tableName === 'department') {
-        payload = {
-          name: dataList,
-          department_head_id: data.value === '' || rowData.is_default_dept_head && rowData.dept_head === data.value ? null : data.value
-        };
-      }
       var message = title + " updated successfully.";
-      handleApiCall(editRecord, payload, message, 'edit', dialogData.data.id);
+      handleApiCall(editRecord, payload, message, 'edit');
       setErrorEdit(false);
     } else {
       setErrorEdit(true);
@@ -10698,10 +9766,7 @@ var UserPanel = function UserPanel(_ref) {
     submitHandler: handleEditPanel,
     isError: errorEdit,
     isDisabledSubmitBtn: loading,
-    validation: validation,
-    rowData: rowData,
-    tableName: tableName,
-    config: config
+    validation: validation
   })) : /*#__PURE__*/React.createElement(VerificationError, {
     config: config
   }));