@stokr/components-library 2.3.41-beta.19 → 2.3.41-beta.20

package/dist/components/headerHo/HeaderHo.js

@@ -17,7 +17,6 @@ var _LoginModal = _interopRequireDefault(require("../LoginModal/LoginModal"));
 var _VerifyEmailModal = _interopRequireDefault(require("../VerifyEmailModal/VerifyEmailModal"));
 var _Header = _interopRequireDefault(require("../Header/Header"));
 var _FA = require("../2FA");
-var _ResendConfirmationCodeModal = _interopRequireDefault(require("../ResendConfirmationCodeModal/ResendConfirmationCodeModal"));
 var _auth = _interopRequireDefault(require("../../api/auth"));
 var _fetchDataPublic = _interopRequireDefault(require("../../api/fetchDataPublic"));
 var _AuthContext = require("../../context/AuthContext");
@@ -30,10 +29,10 @@ 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -58,7 +57,6 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
   _inherits(HeaderHoClass, _Component);
   var _super = _createSuper(HeaderHoClass);
   function HeaderHoClass() {
-    var _isModalOpen;
     var _this;
     _classCallCheck(this, HeaderHoClass);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -67,7 +65,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "state", {
       mobileMenuOpen: false,
-      isModalOpen: (_isModalOpen = {
+      isModalOpen: {
         login: false,
         signUp: false,
         terms: false,
@@ -78,7 +76,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         enter2fa: false,
         resetCode: false,
         verifyEmail: false
-      }, _defineProperty(_isModalOpen, "resetPassword", false), _defineProperty(_isModalOpen, "resendConfirmation", false), _isModalOpen),
+      },
       userInfo: {
         email: undefined,
         password: undefined,
@@ -95,70 +93,67 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         message: undefined
       },
       isActionLoading: undefined,
-      termsData: undefined
+      termsData: undefined,
+      isResettingExpiredToken: false
+    });
+    _defineProperty(_assertThisInitialized(_this), "checkForModals", function () {
+      var _this$props = _this.props,
+        isLogin = _this$props.isLogin,
+        isSignUp = _this$props.isSignUp,
+        isResetPassword = _this$props.isResetPassword,
+        isVerifyEmail = _this$props.isVerifyEmail;
+      var user = _this.context.user;
+      var isModalOpen = _this.state.isModalOpen;
+      var login = isModalOpen.login,
+        signUp = isModalOpen.signUp,
+        resetPassword = isModalOpen.resetPassword,
+        verifyEmail = isModalOpen.verifyEmail;
+
+      //checks if any modal is open
+      //if true we won't open any modal from below
+      var isAnyModalOpen = Object.values(isModalOpen).some(function (value) {
+        return value === true;
+      });
+      if (isAnyModalOpen) return;
+
+      //dont open if modal is already open or user is logged in
+      if (isLogin && !user && !login) {
+        _this.setState(function (prevState) {
+          return _objectSpread(_objectSpread({}, prevState), {}, {
+            isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
+              login: true
+            })
+          });
+        });
+      }
+      if (isSignUp && !user && !signUp) {
+        _this.setState(function (prevState) {
+          return _objectSpread(_objectSpread({}, prevState), {}, {
+            isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
+              signUp: true
+            })
+          });
+        });
+      }
+      if (isResetPassword && !user && !resetPassword) {
+        _this.setState(function (prevState) {
+          return _objectSpread(_objectSpread({}, prevState), {}, {
+            isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
+              resetPassword: true
+            })
+          });
+        });
+      }
+      if (isVerifyEmail && !verifyEmail) {
+        _this.setState(function (prevState) {
+          return _objectSpread(_objectSpread({}, prevState), {}, {
+            isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
+              verifyEmail: true
+            })
+          });
+        });
+      }
     });
