tf-checkout-react 1.2.12 → 1.2.15

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

@@ -1724,35 +1724,39 @@ var PhoneNumberField = function PhoneNumberField(_ref) {
 
             case 4:
               setFieldError(field.name, '');
-              setFieldTouched(field.name, false);
-              _context.next = 12;
+              _context.next = 11;
               break;
 
-            case 8:
-              _context.prev = 8;
+            case 7:
+              _context.prev = 7;
               _context.t0 = _context["catch"](0);
               message = _get(_context.t0, 'response.data.message', 'Invalid phone number');
               setFieldError(field.name, message);
 
-            case 12:
-              _context.prev = 12;
+            case 11:
+              _context.prev = 11;
               setStatus((_setStatus2 = {}, _setStatus2[field.name] = false, _setStatus2));
-              return _context.finish(12);
+              return _context.finish(11);
 
-            case 15:
+            case 14:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 8, 12, 15]]);
+      }, _callee, null, [[0, 7, 11, 14]]);
     }))); // eslint-disable-next-line
   }, [field.value]);
-  return React.createElement(MuiPhoneNumber, {
+  return React.createElement(React.Fragment, null, React.createElement(MuiPhoneNumber, {
     name: field.name,
     value: fill ? values.phone : initialValues.phone,
-    onChange: function onChange(e) {
-      setFieldTouched(field.name, true);
-      setFieldValue(field.name, e);
+    onChange: function onChange(value, country) {
+      if ("+" + (country == null ? void 0 : country.dialCode) !== value) {
+        setFieldTouched(field.name, true);
+        setFieldValue(field.name, value);
+      } else {
+        setFieldValue(field.name, '');
+        setFieldError(field.name, '');
+      }
     },
     variant: "outlined",
     defaultCountry: "us",
@@ -1763,7 +1767,7 @@ var PhoneNumberField = function PhoneNumberField(_ref) {
     fullWidth: true,
     autoFormat: false,
     disableAreaCodes: true
-  });
+  }));
 };
 
 function Loader() {
@@ -2662,7 +2666,8 @@ var LogicRunner = function LogicRunner(_ref) {
       setUserValues = _ref.setUserValues,
       onGetStatesSuccess = _ref.onGetStatesSuccess,
       onGetStatesError = _ref.onGetStatesError,
-      shouldFetchCountries = _ref.shouldFetchCountries;
+      shouldFetchCountries = _ref.shouldFetchCountries,
+      brandOptIn = _ref.brandOptIn;
   var prevCountry = useRef(values.country);
   useEffect(function () {
     var fetchStates = /*#__PURE__*/function () {
@@ -2737,7 +2742,7 @@ var LogicRunner = function LogicRunner(_ref) {
               street_address: (parsedData == null ? void 0 : parsedData.street_address) || '',
               country: (parsedData == null ? void 0 : parsedData.country) || '1',
               zip: (parsedData == null ? void 0 : parsedData.zip) || '',
-              brand_opt_in: (parsedData == null ? void 0 : parsedData.brand_opt_in) || false,
+              brand_opt_in: brandOptIn ? brandOptIn : (parsedData == null ? void 0 : parsedData.brand_opt_in) || false,
               city: (parsedData == null ? void 0 : parsedData.city) || '',
               confirmPassword: '',
               password: '',
@@ -2832,7 +2837,9 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
       _ref3$showForgotPassw = _ref3.showForgotPasswordButton,
       showForgotPasswordButton = _ref3$showForgotPassw === void 0 ? false : _ref3$showForgotPassw,
       _ref3$showSignUpButto = _ref3.showSignUpButton,
-      showSignUpButton = _ref3$showSignUpButto === void 0 ? false : _ref3$showSignUpButto;
+      showSignUpButton = _ref3$showSignUpButto === void 0 ? false : _ref3$showSignUpButto,
+      _ref3$brandOptIn = _ref3.brandOptIn,
+      brandOptIn = _ref3$brandOptIn === void 0 ? false : _ref3$brandOptIn;
 
   var themeMui = createTheme(themeOptions);
   var isWindowDefined = typeof window !== 'undefined';
@@ -2920,9 +2927,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
   var showDOB = getQueryVariable('age_required') === 'true';
   var showTicketHolders = getQueryVariable('names_required') === 'true';
   var eventId = getQueryVariable('event_id');
-
-  var optedInFieldValue = _get(cartInfoData, 'optedIn', false);
-
+  var optedInFieldValue = brandOptIn ? brandOptIn : _get(cartInfoData, 'optedIn', false);
   var ttfOptIn = Boolean(_get(cartInfoData, 'ttfOptIn', false));
 
   var hideTtfOptIn = _get(cartInfoData, 'hide_ttf_opt_in', true);
@@ -3398,6 +3403,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
     return React.createElement(Form, {
       onSubmit: props.handleSubmit
     }, React.createElement(ErrorFocus, null), React.createElement(LogicRunner, {
+      brandOptIn: brandOptIn,
       values: props.values,
       setStates: setStates,
       setFieldValue: props.setFieldValue,
@@ -5935,119 +5941,47 @@ var MyTicketsContainer = function MyTicketsContainer(_ref) {
   })));
 };
 
-var TicketsTable = function TicketsTable(_ref) {
-  var _ref$tickets = _ref.tickets,
-      tickets = _ref$tickets === void 0 ? [] : _ref$tickets,
-      _ref$handleSellTicket = _ref.handleSellTicket,
-      handleSellTicket = _ref$handleSellTicket === void 0 ? _identity : _ref$handleSellTicket,
-      _ref$handleRemoveFrom = _ref.handleRemoveFromResale,
-      handleRemoveFromResale = _ref$handleRemoveFrom === void 0 ? _identity : _ref$handleRemoveFrom,
-      _ref$icon = _ref.icon,
-      icon = _ref$icon === void 0 ? '' : _ref$icon;
-
-  var _useState = useState(null),
-      pdfError = _useState[0],
-      setPdfError = _useState[1];
-
-  return React.createElement("div", {
-    className: "tickets-box"
-  }, React.createElement(SnackbarAlert, {
-    type: "error",
-    isOpen: !!pdfError,
-    message: pdfError || '',
-    onClose: function onClose() {
-      return setPdfError(null);
-    }
-  }), React.createElement("h4", {
-    className: "sub-title"
-  }, "Your Tickets"), React.createElement(TableContainer, {
-    component: Paper
-  }, React.createElement(Table, {
-    "aria-label": "collapsible table"
-  }, React.createElement(TableHead, null, React.createElement(TableRow, null, React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null))), React.createElement(TableBody, null, tickets.map(function (ticket, index) {
-    var _ticket$add_ons;
-
-    return React.createElement(Fragment, {
-      key: index
-    }, React.createElement(TableRow, null, React.createElement(TableCell, null, React.createElement("div", {
-      className: "cell-block"
-    }, React.createElement("span", null, "Ticket ID"), React.createElement("span", null, ticket.hash))), React.createElement(TableCell, null, React.createElement("div", {
-      className: "cell-block"
-    }, React.createElement("span", null, "Ticket Type"), React.createElement("span", null, ticket.ticket_type))), React.createElement(TableCell, null, React.createElement("div", {
-      className: "cell-block"
-    }, React.createElement("span", null, "Ticket Holder"), React.createElement("span", null, ticket.holder_name))), React.createElement(TableCell, null, React.createElement("div", {
-      className: "cell-block"
-    }, React.createElement("span", null, "Status"), React.createElement("span", null, ticket.status))), ticket.pdf_link && ticket.status !== "Sold" ? React.createElement(TableCell, null, Boolean(icon) && React.createElement("img", {
-      src: icon,
-      alt: "nodata"
-    }), React.createElement("span", {
-      "aria-hidden": true,
-      className: "action-button",
-      onClick: function () {
-        var _onClick = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
-          var pdfDownloadError;
-          return runtime_1.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _context.prev = 0;
-                  _context.next = 3;
-                  return downloadPDF(ticket.pdf_link);
-
-                case 3:
-                  pdfDownloadError = _context.sent;
-
-                  if (pdfDownloadError) {
-                    setPdfError(pdfDownloadError == null ? void 0 : pdfDownloadError.message);
-                  }
-
-                  _context.next = 10;
-                  break;
-
-                case 7:
-                  _context.prev = 7;
-                  _context.t0 = _context["catch"](0);
-
-                  if (_context.t0 && typeof _context.t0 === 'string') {
-                    setPdfError(_context.t0);
-                  }
-
-                case 10:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee, null, [[0, 7]]);
-        }));
-
-        function onClick() {
-          return _onClick.apply(this, arguments);
-        }
+var style$3 = {
+  position: 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translate(-50%, -50%)',
+  minWidth: 480,
+  backgroundColor: '#e3e3e3',
+  border: '1px solid white',
+  outline: 'none',
+  padding: '14px',
+  maxHeight: '85vh',
+  overflow: 'auto'
+};
 
-        return onClick;
-      }()
-    }, "Download")) : null, React.createElement(TableCell, null, ticket.is_sellable && React.createElement("span", {
-      "aria-hidden": true,
-      className: "action-button",
-      onClick: function onClick() {
-        return handleSellTicket(ticket);
-      }
-    }, "Sell Ticket"), ticket.is_on_sale && React.createElement("span", {
-      "aria-hidden": true,
-      className: "action-button",
-      onClick: function onClick() {
-        return handleRemoveFromResale(ticket);
-      }
-    }, "Remove from Resale"))), !!((_ticket$add_ons = ticket.add_ons) != null && _ticket$add_ons.length) && React.createElement(TableRow, null, React.createElement(TableCell, {
-      colSpan: 6
-    }, React.createElement(Table, {
-      className: "ticket-add-on-table"
-    }, React.createElement(TableHead, null, React.createElement(TableRow, null, React.createElement(TableCell, null, "Add-On"), React.createElement(TableCell, null, "Status"))), React.createElement(TableBody, null, ticket.add_ons.map(function (add_on, index) {
-      return React.createElement(TableRow, {
-        key: index
-      }, React.createElement(TableCell, null, add_on.name), React.createElement(TableCell, null, add_on.status));
-    }))))));
-  })))));
+var ConfirmModal = function ConfirmModal(_ref) {
+  var _ref$message = _ref.message,
+      message = _ref$message === void 0 ? '' : _ref$message,
+      _ref$loading = _ref.loading,
+      loading = _ref$loading === void 0 ? false : _ref$loading,
+      _ref$onClose = _ref.onClose,
+      onClose = _ref$onClose === void 0 ? function () {} : _ref$onClose,
+      _ref$onConfirm = _ref.onConfirm,
+      onConfirm = _ref$onConfirm === void 0 ? function () {} : _ref$onConfirm;
+  return React.createElement(Modal$1, {
+    open: true,
+    onClose: onClose,
+    "aria-labelledby": "modal-modal-title",
+    "aria-describedby": "modal-modal-description",
+    className: 'confirm-modal'
+  }, React.createElement(Box$1, {
+    style: style$3
+  }, React.createElement("p", null, message), React.createElement("div", {
+    className: 'footer'
+  }, React.createElement(Button, {
+    onClick: onClose,
+    disabled: loading
+  }, "Cancel"), React.createElement(Button, {
+    onClick: onConfirm
+  }, loading ? React.createElement(CircularProgress, {
+    size: "22px"
+  }) : 'OK'))));
 };
 
 var _excluded$2 = ["label", "field", "theme", "disableDropdown"];
@@ -6066,7 +6000,7 @@ var RadioField = function RadioField(_ref) {
   }));
 };
 
