@itilite/iui-user-management 1.4.77342 → 1.5.0-beta-1

package/dist/index.js

@@ -185,7 +185,7 @@ function _finallyRethrows(body, finalizer) {
   return finalizer(false, result);
 }
 
-var styles = {"UUIUserManagementAddEdit":"_3n-WG","pageHeader":"_3qWcA","buttonWrapper":"_1IP9P","scrolled":"_m8f96","headingButtonWrapper":"_w9z7b","headingButtonWrapperProfile":"_12Wd9","hintText":"_ySdbZ","heading":"_2Y1Aw","headingLarge":"_2K1NF","headingMedium":"_RUuAz","headingSmall":"_23Dye","additionalInfoContainer":"_1Suhw","additionalInfoTitle":"_56iJF","titleContainer":"_H5nfl","expandIconAlign":"_3F4i0","detailsContainer":"_2G0LW","formWrapper":"_2fPRc","sectionWrapper":"_37Gqp","margin":"_2Sdl7","minGridWidth":"_2D7iu","firstRowMargin":"_1BozG","firstChildMargin":"_2C3Mb","paddingTop":"_DBPjV","backGrdColorOnHover":"_5oE6H","fieldMargin":"_RCWjq","productContainerGap":"_tuCbi","containerWidth":"_1oWos","productItemBroder":"_T0Hcd","headingPadding":"_2MFfQ","emptyFieldContainer":"_3VWtw","emptyFieldDescription":"_2jC5u","rowGap":"_1NJFY","formTitle":"_GAKk2","formDescription":"_3TZ6Z","themeLink":"_eJ_1B","dashedLine":"_3ZOs1","dividerColor":"_2pxEJ","errorTextCls":"_27eth","backdrop":"_Pm0Au","inputWidth":"_ajB82"};
+var styles = {"UUIUserManagementAddEdit":"_3n-WG","pageHeader":"_3qWcA","buttonWrapper":"_1IP9P","scrolled":"_m8f96","headingButtonWrapper":"_w9z7b","headingButtonWrapperProfile":"_12Wd9","hintText":"_ySdbZ","heading":"_2Y1Aw","headingLarge":"_2K1NF","headingMedium":"_RUuAz","headingSmall":"_23Dye","additionalInfoContainer":"_1Suhw","additionalInfoTitle":"_56iJF","titleContainer":"_H5nfl","expandIconAlign":"_3F4i0","detailsContainer":"_2G0LW","formWrapper":"_2fPRc","sectionWrapper":"_37Gqp","margin":"_2Sdl7","minGridWidth":"_2D7iu","firstRowMargin":"_1BozG","firstChildMargin":"_2C3Mb","paddingTop":"_DBPjV","backGrdColorOnHover":"_5oE6H","fieldMargin":"_RCWjq","productContainerGap":"_tuCbi","containerWidth":"_1oWos","productItemBroder":"_T0Hcd","headingPadding":"_2MFfQ","emptyFieldContainer":"_3VWtw","emptyFieldDescription":"_2jC5u","rowGap":"_1NJFY","formTitle":"_GAKk2","formDescription":"_3TZ6Z","themeLink":"_eJ_1B","dashedLine":"_3ZOs1","dividerColor":"_2pxEJ","errorTextCls":"_27eth","backdrop":"_Pm0Au","inputWidth":"_ajB82","buttonRight":"_1lEyQ","containedDropdownBtn":"_3ymE1"};
 
 function r(e) {
   var t,
@@ -423,6 +423,9 @@ var userAddEditUrl = {
   setDefaultCard: function setDefaultCard(pmId, vendorId) {
     return env.getPaymentUrl() + "/api/v1/card/default";
   },
+  disablePaymentCard: function disablePaymentCard() {
+    return env.getPaymentUrl() + "/api/v1/card/status";
+  },
   verifyUserInfo: function verifyUserInfo(userId) {
     return "api/v1/onboarding/user-sign-up-info/" + userId + "?company_id=" + IUILocalStorageService.getCompanyId();
   },
@@ -839,7 +842,7 @@ var UserRole = function UserRole(_ref) {
 
 var styles$1 = {"defaultLabel":"_smjc4","card":"_3_S9J","cardNumber":"_36E9M","cardDigit":"_2pm-T","expiryDate":"_2tBnF","cardImage":"_3QvZh","visa":"_1IpBm","mastercard":"_2x6IX","amex":"_2a38S","discover":"_2vksl","diners":"_2kQRs","jcb":"_2bO1f","unionpay":"_2_jfu","is_nothing":"_1Lrzs","addCard":"_3711U","cardDeleteBtn":"_7Da2t","cardLabel":"_PQTex","defaultBtn":"_1_ArA","cursonPointer":"_1L115","sectionWrapper":"_VpUCK","margin":"_1Fs_D","minGridWidth":"_1hl-Z","firstRowMargin":"_1WZZj","firstChildMargin":"_IT_O_","paddingTop":"_Mhnl7","dividerColor":"_3ltFd"};
 
-var classes = {"sectionHeader":"_2d_OH","myCardsSection":"_3MNHj","companyCardsSection":"_34lN6","disabledNotice":"_1yV0j","cardsGrid":"_1oHGu","card":"_3ZTQc","moreIcon":"_3utA0","personal":"_duePd","corporate":"_3O33a","company":"_180_L","cardHeader":"_1eF61","cardTitleSection":"_2c40W","cardMaskedNumber":"_2Vlhq","cardName":"_bp-Mt","cardType":"_3l4HZ","menuButton":"_3TTEn","lockIcon":"_1S27X","cardDetails":"_IP2rg","cardNumber":"_7FOPe","cardExpiry":"_CI_p2","cardCvv":"_3Gzqu","cardUnhide":"_ivgBf","cardFooter":"_1WgPL","brandLogo":"_EV0l8","addCardButton":"_1oaCc","plusIcon":"_w9L5L"};
+var classes = {"disabledCard":"_3MVKj","expiredLabel":"_2_sgJ","expiresoonLabel":"_3G7La","sectionHeader":"_2d_OH","myCardsSection":"_3MNHj","companyCardsSection":"_34lN6","disabledNotice":"_1yV0j","cardsGrid":"_1oHGu","card":"_3ZTQc","moreIcon":"_3utA0","personal":"_duePd","corporate":"_3O33a","company":"_180_L","cardHeader":"_1eF61","cardTitleSection":"_2c40W","cardMaskedNumber":"_2Vlhq","cardName":"_bp-Mt","cardAlias":"_19m4v","cardType":"_3l4HZ","menuButton":"_3TTEn","lockIcon":"_1S27X","cardDetails":"_IP2rg","cardNumber":"_7FOPe","cardExpiry":"_CI_p2","cardCvv":"_3Gzqu","cardUnhide":"_ivgBf","cardFooter":"_1WgPL","brandLogo":"_EV0l8","addCardButton":"_1oaCc","plusIcon":"_w9L5L"};
 
 var SHOW_LOADER = 'SHOW_LOADER';
 var STOP_LOADER = 'STOP_LOADER';
@@ -856,6 +859,27 @@ var SET_PAYMENT_DETAILS = 'SET_PAYMENT_DETAILS';
 
 var env$1 = utils.configs.env;
 var IUILocalStorageService$1 = utils.services.IUILocalStorageService;
+var resolveMembershipName = function resolveMembershipName(membership) {
+  var _membership;
+  if (membership === void 0) {
+    membership = {};
+  }
+  if (((_membership = membership) === null || _membership === void 0 ? void 0 : _membership.membership_type) === 'rental_car') {
+    var _membership2, _membership3, _membership3$program_, _membership5, _membership6, _membership6$loyalty_;
+    if ((_membership2 = membership) !== null && _membership2 !== void 0 && _membership2.program_name && (_membership3 = membership) !== null && _membership3 !== void 0 && (_membership3$program_ = _membership3.program_name) !== null && _membership3$program_ !== void 0 && _membership3$program_.trim()) {
+      var _membership4, _membership4$program_;
+      return (_membership4 = membership) === null || _membership4 === void 0 ? void 0 : (_membership4$program_ = _membership4.program_name) === null || _membership4$program_ === void 0 ? void 0 : _membership4$program_.trim();
+    }
+    if ((_membership5 = membership) !== null && _membership5 !== void 0 && _membership5.loyalty_program_name && (_membership6 = membership) !== null && _membership6 !== void 0 && (_membership6$loyalty_ = _membership6.loyalty_program_name) !== null && _membership6$loyalty_ !== void 0 && _membership6$loyalty_.trim()) {
+      var _membership7, _membership7$loyalty_;
+      return (_membership7 = membership) === null || _membership7 === void 0 ? void 0 : (_membership7$loyalty_ = _membership7.loyalty_program_name) === null || _membership7$loyalty_ === void 0 ? void 0 : _membership7$loyalty_.trim();
+    } else {
+      return '';
+    }
+  } else {
+    return membership.name;
+  }
+};
 var formatCreateUserPayload = function formatCreateUserPayload(payload) {
   var _payload$employeeInfo, _payload$employeeInfo2, _payload$employeeInfo3, _payload$employeeInfo4, _payload$employeeInfo5, _payload$employeeInfo6, _payload$employeeInfo7, _payload$employeeInfo8, _payload$employeeInfo9, _payload$employeeInfo10;
   var res = {
@@ -899,6 +923,9 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
     approvers: {},
     requested_user_is_admin: payload.isCardsAdmin
   };
+  if (payload.send_welcome_email !== undefined) {
+    res.should_send_welcome_email = payload.send_welcome_email;
+  }
   var userTags = [];
   for (var key in payload.userTagType) {
     if (Object.hasOwnProperty.call(payload.userTagType, key) && payload.userTagType[key]) {
@@ -947,7 +974,7 @@ var formatCreateUserPayload = function formatCreateUserPayload(payload) {
           loyalty_program_id = _ref$loyalty_program_ === void 0 ? null : _ref$loyalty_program_;
         var res = {
           membership_type: membership.membership_type,
-          name: membership.name,
+          name: resolveMembershipName(membership),
           number: membership.number,
           iata_code: iata_code,
           loyalty_program_id: loyalty_program_id
@@ -1135,7 +1162,7 @@ var formatUpdateUserPayload = function formatUpdateUserPayload(payload, inputCha
           loyalty_program_id = _ref2$loyalty_program === void 0 ? null : _ref2$loyalty_program;
         var res = {
           membership_type: membership.membership_type,
-          name: membership.name,
+          name: resolveMembershipName(membership),
           number: membership.number,
           id: membership.id,
           iata_code: iata_code,
@@ -1355,9 +1382,9 @@ var updateActiveStatus = function updateActiveStatus(activateVal, id, roleTransf
   };
 };
 
-var api$2 = utils.configs.api;
-var IUIToastMessageService$1 = utils.services.IUIToastMessageService,
-  IUILocalStorageService$2 = utils.services.IUILocalStorageService;
+var api$2 = utils.configs.api,
+  paymentApi = utils.configs.paymentApi;
+var IUIToastMessageService$1 = utils.services.IUIToastMessageService;
 var showLoader = function showLoader() {
   return {
     type: SHOW_LOADER
@@ -1796,11 +1823,7 @@ var deletePaymentCard = function deletePaymentCard(payload) {
   return function (dispatch, getState) {
     return new Promise(function (resolve, reject) {
       dispatch(showLoader());
-      axios["delete"](userAddEditUrl.deletePaymentCard(payload.pmId, payload.vendorId), {
-        headers: {
-          Authorization: 'Bearer ' + IUILocalStorageService$2.getAccessToken()
-        }
-      }).then(function (res) {
+      paymentApi["delete"](userAddEditUrl.deletePaymentCard(payload.pmId, payload.vendorId)).then(function (res) {
         if (res.data.status) {
           resolve(res.data.result);
           var _paymentDetails = getState().userAddEdit.paymentDetails;
@@ -1827,11 +1850,7 @@ var setDefaultPaymentCard = function setDefaultPaymentCard(payload) {
   return function (dispatch, getState) {
     return new Promise(function (resolve, reject) {
       dispatch(showLoader());
-      axios.put(userAddEditUrl.setDefaultCard(), payload, {
-        headers: {
-          Authorization: 'Bearer ' + IUILocalStorageService$2.getAccessToken()
-        }
-      }).then(function (res) {
+      paymentApi.put(userAddEditUrl.setDefaultCard(), payload).then(function (res) {
         if (res.data.status) {
           resolve(res.data.result);
           var _paymentDetails = getState().userAddEdit.paymentDetails;
@@ -1845,13 +1864,13 @@ var setDefaultPaymentCard = function setDefaultPaymentCard(payload) {
           });
           dispatch(setPaymentDetails(_paymentDetails));
         } else {
-          var _res$data3;
-          IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.message) || 'Opps, Something went wrong.');
+          var _res$data4;
+          IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.message) || 'Opps, Something went wrong.');
           reject(res);
         }
       })["catch"](function (err) {
-        var _err$response15, _err$response15$data;
-        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response15 = err.response) === null || _err$response15 === void 0 ? void 0 : (_err$response15$data = _err$response15.data) === null || _err$response15$data === void 0 ? void 0 : _err$response15$data.message) || 'Opps, Something went wrong.');
+        var _err$response16, _err$response16$data;
+        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response16 = err.response) === null || _err$response16 === void 0 ? void 0 : (_err$response16$data = _err$response16.data) === null || _err$response16$data === void 0 ? void 0 : _err$response16$data.message) || 'Opps, Something went wrong.');
         reject(err);
       })["finally"](function () {
         dispatch(stopLoader());
@@ -1866,16 +1885,16 @@ var verifyUserInfo = function verifyUserInfo(userId) {
         if (res.data.status === 200) {
           resolve(res.data.result);
         } else {
-          var _res$data4;
-          IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.message) || 'Opps, Unable to fetch user info.');
+          var _res$data5;
+          IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.message) || 'Opps, Unable to fetch user info.');
           setTimeout(function () {
             window.history.back();
           }, 1000);
           reject(res);
         }
       })["catch"](function (err) {
-        var _err$response16, _err$response16$data;
-        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response16 = err.response) === null || _err$response16 === void 0 ? void 0 : (_err$response16$data = _err$response16.data) === null || _err$response16$data === void 0 ? void 0 : _err$response16$data.message) || 'Opps, Unable to fetch user info.');
+        var _err$response17, _err$response17$data;
+        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response17 = err.response) === null || _err$response17 === void 0 ? void 0 : (_err$response17$data = _err$response17.data) === null || _err$response17$data === void 0 ? void 0 : _err$response17$data.message) || 'Opps, Unable to fetch user info.');
         setTimeout(function () {
           window.history.back();
         }, 1000);
@@ -1890,8 +1909,8 @@ var submitAddModalData = function submitAddModalData(tableName, data) {
       api$2.post(tableName === 'department' ? departmentUrl.departmentUrl() : userAddEditUrl.dropdownList() + ("?action=add&table=" + tableName), data).then(function (res) {
         resolve(res);
       })["catch"](function (err) {
-        var _err$response17, _err$response17$data;
-        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response17 = err.response) === null || _err$response17 === void 0 ? void 0 : (_err$response17$data = _err$response17.data) === null || _err$response17$data === void 0 ? void 0 : _err$response17$data.message) || 'Opps, Something went wrong.');
+        var _err$response18, _err$response18$data;
+        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response18 = err.response) === null || _err$response18 === void 0 ? void 0 : (_err$response18$data = _err$response18.data) === null || _err$response18$data === void 0 ? void 0 : _err$response18$data.message) || 'Opps, Something went wrong.');
         dispatch(stopLoader());
       });
     });
@@ -1904,13 +1923,13 @@ var rejectUserVerification = function rejectUserVerification(userId) {
         if (res.data.status === true) {
           resolve(res.data);
         } else {
-          var _res$data5;
-          IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.message) || 'Opps, Unable to reject user.');
+          var _res$data6;
+          IUIToastMessageService$1.warningNotify((res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.message) || 'Opps, Unable to reject user.');
           reject(res);
         }
       })["catch"](function (err) {
-        var _err$response18, _err$response18$data;
-        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response18 = err.response) === null || _err$response18 === void 0 ? void 0 : (_err$response18$data = _err$response18.data) === null || _err$response18$data === void 0 ? void 0 : _err$response18$data.message) || 'Opps, Unable to reject user.');
+        var _err$response19, _err$response19$data;
+        IUIToastMessageService$1.warningNotify((err === null || err === void 0 ? void 0 : (_err$response19 = err.response) === null || _err$response19 === void 0 ? void 0 : (_err$response19$data = _err$response19.data) === null || _err$response19$data === void 0 ? void 0 : _err$response19$data.message) || 'Opps, Unable to reject user.');
         reject(err);
       });
     });