-    _defineProperty(_assertThisInitialized(_this), "checkForModals", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _this$props, isLogin, isSignUp, isResetPassword, isVerifyEmail, user, isModalOpen, login, signUp, resetPassword, verifyEmail, isAnyModalOpen;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _this$props = _this.props, isLogin = _this$props.isLogin, isSignUp = _this$props.isSignUp, isResetPassword = _this$props.isResetPassword, isVerifyEmail = _this$props.isVerifyEmail;
-            user = _this.context.user;
-            isModalOpen = _this.state.isModalOpen;
-            login = isModalOpen.login, signUp = isModalOpen.signUp, resetPassword = isModalOpen.resetPassword, verifyEmail = isModalOpen.verifyEmail; //checks if any modal is open
-            //if true we won't open any modal from below
-            isAnyModalOpen = Object.values(isModalOpen).some(function (value) {
-              return value === true;
-            });
-            if (!isAnyModalOpen) {
-              _context.next = 7;
-              break;
-            }
-            return _context.abrupt("return");
-          case 7:
-            //dont open if modal is already open or user is logged in
-            if (isLogin && !user && !login) {
-              _this.setState(function (prevState) {
-                return _objectSpread(_objectSpread({}, prevState), {}, {
-                  isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
-                    login: true
-                  })
-                });
-              });
-            }
-            if (isSignUp && !user && !signUp) {
-              _this.setState(function (prevState) {
-                return _objectSpread(_objectSpread({}, prevState), {}, {
-                  isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
-                    signUp: true
-                  })
-                });
-              });
-            }
-            if (isResetPassword && !user && !resetPassword) {
-              _this.setState(function (prevState) {
-                return _objectSpread(_objectSpread({}, prevState), {}, {
-                  isModalOpen: _objectSpread(_objectSpread({}, prevState.isModalOpen), {}, {
-                    resetPassword: true
-                  })
-                });
-              });
-            }
-            if (isVerifyEmail && !verifyEmail) {
-              _this.setState(function (prevState) {
-                return _objectSpread(_objectSpread({}, prevState), {}, {
-                  isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
-                    verifyEmail: true
-                  })
-                });
-              });
-            }
-          case 11:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })));
     _defineProperty(_assertThisInitialized(_this), "setOpenModalStatus", function (modalId, status) {
       var isModalOpen = _this.state.isModalOpen;
       var _this$props2 = _this.props,
@@ -178,6 +173,8 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
       _this.setState(function (prevState) {
         return _objectSpread(_objectSpread({}, prevState), {}, {
           isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, _defineProperty({}, modalId, status))
+        }, modalId === 'forgot' && !status && {
+          isResettingExpiredToken: false
         });
       });
     });
@@ -290,7 +287,8 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         isModalOpen = _this$state.isModalOpen,
         userInfo = _this$state.userInfo,
         isActionLoading = _this$state.isActionLoading,
-        termsData = _this$state.termsData;
+        termsData = _this$state.termsData,
+        isResettingExpiredToken = _this$state.isResettingExpiredToken;
       var _this$props3 = this.props,
         fixed = _this$props3.fixed,
         activateMenu = _this$props3.activateMenu,
@@ -355,47 +353,47 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+          var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
             var email, password, errorMessage;
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-              while (1) switch (_context2.prev = _context2.next) {
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  email = _ref3.email, password = _ref3.password;
+                  email = _ref2.email, password = _ref2.password;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('login');
-                  _context2.prev = 3;
+                  _context.prev = 3;
                   if (!(password.length > 128)) {
-                    _context2.next = 8;
+                    _context.next = 8;
                     break;
                   }
                   _this2.setPopupError('login', 'Your password cannot exceed 128 characters');
                   _this2.setIsActionLoading(undefined);
-                  return _context2.abrupt("return");
+                  return _context.abrupt("return");
                 case 8:
-                  _context2.next = 10;
+                  _context.next = 10;
                   return loginUser(email, password);
                 case 10:
-                  _context2.next = 12;
+                  _context.next = 12;
                   return getUser();
                 case 12:
                   _this2.setOpenModalStatus('login', false);
                   setIsLoginModalOpen && setIsLoginModalOpen(false);
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
-                  _context2.next = 28;
+                  _context.next = 28;
                   break;
                 case 18:
-                  _context2.prev = 18;
-                  _context2.t0 = _context2["catch"](3);
-                  errorMessage = _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message; //handle switch modal correctly
-                  if (!((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === 'auth/multi-factor-auth-required')) {
-                    _context2.next = 26;
+                  _context.prev = 18;
+                  _context.t0 = _context["catch"](3);
+                  errorMessage = _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message; //handle switch modal correctly
+                  if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) === 'auth/multi-factor-auth-required')) {
+                    _context.next = 26;
                     break;
                   }
                   _this2.switchOpenModal('login', 'enter2fa');
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
-                  return _context2.abrupt("return");
+                  return _context.abrupt("return");
                 case 26:
                   if (errorMessage) {
                     _this2.setPopupError('login', errorMessage);
@@ -405,12 +403,12 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
                   _this2.setIsActionLoading(undefined);
                 case 28:
                 case "end":
-                  return _context2.stop();
+                  return _context.stop();
               }
