tf-checkout-react 1.5.6 → 1.5.7

package/dist/tf-checkout-react.esm.js

@@ -50,7 +50,6 @@ import { useStripe, useElements, CardNumberElement, CardExpiryElement, CardCvcEl
 import { loadStripe } from '@stripe/stripe-js';
 import { FacebookShareButton, FacebookIcon, FacebookMessengerShareButton, FacebookMessengerIcon, TwitterShareButton, TwitterIcon, LinkedinShareButton, LinkedinIcon, PinterestShareButton, PinterestIcon, VKShareButton, VKIcon, OKShareButton, OKIcon, TelegramShareButton, TelegramIcon, WhatsappShareButton, WhatsappIcon, RedditShareButton, RedditIcon, TumblrShareButton, TumblrIcon, MailruShareButton, MailruIcon, EmailShareButton, EmailIcon, LivejournalShareButton, LivejournalIcon, ViberShareButton, ViberIcon, WorkplaceShareButton, WorkplaceIcon, LineShareButton, LineIcon, PocketShareButton, PocketIcon, InstapaperShareButton, InstapaperIcon, WeiboShareButton, WeiboIcon, HatenaShareButton, HatenaIcon } from 'react-share';
 import { ThemeProvider as ThemeProvider$1 } from '@mui/private-theming';
-import jwt_decode from 'jwt-decode';
 import _filter from 'lodash-es/filter';
 import _some from 'lodash-es/some';
 import moment from 'moment-timezone';
@@ -469,9 +468,6 @@ publicRequest.setBaseUrl = function (baseUrl) {
 publicRequest.setGuestToken = function (guestToken) {
   return publicRequest.defaults.headers.common['Authorization-Guest'] = guestToken;
 };
-publicRequest.setAccessToken = function (token) {
-  return publicRequest.defaults.headers.common.Authorization = token;
-};
 
 var CONFIGS = {};
 var setConfigs = function setConfigs(configs) {
@@ -576,14 +572,8 @@ function deleteCookieByName(name) {
 var downloadPDF = function downloadPDF(pdfUrl) {
   if (typeof window === 'undefined') return;
   var xtfCookie = getCookieByName('X-TF-ECOMMERCE');
-  var accessToken = localStorage.getItem('access_token');
-  if (!accessToken && !xtfCookie) return;
+  if (!xtfCookie) return;
   var headers = {};
-  if (accessToken) {
-    headers = {
-      Authorization: "Bearer " + accessToken
-    };
-  }
   if (xtfCookie) {
     headers = {
       'X-TF-ECOMMERCE': xtfCookie
@@ -757,40 +747,32 @@ var isJson = function isJson(value) {
 
 publicRequest.interceptors.request.use(function (config) {
   var _document$cookie;
-  var userData = isBrowser ? window.localStorage.getItem('user_data') : null;
-  var accessToken = isBrowser ? window.localStorage.getItem('access_token') : null;
-  if (userData && accessToken) {
-    var updatedHeaders = _extends({}, config.headers, {
-      Authorization: "Bearer " + accessToken
-    });
-    config.headers = updatedHeaders;
-  }
   var guestToken = isBrowser ? window.localStorage.getItem('auth_guest_token') : null;
   if (guestToken) {
-    var _updatedHeaders = _extends({}, config.headers, {
+    var updatedHeaders = _extends({}, config.headers, {
       'Authorization-Guest': guestToken
     });
-    config.headers = _updatedHeaders;
+    config.headers = updatedHeaders;
   }
   var xtfCookie = getCookieByName('X-TF-ECOMMERCE');
   if (xtfCookie) {
-    var _updatedHeaders2 = _extends({}, config.headers, {
+    var _updatedHeaders = _extends({}, config.headers, {
       'X-TF-ECOMMERCE': xtfCookie
     });
-    config.headers = _updatedHeaders2;
+    config.headers = _updatedHeaders;
   }
   var additionalCookiesHeaderValue = isBrowser ? (_document$cookie = document.cookie) != null ? _document$cookie : '' : '';
   if (additionalCookiesHeaderValue !== '') {
-    var _updatedHeaders3 = _extends({}, config.headers, {
+    var _updatedHeaders2 = _extends({}, config.headers, {
       'Additional-Cookies': additionalCookiesHeaderValue
     });
-    config.headers = _updatedHeaders3;
+    config.headers = _updatedHeaders2;
   }
   if (CONFIGS.X_SOURCE_ORIGIN) {
-    var _updatedHeaders4 = _extends({}, config.headers, {
+    var _updatedHeaders3 = _extends({}, config.headers, {
       'X-Source-Origin': CONFIGS.X_SOURCE_ORIGIN
     });
-    config.headers = _updatedHeaders4;
+    config.headers = _updatedHeaders3;
   }
   if (CONFIGS.BASE_URL) {
     config.baseURL = CONFIGS.BASE_URL + '/api';
@@ -816,7 +798,6 @@ publicRequest.interceptors.response.use(function (response) {
     if (isBrowser) {
       var _error$response2, _error$response2$data;
       window.localStorage.removeItem('user_data');
-      window.localStorage.removeItem('access_token');
       var errorType = error == null ? void 0 : (_error$response2 = error.response) == null ? void 0 : (_error$response2$data = _error$response2.data) == null ? void 0 : _error$response2$data.error;
       if (errorType === 'invalid_token') {
         window.location.href = '/';
@@ -874,17 +855,13 @@ var register = /*#__PURE__*/function () {
   };
 }();
 var getProfileData = /*#__PURE__*/function () {
-  var _ref4 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(accessToken) {
+  var _ref4 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
     var response;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           _context4.next = 2;
-          return publicRequest.get('/customer/profile/', {
-            headers: _extends({}, publicRequest.defaults.headers.common, {
-              Authorization: "Bearer " + accessToken
-            })
-          });
+          return publicRequest.get('/customer/profile/');
         case 2:
           response = _context4.sent;
           return _context4.abrupt("return", response.data);
@@ -894,7 +871,7 @@ var getProfileData = /*#__PURE__*/function () {
       }
     }, _callee4);
   }));
-  return function getProfileData(_x4) {
+  return function getProfileData() {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -1014,7 +991,7 @@ var getCart = /*#__PURE__*/function () {
 }();
 
 var postOnCheckout = /*#__PURE__*/function () {
-  var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, accessToken, freeTicket) {
+  var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, freeTicket) {
     var response;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1031,10 +1008,6 @@ var postOnCheckout = /*#__PURE__*/function () {
           _context.next = 4;
           return publicRequest.post("v1/on-checkout", {
             data: data
-          }, {
-            headers: _extends({}, publicRequest.defaults.headers.common, {
-              Authorization: "Bearer " + accessToken
-            })
           });
         case 4:
           response = _context.sent;
@@ -1045,7 +1018,7 @@ var postOnCheckout = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function postOnCheckout(_x, _x2, _x3) {
+  return function postOnCheckout(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -1511,14 +1484,6 @@ var setCustomHeader = function setCustomHeader(response) {
     }
   }
 };
-var handleSetAccessToken = function handleSetAccessToken(token) {
-  if (token) {
-    if (isBrowser) {
-      window.localStorage.setItem('access_token', token);
-      publicRequest.setAccessToken(token);
-    }
-  }
-};
 var createPaymentPlan = function createPaymentPlan(orderHash, stripePaymentMethodId) {
   var res = publicRequest.post("v1/order/" + orderHash + "/payment_plan/create", {
     stripe_payment_method_id: stripePaymentMethodId
@@ -2532,7 +2497,7 @@ var SignupModal = function SignupModal(_ref) {
     setLoading = _useState[1];
   var onSignup = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-      var formData, res, access_token_register, refreshToken, tokens;
+      var formData, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -2550,32 +2515,25 @@ var SignupModal = function SignupModal(_ref) {
             return register(formData);
           case 12:
             res = _context.sent;
-            access_token_register = _get(res, 'data.attributes.access_token');
-            refreshToken = _get(res, 'data.attributes.refresh_token');
-            handleSetAccessToken(access_token_register);
-            tokens = {
-              accessToken: access_token_register,
-              refreshToken: refreshToken
-            };
-            onRegisterSuccess(tokens);
+            onRegisterSuccess(res);
             onClose();
-            _context.next = 24;
+            _context.next = 20;
             break;
-          case 21:
-            _context.prev = 21;
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](0);
             if (axios.isAxiosError(_context.t0)) {
               onRegisterError(_context.t0, values.email);
             }
-          case 24:
-            _context.prev = 24;
+          case 20:
+            _context.prev = 20;
             setLoading(false);
-            return _context.finish(24);
-          case 27:
+            return _context.finish(20);
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 21, 24, 27]]);
+      }, _callee, null, [[0, 17, 20, 23]]);
     }));
     return function onSignup(_x) {
       return _ref2.apply(this, arguments);
@@ -3309,18 +3267,18 @@ var assingUniqueIds = function assingUniqueIds(data) {
     });
   });
 };
-var isRequiredField = function isRequiredField(element) {
-  var flagRequirePhone = getQueryVariable('phone_required') === 'true';
-  var collectMandatoryWalletAddress = getQueryVariable('collect_mandatory_wallet_address') === 'true';
+var isRequiredField = function isRequiredField(element, configs) {
   var name = element.name,
     required = element.required;
+  var flagRequirePhone = _get(configs, 'phone_required', false);
+  var collectMandatoryWalletAddress = _get(configs, 'collect_mandatory_wallet_address', false);
   if (required || name === 'phone' && flagRequirePhone || name === 'data_capture[wallet_address]' && !collectMandatoryWalletAddress) {
     return true;
   }
   return false;
 };
-var getFieldLabel = function getFieldLabel(element) {
-  if (isRequiredField(element) || React.isValidElement(element.label)) {
+var getFieldLabel = function getFieldLabel(element, configs) {
+  if (isRequiredField(element, configs) || React.isValidElement(element.label)) {
     return element.label;
   }
   return element.label + " (optional)";
@@ -3548,7 +3506,6 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
   }, [isBrowser]);
   var defaultCountry = isBrowser ? window.localStorage.getItem('eventCountry') : '';
   var userData = isBrowser && window.localStorage.getItem('user_data') ? JSON.parse(window.localStorage.getItem('user_data') || '') : {};
-  var access_token = isBrowser && window.localStorage.getItem('access_token') ? window.localStorage.getItem('access_token') || '' : '';
   var _useState5 = useState(assingUniqueIds(data)),
     dataWithUniqueIds = _useState5[0],
     setDataWithUniqueIds = _useState5[1];
@@ -3763,18 +3720,18 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
   }();
   // fetch user data
   var fetchUserData = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(token) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var userDataResponse, profileSpecifiedData, profileDataObj;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.prev = 0;
-            if (!(isBrowser && token || isLoggedIn)) {
+            if (!isLoggedIn) {
               _context4.next = 10;
               break;
             }
             _context4.next = 4;
-            return getProfileData(token);
+            return getProfileData();
           case 4:
             userDataResponse = _context4.sent;
             profileSpecifiedData = _get(userDataResponse, 'data');
@@ -3800,14 +3757,14 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
         }
       }, _callee4, null, [[0, 12]]);
     }));
-    return function fetchUserData(_x) {
+    return function fetchUserData() {
       return _ref7.apply(this, arguments);
     };
   }();
   useEffect(function () {
-    fetchUserData(access_token);
+    fetchUserData();
     fetchCart();
-  }, [access_token, isLoggedIn]);
+  }, [isLoggedIn]);
   useEffect(function () {
     var collectPaymentData = /*#__PURE__*/function () {
       var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
@@ -3826,7 +3783,7 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
                 addAddOnsInAttributes(checkoutBody);
               }
               _context5.next = 7;
-              return postOnCheckout(checkoutBody, access_token, flagFreeTicket);
+              return postOnCheckout(checkoutBody, flagFreeTicket);
             case 7:
               checkoutResponse = _context5.sent;
               removeReferralKey();
@@ -3927,7 +3884,7 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
     enableReinitialize: false,
     onSubmit: function () {
       var _onSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(values, formikHelpers) {
-        var _checkoutBody, _checkoutResponse, updatedUserData, _profileSpecifiedData, _profileDataObj, checkoutBodyForRegistration, bodyFormData, resRegister, _xtfCookie, accessToken, refreshToken, userProfile, _e$response3, _e$response3$data, _e$response3$data$dat, _e$response4, _e$response4$data, _e$response5, _e$response5$data, _error, profileData, profileSpecifiedData, profileDataObj, checkoutBody, checkoutResponse, _e$response6, _e$response6$data, _e$response6$data$dat, _e$response7, _e$response7$data, _e$response8, _e$response9, _e$response9$data, _e$response10, event;
+        var _checkoutBody, _checkoutResponse, updatedUserData, _profileSpecifiedData, _profileDataObj, checkoutBodyForRegistration, bodyFormData, resRegister, _xtfCookie, refreshToken, userProfile, _e$response3, _e$response3$data, _e$response3$data$dat, _e$response4, _e$response4$data, _e$response5, _e$response5$data, _error, profileData, profileSpecifiedData, profileDataObj, checkoutBody, checkoutResponse, _e$response6, _e$response6$data, _e$response6$data$dat, _e$response7, _e$response7$data, _e$response8, _e$response9, _e$response9$data, _e$response10, event;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -3951,7 +3908,7 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
                 addAddOnsInAttributes(_checkoutBody);
               }
               _context6.next = 7;
-              return postOnCheckout(_checkoutBody, access_token, flagFreeTicket);
+              return postOnCheckout(_checkoutBody, flagFreeTicket);
             case 7:
               _checkoutResponse = _context6.sent;
               removeReferralKey();
@@ -3961,7 +3918,7 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
                 break;
               }
               _context6.next = 12;
-              return getProfileData(access_token);
+              return getProfileData();
             case 12:
               updatedUserData = _context6.sent;
               _profileSpecifiedData = _get(updatedUserData, 'data');
@@ -3984,20 +3941,18 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
             case 24:
               resRegister = _context6.sent;
               _xtfCookie = _get(resRegister, 'headers.x-tf-ecommerce');
-              accessToken = _get(resRegister, 'data.attributes.access_token');
               refreshToken = _get(resRegister, 'data.attributes.refresh_token');
               userProfile = _get(resRegister, 'data.attributes.user_profile');
               setIsNewUser(true);
               onRegisterSuccess({
                 xtfCookie: _xtfCookie,
-                accessToken: accessToken,
                 refreshToken: refreshToken,
                 userProfile: userProfile
               });
-              _context6.next = 38;
+              _context6.next = 37;
               break;
-            case 33:
-              _context6.prev = 33;
+            case 32:
+              _context6.prev = 32;
               _context6.t0 = _context6["catch"](20);
               setLoading(false);
               if ((_e$response3 = _context6.t0.response) != null && (_e$response3$data = _e$response3.data) != null && (_e$response3$data$dat = _e$response3$data.data) != null && _e$response3$data$dat.hasUnverifiedOrder) {
@@ -4022,10 +3977,10 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
                 onRegisterError(_context6.t0, values.email);
               }
               return _context6.abrupt("return");
-            case 38:
-              _context6.next = 40;
+            case 37:
+              _context6.next = 39;
               return getProfileData();
-            case 40:
+            case 39:
               profileData = _context6.sent;
               profileSpecifiedData = _get(profileData, 'data');
               profileDataObj = setLoggedUserData(profileSpecifiedData);
@@ -4036,16 +3991,16 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
               if (isBrowser) {
                 addAddOnsInAttributes(checkoutBody);
               }
-              _context6.next = 48;
-              return postOnCheckout(checkoutBody, undefined, flagFreeTicket);
-            case 48:
+              _context6.next = 47;
+              return postOnCheckout(checkoutBody, flagFreeTicket);
+            case 47:
               checkoutResponse = _context6.sent;
               removeReferralKey();
               handleSubmit(values, formikHelpers, eventId, checkoutResponse);
-              _context6.next = 57;
+              _context6.next = 56;
               break;
-            case 53:
-              _context6.prev = 53;
+            case 52:
+              _context6.prev = 52;
               _context6.t1 = _context6["catch"](0);
               setLoading(false);
               if ((_e$response6 = _context6.t1.response) != null && (_e$response6$data = _e$response6.data) != null && (_e$response6$data$dat = _e$response6$data.data) != null && _e$response6$data$dat.hasUnverifiedOrder) {
@@ -4054,7 +4009,6 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
                 if (((_e$response8 = _context6.t1.response) == null ? void 0 : _e$response8.status) === 401 || ((_e$response9 = _context6.t1.response) == null ? void 0 : (_e$response9$data = _e$response9.data) == null ? void 0 : _e$response9$data.error) === 'invalid_token') {
                   if (isBrowser) {
                     window.localStorage.removeItem('user_data');
-                    window.localStorage.removeItem('access_token');
                     setUserExpired(true);
                     setShowModalLogin(true);
                     setIsLoggedIn(false);
@@ -4070,17 +4024,17 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
                 }
                 onSubmitError(_context6.t1);
               }
-            case 57:
-              _context6.prev = 57;
+            case 56:
+              _context6.prev = 56;
               setLoading(false);
-              return _context6.finish(57);
-            case 60:
+              return _context6.finish(56);
+            case 59:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, null, [[0, 53, 57, 60], [20, 33]]);
+        }, _callee6, null, [[0, 52, 56, 59], [20, 32]]);
       }));
-      function onSubmit(_x2, _x3) {
+      function onSubmit(_x, _x2) {
         return _onSubmit.apply(this, arguments);
       }
       return onSubmit;
@@ -4214,7 +4168,7 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
           }, element.component ? element.component : React.createElement(Field, Object.assign({}, element, {
             type: element.type === 'radio' ? undefined : element.type,
             setPhoneValidationIsLoading: element.type === 'phone' ? setPhoneValidationIsLoading : undefined,
-            label: getFieldLabel(element),
+            label: getFieldLabel(element, configs),
             validate: getValidateFunctions(element, states, props.values, props.errors),
             setFieldValue: props.setFieldValue,
             onBlur: props.handleBlur,
@@ -4258,7 +4212,7 @@ var BillingInfoContainer = /*#__PURE__*/React.memo(function (_ref4) {
           }, React.createElement(Field, Object.assign({}, element, {
             type: element.type === 'radio' ? undefined : element.type,
             name: element.name + "-" + index,
-            label: getFieldLabel(element),
+            label: getFieldLabel(element, configs),
             component: getFieldComponent(element),
             validate: combineValidators(element.required ? requiredValidator : function () {
               return props.errors[element.name + "-" + index];
@@ -6642,17 +6596,7 @@ var TicketsContainer = function TicketsContainer(_ref) {
     pageUrl: pageUrl
   });
   useEffect(function () {
-    if (isWindowDefined) {
-      var access_token = window.localStorage.getItem('access_token');
-      if (access_token) {
-        var decoded = jwt_decode(access_token);
-        if (decoded && decoded.exp < Date.now() / 1000) {
-          window.localStorage.removeItem('access_token');
-          window.localStorage.removeItem('user_data');
-        }
-      }
-      window.localStorage.removeItem('extraData');
-    }
+    window.localStorage.removeItem('extraData');
   }, []);
   useEffect(function () {
     if (eventId) {
@@ -6687,7 +6631,6 @@ var TicketsContainer = function TicketsContainer(_ref) {
           case 3:
             onLogoutSuccess();
             if (isBrowser) {
-              window.localStorage.removeItem('access_token');
               window.localStorage.removeItem('user_data');
               setIsLogged(false);
               _event = new window.CustomEvent('tf-logout');
@@ -6850,7 +6793,7 @@ var TicketsContainer = function TicketsContainer(_ref) {
   var handleBook = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _product_options, _product_options2, _ticket_types;
-      var ticket, optionName, ticketId, isTableType, productCartQuantity, ticketQuantity, data, result, pageConfigsDataResponse, _pageConfigsData$skip, _pageConfigsData$name, _pageConfigsData$age_, _pageConfigsData$phon, _pageConfigsData$hide, _pageConfigsData$has_, _pageConfigsData$free, _pageConfigsData$coll, _pageConfigsData$coll2, pageConfigsData, skipBillingPage, nameIsRequired, ageIsRequired, phoneIsRequired, hidePhoneField, hasAddOn, freeTicket, collectOptionalWalletAddress, collectMandatoryWalletAddress, hash, total, _checkoutResponse$dat, _checkoutResponse$dat2, _checkoutResponse$dat3, _checkoutResponse$dat4, userData, access_token, checkoutBody, checkoutResponse, _e$response, _e$response$data, _e$response$data$data, _e$response2, _e$response2$data, message, _isInvalidLinkError, _isNotInvitedError;
+      var ticket, optionName, ticketId, isTableType, productCartQuantity, ticketQuantity, data, result, pageConfigsDataResponse, _pageConfigsData$skip, _pageConfigsData$has_, _pageConfigsData$free, pageConfigsData, skipBillingPage, hasAddOn, freeTicket, hash, total, _checkoutResponse$dat, _checkoutResponse$dat2, _checkoutResponse$dat3, _checkoutResponse$dat4, userData, checkoutBody, checkoutResponse, _e$response, _e$response$data, _e$response$data$data, _e$response2, _e$response2$data, message, _isInvalidLinkError, _isNotInvitedError;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -6900,66 +6843,52 @@ var TicketsContainer = function TicketsContainer(_ref) {
           case 19:
             pageConfigsDataResponse = _context2.t0;
             if (!(result.status === 200 && pageConfigsDataResponse.status === 200)) {
-              _context2.next = 49;
+              _context2.next = 42;
               break;
             }
             pageConfigsData = _get(pageConfigsDataResponse, 'data.attributes') || {};
             skipBillingPage = (_pageConfigsData$skip = pageConfigsData.skip_billing_page) != null ? _pageConfigsData$skip : false;
-            nameIsRequired = (_pageConfigsData$name = pageConfigsData.names_required) != null ? _pageConfigsData$name : false;
-            ageIsRequired = (_pageConfigsData$age_ = pageConfigsData.age_required) != null ? _pageConfigsData$age_ : false;
-            phoneIsRequired = (_pageConfigsData$phon = pageConfigsData.phone_required) != null ? _pageConfigsData$phon : false;
-            hidePhoneField = (_pageConfigsData$hide = pageConfigsData.hide_phone_field) != null ? _pageConfigsData$hide : false;
             hasAddOn = (_pageConfigsData$has_ = pageConfigsData.has_add_on) != null ? _pageConfigsData$has_ : false;
             freeTicket = (_pageConfigsData$free = pageConfigsData.free_ticket) != null ? _pageConfigsData$free : false;
-            collectOptionalWalletAddress = (_pageConfigsData$coll = pageConfigsData.collect_optional_wallet_address) != null ? _pageConfigsData$coll : false;
-            collectMandatoryWalletAddress = (_pageConfigsData$coll2 = pageConfigsData.collect_mandatory_wallet_address) != null ? _pageConfigsData$coll2 : false;
             hash = '';
             total = '';
             isBrowser && window.localStorage.removeItem('add_ons');
             if (!(skipBillingPage && !hasAddOn)) {
-              _context2.next = 48;
+              _context2.next = 41;
               break;
             }
             // Get user data for checkout data
             userData = isBrowser && window.localStorage.getItem('user_data') ? JSON.parse(window.localStorage.getItem('user_data') || '') : {};
-            access_token = isBrowser && window.localStorage.getItem('access_token') ? window.localStorage.getItem('access_token') || '' : '';
             checkoutBody = createCheckoutDataBodyWithDefaultHolder(ticketQuantity, userData);
             if (!enableBillingInfoAutoCreate) {
-              _context2.next = 44;
+              _context2.next = 37;
               break;
             }
-            _context2.next = 41;
-            return postOnCheckout(checkoutBody, access_token, freeTicket);
-          case 41:
+            _context2.next = 34;
+            return postOnCheckout(checkoutBody, freeTicket);
+          case 34:
             _context2.t1 = _context2.sent;
-            _context2.next = 45;
+            _context2.next = 38;
             break;
-          case 44:
+          case 37:
             _context2.t1 = null;
-          case 45:
+          case 38:
             checkoutResponse = _context2.t1;
             hash = (checkoutResponse == null ? void 0 : (_checkoutResponse$dat = checkoutResponse.data) == null ? void 0 : (_checkoutResponse$dat2 = _checkoutResponse$dat.attributes) == null ? void 0 : _checkoutResponse$dat2.hash) || '';
             total = (checkoutResponse == null ? void 0 : (_checkoutResponse$dat3 = checkoutResponse.data) == null ? void 0 : (_checkoutResponse$dat4 = _checkoutResponse$dat3.attributes) == null ? void 0 : _checkoutResponse$dat4.total) || '';
-          case 48:
+          case 41:
             onAddToCartSuccess({
               skip_billing_page: skipBillingPage,
-              names_required: nameIsRequired,
-              phone_required: phoneIsRequired,
-              age_required: ageIsRequired,
-              hide_phone_field: hidePhoneField,
-              free_ticket: freeTicket,
-              collect_optional_wallet_address: collectOptionalWalletAddress,
-              collect_mandatory_wallet_address: collectMandatoryWalletAddress,
               event_id: String(eventId),
               hash: hash,
               total: total,
               hasAddOn: hasAddOn
             });
-          case 49:
-            _context2.next = 54;
+          case 42:
+            _context2.next = 47;
             break;
-          case 51:
-            _context2.prev = 51;
+          case 44:
+            _context2.prev = 44;
             _context2.t2 = _context2["catch"](8);
             if ((_e$response = _context2.t2.response) != null && (_e$response$data = _e$response.data) != null && (_e$response$data$data = _e$response$data.data) != null && _e$response$data$data.hasUnverifiedOrder) {
               setPendingVerificationMessage((_e$response2 = _context2.t2.response) == null ? void 0 : (_e$response2$data = _e$response2.data) == null ? void 0 : _e$response2$data.message);
@@ -6976,15 +6905,15 @@ var TicketsContainer = function TicketsContainer(_ref) {
                 setError(message);
               }
             }
-          case 54:
-            _context2.prev = 54;
+          case 47:
+            _context2.prev = 47;
             setHandleBookIsLoading(false);
-            return _context2.finish(54);
-          case 57:
+            return _context2.finish(47);
+          case 50:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[8, 51, 54, 57]]);
+      }, _callee2, null, [[8, 44, 47, 50]]);
     }));
     return function handleBook() {
       return _ref4.apply(this, arguments);
@@ -7419,7 +7348,6 @@ var MyTicketsContainer = function MyTicketsContainer(_ref) {
               if (((_error$response = _context.t0.response) == null ? void 0 : _error$response.data.error) === 'invalid_token') {
                 if (isWindowDefined) {
                   window.localStorage.removeItem('user_data');
-                  window.localStorage.removeItem('access_token');
                   setUserExpired(true);
                   setShowModalLogin(true);
                 }
@@ -8345,19 +8273,19 @@ var TicketResaleContainer = function TicketResaleContainer(_ref) {
     setSuccessMessage = _useState2[1];
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var params, hash, isDeclined, response, _error$response, _error$response$data, _response, data, age_required, names_required, event_id, _error$response2, _error$response2$data;
+      var params, hash, isDeclined, response, _error$response, _error$response$data, _response, _error$response2, _error$response2$data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isWindowDefined) {
-              _context.next = 38;
+              _context.next = 34;
               break;
             }
             params = new URL("" + window.location).searchParams;
             hash = params.get('invitation_hash') || orderHash || null;
             isDeclined = params.get('decline') || false;
             if (!hash) {
-              _context.next = 37;
+              _context.next = 33;
               break;
             }
             if (!isDeclined) {
@@ -8386,29 +8314,25 @@ var TicketResaleContainer = function TicketResaleContainer(_ref) {
             return processTicket(hash);
           case 22:
             _response = _context.sent;
-            data = _get(_response, 'data.attributes');
-            age_required = _get(data, 'age_required', false);
-            names_required = _get(data, 'names_required', false);
-            event_id = _get(data, 'event_id');
             onProcessTicketSuccess(_response.data);
-            window.location.href = (billingPath != null ? billingPath : '/billing/billing-info/') + "?age_required=" + age_required + "&names_required=" + names_required + "&event_id=" + event_id;
-            _context.next = 35;
+            window.location.href = "" + (billingPath != null ? billingPath : '/billing/billing-info/');
+            _context.next = 31;
             break;
-          case 31:
-            _context.prev = 31;
+          case 27:
+            _context.prev = 27;
             _context.t1 = _context["catch"](19);
             setError(_context.t1 == null ? void 0 : (_error$response2 = _context.t1.response) == null ? void 0 : (_error$response2$data = _error$response2.data) == null ? void 0 : _error$response2$data.message);
             onProcessTicketError(_context.t1.response);
-          case 35:
-            _context.next = 38;
+          case 31:
+            _context.next = 34;
             break;
-          case 37:
+          case 33:
             window.location.href = '/';
-          case 38:
+          case 34:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 14], [19, 31]]);
+      }, _callee, null, [[6, 14], [19, 27]]);
     }))();
   }, []);
   return React.createElement("div", {
@@ -8837,7 +8761,7 @@ var AddonsContainter = function AddonsContainter(_ref) {
   };
   var handleConfirm = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values, skipAddonPage) {
-      var _pageConfigsData$skip, _pageConfigsData$name, _pageConfigsData$age_, _pageConfigsData$phon, _pageConfigsData$has_, _pageConfigsData$free, _pageConfigsData$coll, _pageConfigsData$coll2, pageConfigsDataResponse, pageConfigsData, skipBillingPage, nameIsRequired, ageIsRequired, phoneIsRequired, hasAddOn, freeTicket, collectOptionalWalletAddress, collectMandatoryWalletAddress, ticketsQuantity, userData, checkoutBody, _checkoutResponse$dat, _checkoutResponse$dat2, _checkoutResponse$dat3, _checkoutResponse$dat4, checkoutResponse, hash, total, _error$response, _error$response$data, _error$response$data$, _error$response2, _error$response2$data;
+      var _pageConfigsData$skip, pageConfigsDataResponse, pageConfigsData, skipBillingPage, ticketsQuantity, userData, checkoutBody, _checkoutResponse$dat, _checkoutResponse$dat2, _checkoutResponse$dat3, _checkoutResponse$dat4, checkoutResponse, hash, total, _error$response, _error$response$data, _error$response$data$, _error$response2, _error$response2$data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -8848,28 +8772,21 @@ var AddonsContainter = function AddonsContainter(_ref) {
             pageConfigsDataResponse = _context2.sent;
             pageConfigsData = _get(pageConfigsDataResponse, 'data.attributes') || {};
             skipBillingPage = (_pageConfigsData$skip = pageConfigsData.skip_billing_page) != null ? _pageConfigsData$skip : false;
-            nameIsRequired = (_pageConfigsData$name = pageConfigsData.names_required) != null ? _pageConfigsData$name : false;
-            ageIsRequired = (_pageConfigsData$age_ = pageConfigsData.age_required) != null ? _pageConfigsData$age_ : false;
-            phoneIsRequired = (_pageConfigsData$phon = pageConfigsData.phone_required) != null ? _pageConfigsData$phon : false;
-            hasAddOn = (_pageConfigsData$has_ = pageConfigsData.has_add_on) != null ? _pageConfigsData$has_ : false;
-            freeTicket = (_pageConfigsData$free = pageConfigsData.free_ticket) != null ? _pageConfigsData$free : false;
-            collectOptionalWalletAddress = (_pageConfigsData$coll = pageConfigsData.collect_optional_wallet_address) != null ? _pageConfigsData$coll : false;
-            collectMandatoryWalletAddress = (_pageConfigsData$coll2 = pageConfigsData.collect_mandatory_wallet_address) != null ? _pageConfigsData$coll2 : false;
             if (!(skipBillingPage && enableBillingInfoAutoCreate)) {
-              _context2.next = 34;
+              _context2.next = 27;
               break;
             }
             ticketsQuantity = window.localStorage.getItem('quantity');
             userData = JSON.parse(window.localStorage.getItem('user_data') || '{}');
             checkoutBody = createCheckoutDataBodyWithDefaultHolder(Number(ticketsQuantity) || 0, userData);
-            _context2.prev = 17;
-            _context2.next = 20;
+            _context2.prev = 10;
+            _context2.next = 13;
             return postOnCheckout(_extends({}, checkoutBody, {
               attributes: _extends({}, checkoutBody.attributes, !skipAddonPage && {
                 add_ons: values
               })
             }));
-          case 20:
+          case 13:
             checkoutResponse = _context2.sent;
             hash = (checkoutResponse == null ? void 0 : (_checkoutResponse$dat = checkoutResponse.data) == null ? void 0 : (_checkoutResponse$dat2 = _checkoutResponse$dat.attributes) == null ? void 0 : _checkoutResponse$dat2.hash) || '';
             total = (checkoutResponse == null ? void 0 : (_checkoutResponse$dat3 = checkoutResponse.data) == null ? void 0 : (_checkoutResponse$dat4 = _checkoutResponse$dat3.attributes) == null ? void 0 : _checkoutResponse$dat4.total) || '';
@@ -8878,43 +8795,32 @@ var AddonsContainter = function AddonsContainter(_ref) {
             onPostCheckoutSuccess(checkoutResponse == null ? void 0 : checkoutResponse.data.attributes);
             onConfirmSelectionSuccess({
               skip_billing_page: skipBillingPage,
-              names_required: nameIsRequired,
-              phone_required: phoneIsRequired,
-              age_required: ageIsRequired,
               event_id: String(eventId),
               hash: hash,
-              total: total,
-              hasAddOn: hasAddOn,
-              free_ticket: freeTicket,
-              collect_optional_wallet_address: collectOptionalWalletAddress,
-              collect_mandatory_wallet_address: collectMandatoryWalletAddress
+              total: total
             });
-            _context2.next = 32;
+            _context2.next = 25;
             break;
-          case 29:
-            _context2.prev = 29;
-            _context2.t0 = _context2["catch"](17);
+          case 22:
+            _context2.prev = 22;
+            _context2.t0 = _context2["catch"](10);
             if ((_error$response = _context2.t0.response) != null && (_error$response$data = _error$response.data) != null && (_error$response$data$ = _error$response$data.data) != null && _error$response$data$.hasUnverifiedOrder) {
               setPendingVerificationMessage((_error$response2 = _context2.t0.response) == null ? void 0 : (_error$response2$data = _error$response2.data) == null ? void 0 : _error$response2$data.message);
             } else {
               onPostCheckoutError(_context2.t0);
               onConfirmSelectionError(_context2.t0);
             }
-          case 32:
-            _context2.next = 35;
+          case 25:
+            _context2.next = 28;
             break;
-          case 34:
+          case 27:
             if (isBrowser) {
               if (!skipAddonPage) {
                 window.localStorage.setItem('add_ons', JSON.stringify(values));
               }
               onConfirmSelectionSuccess({
                 skip_billing_page: skipBillingPage && enableBillingInfoAutoCreate,
-                names_required: nameIsRequired,
-                phone_required: phoneIsRequired,
-                age_required: ageIsRequired,
-                event_id: String(eventId),
-                hasAddOn: hasAddOn
+                event_id: String(eventId)
               });
             } else {
               onConfirmSelectionError({
@@ -8922,18 +8828,18 @@ var AddonsContainter = function AddonsContainter(_ref) {
                 message: 'Window is not defined'
               });
             }
-          case 35:
-            _context2.next = 40;
+          case 28:
+            _context2.next = 33;
             break;
-          case 37:
-            _context2.prev = 37;
+          case 30:
+            _context2.prev = 30;
             _context2.t1 = _context2["catch"](0);
             onConfirmSelectionError(_context2.t1);
-          case 40:
+          case 33:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 37], [17, 29]]);
+      }, _callee2, null, [[0, 30], [10, 22]]);
     }));
     return function handleConfirm(_x, _x2) {
       return _ref3.apply(this, arguments);
@@ -10136,7 +10042,7 @@ var useOnline = function useOnline(handler) {
 
 var addToCartFunc = /*#__PURE__*/function () {
   var _ref2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var eventId, data, ticketQuantity, _ref$enableBillingInf, enableBillingInfoAutoCreate, result, pageConfigsDataResponse, pageConfigsData, _pageConfigsData$skip, skipBillingPage, _pageConfigsData$name, nameIsRequired, _pageConfigsData$age_, ageIsRequired, _pageConfigsData$phon, phoneIsRequired, _pageConfigsData$hide, hidePhoneField, _pageConfigsData$has_, hasAddOn, _pageConfigsData$free, freeTicket, _pageConfigsData$coll, collectOptionalWalletAddress, _pageConfigsData$coll2, collectMandatoryWalletAddress, hash, total, _checkoutResponse$dat, _checkoutResponse$dat2, _checkoutResponse$dat3, _checkoutResponse$dat4, userData, checkoutBody, checkoutResponse;
+    var eventId, data, ticketQuantity, _ref$enableBillingInf, enableBillingInfoAutoCreate, result, pageConfigsDataResponse, pageConfigsData, _pageConfigsData$skip, skipBillingPage, _pageConfigsData$has_, hasAddOn, _pageConfigsData$free, freeTicket, hash, total, _checkoutResponse$dat, _checkoutResponse$dat2, _checkoutResponse$dat3, _checkoutResponse$dat4, userData, checkoutBody, checkoutResponse;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -10154,7 +10060,7 @@ var addToCartFunc = /*#__PURE__*/function () {
             break;
           }
           pageConfigsData = _get(pageConfigsDataResponse, 'data.attributes') || {};
-          _pageConfigsData$skip = pageConfigsData.skip_billing_page, skipBillingPage = _pageConfigsData$skip === void 0 ? false : _pageConfigsData$skip, _pageConfigsData$name = pageConfigsData.names_required, nameIsRequired = _pageConfigsData$name === void 0 ? false : _pageConfigsData$name, _pageConfigsData$age_ = pageConfigsData.age_required, ageIsRequired = _pageConfigsData$age_ === void 0 ? false : _pageConfigsData$age_, _pageConfigsData$phon = pageConfigsData.phone_required, phoneIsRequired = _pageConfigsData$phon === void 0 ? false : _pageConfigsData$phon, _pageConfigsData$hide = pageConfigsData.hide_phone_field, hidePhoneField = _pageConfigsData$hide === void 0 ? false : _pageConfigsData$hide, _pageConfigsData$has_ = pageConfigsData.has_add_on, hasAddOn = _pageConfigsData$has_ === void 0 ? false : _pageConfigsData$has_, _pageConfigsData$free = pageConfigsData.free_ticket, freeTicket = _pageConfigsData$free === void 0 ? false : _pageConfigsData$free, _pageConfigsData$coll = pageConfigsData.collect_optional_wallet_address, collectOptionalWalletAddress = _pageConfigsData$coll === void 0 ? false : _pageConfigsData$coll, _pageConfigsData$coll2 = pageConfigsData.collect_mandatory_wallet_address, collectMandatoryWalletAddress = _pageConfigsData$coll2 === void 0 ? false : _pageConfigsData$coll2;
+          _pageConfigsData$skip = pageConfigsData.skip_billing_page, skipBillingPage = _pageConfigsData$skip === void 0 ? false : _pageConfigsData$skip, _pageConfigsData$has_ = pageConfigsData.has_add_on, hasAddOn = _pageConfigsData$has_ === void 0 ? false : _pageConfigsData$has_, _pageConfigsData$free = pageConfigsData.free_ticket, freeTicket = _pageConfigsData$free === void 0 ? false : _pageConfigsData$free;
           hash = '';
           total = '';
           isBrowser && window.localStorage.removeItem('add_ons');
@@ -10170,7 +10076,7 @@ var addToCartFunc = /*#__PURE__*/function () {
             break;
           }
           _context.next = 19;
-          return postOnCheckout(checkoutBody, undefined, freeTicket);
+          return postOnCheckout(checkoutBody, freeTicket);
         case 19:
           _context.t0 = _context.sent;
           _context.next = 23;
@@ -10184,13 +10090,6 @@ var addToCartFunc = /*#__PURE__*/function () {
         case 26:
           return _context.abrupt("return", {
             skip_billing_page: skipBillingPage,
-            names_required: nameIsRequired,
-            phone_required: phoneIsRequired,
-            age_required: ageIsRequired,
-            hide_phone_field: hidePhoneField,
-            free_ticket: freeTicket,
-            collect_optional_wallet_address: collectOptionalWalletAddress,
-            collect_mandatory_wallet_address: collectMandatoryWalletAddress,
             event_id: String(eventId),
             hash: hash,
             total: total,