-var style$3 = {
+var style$4 = {
   position: 'absolute',
   top: '50%',
   left: '50%',
@@ -6121,7 +6055,9 @@ var TicketResaleModal = function TicketResaleModal(_ref) {
       _ref$onClose = _ref.onClose,
       onClose = _ref$onClose === void 0 ? function () {} : _ref$onClose,
       _ref$onSubmit = _ref.onSubmit,
-      onSubmit = _ref$onSubmit === void 0 ? function () {} : _ref$onSubmit;
+      onSubmit = _ref$onSubmit === void 0 ? function () {} : _ref$onSubmit,
+      _ref$loading = _ref.loading,
+      loading = _ref$loading === void 0 ? false : _ref$loading;
   var hash = ticket.hash,
       holder_name = ticket.holder_name,
       event_name = ticket.event_name,
@@ -6135,7 +6071,7 @@ var TicketResaleModal = function TicketResaleModal(_ref) {
     "aria-describedby": "modal-modal-description",
     className: 'resale-modal'
   }, React.createElement(Box$1, {
-    style: style$3
+    style: style$4
   }, React.createElement("h3", null, "Sell Ticket"), React.createElement("div", null, React.createElement("h3", null, "Ticket Details"), React.createElement("div", null, React.createElement("h4", null, "Event"), React.createElement("p", null, event_name)), React.createElement("div", null, React.createElement("h4", null, "Ticket Holder"), React.createElement("p", null, holder_name)), React.createElement("div", null, React.createElement("h4", null, "Ticket ID"), React.createElement("p", null, hash))), React.createElement("div", null, React.createElement("h3", null, "Sell to Whom"), React.createElement(Formik, {
     initialValues: initialValues,
     validationSchema: schema,
@@ -6216,46 +6152,125 @@ var TicketResaleModal = function TicketResaleModal(_ref) {
     }, React.createElement(Button, {
       type: "submit",
       disabled: !(isValid && dirty)
-    }, "Sell Ticket")));
+    }, loading ? React.createElement(CircularProgress, {
+      size: "22px"
+    }) : 'Sell Ticket')));
   }))));
 };
 