-            }, _callee2, null, [[3, 18]]);
+            }, _callee, null, [[3, 18]]);
           }));
           return function (_x) {
-            return _ref4.apply(this, arguments);
+            return _ref3.apply(this, arguments);
           };
         }()
       }), waitingFor2fa && /*#__PURE__*/_react.default.createElement(_FA.EnterCode, {
@@ -429,46 +427,46 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
+          var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
             var otpInput;
-            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  otpInput = _ref5.otpInput;
+                  otpInput = _ref4.otpInput;
                   _this2.setIsActionLoading('enter2fa');
-                  _context3.prev = 2;
-                  _context3.next = 5;
+                  _context2.prev = 2;
+                  _context2.next = 5;
                   return loginUserWithTotp(otpInput, firebaseError);
                 case 5:
-                  _context3.next = 7;
+                  _context2.next = 7;
                   return getUser();
                 case 7:
                   _this2.setOpenModalStatus('enter2fa', false);
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
-                  _context3.next = 16;
+                  _context2.next = 16;
                   break;
                 case 12:
-                  _context3.prev = 12;
-                  _context3.t0 = _context3["catch"](2);
-                  console.log('🚀 ~ file: HeaderHo.jsx:364 ~ error:', _context3.t0);
-                  if ((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) === 'auth/invalid-verification-code') {
+                  _context2.prev = 12;
+                  _context2.t0 = _context2["catch"](2);
+                  console.log('🚀 ~ file: HeaderHo.jsx:364 ~ error:', _context2.t0);
+                  if ((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === 'auth/invalid-verification-code') {
                     _this2.setPopupError('enter2fa', 'That’s not the right 2FA code. Try again');
-                  } else if ((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) === 'auth/code-expired') {
+                  } else if ((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === 'auth/code-expired') {
                     _this2.setPopupError('enter2fa', 'Time out. Please restart the flow and log in again');
                   } else {
-                    _this2.setPopupError('enter2fa', _context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message);
+                    _this2.setPopupError('enter2fa', _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message);
                   }
                 case 16:
                   _this2.setIsActionLoading(undefined);
                 case 17:
                 case "end":
-                  return _context3.stop();
+                  return _context2.stop();
               }
-            }, _callee3, null, [[2, 12]]);
+            }, _callee2, null, [[2, 12]]);
           }));
           return function (_x2) {
-            return _ref6.apply(this, arguments);
+            return _ref5.apply(this, arguments);
           };
         }()
       }), /*#__PURE__*/_react.default.createElement(_FA.ResetCode, {
@@ -523,24 +521,24 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           onSignupModalClose && onSignupModalClose();
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(userInfo) {
-            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
+          var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(userInfo) {
+            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
                 case 0:
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('signUp');
 
                   //check password
-                  _context4.prev = 2;
+                  _context3.prev = 2;
                   if (!(userInfo.password.length > 128)) {
-                    _context4.next = 7;
+                    _context3.next = 7;
                     break;
                   }
                   _this2.setPopupError('register', 'Your password cannot exceed 128 characters', 'password');
                   _this2.setIsActionLoading(undefined);
-                  return _context4.abrupt("return");
+                  return _context3.abrupt("return");
                 case 7:
-                  _context4.next = 9;
+                  _context3.next = 9;
                   return createUser(userInfo.email, userInfo.password);
                 case 9:
                   //start the timer to count when user can resend email
@@ -548,10 +546,10 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
 
                   //if user checked newsletter checkbox
                   if (!userInfo.newsletter) {
-                    _context4.next = 13;
+                    _context3.next = 13;
                     break;
                   }
-                  _context4.next = 13;
+                  _context3.next = 13;
                   return (0, _fetchDataPublic.default)('emails/subscribe', {
                     email: userInfo.email,
                     listName: 'newsletter'
@@ -560,28 +558,28 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
                   _this2.setUserInfo(userInfo);
                   _this2.switchOpenModal('signUp', 'confirm');
                   _this2.setIsActionLoading(undefined);
-                  _context4.next = 23;
+                  _context3.next = 23;
                   break;
                 case 18:
-                  _context4.prev = 18;
-                  _context4.t0 = _context4["catch"](2);
-                  console.log(_context4.t0);
+                  _context3.prev = 18;
+                  _context3.t0 = _context3["catch"](2);
+                  console.log(_context3.t0);
                   _this2.setIsActionLoading(undefined);
-                  if ((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.code) === 'auth/email-already-in-use') {
+                  if ((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) === 'auth/email-already-in-use') {
                     _this2.setPopupError('register', 'This email address is already taken', 'email');
-                  } else if ((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.code) === 'auth/weak-password') {
+                  } else if ((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) === 'auth/weak-password') {
                     _this2.setPopupError('register', 'The password is too weak. Please try again.', 'password');
                   } else {
                     _this2.setPopupError('register', 'Oops, something went wrong');
                   }
                 case 23:
                 case "end":
-                  return _context4.stop();
+                  return _context3.stop();
               }
-            }, _callee4, null, [[2, 18]]);
+            }, _callee3, null, [[2, 18]]);
           }));
           return function (_x3) {
-            return _ref7.apply(this, arguments);
+            return _ref6.apply(this, arguments);
           };
         }()
       }), /*#__PURE__*/_react.default.createElement(_TermsModal.default, {
@@ -607,41 +605,42 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.clearPopupError();
           _this2.setIsActionLoading(undefined);
         },
-        onResend: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        onResend: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
           var email;
-          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-            while (1) switch (_context5.prev = _context5.next) {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
               case 0:
                 _this2.clearPopupSuccess();
                 _this2.clearPopupError();
                 _this2.setIsActionLoading('resend');
-                _context5.prev = 3;
+                _context4.prev = 3;
                 email = _this2.state.userInfo.email;
-                _context5.next = 7;
+                _context4.next = 7;
                 return resendActivationEmail(email);
               case 7:
                 cooldown === null || cooldown === void 0 || cooldown.startCooldown();
                 _this2.setPopupSuccess('resend', 'Email sent.');
                 _this2.setIsActionLoading(undefined);
-                _context5.next = 17;
+                _context4.next = 17;
                 break;
               case 12:
-                _context5.prev = 12;
-                _context5.t0 = _context5["catch"](3);
-                console.log(_context5.t0);
+                _context4.prev = 12;
+                _context4.t0 = _context4["catch"](3);
+                console.log(_context4.t0);
                 _this2.setPopupError('resend', 'Something went wrong.');
                 _this2.setIsActionLoading(undefined);
               case 17:
               case "end":
-                return _context5.stop();
+                return _context4.stop();
             }
-          }, _callee5, null, [[3, 12]]);
+          }, _callee4, null, [[3, 12]]);
         }))
       }), /*#__PURE__*/_react.default.createElement(_ForgotPasswordModal.default, {
         isActionLoading: isActionLoading,
         popupError: this.state.popupError,
         popupSuccess: this.state.popupSuccess,
         isModalOpen: isModalOpen.forgot,
+        isResettingExpiredToken: isResettingExpiredToken,
         onModalClose: function onModalClose() {
           _this2.setOpenModalStatus('forgot', false);
           _this2.clearPopupError();
@@ -655,38 +654,38 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref9) {
+          var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref8) {
             var email;
-            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+            return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
                 case 0:
-                  email = _ref9.email;
+                  email = _ref8.email;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('forgot');
-                  _context6.prev = 3;
-                  _context6.next = 6;
+                  _context5.prev = 3;
+                  _context5.next = 6;
                   return (0, _auth.default)('forgotPass', {
                     email: email
                   });
                 case 6:
                   _this2.setPopupSuccess('forgot', "We sent a message to ".concat(email, " (you might need to check your junk or spam folder) \u2014 tap the link inside to create a new password."));
                   _this2.setIsActionLoading(undefined);
-                  _context6.next = 15;
+                  _context5.next = 15;
                   break;
                 case 10:
-                  _context6.prev = 10;
-                  _context6.t0 = _context6["catch"](3);
-                  console.log(_context6.t0);
+                  _context5.prev = 10;
+                  _context5.t0 = _context5["catch"](3);
+                  console.log(_context5.t0);
                   _this2.setPopupError('forgot', 'This email is not registered.');
                   _this2.setIsActionLoading(undefined);
                 case 15:
                 case "end":
-                  return _context6.stop();
+                  return _context5.stop();
               }
-            }, _callee6, null, [[3, 10]]);
+            }, _callee5, null, [[3, 10]]);
           }));
           return function (_x4) {
-            return _ref10.apply(this, arguments);
+            return _ref9.apply(this, arguments);
           };
         }()
       }), /*#__PURE__*/_react.default.createElement(_ResetPasswordModal.default, {
@@ -705,63 +704,72 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref11) {
+          var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref10) {
             var password;
-            return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-              while (1) switch (_context7.prev = _context7.next) {
+            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
-                  password = _ref11.password;
+                  password = _ref10.password;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('resetPassword');
-                  _context7.prev = 3;
-                  _context7.next = 6;
+                  _context6.prev = 3;
+                  _context6.next = 6;
                   return handleResetPassword(password);
                 case 6:
                   _this2.switchOpenModal('resetPassword', 'confirmReset');
                   _this2.setIsActionLoading(undefined);
-                  _context7.next = 15;
+                  _context6.next = 15;
                   break;
                 case 10:
-                  _context7.prev = 10;
-                  _context7.t0 = _context7["catch"](3);
-                  console.log(_context7.t0);
-                  _this2.setPopupError('resetPassword', (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.message) || 'Something went wrong.');
+                  _context6.prev = 10;
+                  _context6.t0 = _context6["catch"](3);
+                  console.log(_context6.t0);
+                  _this2.setPopupError('resetPassword', (_context6.t0 === null || _context6.t0 === void 0 ? void 0 : _context6.t0.message) || 'Something went wrong.');
                   _this2.setIsActionLoading(undefined);
                 case 15:
                 case "end":
-                  return _context7.stop();
+                  return _context6.stop();
               }
-            }, _callee7, null, [[3, 10]]);
+            }, _callee6, null, [[3, 10]]);
           }));
           return function (_x5) {
-            return _ref12.apply(this, arguments);
+            return _ref11.apply(this, arguments);
           };
         }(),