@@ -2049,7 +2068,7 @@ var SET_VERIFICATION_ERROR = 'SET_VERIFICATION_ERROR';
 var api$4 = utils.configs.api,
   env$2 = utils.configs.env;
 var common = utils.utilUrls.common;
-var IUILocalStorageService$3 = utils.services.IUILocalStorageService;
+var IUILocalStorageService$2 = utils.services.IUILocalStorageService;
 var setTokenResponse = function setTokenResponse(payload) {
   return {
     type: VERIFY_ACCESS_TOKEN,
@@ -2070,7 +2089,7 @@ var verifyAccessToken = function verifyAccessToken(roleCanAccess) {
     return new Promise(function (resolve, reject) {
       dispatch(setVerificationError(false));
       api$4.post(common.verifyToken(), {
-        client_id: +IUILocalStorageService$3.getClientId() || null,
+        client_id: +IUILocalStorageService$2.getClientId() || null,
         product: env$2.isExpense() ? 'expense' : 'travel'
       }).then(function (res) {
         if (res.data.status === true) {
@@ -2080,21 +2099,21 @@ var verifyAccessToken = function verifyAccessToken(roleCanAccess) {
             return;
           }
           if (env$2.isProfilePage()) {
-            IUILocalStorageService$3.setCompanyId(res.data.company);
+            IUILocalStorageService$2.setCompanyId(res.data.company);
             dispatch(setTokenResponse(res.data));
             dispatch(setVerificationError(false));
             if (env$2.isExpense()) {
-              IUILocalStorageService$3.setRole('submitter');
+              IUILocalStorageService$2.setRole('submitter');
             } else {
-              IUILocalStorageService$3.setRole('traveler');
+              IUILocalStorageService$2.setRole('traveler');
             }
             resolve();
             return;
           } else {
             for (var index = 0; index < res.data.applicable_role.length; index++) {
               if (roleCanAccess.includes(res.data.applicable_role[index])) {
-                IUILocalStorageService$3.setCompanyId(res.data.company);
-                IUILocalStorageService$3.setRole(res.data.applicable_role[index]);
+                IUILocalStorageService$2.setCompanyId(res.data.company);
+                IUILocalStorageService$2.setRole(res.data.applicable_role[index]);
                 dispatch(setTokenResponse(res.data));
                 dispatch(setVerificationError(false));
                 resolve();
@@ -2644,14 +2663,16 @@ var Visa = function Visa(props) {
   }))));
 };
 
-var IUILocalStorageService$4 = utils.services.IUILocalStorageService;
+var IUILocalStorageService$3 = utils.services.IUILocalStorageService;
 var env$3 = utils.configs.env;
 var CardsManagement = function CardsManagement(_ref) {
-  var _pg$gateway;
+  var _selectedCard$metadat, _pg$gateway;
   var _ref$paymentDetails = _ref.paymentDetails,
     paymentDetails = _ref$paymentDetails === void 0 ? {} : _ref$paymentDetails,
     _ref$paymentMethod = _ref.paymentMethod,
-    paymentMethod = _ref$paymentMethod === void 0 ? null : _ref$paymentMethod;
+    paymentMethod = _ref$paymentMethod === void 0 ? null : _ref$paymentMethod,
+    _ref$sendLog = _ref.sendLog,
+    sendLog = _ref$sendLog === void 0 ? function () {} : _ref$sendLog;
   var dispatch = reactRedux.useDispatch();
   var _ref2 = paymentDetails || {},
     _ref2$pg = _ref2.pg,
@@ -2673,8 +2694,16 @@ var CardsManagement = function CardsManagement(_ref) {
     setSelectedCard(null);
   };
   var handleMarkAsDefault = function handleMarkAsDefault() {
-    console.log('Mark as default:', selectedCard);
+    var _selectedCard$card;
     if (!pg || !selectedCard) return;
+    sendLog({
+      eventName: 'edit_card_clicked',
+      customProperties: {
+        action_type: 'Make default',
+        card_last4: (selectedCard === null || selectedCard === void 0 ? void 0 : (_selectedCard$card = selectedCard.card) === null || _selectedCard$card === void 0 ? void 0 : _selectedCard$card.last4) || ''
+      },
+      logImpression: true
+    });
     dispatch(setDefaultPaymentCard({
       user_id: +pg.user_id,
       method_id: selectedCard.id,
@@ -2684,13 +2713,21 @@ var CardsManagement = function CardsManagement(_ref) {
     handleMenuClose();
   };
   var handleDeleteCard = function handleDeleteCard() {
+    var _selectedCard$card2;
+    sendLog({
+      eventName: 'edit_card_clicked',
+      customProperties: {
+        action_type: 'Delete',
+        card_last4: (selectedCard === null || selectedCard === void 0 ? void 0 : (_selectedCard$card2 = selectedCard.card) === null || _selectedCard$card2 === void 0 ? void 0 : _selectedCard$card2.last4) || ''
+      },
+      logImpression: true
+    });
     dispatch(deletePaymentCard({
       pmId: selectedCard.id,
       vendorId: pg.vendor_id
     }));
     handleMenuClose();
   };
-  console.log('test mudu 22');
   var getBrandLogo = function getBrandLogo(brand) {
     var width = 40;
     var aspectRatio = 780 / 500;
@@ -2767,25 +2804,48 @@ var CardsManagement = function CardsManagement(_ref) {
       fill: "#2EA363"
     }));
   };
+  var personalCards = cards === null || cards === void 0 ? void 0 : cards.filter(function (card) {
+    return (card === null || card === void 0 ? void 0 : card.category) === 'Personal';
+  });
+  var corporateCards = cards === null || cards === void 0 ? void 0 : cards.filter(function (card) {
+    return (card === null || card === void 0 ? void 0 : card.category) === 'Corporate';
+  });
+  var companyCards = cards === null || cards === void 0 ? void 0 : cards.filter(function (card) {
+    return (card === null || card === void 0 ? void 0 : card.category) === 'Company';
+  });
+  var cardsCount = (personalCards === null || personalCards === void 0 ? void 0 : personalCards.length) + (corporateCards === null || corporateCards === void 0 ? void 0 : corporateCards.length);
   var renderCard = function renderCard(card) {
-    var _card$metadata, _card$card, _card$card2, _card$card3, _card$card4;
+    var _card$metadata, _clsx, _card$card, _card$card2, _card$card3, _card$card4;
     var isCompanyCard = (card === null || card === void 0 ? void 0 : card.category) === 'Company';
     var cardClass = getCardTypeClass(card === null || card === void 0 ? void 0 : card.category);
     var isDefaultCard = !!+(card === null || card === void 0 ? void 0 : (_card$metadata = card.metadata) === null || _card$metadata === void 0 ? void 0 : _card$metadata.default_card);
+    var isExpired = card.metadata.is_enabled === '2';
+    var isDisabled = card.metadata.is_enabled === '0' || isExpired;
+    var currentDate = new Date();
+    var cardExpDate = new Date(parseInt(card.card.exp_year, 10), parseInt(card.card.exp_month, 10) - 1);
+    var timeDiff = cardExpDate.getTime() - currentDate.getTime();
+    var daysToExpire = Math.ceil(timeDiff / (1000 * 3600 * 24));
+    var expiresSoon = daysToExpire <= 30 && !isExpired;
     return /*#__PURE__*/React__default.createElement("div", {
       key: card.id,
-      className: clsx(classes.card, classes[cardClass])
+      className: clsx(classes.card, classes[cardClass], (_clsx = {}, _clsx[classes.disabledCard] = isDisabled, _clsx))
     }, /*#__PURE__*/React__default.createElement("div", {
       className: classes.cardHeader
     }, /*#__PURE__*/React__default.createElement("div", {
       className: classes.cardTitleSection
     }, /*#__PURE__*/React__default.createElement("h3", {
       className: classes.cardName
-    }, card === null || card === void 0 ? void 0 : card.alias), /*#__PURE__*/React__default.createElement("span", {
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: classes.cardAlias
+    }, card === null || card === void 0 ? void 0 : card.alias), isExpired && /*#__PURE__*/React__default.createElement("span", {
+      className: classes.expiredLabel
+    }, "Expired"), expiresSoon && /*#__PURE__*/React__default.createElement("span", {
+      className: clsx(classes.expiresoonLabel, classes.expiredLabel)
+    }, "Expires Soon")), /*#__PURE__*/React__default.createElement("span", {
       className: classes.cardType
     }, getCardTypeLabel(card.category), isDefaultCard && /*#__PURE__*/React__default.createElement("span", null, ' (Default)'))), isCompanyCard ? /*#__PURE__*/React__default.createElement(LockIcon, {
       className: classes.lockIcon
-    }) : /*#__PURE__*/React__default.createElement(core.IconButton, {
+    }) :  /*#__PURE__*/React__default.createElement(core.IconButton, {
       size: "small",
       onClick: function onClick(e) {
         return handleMenuClick(e, card);
@@ -2794,7 +2854,7 @@ var CardsManagement = function CardsManagement(_ref) {
     }, /*#__PURE__*/React__default.createElement(MoreIcon, {
       className: clsx(classes.moreIcon, classes[cardClass]),
       color: isCompanyCard ? '#2EA363' : '#3D89FF'
-    }))), /*#__PURE__*/React__default.createElement("div", {
+    })) ), /*#__PURE__*/React__default.createElement("div", {
       className: classes.cardDetails
     }, /*#__PURE__*/React__default.createElement("div", {
       className: classes.cardNumber
@@ -2808,17 +2868,8 @@ var CardsManagement = function CardsManagement(_ref) {
       className: classes.cardFooter
     }, /*#__PURE__*/React__default.createElement("div", null), getBrandLogo(card === null || card === void 0 ? void 0 : (_card$card4 = card.card) === null || _card$card4 === void 0 ? void 0 : _card$card4.brand)));
   };
-  var personalCards = cards === null || cards === void 0 ? void 0 : cards.filter(function (card) {
-    return (card === null || card === void 0 ? void 0 : card.category) === 'Personal';
-  });
-  var corporateCards = cards === null || cards === void 0 ? void 0 : cards.filter(function (card) {
-    return (card === null || card === void 0 ? void 0 : card.category) === 'Corporate';
-  });
-  var companyCards = cards === null || cards === void 0 ? void 0 : cards.filter(function (card) {
-    return (card === null || card === void 0 ? void 0 : card.category) === 'Company';
-  });
-  var cardsCount = (personalCards === null || personalCards === void 0 ? void 0 : personalCards.length) + (corporateCards === null || corporateCards === void 0 ? void 0 : corporateCards.length);
-  var _url = env$3.getPaymentUrl() + ("/api/v1/auth/" + IUILocalStorageService$4.getAccessToken() + "/1/" + pg.entity_id + "/0/" + pg.vendor_id + "/1");
+  var _url = env$3.getPaymentUrl() + ("/api/v1/auth/" + IUILocalStorageService$3.getAccessToken() + "/1/" + pg.entity_id + "/0/" + pg.vendor_id + "/1");
+  var showMenuButton = cardsCount === 1 || cardsCount > 1 && !+(selectedCard === null || selectedCard === void 0 ? void 0 : (_selectedCard$metadat = selectedCard.metadata) === null || _selectedCard$metadat === void 0 ? void 0 : _selectedCard$metadat.default_card);
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginBottom: -20
@@ -2854,7 +2905,11 @@ var CardsManagement = function CardsManagement(_ref) {
   }) : null), console.log('cards', cards, 'cardsCount', cardsCount, pg), (!cards || cardsCount < 10) && (pg === null || pg === void 0 ? void 0 : (_pg$gateway = pg.gateway) === null || _pg$gateway === void 0 ? void 0 : _pg$gateway.toLowerCase()) === 'stripe' && (pg === null || pg === void 0 ? void 0 : pg.save_card_enable) === 1 && paymentMethod === 1 && /*#__PURE__*/React__default.createElement("button", {
     className: classes.addCardButton,
     onClick: function onClick() {
-      return window.location.assign(_url);
+      sendLog({
+        eventName: 'add_user_card_clicked',
+        logImpression: true
+      });
+      window.location.assign(_url);
     }
   }, /*#__PURE__*/React__default.createElement("span", {
     className: classes.plusIcon
@@ -2884,7 +2939,7 @@ var CardsManagement = function CardsManagement(_ref) {
     className: classes.cardsGrid
   }, companyCards === null || companyCards === void 0 ? void 0 : companyCards.map(function (card) {
     return renderCard(card);
-  }))))))), /*#__PURE__*/React__default.createElement(core.Menu, {
+  }))))))), showMenuButton && /*#__PURE__*/React__default.createElement(core.Menu, {
     anchorEl: anchorEl,
     open: Boolean(anchorEl),
     onClose: handleMenuClose,
@@ -2896,9 +2951,9 @@ var CardsManagement = function CardsManagement(_ref) {
       vertical: 'top',
       horizontal: 'right'
     }
-  }, selectedCard && !+selectedCard.metadata.default_card && /*#__PURE__*/React__default.createElement(core.MenuItem, {
+  }, selectedCard && selectedCard.metadata.is_enabled !== '2' && !+selectedCard.metadata.default_card && /*#__PURE__*/React__default.createElement(core.MenuItem, {
     onClick: handleMarkAsDefault
-  }, "Mark as default"), /*#__PURE__*/React__default.createElement(core.MenuItem, {
+  }, "Mark as default"), showMenuButton && /*#__PURE__*/React__default.createElement(core.MenuItem, {
     onClick: handleDeleteCard,
     style: {
       color: '#ff4444'
@@ -2911,7 +2966,9 @@ var PaymentCards = function PaymentCards(_ref) {
   var _ref$paymentDetails = _ref.paymentDetails,
     paymentDetails = _ref$paymentDetails === void 0 ? {} : _ref$paymentDetails,
     _ref$paymentMethod = _ref.paymentMethod,
-    paymentMethod = _ref$paymentMethod === void 0 ? null : _ref$paymentMethod;
+    paymentMethod = _ref$paymentMethod === void 0 ? null : _ref$paymentMethod,
+    _ref$sendLog = _ref.sendLog,
+    sendLog = _ref$sendLog === void 0 ? function () {} : _ref$sendLog;
   if (!paymentDetails || ((_Object$keys = Object.keys(paymentDetails)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 0 || (!(paymentDetails !== null && paymentDetails !== void 0 && paymentDetails.cards) || (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$cards = paymentDetails.cards) === null || _paymentDetails$cards === void 0 ? void 0 : _paymentDetails$cards.length) === 0) && ((paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$pg = paymentDetails.pg) === null || _paymentDetails$pg === void 0 ? void 0 : _paymentDetails$pg.gateway.toLowerCase()) !== 'stripe' || (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$pg2 = paymentDetails.pg) === null || _paymentDetails$pg2 === void 0 ? void 0 : _paymentDetails$pg2.save_card_enable) !== 1 || paymentMethod !== 1)) {
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, null);
   }
@@ -2919,7 +2976,8 @@ var PaymentCards = function PaymentCards(_ref) {
     className: styles$1.dividerColor
   }), /*#__PURE__*/React__default.createElement(CardsManagement, {
     paymentDetails: paymentDetails,
-    paymentMethod: paymentMethod
+    paymentMethod: paymentMethod,
+    sendLog: sendLog
   }));
 };
 
@@ -2995,7 +3053,9 @@ var TravelExpenseFields = function TravelExpenseFields(props) {
     _props$roles = props.roles,
     roles = _props$roles === void 0 ? [] : _props$roles,
     _props$paymentMethod = props.paymentMethod,
-    paymentMethod = _props$paymentMethod === void 0 ? null : _props$paymentMethod;
+    paymentMethod = _props$paymentMethod === void 0 ? null : _props$paymentMethod,
+    _props$sendLog = props.sendLog,
+    sendLog = _props$sendLog === void 0 ? function () {} : _props$sendLog;
   var _useState = React.useState({
       product: '',
       approvers: []
@@ -3012,6 +3072,9 @@ var TravelExpenseFields = function TravelExpenseFields(props) {
   var paymentDetails = reactRedux.useSelector(function (state) {
     return state.userAddEdit.paymentDetails;
   });
+  var isItiliteAdminRoleRestricted = type === 'travel' && roles.some(function (role) {
+    return (role === null || role === void 0 ? void 0 : role.name) === 'travel_itilite_admin';
+  });
   var openEditAproverModal = function openEditAproverModal() {
     setOpenEditAproverModalFlag(true);
   };
@@ -3119,7 +3182,16 @@ var TravelExpenseFields = function TravelExpenseFields(props) {
   }, isProfile ? /*#__PURE__*/React__default.createElement(UserRole, {
     list: roles,
     value: roleValue
-  }) : /*#__PURE__*/React__default.createElement(iuistyles.IUIRadio, {
+  }) : isItiliteAdminRoleRestricted ? /*#__PURE__*/React__default.createElement(iuistyles.IUITooltip, {
+    tooltipText: "To change the role, please reach out to IT team"
+  }, /*#__PURE__*/React__default.createElement(iuistyles.IUIGrid, {
+    item: true
+  }, /*#__PURE__*/React__default.createElement(iuistyles.IUIRadio, {
+    list: roles,
+    value: roleValue,
+    onValueChange: onRoleChange,
+    disabled: true
+  }))) : /*#__PURE__*/React__default.createElement(iuistyles.IUIRadio, {
     list: roles,
     value: roleValue,
     onValueChange: onRoleChange
@@ -3291,9 +3363,10 @@ var TravelExpenseFields = function TravelExpenseFields(props) {
       isError: !!errMsg[i],
       placeholder: "Example label - \u201CManager\u201D"
     }));
-  })))), type === 'travel' && paymentDetails && /*#__PURE__*/React__default.createElement(PaymentCards, {
+  })))), type === 'travel' && paymentDetails && isProfile && /*#__PURE__*/React__default.createElement(PaymentCards, {
     paymentDetails: paymentDetails,
-    paymentMethod: paymentMethod
+    paymentMethod: paymentMethod,
+    sendLog: sendLog
   }));
 };
 
