tf-checkout-react 1.2.28 → 1.2.30

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.28",
+  "version": "1.2.30",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -76,9 +76,9 @@
   "dependencies": {
     "@emotion/react": "^11.7.0",
     "@emotion/styled": "^11.6.0",
-    "@mui/lab": "^5.0.0-alpha.55",
     "@mui/material": "^5.2.2",
     "@mui/styles": "^5.2.2",
+    "@mui/x-date-pickers": "^5.0.1",
     "@stripe/react-stripe-js": "^1.6.0",
     "@stripe/stripe-js": "^1.21.1",
     "axios": "^0.24.0",

package/src/components/billing-info-container/index.tsx

@@ -256,7 +256,7 @@ export const BillingInfoContainer = React.memo(
         : ''
     const [dataWithUniqueIds, setDataWithUniqueIds] = useState<
       IBillingInfoData[]
-    >(data)
+    >(assingUniqueIds(data))
     const xtfCookie = getCookieByName('X-TF-ECOMMERCE')
     const [isLoggedIn, setIsLoggedIn] = useState(!!(pIsLoggedIn || xtfCookie))
     const [cartInfoData, setCartInfo] = useState<any>({})

package/src/components/common/CheckboxField.tsx

@@ -22,6 +22,7 @@ export const CheckboxField = ({
   theme,
   setFieldValue,
   disableDropdown,
+  setPhoneValidationIsLoading,
   ...rest
 }: ICheckboxField & IOtherProps) => {
   const customTheme: any = useTheme()

package/src/components/common/DatePickerField.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
-import DatePicker from '@mui/lab/DatePicker'
-import AdapterMoment from '@mui/lab/AdapterMoment'
-import LocalizationProvider from '@mui/lab/LocalizationProvider'
+import { DatePicker } from '@mui/x-date-pickers'
+import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment'
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'
 import { ThemeProvider, createTheme } from '@mui/material/styles'
 import { FieldInputProps, FormikProps } from 'formik'
 import _get from 'lodash/get'
@@ -32,6 +32,12 @@ const compactStyles = {
     width: DATE_SIZE,
     height: DATE_SIZE,
   },
+  '& .MuiPickersArrowSwitcher-spacer': {
+    width: 0,
+  },
+  '& [role="presentation"] .PrivatePickersFadeTransitionGroup-root': {
+    marginRight: -1,
+  },
 }
 
 const compactStyleTheme = createTheme({

package/src/components/common/PhoneNumberField.tsx

@@ -88,8 +88,8 @@ export const PhoneNumberField = ({
         defaultCountry="us"
         disableDropdown={disableDropdown}
         label={label}
-        error={!!error && isTouched}
-        helperText={isTouched && error}
+        error={!!error && (isTouched || fill)}
+        helperText={(isTouched || fill) && error}
         fullWidth
         autoFormat={false}
         disableAreaCodes={true}

package/src/components/common/dist/PhoneNumberField.js

@@ -0,0 +1,96 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.PhoneNumberField = void 0;
+var TextField_1 = require("@mui/material/TextField");
+var debounce_1 = require("lodash/debounce");
+var get_1 = require("lodash/get");
+var react_1 = require("react");
+var api_1 = require("../../api");
+exports.PhoneNumberField = function (_a) {
+    var label = _a.label, _b = _a.type, type = _b === void 0 ? 'text' : _b, field = _a.field, _c = _a.form, errors = _c.errors, setFieldError = _c.setFieldError, setStatus = _c.setStatus;
+    var error = get_1["default"](errors, field.name);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var debounceCb = react_1.useCallback(debounce_1["default"](function (cb) { return void cb(); }, 1000), []);
+    react_1.useEffect(function () {
+        var _a;
+        if (field.value) {
+            setStatus((_a = {}, _a[field.name] = true, _a));
+        }
+        debounceCb(function () { return __awaiter(void 0, void 0, void 0, function () {
+            var error_1, message;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 3, 4, 5]);
+                        if (!field.value) return [3 /*break*/, 2];
+                        return [4 /*yield*/, api_1.validatePhoneNumber(field.value)];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        setFieldError(field.name, '');
+                        return [3 /*break*/, 5];
+                    case 3:
+                        error_1 = _b.sent();
+                        message = get_1["default"](error_1, 'response.data.message', 'Invalid phone number');
+                        setFieldError(field.name, message);
+                        return [3 /*break*/, 5];
+                    case 4:
+                        setStatus((_a = {}, _a[field.name] = false, _a));
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        }); });
+        // eslint-disable-next-line
+    }, [field.value]);
+    return (react_1["default"].createElement(TextField_1["default"], __assign({}, field, { id: field.name, label: label, type: type, fullWidth: true, error: !!error, helperText: error, value: field.value || '', inputProps: { pattern: '[+0-9]/d+' } })));
+};

package/src/components/orderDetailsContainer/ticketsTable.tsx

@@ -1,3 +1,4 @@
+import CircularProgress from '@mui/material/CircularProgress'
 import Paper from '@mui/material/Paper'
 import Table from '@mui/material/Table'
 import TableBody from '@mui/material/TableBody'
@@ -27,7 +28,6 @@ export interface ITicketTypes {
   is_on_sale?: boolean;
   event_name: string;
   currency: string;
-  resale_fee_amount: number | string;
   ticket_type_hash: string;
   ticket_type_is_active?: boolean;
   retain_amount_on_sale: number | string;
@@ -52,6 +52,11 @@ interface TicketsTableTypes {
   displayColumnNameInRow?: boolean;
 }
 
+type PdfDownload = {
+  hash: string;
+  loading: boolean;
+}
+
 const TicketsTable = ({
   tickets = [],
   columns = [],
@@ -61,11 +66,20 @@ const TicketsTable = ({
   displayColumnNameInRow = false,
 }: TicketsTableTypes) => {
   const [pdfError, setPdfError] = useState<string | null>(null)
+  const [pdfDownload, setPdfDownload] = useState<PdfDownload>({
+    hash: '',
+    loading: false,
+  })
 
   const getRow = (ticket: ITicketTypes) =>
     _map(columns, (column, columnIndex) => {
       if (column.key === 'download') {
-        if (ticket.pdf_link && ticket.status === 'Sold') return null
+        const ticketIsDownloading =
+          pdfDownload.loading && pdfDownload.hash === ticket.hash
+
+        if (!ticket.pdf_link || ticket.status === 'Sold' || ticket.is_on_sale)
+          return null
+
         return (
           <TableCell key={columnIndex}>
             {Boolean(icon) && <img src={icon} alt="nodata" />}
@@ -73,6 +87,11 @@ const TicketsTable = ({
               aria-hidden={true}
               className="action-button"
               onClick={async () => {
+                if (ticketIsDownloading) {
+                  return
+                }
+
+                setPdfDownload({ hash: ticket.hash, loading: true })
                 try {
                   const pdfDownloadError = await downloadPDF(ticket.pdf_link)
                   if (pdfDownloadError) {
@@ -82,10 +101,16 @@ const TicketsTable = ({
                   if (err && typeof err === 'string') {
                     setPdfError(err)
                   }
+                } finally {
+                  setPdfDownload({ hash: '', loading: false })
                 }
               }}
             >
-              Download
+              {ticketIsDownloading ? (
+                <CircularProgress size="22px" />
+              ) : (
+                'Download'
+              )}
             </span>
           </TableCell>
         )

package/src/components/ticketResaleModal/index.tsx

@@ -81,7 +81,7 @@ export const TicketResaleModal = ({
   onSubmit = () => { },
   loading = false
 }: Props) => {
-  const { hash, holder_name, event_name, currency, resale_fee_amount, retain_amount_on_sale, ticket_type_is_active } = ticket
+  const { hash, holder_name, event_name, currency, retain_amount_on_sale, ticket_type_is_active } = ticket
 
   return (
     <Modal
@@ -198,7 +198,6 @@ export const TicketResaleModal = ({
                   <p>I confirm that I want to sell this ticket and that, if someone chooses to buy it, I will no longer own it or have the right to ask for it back.</p>
                   <p>I also understand that, if no one chooses to buy it, it remains my property, is valid for entry to <strong>{event_name}</strong> and I will not receive any refund.</p>
                   <p>If my ticket is sold, the original card I used to buy my ticket will be refunded with the original amount paid, minus a small handling fee of <strong>{`${currency ?? ''} ${retain_amount_on_sale ?? '0'}`}</strong>, and that any existing refunds due to me for referring sales for this event are no longer valid.</p>
-                  <p>In order to receive the refund, I agree to pay a fee of <strong>{`${currency ?? ''} ${resale_fee_amount ?? '0'}`}</strong>.</p>
                   <Field
                     name='confirm'
                     label='I agree'

package/src/utils/getQueryVariable.ts

@@ -5,7 +5,7 @@ export const getQueryVariable = (variable: string) => {
     for (let i = 0; i < vars.length; i++) {
       const pair = vars[i].split('=')
       if (pair[0] === variable) {
-        return pair[1]
+        return decodeURIComponent(pair[1])
       }
     }
   }