-var style$4 = {
-  position: 'absolute',
-  top: '50%',
-  left: '50%',
-  transform: 'translate(-50%, -50%)',
-  minWidth: 480,
-  backgroundColor: '#e3e3e3',
-  border: '1px solid white',
-  outline: 'none',
-  padding: '14px',
-  maxHeight: '85vh',
-  overflow: 'auto'
-};
+var TicketsTable = function TicketsTable(_ref) {
+  var _ref$tickets = _ref.tickets,
+      tickets = _ref$tickets === void 0 ? [] : _ref$tickets,
+      _ref$handleSellTicket = _ref.handleSellTicket,
+      handleSellTicket = _ref$handleSellTicket === void 0 ? _identity : _ref$handleSellTicket,
+      _ref$handleRemoveFrom = _ref.handleRemoveFromResale,
+      handleRemoveFromResale = _ref$handleRemoveFrom === void 0 ? _identity : _ref$handleRemoveFrom,
+      _ref$icon = _ref.icon,
+      icon = _ref$icon === void 0 ? '' : _ref$icon;
 
-var ConfirmModal = function ConfirmModal(_ref) {
-  var _ref$message = _ref.message,
-      message = _ref$message === void 0 ? '' : _ref$message,
-      _ref$onClose = _ref.onClose,
-      onClose = _ref$onClose === void 0 ? function () {} : _ref$onClose,
-      _ref$onConfirm = _ref.onConfirm,
-      onConfirm = _ref$onConfirm === void 0 ? function () {} : _ref$onConfirm;
-  return React.createElement(Modal$1, {
-    open: true,
-    onClose: onClose,
-    "aria-labelledby": "modal-modal-title",
-    "aria-describedby": "modal-modal-description",
-    className: 'confirm-modal'
-  }, React.createElement(Box$1, {
-    style: style$4
-  }, React.createElement("p", null, message), React.createElement("div", {
-    className: 'footer'
-  }, React.createElement(Button, {
-    onClick: onClose
-  }, "Cancel"), React.createElement(Button, {
-    onClick: onConfirm
-  }, "OK"))));
+  var _useState = useState(null),
+      pdfError = _useState[0],
+      setPdfError = _useState[1];
+
+  return React.createElement("div", {
+    className: "tickets-box"
+  }, React.createElement(SnackbarAlert, {
+    type: "error",
+    isOpen: !!pdfError,
+    message: pdfError || '',
+    onClose: function onClose() {
+      return setPdfError(null);
+    }
+  }), React.createElement("h4", {
+    className: "sub-title"
+  }, "Your Tickets"), React.createElement(TableContainer, {
+    component: Paper
+  }, React.createElement(Table, {
+    "aria-label": "collapsible table"
+  }, React.createElement(TableHead, null, React.createElement(TableRow, null, React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null), React.createElement(TableCell, null))), React.createElement(TableBody, null, tickets.map(function (ticket, index) {
+    var _ticket$add_ons;
+
+    return React.createElement(Fragment, {
+      key: index
+    }, React.createElement(TableRow, null, React.createElement(TableCell, null, React.createElement("div", {
+      className: "cell-block"
+    }, React.createElement("span", null, "Ticket ID"), React.createElement("span", null, ticket.hash))), React.createElement(TableCell, null, React.createElement("div", {
+      className: "cell-block"
+    }, React.createElement("span", null, "Ticket Type"), React.createElement("span", null, ticket.ticket_type))), React.createElement(TableCell, null, React.createElement("div", {
+      className: "cell-block"
+    }, React.createElement("span", null, "Ticket Holder"), React.createElement("span", null, ticket.holder_name))), React.createElement(TableCell, null, React.createElement("div", {
+      className: "cell-block"
+    }, React.createElement("span", null, "Status"), React.createElement("span", null, ticket.status))), ticket.pdf_link && ticket.status !== "Sold" ? React.createElement(TableCell, null, Boolean(icon) && React.createElement("img", {
+      src: icon,
+      alt: "nodata"
+    }), React.createElement("span", {
+      "aria-hidden": true,
+      className: "action-button",
+      onClick: function () {
+        var _onClick = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
+          var pdfDownloadError;
+          return runtime_1.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.prev = 0;
+                  _context.next = 3;
+                  return downloadPDF(ticket.pdf_link);
+
+                case 3:
+                  pdfDownloadError = _context.sent;
+
+                  if (pdfDownloadError) {
+                    setPdfError(pdfDownloadError == null ? void 0 : pdfDownloadError.message);
+                  }
+
+                  _context.next = 10;
+                  break;
+
+                case 7:
+                  _context.prev = 7;
+                  _context.t0 = _context["catch"](0);
+
+                  if (_context.t0 && typeof _context.t0 === 'string') {
+                    setPdfError(_context.t0);
+                  }
+
+                case 10:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[0, 7]]);
+        }));
+
+        function onClick() {
+          return _onClick.apply(this, arguments);
+        }
+
+        return onClick;
+      }()
+    }, "Download")) : null, React.createElement(TableCell, null, ticket.is_sellable && React.createElement("span", {
+      "aria-hidden": true,
+      className: "action-button",
+      onClick: function onClick() {
+        return handleSellTicket(ticket);
+      }
+    }, "Sell Ticket"), ticket.is_on_sale && React.createElement("span", {
+      "aria-hidden": true,
+      className: "action-button",
+      onClick: function onClick() {
+        return handleRemoveFromResale(ticket);
+      }
+    }, "Remove from Resale"))), !!((_ticket$add_ons = ticket.add_ons) != null && _ticket$add_ons.length) && React.createElement(TableRow, null, React.createElement(TableCell, {
+      colSpan: 6
+    }, React.createElement(Table, {
+      className: "ticket-add-on-table"
+    }, React.createElement(TableHead, null, React.createElement(TableRow, null, React.createElement(TableCell, null, "Add-On"), React.createElement(TableCell, null, "Status"))), React.createElement(TableBody, null, ticket.add_ons.map(function (add_on, index) {
+      return React.createElement(TableRow, {
+        key: index
+      }, React.createElement(TableCell, null, add_on.name), React.createElement(TableCell, null, add_on.status));
+    }))))));
+  })))));
 };
 
 var getTotal = function getTotal(data) {
@@ -6272,6 +6287,14 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
       onGetOrdersSuccess = _ref$onGetOrdersSucce === void 0 ? function () {} : _ref$onGetOrdersSucce,
       _ref$onGetOrdersError = _ref.onGetOrdersError,
       onGetOrdersError = _ref$onGetOrdersError === void 0 ? function () {} : _ref$onGetOrdersError,
+      _ref$onRemoveFromResa = _ref.onRemoveFromResaleSuccess,
+      onRemoveFromResaleSuccess = _ref$onRemoveFromResa === void 0 ? function () {} : _ref$onRemoveFromResa,
+      _ref$onRemoveFromResa2 = _ref.onRemoveFromResaleError,
+      onRemoveFromResaleError = _ref$onRemoveFromResa2 === void 0 ? function () {} : _ref$onRemoveFromResa2,
+      _ref$onResaleTicketSu = _ref.onResaleTicketSuccess,
+      onResaleTicketSuccess = _ref$onResaleTicketSu === void 0 ? function () {} : _ref$onResaleTicketSu,
+      _ref$onResaleTicketEr = _ref.onResaleTicketError,
+      onResaleTicketError = _ref$onResaleTicketEr === void 0 ? function () {} : _ref$onResaleTicketEr,
       onReturnButtonClick = _ref.onReturnButtonClick,
       _ref$personalLinkIcon = _ref.personalLinkIcon,
       personalLinkIcon = _ref$personalLinkIcon === void 0 ? '' : _ref$personalLinkIcon;
@@ -6285,16 +6308,24 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
       setLoading = _useState2[1];
 
   var _useState3 = useState(false),
-      showResaleModal = _useState3[0],
-      setShowResaleModal = _useState3[1];
+      removeFromResaleLoading = _useState3[0],
+      setRemoveFromResaleLoading = _useState3[1];
 
   var _useState4 = useState(false),
-      showRemoveResaleModal = _useState4[0],
-      setShowRemoveResaleModal = _useState4[1];
+      resaleTicketLoading = _useState4[0],
+      setResaleTicketLoading = _useState4[1];
 
-  var _useState5 = useState(null),
-      activeTicket = _useState5[0],
-      setActiveTicket = _useState5[1];
+  var _useState5 = useState(false),
+      showResaleModal = _useState5[0],
+      setShowResaleModal = _useState5[1];
+
+  var _useState6 = useState(false),
+      showRemoveResaleModal = _useState6[0],
+      setShowRemoveResaleModal = _useState6[1];
+
+  var _useState7 = useState(null),
+      activeTicket = _useState7[0],
+      setActiveTicket = _useState7[1];
 
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
@@ -6369,8 +6400,16 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.prev = 0;
-              setLoading(true);
+              if (!resaleTicketLoading) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 2:
+              _context2.prev = 2;
+              setResaleTicketLoading(true);
               to = values.to, first_name = values.first_name, last_name = values.last_name, email = values.email, confirm_email = values.confirm_email, confirm = values.confirm;
               formData = new FormData();
               formData.append('to', to);
@@ -6379,10 +6418,10 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
               formData.append('email', email);
               formData.append('confirm_email', confirm_email);
               formData.append('confirm', String(confirm));
-              _context2.next = 12;
+              _context2.next = 14;
               return resaleTicket(formData, activeTicket.hash);
 
-            case 12:
+            case 14:
               updatedData = _extends({}, data);
               updatedData == null ? void 0 : (_updatedData$tickets = updatedData.tickets) == null ? void 0 : _updatedData$tickets.forEach(function (ticket) {
                 if (ticket.hash === activeTicket.hash) {
@@ -6391,25 +6430,27 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
                 }
               });
               setData(updatedData);
-              _context2.next = 19;
+              onResaleTicketSuccess();
+              _context2.next = 23;
               break;
 
-            case 17:
-              _context2.prev = 17;
-              _context2.t0 = _context2["catch"](0);
+            case 20:
+              _context2.prev = 20;
+              _context2.t0 = _context2["catch"](2);
+              onResaleTicketError(_context2.t0);
 
-            case 19:
-              _context2.prev = 19;
+            case 23:
+              _context2.prev = 23;
               setShowResaleModal(false);
-              setLoading(false);
-              return _context2.finish(19);
+              setResaleTicketLoading(false);
+              return _context2.finish(23);
 
-            case 23:
+            case 27:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[0, 17, 19, 23]]);
+      }, _callee2, null, [[2, 20, 23, 27]]);
     }));
 
     return function handleOnSubmit(_x) {
@@ -6435,12 +6476,20 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
-              setLoading(true);
-              _context3.next = 4;
+              if (!removeFromResaleLoading) {
+                _context3.next = 2;
+                break;
+              }
+
+              return _context3.abrupt("return");
+
+            case 2:
+              _context3.prev = 2;
+              setRemoveFromResaleLoading(true);
+              _context3.next = 6;
               return removeFromResale(activeTicket.hash);
 
-            case 4:
+            case 6:
               updatedData = _extends({}, data);
               updatedData == null ? void 0 : (_updatedData$tickets2 = updatedData.tickets) == null ? void 0 : _updatedData$tickets2.forEach(function (ticket) {
                 if (ticket.hash === activeTicket.hash) {
@@ -6449,25 +6498,27 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
                 }
               });
               setData(updatedData);
-              _context3.next = 11;
+              onRemoveFromResaleSuccess();
+              _context3.next = 15;
               break;
 
-            case 9:
-              _context3.prev = 9;
-              _context3.t0 = _context3["catch"](0);
+            case 12:
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](2);
+              onRemoveFromResaleError(_context3.t0);
 