@@ -3588,7 +3661,7 @@ var personalInfo = [{
     maxLength: 100,
     minLength: 0
   },
-  disableText: 'Please get in touch with your administrator to change this value.'
+  disableText: 'A user’s email is their primary identifier and cannot be changed for security reasons. To update it, please deactivate the existing user and create a new one with the correct email address.'
 }, {
   id: 4,
   label: 'Phone number',
@@ -5052,6 +5125,7 @@ function withStore(Component) {
 }
 
 var ExpandMoreIcon = function ExpandMoreIcon(props) {
+  var fillColor = props.fillColor || '#6B7280';
   return /*#__PURE__*/React__default.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
     width: props.width,
@@ -5059,7 +5133,7 @@ var ExpandMoreIcon = function ExpandMoreIcon(props) {
     fill: "none",
     viewBox: "0 0 12 7"
   }, /*#__PURE__*/React__default.createElement("path", {
-    fill: "#6B7280",
+    fill: fillColor,
     d: "M.293.294a1 1 0 011.414 0L6 4.587 10.293.294a1 1 0 111.414 1.414l-5 5a1 1 0 01-1.414 0l-5-5a1 1 0 010-1.414z"
   }));
 };
@@ -5641,14 +5715,37 @@ var AddMembershipButton = React.memo(function (_ref) {
 var IUIToastMessageService$5 = utils.services.IUIToastMessageService;
 var api$7 = utils.configs.api;
 var sixteenDigitNumber$1 = /^\d{16}$/;
-var Membership = function Membership(_ref) {
+var resolveMembershipName$1 = function resolveMembershipName(membership, customName) {
+  var _membership, _ref;
+  if (membership === void 0) {
+    membership = {};
+  }
+  if (customName === void 0) {
+    customName = '';
+  }
+  if (((_membership = membership) === null || _membership === void 0 ? void 0 : _membership.membership_type) === 'rental_car') {
+    var _membership2, _membership3, _membership3$program_, _membership5, _membership6, _membership6$loyalty_;
+    if ((_membership2 = membership) !== null && _membership2 !== void 0 && _membership2.program_name && (_membership3 = membership) !== null && _membership3 !== void 0 && (_membership3$program_ = _membership3.program_name) !== null && _membership3$program_ !== void 0 && _membership3$program_.trim()) {
+      var _membership4, _membership4$program_;
+      return (_membership4 = membership) === null || _membership4 === void 0 ? void 0 : (_membership4$program_ = _membership4.program_name) === null || _membership4$program_ === void 0 ? void 0 : _membership4$program_.trim();
+    }
+    if ((_membership5 = membership) !== null && _membership5 !== void 0 && _membership5.loyalty_program_name && (_membership6 = membership) !== null && _membership6 !== void 0 && (_membership6$loyalty_ = _membership6.loyalty_program_name) !== null && _membership6$loyalty_ !== void 0 && _membership6$loyalty_.trim()) {
+      var _membership7, _membership7$loyalty_;
+      return (_membership7 = membership) === null || _membership7 === void 0 ? void 0 : (_membership7$loyalty_ = _membership7.loyalty_program_name) === null || _membership7$loyalty_ === void 0 ? void 0 : _membership7$loyalty_.trim();
+    } else {
+      return '';
+    }
+  }
+  return (_ref = customName || '') === null || _ref === void 0 ? void 0 : _ref.trim();
+};
+var Membership = function Membership(_ref2) {
   var _clsx;
-  var _ref$membershipInfoIn = _ref.membershipInfoInput,
-    membershipInfoInput = _ref$membershipInfoIn === void 0 ? [] : _ref$membershipInfoIn,
-    _ref$setMembershipInf = _ref.setMembershipInfoInput,
-    setMembershipInfoInput = _ref$setMembershipInf === void 0 ? function () {} : _ref$setMembershipInf,
-    _ref$isProfile = _ref.isProfile,
-    isProfile = _ref$isProfile === void 0 ? false : _ref$isProfile;
+  var _ref2$membershipInfoI = _ref2.membershipInfoInput,
+    membershipInfoInput = _ref2$membershipInfoI === void 0 ? [] : _ref2$membershipInfoI,
+    _ref2$setMembershipIn = _ref2.setMembershipInfoInput,
+    setMembershipInfoInput = _ref2$setMembershipIn === void 0 ? function () {} : _ref2$setMembershipIn,
+    _ref2$isProfile = _ref2.isProfile,
+    isProfile = _ref2$isProfile === void 0 ? false : _ref2$isProfile;
   var _useParams = reactRouterDom.useParams(),
     editUserId = _useParams.userId;
   var _useSelector = reactRedux.useSelector(function (state) {
@@ -5851,22 +5948,24 @@ var Membership = function Membership(_ref) {
   };
   var handleSubmit = function handleSubmit() {
     try {
-      var _ref2, _ref3;
       if (isAAAloyaltySelected && !sixteenDigitNumber$1.test(membershipNumber)) {
         IUIToastMessageService$5.warningNotify('Enter 16-digit AAA membership ID');
         return Promise.resolve();
       }
       var url = "/api/v1/user-management/users/" + userID + "/membership";
+      var resolvedMembershipName = resolveMembershipName$1(_extends({}, selectedMembershipChain, {
+        membership_type: type
+      }), membershipName);
       var payload = isEditing ? _extends({}, selectedMembershipChain, {
         number: membershipNumber === null || membershipNumber === void 0 ? void 0 : membershipNumber.trim(),
-        name: (_ref2 = membershipName || '') === null || _ref2 === void 0 ? void 0 : _ref2.trim()
+        name: resolvedMembershipName
       }) : {
         membership_type: type,
         number: membershipNumber === null || membershipNumber === void 0 ? void 0 : membershipNumber.trim(),
         iata_code: null,
         user: userID,
         loyalty_program_id: selectedMembershipChain === null || selectedMembershipChain === void 0 ? void 0 : selectedMembershipChain.loyalty_program_id,
-        name: (_ref3 = membershipName || '') === null || _ref3 === void 0 ? void 0 : _ref3.trim()
+        name: resolvedMembershipName
       };
       setIsUpdating(true);
       var _temp4 = _finallyRethrows(function () {
@@ -5917,7 +6016,7 @@ var Membership = function Membership(_ref) {
   var handleEdit = function handleEdit(mem, index, isOther) {
     setEditIndex(index);
     setSelectedMembershipChain(mem);
-    setMembershipName((mem === null || mem === void 0 ? void 0 : mem.name) || '');
+    setMembershipName((mem === null || mem === void 0 ? void 0 : mem.name) || resolveMembershipName$1(mem, mem === null || mem === void 0 ? void 0 : mem.name));
     setMembershipNumber(mem === null || mem === void 0 ? void 0 : mem.number);
     setIsOtherMembership(isOther);
     var currentModalState = _extends({}, modalState);
@@ -6417,9 +6516,9 @@ var CardsField = function CardsField(props) {
   }, editUserId ? "Only Card admin can change the Card role." : "Only Card admin can change card roles. By default this user will have Card Holder role.")))));
 };
 
-var IUIToastMessageService$6 = utils.services.IUIToastMessageService,
-  IUILocalStorageService$5 = utils.services.IUILocalStorageService;
-var env$4 = utils.configs.env;
+var IUIToastMessageService$6 = utils.services.IUIToastMessageService;
+var cardsApi = utils.configs.cardsApi,
+  env$4 = utils.configs.env;
 var UserAddEdit = function UserAddEdit(props) {
   var isEditMode = props.isEditMode,
     editUserId = props.editUserId,
@@ -6427,7 +6526,9 @@ var UserAddEdit = function UserAddEdit(props) {
     _props$isProfile = props.isProfile,
     isProfile = _props$isProfile === void 0 ? false : _props$isProfile,
     _props$paymentMethod = props.paymentMethod,
-    paymentMethod = _props$paymentMethod === void 0 ? null : _props$paymentMethod;
+    paymentMethod = _props$paymentMethod === void 0 ? null : _props$paymentMethod,
+    _props$sendLog = props.sendLog,
+    sendLog = _props$sendLog === void 0 ? function () {} : _props$sendLog;
   env$4.init(config, isProfile);
   var queryParams = new URLSearchParams(window.location.search);
   var verifyUserId = Number(queryParams.get(config.routes.users.add.queryParamKeys.verifyUserId));
@@ -6632,14 +6733,8 @@ var UserAddEdit = function UserAddEdit(props) {
     });
   };
   var fetchEditUserCardsDetails = function fetchEditUserCardsDetails(editUserId) {
-    fetch(userAddEditUrl.cardsEditUserDetails(editUserId), {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        authorization: "Bearer " + IUILocalStorageService$5.getAccessToken()
-      }
-    }).then(function (response) {
-      return response.json();
+    cardsApi.get(userAddEditUrl.cardsEditUserDetails(editUserId)).then(function (response) {
+      return response.data;
     }).then(function (res) {
       var _res$roles;
       if (res !== null && res !== void 0 && (_res$roles = res.roles) !== null && _res$roles !== void 0 && _res$roles.length) {
@@ -6648,7 +6743,29 @@ var UserAddEdit = function UserAddEdit(props) {
         IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
       }
     })["catch"](function (error) {
-      console.log('errorrr', error);
+      if (error !== null && error !== void 0 && error.response) {
+        IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
+      } else {
+        console.log('errorrr', error);
+      }
+    });
+  };
+  var fetchLoggedUserCardsDetails = function fetchLoggedUserCardsDetails() {
+    cardsApi.get(userAddEditUrl.cardsAddUsersDetails()).then(function (response) {
+      return response.data;
+    }).then(function (res) {
+      var _res$roles2;
+      if (res !== null && res !== void 0 && (_res$roles2 = res.roles) !== null && _res$roles2 !== void 0 && _res$roles2.length) {
+        dispatch(setCardsDetails(res));
+      } else {
+        IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
+      }
+    })["catch"](function (error) {
+      if (error !== null && error !== void 0 && error.response) {
+        IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
+      } else {
+        console.log('errorrr', error);
+      }
     });
   };
   React.useEffect(function () {
@@ -7352,8 +7469,12 @@ var UserAddEdit = function UserAddEdit(props) {
     if (isRendered === true) {
       renderFields === null || renderFields === void 0 ? void 0 : renderFields.products.forEach(function (prod) {
         console.log(prod, isProfile, editUserId, id, 'card check');
-        if ((prod === null || prod === void 0 ? void 0 : prod.name) === 'card' && (isProfile || editUserId)) {
-          fetchEditUserCardsDetails(isProfile ? id : editUserId);
+        if ((prod === null || prod === void 0 ? void 0 : prod.name) === 'card') {
+          if (isProfile || editUserId) {
+            fetchEditUserCardsDetails(isProfile ? id : editUserId);
+          } else {
+            fetchLoggedUserCardsDetails();
+          }
         }
       });
       setPersonalInfoInput(_extends({}, personalInfoInput, {
@@ -7682,7 +7803,10 @@ var UserAddEdit = function UserAddEdit(props) {
       return Promise.reject(e);
     }
   };
-  var formSubmitHandler = function formSubmitHandler() {
+  var formSubmitHandler = function formSubmitHandler(send_welcome_email) {
+    if (send_welcome_email === void 0) {
+      send_welcome_email = false;
+    }
     try {
       var checkAnyError = doesFormHasError();
       if (checkAnyError) {
@@ -7720,6 +7844,9 @@ var UserAddEdit = function UserAddEdit(props) {
         cardsRole: cardsRole,
         isCardsAdmin: isCardsAdmin
       };
+      if (!isEditMode && !isProfile) {
+        payload.send_welcome_email = send_welcome_email;
+      }
       if (verifyUserId) {
         payload.verifyUserId = verifyUserId;
       }
@@ -7877,21 +8004,18 @@ var UserAddEdit = function UserAddEdit(props) {
         if (isEditMode && editUserId || isProfile) {
           dispatch(showLoader());
           if (cardApiflag && !isProfile && editUserId !== (id === null || id === void 0 ? void 0 : id.toString())) {
-            fetch(userAddEditUrl.cardsEditUserDetails(editUserId), {
-              method: 'POST',
-              body: JSON.stringify(cardsPayload),
-              headers: {
-                'Content-Type': 'application/json',
-                authorization: "Bearer " + IUILocalStorageService$5.getAccessToken()
-              }
-            }).then(function (response) {
+            cardsApi.post(userAddEditUrl.cardsEditUserDetails(editUserId), cardsPayload).then(function (response) {
               if (response.status === 200) {
                 updateUserApiCall(payload, inputChangeLog);
               } else {
                 IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
               }
             })["catch"](function (error) {
-              console.log('errorrr', error);
+              if (error !== null && error !== void 0 && error.response) {
+                IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
+              } else {
+                console.log('errorrr', error);
+              }
             })["finally"](function () {
               dispatch(stopLoader());
             });
@@ -7904,19 +8028,16 @@ var UserAddEdit = function UserAddEdit(props) {
             dispatch(createUser(payload)).then(function (res) {
               var _config$routes4, _config$routes4$users, _config$routes4$users2;
               if (res !== null && res !== void 0 && res.user_id) {
-                fetch(userAddEditUrl.cardsEditUserDetails(res === null || res === void 0 ? void 0 : res.user_id), {
-                  method: 'POST',
-                  body: JSON.stringify(cardsPayload),
-                  headers: {
-                    'Content-Type': 'application/json',
-                    authorization: "Bearer " + IUILocalStorageService$5.getAccessToken()
-                  }
-                }).then(function (response) {
+                cardsApi.post(userAddEditUrl.cardsEditUserDetails(res === null || res === void 0 ? void 0 : res.user_id), cardsPayload).then(function (response) {
                   if (response.status !== 200) {
                     IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
                   }
                 })["catch"](function (error) {
-                  console.log('errorrr', error);
+                  if (error !== null && error !== void 0 && error.response) {
+                    IUIToastMessageService$6.warningNotify('Opps, Something went wrong.');
+                  } else {
+                    console.log('errorrr', error);
+                  }
                 });
               }
               (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);
@@ -8108,12 +8229,34 @@ var UserAddEdit = function UserAddEdit(props) {
     onClick: handleCancelNavigation
   })), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     component: "div",
-    className: "pageHeader--button-single button-right"
-  }, /*#__PURE__*/React__default.createElement(iuistyles.IUIButton, {
+    className: clsx('pageHeader--button-single', styles.buttonRight)
+  }, isEditMode || isProfile ? /*#__PURE__*/React__default.createElement(iuistyles.IUIButton, {
     buttonText: "Save",
     type: "contained",
     onClick: formSubmitHandler,
     disabled: isPageLoading || productAccess.travel === false && productAccess.expense === false || !!doesFormHasError()
+  }) : /*#__PURE__*/React__default.createElement(iuistyles.IUIDropdownButton, {
+    buttonText: "Create user",
+    outlinedBtn: false,
+    className: styles.containedDropdownBtn,
+    placement: "bottom-end",
+    endIcon: /*#__PURE__*/React__default.createElement(ExpandMoreIcon, {
+      fillColor: "white",
+      width: "10",
+      height: "10",
+      fill: true
+    }),
+    menuListInfo: [{
+      label: 'Send email invite',
+      handler: function handler() {
+        return formSubmitHandler(true);
+      }
+    }, {
+      label: 'Do not send email',
+      handler: function handler() {
+        return formSubmitHandler(false);
+      }
+    }]
   }))))), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     component: "div",
     marginTop: "8rem",
@@ -8327,7 +8470,8 @@ var UserAddEdit = function UserAddEdit(props) {
     isProfile: isProfile,
     editUserId: editUserId,
     roles: renderFields.travelRoles,
-    paymentMethod: paymentMethod
+    paymentMethod: paymentMethod,
+    sendLog: sendLog
   }), /*#__PURE__*/React__default.createElement(AdditionalInfo, {
     membershipInfoInput: membershipInfoInput,
     onMemInfoInputChange: onMemInfoInputChange,
@@ -8372,7 +8516,8 @@ var UserAddEdit = function UserAddEdit(props) {
     isProfile: isProfile,
     editUserId: editUserId,
     roles: renderFields.expenseRoles,
-    paymentMethod: paymentMethod
+    paymentMethod: paymentMethod,
+    sendLog: sendLog
   }), /*#__PURE__*/React__default.createElement(iuistyles.IUIDivider, {
     className: styles.dividerColor
   }), isCardsDetailsRendered && productAccess && productAccess.card && /*#__PURE__*/React__default.createElement(CardsField, {
@@ -8623,10 +8768,15 @@ var downloadUploadedRecords = function downloadUploadedRecords(type, jobId) {
     });
   };
 };
-var importUploadedRecords = function importUploadedRecords(jobId, canUpdateExistingUsers) {
+var importUploadedRecords = function importUploadedRecords(jobId, canUpdateExistingUsers, sendInvite) {
+  if (sendInvite === void 0) {
+    sendInvite = false;
+  }
   return function (dispatch) {
     return new Promise(function (resolve, reject) {
-      api$8.post(userBulkImport.importRecords() + "?job_id=" + jobId + "&update=" + canUpdateExistingUsers).then(function (res) {
+      api$8.post(userBulkImport.importRecords() + "?job_id=" + jobId + "&update=" + canUpdateExistingUsers, {
+        should_send_welcome_email: sendInvite
+      }).then(function (res) {
         resolve(res);
       })["catch"](function (err) {
         reject(err);
@@ -8887,9 +9037,12 @@ var UserBulkUpload = function UserBulkUpload(_ref) {
   var _useState5 = React.useState(false),
     canUpdateExistingUsers = _useState5[0],
     setCanUpdateExistingUsers = _useState5[1];
-  var _useState6 = React.useState(false),
-    isFileDownloading = _useState6[0],
-    setDownlStatus = _useState6[1];
+  var _useState6 = React.useState(true),
+    sendInvite = _useState6[0],
+    setSendInvite = _useState6[1];
+  var _useState7 = React.useState(false),
+    isFileDownloading = _useState7[0],
+    setDownlStatus = _useState7[1];
   var _useSelector = reactRedux.useSelector(function (state) {
       return state.common;
     }),
@@ -8997,7 +9150,7 @@ var UserBulkUpload = function UserBulkUpload(_ref) {
         }
       }
       setImportStatus(1);
-      return Promise.resolve(dispatch(importUploadedRecords(jobId, canUpdateExistingUsers ? 1 : 0))).then(function (res) {
+      return Promise.resolve(dispatch(importUploadedRecords(jobId, canUpdateExistingUsers ? 1 : 0, sendInvite))).then(function (res) {
         var _temp = function () {
           if (res.data.status) {
             return Promise.resolve(dispatch(_executionJob(jobId, 'is_job_completed')).then(function (resp) {
@@ -9028,6 +9181,9 @@ var UserBulkUpload = function UserBulkUpload(_ref) {
   var handleExistingUserUpdation = function handleExistingUserUpdation(event) {
     setCanUpdateExistingUsers(!canUpdateExistingUsers);
   };
+  var handleSendInvite = function handleSendInvite() {
+    setSendInvite(!sendInvite);
+  };
   var CustomStepIcon = function CustomStepIcon(step) {
     if ((importStatus === 1 || importStatus === 2 || importStatus === 4) && step === Number(activeStep)) {
       return /*#__PURE__*/React__default.createElement(iuistyles.IUIPrimaryRadio, {
@@ -9337,6 +9493,18 @@ var UserBulkUpload = function UserBulkUpload(_ref) {
     label: "Update any existing users",
     className: clsx(styles$5.checkboxlabel, (_clsx5 = {}, _clsx5[styles$5.disabledText] = +userBulkImportInfo.exist_users === 0, _clsx5)),
     disabled: +userBulkImportInfo.exist_users === 0
+  })), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
+    display: "flex",
+    style: {
+      paddingLeft: '28px'
+    }
+  }, /*#__PURE__*/React__default.createElement(iuistyles.IUIFormControlLabel, {
+    control: /*#__PURE__*/React__default.createElement(iuistyles.IUICheckBox, {
+      handleCheckBoxHandler: handleSendInvite,
+      checked: sendInvite
+    }),
+    label: "Send invitation emails to new users who have not logged into the platform.",
+    className: clsx(styles$5.checkboxlabel)
   })), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     display: "flex",
     style: {
@@ -10226,6 +10394,7 @@ var StickyHeadTable = function StickyHeadTable(props) {
     id: 'status',
     label: 'Status',
     minWidth: 160,
+    sortable: true,
     cell: function cell(row) {
       return /*#__PURE__*/React__default.createElement(iuistyles.IUIFormGroup, null, /*#__PURE__*/React__default.createElement(iuistyles.IUITypography, {
         component: "div",
@@ -10525,9 +10694,11 @@ var UndoButton = function UndoButton(_ref) {
   }, "UNDO"));
 };
 var UserList = function UserList(_ref2) {
+  var _config$features;
   var config = _ref2.config,
     isProfile = _ref2.isProfile;
   env$7.init(config, isProfile);
+  var hideSignupRequestsTab = !!(config !== null && config !== void 0 && (_config$features = config.features) !== null && _config$features !== void 0 && _config$features.hideSignupRequestsTab);
   var history = reactRouterDom.useHistory();
   var _useSelector = reactRedux.useSelector(function (state) {
       return state.userList;
@@ -11065,7 +11236,7 @@ var UserList = function UserList(_ref2) {
     if (isTokenVerified === true) {
       var pageNum = page;
       var searchParam = searchValue.trim() !== '' ? '&search=' + searchValue : '';
-      var orderingParam = orderBy === '' ? '' : order === 'asc' ? '&ordering=' + orderBy : '&ordering=-' + orderBy;
+      var orderingParam = orderBy === '' ? '' : orderBy === 'status' ? order === 'asc' ? '&ordering=is_active,-has_visited' : '&ordering=-is_active,-has_visited' : order === 'asc' ? '&ordering=' + orderBy : '&ordering=-' + orderBy;
       var url = userListUrl.getUser + '?length=' + rowsPerPage + '&page=' + pageNum + searchParam + orderingParam;
       if (isSearchingChange) {
         var delayDebounceFn = setTimeout(function () {
@@ -11128,6 +11299,10 @@ var UserList = function UserList(_ref2) {
       if (!isSearchingChange && !isSortingChange && !isSignUpSearchingChange && !isSignUpSortingChange) {
         dispatch(showDataFetchingStatus());
         dispatch(fetchUsersList(url)).then(function () {
+          if (hideSignupRequestsTab) {
+            dispatch(stopDataFetchingStatus());
+            return;
+          }
           dispatch(fetchUserSignupRequests({
             ordering: signup_order === 'asc' ? signup_orderBy : "-" + signup_orderBy,
             length: signup_rowsPerPage,
@@ -11181,6 +11356,38 @@ var UserList = function UserList(_ref2) {
       onClick: handleAddPageNavigation
     })));
   };
+  var currentUsersPanel = /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
+    style: {
+      marginLeft: '-17px'
+    }
+  }, /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
+    component: "div",
+    className: styles$6.headingWrapper
+  }, /*#__PURE__*/React__default.createElement(iuistyles.IUITypography, {
+    variant: "body2",
+    className: clsx(styles$6.description)
+  }, "Create new users, customize user permissions and manage user accounts")), /*#__PURE__*/React__default.createElement(StickyHeadTable, {
+    data: userListInfo,
+    handleChangeRowsPerPage: handleChangeRowsPerPage,
+    handleChangePage: handleChangePage,
+    page: page,
+    rowsPerPage: rowsPerPage,
+    handleActiveUser: handleActiveUser,
+    handleSelectAllClick: handleSelectAllClick,
+    selected: selected,
+    handleSingleCheckBoxClick: handleSingleCheckBoxClick,
+    orderBy: orderBy,
+    order: order,
+    onRequestSort: onRequestSort,
+    onSearchHandler: onSearchHandler,
+    onEditHandler: handleEditUserClick,
+    disableRowCheckbox: deactivatedUsers,
+    searchValue: searchValue,
+    isILadmin: isILadmin,
+    onPrimaryAdminHandler: onPrimaryAdminHandler,
+    onResetPasswordHandler: onResetPasswordHandler,
+    toggleInviteModal: toggleInviteModal
+  }));
   return /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     component: "div",
     className: styles$6.UUIUserManagementList
@@ -11255,7 +11462,7 @@ var UserList = function UserList(_ref2) {
     alignItems: "center"
   })), /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
     className: styles$6.tablewrapper
-  }, /*#__PURE__*/React__default.createElement(iuistyles.IUITabs, {
+  }, hideSignupRequestsTab ? currentUsersPanel : /*#__PURE__*/React__default.createElement(iuistyles.IUITabs, {
     value: tabValue,
     customTabHandler: function customTabHandler(value) {
       return dispatch(updateTabValue(value));
@@ -11265,38 +11472,7 @@ var UserList = function UserList(_ref2) {
       label: /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, null, "Current users", ' ', /*#__PURE__*/React__default.createElement(TabLabelCount, {
         count: userListInfo.count
       }), ' '),
-      content: /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
-        style: {
-          marginLeft: '-17px'
-        }
-      }, /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, {
-        component: "div",
-        className: styles$6.headingWrapper
-      }, /*#__PURE__*/React__default.createElement(iuistyles.IUITypography, {
-        variant: "body2",
-        className: clsx(styles$6.description)
-      }, "Create new users, customize user permissions and manage user accounts")), /*#__PURE__*/React__default.createElement(StickyHeadTable, {
-        data: userListInfo,
-        handleChangeRowsPerPage: handleChangeRowsPerPage,
-        handleChangePage: handleChangePage,
-        page: page,
-        rowsPerPage: rowsPerPage,
-        handleActiveUser: handleActiveUser,
-        handleSelectAllClick: handleSelectAllClick,
-        selected: selected,
-        handleSingleCheckBoxClick: handleSingleCheckBoxClick,
-        orderBy: orderBy,
-        order: order,
-        onRequestSort: onRequestSort,
-        onSearchHandler: onSearchHandler,
-        onEditHandler: handleEditUserClick,
-        disableRowCheckbox: deactivatedUsers,
-        searchValue: searchValue,
-        isILadmin: isILadmin,
-        onPrimaryAdminHandler: onPrimaryAdminHandler,
-        onResetPasswordHandler: onResetPasswordHandler,
-        toggleInviteModal: toggleInviteModal
-      }))
+      content: currentUsersPanel
     }, {
       label: /*#__PURE__*/React__default.createElement(iuistyles.IUIBox, null, "Sign-up requests", ' ', /*#__PURE__*/React__default.createElement(TabLabelCount, {
         count: signupRequestListInfo.count