ordering-ui-external 2.5.9 → 2.6.0

package/_modules/components/VerticalOrdersLayout/styles.js

@@ -31,7 +31,7 @@ var PastLogo = _styledComponents.default.div(_templateObject7 || (_templateObjec
   return isMulti && (0, _styledComponents.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n      width: 55px;\n      min-width: 55px;\n      height: 55px;\n      min-height: 55px;\n      margin: 3px;\n    "])));
 });
 exports.PastLogo = PastLogo;
-var WrapperBusinessTitle = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  width: 95%;\n  display: flex;\n  gap: 10px;\n\n  @media (min-width: 480px) {\n    width: 80%;\n  }\n"])));
+var WrapperBusinessTitle = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  width: 80%;\n  display: flex;\n  gap: 10px;\n\n  @media (min-width: 480px) {\n    width: 95%;\n  }\n"])));
 exports.WrapperBusinessTitle = WrapperBusinessTitle;
 var Reorder = _styledComponents.default.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  width: 20%;\n  text-align: center;\n  align-items: center;\n  justify-content: center;\n  font-size: 0.8em;\n\n  button {\n    border-radius: 8px;\n    font-size: 10px;\n    line-height: 15px;\n    padding: 10px;\n    overflow: inherit;\n    text-overflow: inherit;\n    border: 1px solid ", ";\n    margin: 5px 0;\n\n    &.reorder {\n      background: ", ";\n      &:hover {\n        background: ", ";\n      }\n    }\n  }\n\n  ", "\n\n  p {\n    color: #53ad26;\n    margin-block-start: 0;\n    margin-block-end: 0;\n    text-overflow: ellipsis;\n    display: -webkit-box;\n    -webkit-line-clamp: 2; /* number of lines to show */\n    -webkit-box-orient: vertical;\n  }\n  @media (min-width: 480px){\n    font-size: 1em;\n    button{\n      width: 90%;\n      font-size: 0.9em;\n    }\n    flex-direction: row;\n    gap: 10px;\n    margin-right: 25px;\n  }\n\n  @media (min-width: 768px){\n    ", "\n    button{\n      width: 80%;\n    }\n  }\n\n  @media (min-width: 1024px){\n    button{\n      width: 50%;\n    }\n  }\n"])), function (props) {
   return props.theme.colors.primaryContrast;
@@ -55,5 +55,5 @@ var WrappButton = _styledComponents.default.div(_templateObject15 || (_templateO
 exports.WrappButton = WrappButton;
 var ReviewWrapper = _styledComponents.default.div(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  .review-sent {\n    border-radius: 7.6px;\n  }\n"])));
 exports.ReviewWrapper = ReviewWrapper;
-var MultiLogosContainer = _styledComponents.default.div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n"])));
+var MultiLogosContainer = _styledComponents.default.div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n  display: none;\n  align-items: center;\n\n  @media (min-width: 480px) {\n    display: flex;\n  }\n"])));
 exports.MultiLogosContainer = MultiLogosContainer;

package/_modules/themes/five/src/components/AddressForm/index.js

@@ -362,16 +362,16 @@ var AddressFormUI = function AddressFormUI(props) {
     if (isEditing) {
       var _formState$changes20;
       if (formState !== null && formState !== void 0 && (_formState$changes20 = formState.changes) !== null && _formState$changes20 !== void 0 && _formState$changes20.location) {
-        var _formState$changes21, _formState$changes21$, _formState$changes22, _formState$changes22$;
+        var _locationChange$lat, _locationChange$lng, _formState$changes21, _formState$changes21$, _formState$changes21$2, _formState$changes22, _formState$changes22$, _formState$changes22$2;
         var prevLocation = {
-          lat: Math.trunc(locationChange === null || locationChange === void 0 ? void 0 : locationChange.lat),
-          lng: Math.trunc(locationChange === null || locationChange === void 0 ? void 0 : locationChange.lng)
+          lat: locationChange === null || locationChange === void 0 ? void 0 : (_locationChange$lat = locationChange.lat) === null || _locationChange$lat === void 0 ? void 0 : _locationChange$lat.toFixed(5),
+          lng: locationChange === null || locationChange === void 0 ? void 0 : (_locationChange$lng = locationChange.lng) === null || _locationChange$lng === void 0 ? void 0 : _locationChange$lng.toFixed(5)
         };
         var newLocation = {
-          lat: Math.trunc(formState === null || formState === void 0 ? void 0 : (_formState$changes21 = formState.changes) === null || _formState$changes21 === void 0 ? void 0 : (_formState$changes21$ = _formState$changes21.location) === null || _formState$changes21$ === void 0 ? void 0 : _formState$changes21$.lat),
-          lng: Math.trunc(formState === null || formState === void 0 ? void 0 : (_formState$changes22 = formState.changes) === null || _formState$changes22 === void 0 ? void 0 : (_formState$changes22$ = _formState$changes22.location) === null || _formState$changes22$ === void 0 ? void 0 : _formState$changes22$.lng)
+          lat: formState === null || formState === void 0 ? void 0 : (_formState$changes21 = formState.changes) === null || _formState$changes21 === void 0 ? void 0 : (_formState$changes21$ = _formState$changes21.location) === null || _formState$changes21$ === void 0 ? void 0 : (_formState$changes21$2 = _formState$changes21$.lat) === null || _formState$changes21$2 === void 0 ? void 0 : _formState$changes21$2.toFixed(5),
+          lng: formState === null || formState === void 0 ? void 0 : (_formState$changes22 = formState.changes) === null || _formState$changes22 === void 0 ? void 0 : (_formState$changes22$ = _formState$changes22.location) === null || _formState$changes22$ === void 0 ? void 0 : (_formState$changes22$2 = _formState$changes22$.lng) === null || _formState$changes22$2 === void 0 ? void 0 : _formState$changes22$2.toFixed(5)
         };
-        if (prevLocation.lat !== newLocation.lat && prevLocation.lng !== newLocation.lng) {
+        if ((prevLocation === null || prevLocation === void 0 ? void 0 : prevLocation.lat) !== (newLocation === null || newLocation === void 0 ? void 0 : newLocation.lat) && (prevLocation === null || prevLocation === void 0 ? void 0 : prevLocation.lng) !== (newLocation === null || newLocation === void 0 ? void 0 : newLocation.lng)) {
           var _formState$changes23;
           setLocationChange(formState === null || formState === void 0 ? void 0 : (_formState$changes23 = formState.changes) === null || _formState$changes23 === void 0 ? void 0 : _formState$changes23.location);
         }

package/_modules/themes/five/src/components/AddressList/index.js

@@ -25,6 +25,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -54,7 +57,8 @@ var AddressListUI = function AddressListUI(props) {
     isFromCheckout = props.isFromCheckout,
     setIsAddressFormOpen = props.setIsAddressFormOpen,
     isProfile = props.isProfile,
-    isMobile = props.isMobile;
+    isMobile = props.isMobile,
+    onCancel = props.onCancel;
   var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -130,18 +134,37 @@ var AddressListUI = function AddressListUI(props) {
     }
     handleCloseAddressForm();
   };
-  var handleSetAddress = function handleSetAddress(address) {
-    if (checkAddress(address) && isCustomerMode && (userCustomerSetup === null || userCustomerSetup === void 0 ? void 0 : userCustomerSetup.id) === (user === null || user === void 0 ? void 0 : user.id) && !isFromCheckout) {
-      events.emit('go_to_page', {
-        page: 'search'
-      });
-      handleSetDefault(address, userCustomerSetup, true);
-      setCustomerModalOpen && setCustomerModalOpen(false);
-      return;
-    }
-    handleCloseAddressForm();
-    handleSetDefault(address, userCustomerSetup);
-  };
+  var handleSetAddress = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(address) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(checkAddress(address) && isCustomerMode && (userCustomerSetup === null || userCustomerSetup === void 0 ? void 0 : userCustomerSetup.id) === (user === null || user === void 0 ? void 0 : user.id) && !isFromCheckout)) {
+              _context.next = 5;
+              break;
+            }
+            events.emit('go_to_page', {
+              page: 'search'
+            });
+            handleSetDefault(address, userCustomerSetup, true);
+            setCustomerModalOpen && setCustomerModalOpen(false);
+            return _context.abrupt("return");
+          case 5:
+            handleCloseAddressForm();
+            _context.next = 8;
+            return handleSetDefault(address, userCustomerSetup);
+          case 8:
+            onCancel && onCancel();
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleSetAddress(_x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var handleDeleteClick = function handleDeleteClick(address) {
     setConfirm({
       open: true,
@@ -194,8 +217,8 @@ var AddressListUI = function AddressListUI(props) {
       handleCloseAddressForm();
     };
   }, []);
-  var AddressListCallcenterLayout = function AddressListCallcenterLayout(_ref) {
-    var children = _ref.children;
+  var AddressListCallcenterLayout = function AddressListCallcenterLayout(_ref2) {
+    var children = _ref2.children;
     return /*#__PURE__*/_react.default.createElement(_styles.AddressHalfContainer, null, /*#__PURE__*/_react.default.createElement(_styles.List, {
       halfWidth: addressOpen,
       id: "address_list"

package/_modules/themes/five/src/components/BusinessListingSearch/styles.js

@@ -19,7 +19,7 @@ var Title = _styledComponents.default.div(_templateObject2 || (_templateObject2
 exports.Title = Title;
 var FiltersContainer = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  flex-direction: column;\n  @media (min-width: 993px){\n    flex-direction: row;\n    display: flex;\n    width: 100%;\n  }\n"])));
 exports.FiltersContainer = FiltersContainer;
-var Filters = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 100%;\n  max-width: 100%;\n\n  @media (min-width: 993px){\n    width: 25%;\n    max-width: 25%;\n    margin-right: 70px;\n  }\n"])));
+var Filters = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 100%;\n  max-width: 100%;\n  padding: 0 10px;\n  box-sizing: border-box;\n\n  @media (min-width: 993px){\n    padding: 0;\n    width: 25%;\n    max-width: 25%;\n    margin-right: 70px;\n  }\n"])));
 exports.Filters = Filters;
 var FiltersResultContainer = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  width: 100%;\n  max-width: 100%;\n  @media (min-width: 993px){\n    width: 75%;\n    max-width: 75%;\n  }\n"])));
 exports.FiltersResultContainer = FiltersResultContainer;

package/_modules/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js

@@ -150,7 +150,7 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     var hasMore = !(paginationProps.totalPages === paginationProps.currentPage);
     if (badScrollPosition || businessesList.loading || ((_businessesList$error = businessesList.error) === null || _businessesList$error === void 0 ? void 0 : _businessesList$error.length) > 0 || !hasMore) return;
     getBusinesses();
-  }, [businessesList.loading, paginationProps]);
+  }, [businessesList, paginationProps]);
   (0, _react.useEffect)(function () {
     window.addEventListener('scroll', handleScroll);
     return function () {

package/_modules/themes/five/src/components/CardForm/index.js

@@ -37,7 +37,8 @@ var CARD_ELEMENT_OPTIONS = {
       color: '#fa755a',
       iconColor: '#fa755a'
     }
-  }
+  },
+  showIcon: true
 };
 var CardFormUI = function CardFormUI(props) {
   var _props$beforeElements, _props$beforeComponen, _props$afterComponent, _props$afterElements;

package/_modules/themes/five/src/components/Checkout/styles.js

@@ -12,7 +12,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 var Container = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  flex-direction: column;\n  min-height: auto;\n\n  @media (min-width: 769px) {\n    flex-direction: row;\n  }\n\n  @media (min-width: 993px) {\n    min-height: calc(100vh - 337px);\n    box-sizing: border-box;\n  }\n"])));
 exports.Container = Container;
-var WrapperLeftContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  box-sizing: border-box;\n  padding: 55px 20px 30px;\n\n  @media (min-width: 769px) {\n    width: 55%;\n    padding: 55px 60px 55px 40px;\n  }\n\n  @media (min-width: 820px) {\n    padding: 30px 60px 55px 40px;\n  }\n"])));
+var WrapperLeftContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  box-sizing: border-box;\n  padding: 20px 20px 30px;\n\n  @media (min-width: 769px) {\n    width: 55%;\n    padding: 55px 60px 55px 40px;\n  }\n\n  @media (min-width: 820px) {\n    padding: 30px 60px 55px 40px;\n  }\n"])));
 exports.WrapperLeftContainer = WrapperLeftContainer;
 var WrapperRightContainer = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: 100%;\n  background: #F8F9FA;\n  box-sizing: border-box;\n  padding: 40px 20px;\n\n  @media (min-width: 769px) {\n    width: 45%;\n    padding: 55px 40px;\n  }\n"])));
 exports.WrapperRightContainer = WrapperRightContainer;

package/_modules/themes/five/src/components/GiftCard/RedeemGiftCard/index.js

@@ -38,6 +38,7 @@ var RedeemGiftCardUI = function RedeemGiftCardUI(props) {
     _useUtils2 = _slicedToArray(_useUtils, 1),
     parsePrice = _useUtils2[0].parsePrice;
   var _useForm = (0, _reactHookForm.useForm)(),
+    control = _useForm.control,
     register = _useForm.register,
     handleSubmit = _useForm.handleSubmit,
     errors = _useForm.errors;
@@ -48,9 +49,18 @@ var RedeemGiftCardUI = function RedeemGiftCardUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     alertState = _useState2[0],
     setAlertState = _useState2[1];
+  var codeRef = (0, _react.useRef)(null);
   var onSubmit = function onSubmit(values) {
     handleApply(values);
   };
+  var handleChangeCode = function handleChangeCode(event) {
+    var string = event.target.value;
+    string = string.replace(/-/g, '');
+    if (!string) return;
+    var codeSlices = string.match(/.{1,4}/g);
+    string = codeSlices.join('-');
+    codeRef.current.value = string;
+  };
   (0, _react.useEffect)(function () {
     if (Object.keys(errors).length > 0) {
       setAlertState({
@@ -70,14 +80,26 @@ var RedeemGiftCardUI = function RedeemGiftCardUI(props) {
   }, [actionState.error]);
   return /*#__PURE__*/_react.default.createElement(_styles.Container, null, !redeemedGiftCard ? /*#__PURE__*/_react.default.createElement(_styles.FormContainer, {
     onSubmit: handleSubmit(onSubmit)
-  }, /*#__PURE__*/_react.default.createElement("h2", null, t('REDEEM_GIFT_CARD', 'Redeem a gift card')), /*#__PURE__*/_react.default.createElement(_styles.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('GIFT_CARD_CODE', 'Gift card code')), /*#__PURE__*/_react.default.createElement(_Inputs.Input, {
+  }, /*#__PURE__*/_react.default.createElement("h2", null, t('REDEEM_GIFT_CARD', 'Redeem a gift card')), /*#__PURE__*/_react.default.createElement(_styles.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('GIFT_CARD_CODE', 'Gift card code')), /*#__PURE__*/_react.default.createElement(_reactHookForm.Controller, {
     name: "code",
-    placeholder: "0000 0000",
-    type: "text",
-    ref: register({
+    control: control,
+    render: function render(_ref) {
+      var _onChange = _ref.onChange,
+        value = _ref.value;
+      return /*#__PURE__*/_react.default.createElement(_Inputs.Input, {
+        placeholder: "XXXX-XXXX-XXXX-XXXX",
+        type: "text",
+        autoComplete: "off",
+        ref: codeRef,
+        onChange: function onChange(e) {
+          _onChange(e.target.value);
+          handleChangeCode(e);
+        }
+      });
+    },
+    rules: {
       required: t('VALIDATION_ERROR_REQUIRED', 'Code is required').replace('_attribute_', t('CODE', 'Code'))
-    }),
-    autoComplete: "off"
+    }
   })), /*#__PURE__*/_react.default.createElement(_styles.FormController, null, /*#__PURE__*/_react.default.createElement("label", null, t('PASSWORD', 'Password')), /*#__PURE__*/_react.default.createElement(_Inputs.Input, {
     name: "password",
     type: "password",

package/_modules/themes/five/src/components/MultiCartsPaymethodsAndWallets/index.js

@@ -73,7 +73,7 @@ var CreditCard2 = function CreditCard2() {
   }));
 };
 var MultiCartsPaymethodsAndWalletsUI = function MultiCartsPaymethodsAndWalletsUI(props) {
-  var _configs$wallet_cash_, _configs$wallet_credi, _paymethodSelected$pa, _paymethodSelected$pa2, _paymethodSelected$pa3, _paymethodSelected$pa4, _paymethodSelected$pa5, _paymethodSelected$pa6, _paymethodSelected$pa7, _paymethodSelected$pa8, _paymethodSelected$pa9, _paymethodSelected$pa10, _walletsState$result, _paymethodSelected$pa11, _paymethodSelected$da, _paymethodSelected$da2, _paymethodSelected$pa12, _paymethodSelected$pa13, _paymethodSelected$da3, _paymethodSelected$da4;
+  var _configs$wallet_cash_, _configs$wallet_credi, _paymethodSelected$pa, _paymethodSelected$pa2, _paymethodSelected$pa3, _paymethodSelected$pa4, _paymethodSelected$da, _paymethodSelected$pa5, _paymethodSelected$pa6, _paymethodSelected$pa7, _paymethodSelected$pa8, _paymethodSelected$pa9, _paymethodSelected$pa10, _walletsState$result, _paymethodSelected$pa11, _paymethodSelected$da2, _paymethodSelected$da3, _paymethodSelected$pa12, _paymethodSelected$pa13, _paymethodSelected$da4, _paymethodSelected$da5;
   var businessIds = props.businessIds,
     balance = props.balance,
     paymethodsAndWallets = props.paymethodsAndWallets,
@@ -148,8 +148,10 @@ var MultiCartsPaymethodsAndWalletsUI = function MultiCartsPaymethodsAndWalletsUI
     businessIds: businessIds,
     publicKey: paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa2 = paymethodSelected.paymethod) === null || _paymethodSelected$pa2 === void 0 ? void 0 : (_paymethodSelected$pa3 = _paymethodSelected$pa2.credentials) === null || _paymethodSelected$pa3 === void 0 ? void 0 : _paymethodSelected$pa3.publishable,
     payType: paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa4 = paymethodSelected.paymethod) === null || _paymethodSelected$pa4 === void 0 ? void 0 : _paymethodSelected$pa4.name,
-    onSelectCard: handlePaymethodDataChange
-  }), stripeOptions.includes(paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa5 = paymethodSelected.paymethod) === null || _paymethodSelected$pa5 === void 0 ? void 0 : _paymethodSelected$pa5.gateway) && (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa6 = paymethodSelected.paymethod_data) === null || _paymethodSelected$pa6 === void 0 ? void 0 : _paymethodSelected$pa6.card) && /*#__PURE__*/_react.default.createElement(_styles.PayCardSelected, null, /*#__PURE__*/_react.default.createElement(_styles.CardItemContent, null, /*#__PURE__*/_react.default.createElement("span", {
+    onSelectCard: handlePaymethodDataChange,
+    paymethodSelected: paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da = paymethodSelected.data) === null || _paymethodSelected$da === void 0 ? void 0 : _paymethodSelected$da.id,
+    setCardList: setCardList
+  }), stripeOptions.includes(paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa5 = paymethodSelected.paymethod) === null || _paymethodSelected$pa5 === void 0 ? void 0 : _paymethodSelected$pa5.gateway) && (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa6 = paymethodSelected.paymethod_data) === null || _paymethodSelected$pa6 === void 0 ? void 0 : _paymethodSelected$pa6.card) && (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : paymethodSelected.gateway) !== 'stripe' && /*#__PURE__*/_react.default.createElement(_styles.PayCardSelected, null, /*#__PURE__*/_react.default.createElement(_styles.CardItemContent, null, /*#__PURE__*/_react.default.createElement("span", {
     className: "checks"
   }, /*#__PURE__*/_react.default.createElement(_IosRadioButtonOn.default, null)), /*#__PURE__*/_react.default.createElement("span", {
     className: "brand"
@@ -213,12 +215,12 @@ var MultiCartsPaymethodsAndWalletsUI = function MultiCartsPaymethodsAndWalletsUI
     onClose: function onClose() {
       return setOpenPaymethod(null);
     }
-  }, !(paymethodSelected !== null && paymethodSelected !== void 0 && (_paymethodSelected$da = paymethodSelected.data) !== null && _paymethodSelected$da !== void 0 && _paymethodSelected$da.publishable) && /*#__PURE__*/_react.default.createElement(_styles.Container, null, /*#__PURE__*/_react.default.createElement("p", null, t('ADD_PUBLISHABLE_KEY', 'Please add a publishable key'))), (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da2 = paymethodSelected.data) === null || _paymethodSelected$da2 === void 0 ? void 0 : _paymethodSelected$da2.publishable) && (stripeDirectMethods === null || stripeDirectMethods === void 0 ? void 0 : stripeDirectMethods.includes(paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa12 = paymethodSelected.paymethod) === null || _paymethodSelected$pa12 === void 0 ? void 0 : _paymethodSelected$pa12.gateway)) && /*#__PURE__*/_react.default.createElement(_StripeElementsForm.StripeElementsForm, {
+  }, !(paymethodSelected !== null && paymethodSelected !== void 0 && (_paymethodSelected$da2 = paymethodSelected.data) !== null && _paymethodSelected$da2 !== void 0 && _paymethodSelected$da2.publishable) && /*#__PURE__*/_react.default.createElement(_styles.Container, null, /*#__PURE__*/_react.default.createElement("p", null, t('ADD_PUBLISHABLE_KEY', 'Please add a publishable key'))), (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da3 = paymethodSelected.data) === null || _paymethodSelected$da3 === void 0 ? void 0 : _paymethodSelected$da3.publishable) && (stripeDirectMethods === null || stripeDirectMethods === void 0 ? void 0 : stripeDirectMethods.includes(paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa12 = paymethodSelected.paymethod) === null || _paymethodSelected$pa12 === void 0 ? void 0 : _paymethodSelected$pa12.gateway)) && /*#__PURE__*/_react.default.createElement(_StripeElementsForm.StripeElementsForm, {
     methodsPay: methodsPay,
     paymethod: paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$pa13 = paymethodSelected.paymethod) === null || _paymethodSelected$pa13 === void 0 ? void 0 : _paymethodSelected$pa13.gateway,
     businessId: props.businessId,
     cartGroup: cartGroup === null || cartGroup === void 0 ? void 0 : cartGroup.result,
-    publicKey: (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da3 = paymethodSelected.data) === null || _paymethodSelected$da3 === void 0 ? void 0 : _paymethodSelected$da3.publishable) || (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da4 = paymethodSelected.data) === null || _paymethodSelected$da4 === void 0 ? void 0 : _paymethodSelected$da4.publishable_key),
+    publicKey: (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da4 = paymethodSelected.data) === null || _paymethodSelected$da4 === void 0 ? void 0 : _paymethodSelected$da4.publishable) || (paymethodSelected === null || paymethodSelected === void 0 ? void 0 : (_paymethodSelected$da5 = paymethodSelected.data) === null || _paymethodSelected$da5 === void 0 ? void 0 : _paymethodSelected$da5.publishable_key),
     handleSource: handlePaymethodDataChange,
     onCancel: function onCancel() {
       return setOpenPaymethod(null);

package/_modules/themes/five/src/components/OrderContextUI/index.js

@@ -30,7 +30,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var OrderContextUI = function OrderContextUI(props) {
-  var _configState$configs, _configState$configs$, _orderState$options2, _orderState$options2$, _orderState$options3;
+  var _configState$configs, _configState$configs$, _configState$configs2, _configState$configs3, _orderState$options2, _orderState$options2$, _orderState$options3;
   var isCheckOut = props.isCheckOut,
     setMapErrors = props.setMapErrors,
     isCustomerMode = props.isCustomerMode,
@@ -70,6 +70,7 @@ var OrderContextUI = function OrderContextUI(props) {
   var configTypes = (configState === null || configState === void 0 ? void 0 : (_configState$configs = configState.configs) === null || _configState$configs === void 0 ? void 0 : (_configState$configs$ = _configState$configs.order_types_allowed) === null || _configState$configs$ === void 0 ? void 0 : _configState$configs$.value.split('|').map(function (value) {
     return Number(value);
   })) || [];
+  var isPreOrderSetting = (configState === null || configState === void 0 ? void 0 : (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 ? void 0 : (_configState$configs3 = _configState$configs2.preorder_status_enabled) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value) === '1';
   var handleTogglePopover = function handleTogglePopover(type) {
     setOpenPopover(_objectSpread(_objectSpread({}, openPopover), {}, _defineProperty({}, type, !openPopover[type])));
   };
@@ -110,7 +111,8 @@ var OrderContextUI = function OrderContextUI(props) {
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.Container, {
     isBusinessList: isBusinessList,
-    hero: props.hideHero
+    hero: props.hideHero,
+    isCheckOut: isCheckOut
   }, /*#__PURE__*/_react.default.createElement(_styles.AddressMenu, {
     onClick: function onClick() {
       return handleClickAddress();
@@ -118,7 +120,7 @@ var OrderContextUI = function OrderContextUI(props) {
     isCheckOut: isCheckOut
   }, /*#__PURE__*/_react.default.createElement(_FaMapMarkerAlt.default, null), /*#__PURE__*/_react.default.createElement("span", null, ((_orderState$options2 = orderState.options) === null || _orderState$options2 === void 0 ? void 0 : (_orderState$options2$ = _orderState$options2.address) === null || _orderState$options2$ === void 0 ? void 0 : _orderState$options2$.address) || t('WHERE_DO_WE_DELIVERY', 'Where do we delivery?'))), /*#__PURE__*/_react.default.createElement(_styles.FeatureItems, null, /*#__PURE__*/_react.default.createElement(_styles.ItemInline, null, /*#__PURE__*/_react.default.createElement(_OrderTypeSelectorHeader.OrderTypeSelectorHeader, {
     configTypes: configTypes
-  })), /*#__PURE__*/_react.default.createElement(_styles.ItemInline, null, /*#__PURE__*/_react.default.createElement(_MomentPopover.MomentPopover, {
+  })), isPreOrderSetting && /*#__PURE__*/_react.default.createElement(_styles.ItemInline, null, /*#__PURE__*/_react.default.createElement(_MomentPopover.MomentPopover, {
     open: openPopover.moment,
     onClick: function onClick() {
       return handleTogglePopover('moment');

package/_modules/themes/five/src/components/OrderContextUI/styles.js

@@ -14,8 +14,9 @@ var Container = _styledComponents.default.div(_templateObject || (_templateObjec
   var isBusinessList = _ref.isBusinessList;
   return isBusinessList && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    width: 100%;\n    padding: 0 15px;\n    box-sizing: border-box;\n  "])));
 }, function (_ref2) {
-  var hero = _ref2.hero;
-  return hero && (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    position: absolute;\n    top: 10%;\n  "])));
+  var hero = _ref2.hero,
+    isCheckOut = _ref2.isCheckOut;
+  return !(hero || isCheckOut) && (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    position: absolute;\n    top: 10%;\n  "])));
 });
 exports.Container = Container;
 var AddressMenu = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  font-size: 14px;\n  display: flex;\n  align-items: center;\n  background-color: ", ";\n  font-weight: 600;\n  border-radius: 50px;\n  padding: 13px 19px;\n  margin-bottom: 10px;\n  ", "\n\n  span {\n    width: 100%;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  svg {\n    margin-right: 5px;\n    color: ", ";\n    ", "\n  }\n"])), function (props) {

package/_modules/themes/five/src/components/OrderProgress/index.js

@@ -64,7 +64,9 @@ var OrderProgressUI = function OrderProgressUI(props) {
   };
   (0, _react.useEffect)(function () {
     if ((orderList === null || orderList === void 0 ? void 0 : orderList.orders.length) > 0) {
-      var sortedOrders = orderList.orders.sort(function (a, b) {
+      var sortedOrders = orderList.orders.filter(function (order) {
+        return !!(order !== null && order !== void 0 && order.business);
+      }).sort(function (a, b) {
         return a.id > b.id ? -1 : 1;
       });
       var orderInProgress = sortedOrders.find(function (_ref) {

package/_modules/themes/five/src/components/SidebarMenu/index.js

@@ -267,7 +267,8 @@ var SidebarMenu = function SidebarMenu(props) {
     }
   })), !auth && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.MenuLink, {
     onClick: function onClick() {
-      return handleOpenLoginSignUp('login');
+      handleOpenLoginSignUp('login');
+      actionSidebar(false);
     }
   }, /*#__PURE__*/_react.default.createElement(_styles.WrappContent, null, /*#__PURE__*/_react.default.createElement(_styles.MenuLinkIcon, {
     active: modalPageToShow === 'login'
@@ -275,7 +276,8 @@ var SidebarMenu = function SidebarMenu(props) {
     active: modalPageToShow === 'login'
   }, t('SIGN_IN', 'Sign in'))), /*#__PURE__*/_react.default.createElement(_styles.MenuLinkSeparator, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("hr", null))))), !isHideSignup && /*#__PURE__*/_react.default.createElement(_styles.MenuLink, {
     onClick: function onClick() {
-      return handleOpenLoginSignUp('signup');
+      handleOpenLoginSignUp('signup');
+      actionSidebar(false);
     }
   }, /*#__PURE__*/_react.default.createElement(_styles.WrappContent, null, /*#__PURE__*/_react.default.createElement(_styles.MenuLinkIcon, {
     active: modalPageToShow === 'signup'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "2.5.9",
+  "version": "2.6.0",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -87,7 +87,7 @@
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
     "nanoid": "^4.0.0",
-    "ordering-components-external": "2.6.2",
+    "ordering-components-external": "2.7.0",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",
     "react-calendar": "^3.3.1",

package/src/components/VerticalOrdersLayout/styles.js

@@ -84,12 +84,12 @@ export const PastLogo = styled.div`
 `
 
 export const WrapperBusinessTitle = styled.div`
-  width: 95%;
+  width: 80%;
   display: flex;
   gap: 10px;
 
   @media (min-width: 480px) {
-    width: 80%;
+    width: 95%;
   }
 `
 
@@ -209,6 +209,10 @@ export const ReviewWrapper = styled.div`
 `
 
 export const MultiLogosContainer = styled.div`
-  display: flex;
+  display: none;
   align-items: center;
+
+  @media (min-width: 480px) {
+    display: flex;
+  }
 `

package/src/themes/five/src/components/AddressForm/index.js

@@ -299,9 +299,18 @@ const AddressFormUI = (props) => {
 
     if (isEditing) {
       if (formState?.changes?.location) {
-        const prevLocation = { lat: Math.trunc(locationChange?.lat), lng: Math.trunc(locationChange?.lng) }
-        const newLocation = { lat: Math.trunc(formState?.changes?.location?.lat), lng: Math.trunc(formState?.changes?.location?.lng) }
-        if (prevLocation.lat !== newLocation.lat && prevLocation.lng !== newLocation.lng) {
+        const prevLocation = {
+          lat: locationChange?.lat?.toFixed(5),
+          lng: locationChange?.lng?.toFixed(5)
+        }
+        const newLocation = {
+          lat: formState?.changes?.location?.lat?.toFixed(5),
+          lng: formState?.changes?.location?.lng?.toFixed(5)
+        }
+        if (
+					prevLocation?.lat !== newLocation?.lat &&
+					prevLocation?.lng !== newLocation?.lng
+        ) {
           setLocationChange(formState?.changes?.location)
         }
       }

package/src/themes/five/src/components/AddressList/index.js

@@ -65,7 +65,8 @@ const AddressListUI = (props) => {
     isFromCheckout,
     setIsAddressFormOpen,
     isProfile,
-    isMobile
+    isMobile,
+    onCancel
   } = props
 
   const [, t] = useLanguage()
@@ -126,7 +127,7 @@ const AddressListUI = (props) => {
     handleCloseAddressForm()
   }
 
-  const handleSetAddress = (address) => {
+  const handleSetAddress = async (address) => {
     if (
       checkAddress(address) &&
       isCustomerMode &&
@@ -140,7 +141,8 @@ const AddressListUI = (props) => {
     }
 
     handleCloseAddressForm()
-    handleSetDefault(address, userCustomerSetup)
+    await handleSetDefault(address, userCustomerSetup)
+    onCancel && onCancel()
   }
 
   const handleDeleteClick = (address) => {

package/src/themes/five/src/components/BusinessListingSearch/styles.js

@@ -48,8 +48,11 @@ export const FiltersContainer = styled.div`
 export const Filters = styled.div`
   width: 100%;
   max-width: 100%;
+  padding: 0 10px;
+  box-sizing: border-box;
 
   @media (min-width: 993px){
+    padding: 0;
     width: 25%;
     max-width: 25%;
     margin-right: 70px;

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js

@@ -113,7 +113,7 @@ const BusinessesListingUI = (props) => {
     const hasMore = !(paginationProps.totalPages === paginationProps.currentPage)
     if (badScrollPosition || businessesList.loading || businessesList.error?.length > 0 || !hasMore) return
     getBusinesses()
-  }, [businessesList.loading, paginationProps])
+  }, [businessesList, paginationProps])
 
   useEffect(() => {
     window.addEventListener('scroll', handleScroll)

package/src/themes/five/src/components/CardForm/index.js

@@ -29,7 +29,8 @@ const CARD_ELEMENT_OPTIONS = {
       color: '#fa755a',
       iconColor: '#fa755a'
     }
-  }
+  },
+  showIcon: true
 }
 
 const CardFormUI = (props) => {

package/src/themes/five/src/components/Checkout/styles.js

@@ -19,7 +19,7 @@ export const Container = styled.div`
 export const WrapperLeftContainer = styled.div`
   width: 100%;
   box-sizing: border-box;
-  padding: 55px 20px 30px;
+  padding: 20px 20px 30px;
 
   @media (min-width: 769px) {
     width: 55%;

package/src/themes/five/src/components/GiftCard/RedeemGiftCard/index.js

@@ -1,6 +1,6 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, useRef } from 'react'
 import { useLanguage, useUtils, RedeemGiftCard as RedeemGiftCardController } from 'ordering-components-external'
-import { useForm } from 'react-hook-form'
+import { useForm, Controller } from 'react-hook-form'
 import { Alert } from '../../Confirm'
 import { Button } from '../../../styles/Buttons'
 import { Input } from '../../../styles/Inputs'
@@ -22,13 +22,23 @@ const RedeemGiftCardUI = (props) => {
 
   const [, t] = useLanguage()
   const [{ parsePrice }] = useUtils()
-  const { register, handleSubmit, errors } = useForm()
+  const { control, register, handleSubmit, errors } = useForm()
   const [alertState, setAlertState] = useState({ open: false, content: [] })
+  const codeRef = useRef(null)
 
   const onSubmit = (values) => {
     handleApply(values)
   }
 
+  const handleChangeCode = (event) => {
+    let string = event.target.value
+    string = string.replace(/-/g, '')
+    if (!string) return
+    const codeSlices = string.match(/.{1,4}/g)
+    string = codeSlices.join('-')
+    codeRef.current.value = string
+  }
+
   useEffect(() => {
     if (Object.keys(errors).length > 0) {
       setAlertState({
@@ -53,14 +63,24 @@ const RedeemGiftCardUI = (props) => {
           <h2>{t('REDEEM_GIFT_CARD', 'Redeem a gift card')}</h2>
           <FormController>
             <label>{t('GIFT_CARD_CODE', 'Gift card code')}</label>
-            <Input
+            <Controller
               name='code'
-              placeholder='0000 0000'
-              type='text'
-              ref={register({
+              control={control}
+              render={({ onChange, value }) => (
+                <Input
+                  placeholder='XXXX-XXXX-XXXX-XXXX'
+                  type='text'
+                  autoComplete='off'
+                  ref={codeRef}
+                  onChange={e => {
+                    onChange(e.target.value)
+                    handleChangeCode(e)
+                  }}
+                />
+              )}
+              rules={{
                 required: t('VALIDATION_ERROR_REQUIRED', 'Code is required').replace('_attribute_', t('CODE', 'Code'))
-              })}
-              autoComplete='off'
+              }}
             />
           </FormController>
           <FormController>

package/src/themes/five/src/components/MultiCartsPaymethodsAndWallets/index.js

@@ -136,10 +136,12 @@ const MultiCartsPaymethodsAndWalletsUI = (props) => {
           publicKey={paymethodSelected?.paymethod?.credentials?.publishable}
           payType={paymethodSelected?.paymethod?.name}
           onSelectCard={handlePaymethodDataChange}
+          paymethodSelected={paymethodSelected?.data?.id}
+          setCardList={setCardList}
         />
       )}
 
-      {stripeOptions.includes(paymethodSelected?.paymethod?.gateway) && paymethodSelected?.paymethod_data?.card && (
+      {stripeOptions.includes(paymethodSelected?.paymethod?.gateway) && paymethodSelected?.paymethod_data?.card && paymethodSelected?.gateway !== 'stripe' && (
         <PayCardSelected>
           <CardItemContent>
             <span className='checks'>