tf-checkout-react 1.3.15 → 1.3.17

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.15",
+  "version": "1.3.17",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

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

@@ -311,10 +311,13 @@ export const BillingInfoContainer = React.memo(
     const hideTtfOptIn: boolean = _get(cartInfoData, 'hide_ttf_opt_in', true)
     const expirationTime = _get(cartInfoData, 'expiresAt')
     const flagRequirePhone = getQueryVariable('phone_required') === 'true'
-    const collectOptionalWalletAddress = getQueryVariable('collect_optional_wallet_address') === 'true'
-    const collectMandatoryWalletAddress = getQueryVariable('collect_mandatory_wallet_address') === 'true'
+    const collectMandatoryWalletAddress =
+      getQueryVariable('collect_mandatory_wallet_address') === 'true'
+    const collectOptionalWalletAddress =
+      getQueryVariable('collect_optional_wallet_address') === 'true'
     const flagFreeTicket = getQueryVariable('free_ticket') === 'true'
     const hidePhoneField = getQueryVariable('hide_phone_field') === 'true'
+    const hideWalletAddressField = !collectOptionalWalletAddress && !collectMandatoryWalletAddress;
 
     // Get prevProps
     const prevData = useRef(data)
@@ -570,7 +573,8 @@ export const BillingInfoContainer = React.memo(
               )
               const bodyFormData = createRegisterFormData(
                 values,
-                checkoutBodyForRegistration
+                checkoutBodyForRegistration,
+                flagFreeTicket,
               )
               try {
                 setLoading(true)
@@ -769,15 +773,22 @@ export const BillingInfoContainer = React.memo(
                                       return false
                                     }
                                   }
-                                  if (el.name === 'data_capture[wallet_address]') {
-                                    if (collectOptionalWalletAddress) {
-                                      el.required = false
-                                    }
+                                  if (
+                                    el.name === 'data_capture[wallet_address]'
+                                  ) {
                                     if (collectMandatoryWalletAddress) {
                                       el.required = true
                                     }
                                   }
-                                  if (['street_address', 'country', 'state', 'city', 'zip'].includes(el.name)) {
+                                  if (
+                                    [
+                                      'street_address',
+                                      'country',
+                                      'state',
+                                      'city',
+                                      'zip',
+                                    ].includes(el.name)
+                                  ) {
                                     if (flagFreeTicket) {
                                       el.required = false
                                       return false
@@ -791,7 +802,10 @@ export const BillingInfoContainer = React.memo(
                                     'confirmPassword',
                                     'password-info',
                                   ].includes(element.name) &&
-                                  isLoggedIn ? null : (
+                                  isLoggedIn ? null : [
+                                      'data_capture[wallet_address]',
+                                    ].includes(element.name) &&
+                                    hideWalletAddressField ? null : (
                                     <React.Fragment key={element.uniqueId}>
                                       <div
                                         className={`${element.className} ${
@@ -815,13 +829,14 @@ export const BillingInfoContainer = React.memo(
                                                       ? ''
                                                       : ' (optional)'
                                                   } `
-                                                : element.name === 'data_capture[wallet_address]'
-                                                  ? `${element.label}${
-                                                    collectOptionalWalletAddress
+                                                : element.name ===
+                                                  'data_capture[wallet_address]'
+                                                ? `${element.label}${
+                                                    !collectMandatoryWalletAddress
                                                       ? ' (optional)'
                                                       : ''
                                                   } `
-                                                  : element.label
+                                                : element.label
                                             }
                                             type={element.type}
                                             fill={element.fill}

package/src/components/billing-info-container/utils.ts

@@ -1,14 +1,14 @@
-import _map from 'lodash/map'
-import _get from 'lodash/get'
-import _forEach from 'lodash/forEach'
+import { FormikErrors, FormikValues } from 'formik'
 import _flatMapDeep from 'lodash/flatMapDeep'
+import _forEach from 'lodash/forEach'
+import _get from 'lodash/get'
 import _isArray from 'lodash/isArray'
+import _map from 'lodash/map'
+import { nanoid } from 'nanoid'
 
-import { CONFIGS } from '../../utils'
 import { IGroupItem } from '../../types'
+import { CONFIGS } from '../../utils'
 import { combineValidators, requiredValidator } from '../../validators'
-import { nanoid } from 'nanoid'
-import { FormikErrors, FormikValues } from 'formik'
 
 export interface ILoggedInValues {
   emailLogged?: string;
@@ -47,7 +47,8 @@ export const getInitialValues = (
 
 export const createRegisterFormData = (
   values: IValues = {},
-  checkoutBody: { attributes: { [key: string]: any } }
+  checkoutBody: { attributes: { [key: string]: any } },
+  flagFreeTicket = false
 ): FormData => {
   const bodyFormData = new FormData()
   bodyFormData.append('first_name', values.firstName)
@@ -66,7 +67,9 @@ export const createRegisterFormData = (
   bodyFormData.append('check_cart_expiration', 'true')
 
   _forEach(checkoutBody.attributes, (item: any, key: string) => {
-    bodyFormData.append(key, item)
+    if (!(flagFreeTicket && ['country', 'state', 'city', 'street_address', 'zip'].includes(key))) {
+      bodyFormData.append(key, item)
+    }
   })
 
   return bodyFormData
@@ -119,7 +122,7 @@ export const createCheckoutDataBody = (
   ticketsQuantity: number,
   values: IValues = {},
   logedInValues: ILoggedInValues = {},
-  includeDob: boolean = false
+  includeDob = false
 ): ICheckoutBody => {
   const {
     firstName,

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

@@ -1,96 +0,0 @@
-"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+' } })));
-};