-            case 11:
-              _context3.prev = 11;
+            case 15:
+              _context3.prev = 15;
               setShowRemoveResaleModal(false);
-              setLoading(false);
-              return _context3.finish(11);
+              setRemoveFromResaleLoading(false);
+              return _context3.finish(15);
 
-            case 15:
+            case 19:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[0, 9, 11, 15]]);
+      }, _callee3, null, [[2, 12, 15, 19]]);
     }));
 
     return function onConfirmRemoveResale() {
@@ -6477,8 +6528,9 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
 
   var orderSummery = "ID " + data.id + ", placed";
 
-  if (data.date) {
-    orderSummery += " " + data.date;
+  if (data.date && data.timezone) {
+    var date = moment.tz(data.date, data.timezone).format('dddd, DD MMMM YYYY');
+    orderSummery += " " + date;
   }
 
   return React.createElement("div", {
@@ -6558,11 +6610,13 @@ var OrderDetailsContainer = function OrderDetailsContainer(_ref) {
   }, "Return to Order History"))), showResaleModal && React.createElement(TicketResaleModal, {
     ticket: activeTicket,
     onClose: handleOnClose,
-    onSubmit: handleOnSubmit
+    onSubmit: handleOnSubmit,
+    loading: resaleTicketLoading
   }), showRemoveResaleModal && React.createElement(ConfirmModal, {
     message: "Are you sure you want to withdraw your ticket from resale?",
     onClose: onCloseRemoveResale,
-    onConfirm: onConfirmRemoveResale
+    onConfirm: onConfirmRemoveResale,
+    loading: removeFromResaleLoading
   }));
 };