-        onLoad: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        onLoad: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
           var location, query, oobCode;
-          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-            while (1) switch (_context8.prev = _context8.next) {
+          return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+            while (1) switch (_context7.prev = _context7.next) {
               case 0:
                 location = _this2.props.location;
                 query = new URLSearchParams(location === null || location === void 0 ? void 0 : location.search);
                 oobCode = query.get('oobCode');
                 if (!(oobCode && oobCode !== '')) {
-                  _context8.next = 16;
+                  _context7.next = 16;
                   break;
                 }
                 _this2.setIsActionLoading('resetPassword');
-                _context8.prev = 5;
-                _context8.next = 8;
+                _context7.prev = 5;
+                _context7.next = 8;
                 return (0, _auth2.checkActionCode)(_firebaseConfig.auth, oobCode);
               case 8:
                 _this2.setIsActionLoading(undefined);
-                _context8.next = 15;
+                _context7.next = 15;
                 break;
               case 11:
-                _context8.prev = 11;
-                _context8.t0 = _context8["catch"](5);
-                console.log('Password reset code error:', _context8.t0);
-                if ((_context8.t0 === null || _context8.t0 === void 0 ? void 0 : _context8.t0.code) === 'auth/expired-action-code' || (_context8.t0 === null || _context8.t0 === void 0 ? void 0 : _context8.t0.code) === 'auth/invalid-action-code') {
+                _context7.prev = 11;
+                _context7.t0 = _context7["catch"](5);
+                console.log('Password reset code error:', _context7.t0);
+                if ((_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.code) === 'auth/expired-action-code') {
+                  _this2.setState(function (prevState) {
+                    return _objectSpread(_objectSpread({}, prevState), {}, {
+                      isResettingExpiredToken: true
+                    });
+                  });
+
+                  // we use a special version of Forgot Password modal
+                  // adjusted to handle and resend expired tokens.
+                  // isResettingExpiredToken makes it adjust.
                   _this2.switchOpenModal('resetPassword', 'forgot');
                   _this2.setPopupError('forgot', 'This password reset link has expired or is invalid. Please request a new one.');
                 } else {
@@ -771,9 +779,9 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
                 _this2.setIsActionLoading(undefined);
               case 16:
               case "end":
-                return _context8.stop();
+                return _context7.stop();
             }
-          }, _callee8, null, [[5, 11]]);
+          }, _callee7, null, [[5, 11]]);
         }))
       }), /*#__PURE__*/_react.default.createElement(_ResetConfirmModal.default, {
         isModalOpen: isModalOpen.confirmReset,
@@ -811,58 +819,39 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onResend: /*#__PURE__*/function () {
-          var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(values) {
+          var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(values) {
             var email;
-            return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-              while (1) switch (_context9.prev = _context9.next) {
+            return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+              while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   _this2.clearPopupSuccess();
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('resend');
-                  _context9.prev = 3;
+                  _context8.prev = 3;
                   email = values === null || values === void 0 ? void 0 : values.email;
-                  _context9.next = 7;
+                  _context8.next = 7;
                   return resendActivationEmail(email);
                 case 7:
                   _this2.setPopupSuccess('resend', 'Email sent.');
                   _this2.setIsActionLoading(undefined);
-                  _context9.next = 16;
+                  _context8.next = 16;
                   break;
                 case 11:
-                  _context9.prev = 11;
-                  _context9.t0 = _context9["catch"](3);
-                  console.log(_context9.t0);
-                  _this2.setPopupError('resend', (_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message) || 'Something went wrong.');
+                  _context8.prev = 11;
+                  _context8.t0 = _context8["catch"](3);
+                  console.log(_context8.t0);
+                  _this2.setPopupError('resend', (_context8.t0 === null || _context8.t0 === void 0 ? void 0 : _context8.t0.message) || 'Something went wrong.');
                   _this2.setIsActionLoading(undefined);
                 case 16:
                 case "end":
-                  return _context9.stop();
+                  return _context8.stop();
               }
-            }, _callee9, null, [[3, 11]]);
+            }, _callee8, null, [[3, 11]]);
           }));
           return function (_x6) {
-            return _ref14.apply(this, arguments);
+            return _ref13.apply(this, arguments);
           };
         }()
-      }), /*#__PURE__*/_react.default.createElement(_ResendConfirmationCodeModal.default, {
-        isActionLoading: isActionLoading,
-        popupError: this.state.popupError,
-        isModalOpen: isModalOpen.resendConfirmation,
-        onModalClose: function onModalClose() {
-          _this2.setOpenModalStatus('resendConfirmation', false);
-          _this2.clearPopupError();
-          _this2.setIsActionLoading(undefined);
-        },
-        onModalSwitch: function onModalSwitch() {
-          window.history.pushState({}, null, '/login');
-          _this2.switchOpenModal('resendConfirmation', 'login');
-          _this2.clearPopupError();
-          _this2.setIsActionLoading(undefined);
-        },
-        onTokenRefreshed: function onTokenRefreshed() {
-          // Switch to reset password modal after token is refreshed
-          _this2.switchOpenModal('resendConfirmation', 'resetPassword');
-        }
       }));
     }
   }]);