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

package/dist/components/Chips/Chip.js

@@ -24,7 +24,7 @@ var Chip = function Chip(_ref) {
     isActive: isActive
   }, props), /*#__PURE__*/_react.default.createElement(_ChipStyles.ChipText, null, children), tooltip && /*#__PURE__*/_react.default.createElement(_InfoIcon.default, {
     title: tooltip,
-    position: "right",
+    position: "top",
     noIcon: true,
     noMarginLeft: true,
     noMarginRight: true

package/dist/components/ResetPasswordModal/ResetPasswordModal.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _formik = require("formik");
 var _formikPersist = require("formik-persist");
@@ -17,16 +17,17 @@ var _InputPassword = _interopRequireDefault(require("../Input/InputPassword"));
 var _Button = _interopRequireDefault(require("../Button/Button.styles"));
 var _Grid = require("../Grid/Grid.styles");
 var _ComponentWrapper = _interopRequireDefault(require("../ComponentWrapper/ComponentWrapper.styles"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var ResetPasswordModal = function ResetPasswordModal(_ref) {
   var isModalOpen = _ref.isModalOpen,
     onModalClose = _ref.onModalClose,
     onFormSend = _ref.onFormSend,
     onModalSwitch = _ref.onModalSwitch,
     popupError = _ref.popupError,
-    isActionLoading = _ref.isActionLoading;
+    isActionLoading = _ref.isActionLoading,
+    onLoad = _ref.onLoad;
   var initialValues = {
     password: '',
     confirmPassword: ''
@@ -35,6 +36,9 @@ var ResetPasswordModal = function ResetPasswordModal(_ref) {
     password: Yup.string().required('Oops, this can‘t be blank'),
     confirmPassword: Yup.string().required('Oops, this can‘t be blank')
   });
+  (0, _react.useEffect)(function () {
+    onLoad && onLoad();
+  }, [onLoad]);
   return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
     isOpen: isModalOpen,
     onClose: onModalClose

package/dist/components/headerHo/HeaderHo.js

@@ -17,11 +17,14 @@ 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");
 var _withRouter = require("../../utils/withRouter");
 var _customHooks = require("../../utils/customHooks");
+var _auth2 = require("firebase/auth");
+var _firebaseConfig = require("../../firebase-config");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
@@ -55,6 +58,7 @@ 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++) {
@@ -63,7 +67,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "state", {
       mobileMenuOpen: false,
-      isModalOpen: _defineProperty({
+      isModalOpen: (_isModalOpen = {
         login: false,
         signUp: false,
         terms: false,
@@ -74,7 +78,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         enter2fa: false,
         resetCode: false,
         verifyEmail: false
-      }, "resetPassword", false),
+      }, _defineProperty(_isModalOpen, "resetPassword", false), _defineProperty(_isModalOpen, "resendConfirmation", false), _isModalOpen),
       userInfo: {
         email: undefined,
         password: undefined,
@@ -91,161 +95,32 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         message: undefined
       },
       isActionLoading: undefined,
-      termsData: undefined,
-      isPasswordResetLinkExpired: false,
-      tokenCheckComplete: false
+      termsData: undefined
     });
-    _defineProperty(_assertThisInitialized(_this), "componentDidMount", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _this$props, isResetPassword, urlParams, oobCode, tokenStatus;
+    _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, isResetPassword = _this$props.isResetPassword, urlParams = _this$props.urlParams; // check if reset password modal and extract oobCode from URL params
-            if (!isResetPassword) {
-              _context.next = 22;
-              break;
-            }
-            console.log('ifResetPassword running');
-            oobCode = urlParams === null || urlParams === void 0 ? void 0 : urlParams.getUrlParam('oobCode');
-            if (!(oobCode && oobCode !== '')) {
-              _context.next = 19;
-              break;
-            }
-            console.log('ifOobCode running');
-            _context.prev = 6;
-            _context.next = 9;
-            return _this.checkTokenExpiration();
-          case 9:
-            tokenStatus = _context.sent;
-            _this.setState(function (prevState) {
-              return _objectSpread(_objectSpread({}, prevState), {}, {
-                isPasswordResetLinkExpired: false,
-                tokenCheckComplete: true
-              });
-            });
-            _context.next = 17;
-            break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](6);
-            console.error('Error checking token expiration in componentDidMount:', _context.t0);
-            // if there's an error checking the token, assume it's expired
-            _this.setState(function (prevState) {
-              return _objectSpread(_objectSpread({}, prevState), {}, {
-                isPasswordResetLinkExpired: true,
-                tokenCheckComplete: true
-              });
-            });
-          case 17:
-            _context.next = 20;
-            break;
-          case 19:
-            // No oobCode means expired/invalid
-            _this.setState(function (prevState) {
-              return _objectSpread(_objectSpread({}, prevState), {}, {
-                isPasswordResetLinkExpired: true,
-                tokenCheckComplete: true
-              });
-            });
-          case 20:
-            _context.next = 23;
-            break;
-          case 22:
-            // Not a reset password flow
-            _this.setState(function (prevState) {
-              return _objectSpread(_objectSpread({}, prevState), {}, {
-                tokenCheckComplete: true
-              });
-            });
-          case 23:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[6, 13]]);
-    })));
-    _defineProperty(_assertThisInitialized(_this), "checkTokenExpiration", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var urlParams, oobCode, result, _error$message;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            urlParams = _this.props.urlParams;
-            if (urlParams) {
-              _context2.next = 3;
-              break;
-            }
-            return _context2.abrupt("return", {
-              expired: true
-            });
-          case 3:
-            _context2.prev = 3;
-            oobCode = urlParams.getUrlParam('oobCode');
-            if (oobCode) {
-              _context2.next = 7;
-              break;
-            }
-            return _context2.abrupt("return", {
-              expired: true
-            });
-          case 7:
-            _context2.next = 9;
-            return _this.context.checkActivationLinkExpired(oobCode);
-          case 9:
-            result = _context2.sent;
-            return _context2.abrupt("return", result);
-          case 13:
-            _context2.prev = 13;
-            _context2.t0 = _context2["catch"](3);
-            console.error('Error checking token expiration:', _context2.t0);
-
-            // Check for specific error codes that indicate invalid/expired token
-            if (!(_context2.t0 !== null && _context2.t0 !== void 0 && (_error$message = _context2.t0.message) !== null && _error$message !== void 0 && _error$message.includes('INVALID_OOB_CODE') || (_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === 'auth/invalid-action-code' || (_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.code) === 'auth/expired-action-code')) {
-              _context2.next = 18;
-              break;
-            }
-            return _context2.abrupt("return", {
-              expired: true
-            });
-          case 18:
-            return _context2.abrupt("return", {
-              expired: true
-            });
-          case 19:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[3, 13]]);
-    })));
-    _defineProperty(_assertThisInitialized(_this), "checkForModals", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var _this$props2, isLogin, isSignUp, isResetPassword, isVerifyEmail, user, _this$state, isModalOpen, isPasswordResetLinkExpired, tokenCheckComplete, login, signUp, resetPassword, verifyEmail, forgot, isAnyModalOpen;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _this$props2 = _this.props, isLogin = _this$props2.isLogin, isSignUp = _this$props2.isSignUp, isResetPassword = _this$props2.isResetPassword, isVerifyEmail = _this$props2.isVerifyEmail;
+            _this$props = _this.props, isLogin = _this$props.isLogin, isSignUp = _this$props.isSignUp, isResetPassword = _this$props.isResetPassword, isVerifyEmail = _this$props.isVerifyEmail;
             user = _this.context.user;
-            _this$state = _this.state, isModalOpen = _this$state.isModalOpen, isPasswordResetLinkExpired = _this$state.isPasswordResetLinkExpired, tokenCheckComplete = _this$state.tokenCheckComplete;
-            login = isModalOpen.login, signUp = isModalOpen.signUp, resetPassword = isModalOpen.resetPassword, verifyEmail = isModalOpen.verifyEmail, forgot = isModalOpen.forgot; // token check needs to complete first
-            if (tokenCheckComplete) {
-              _context3.next = 6;
-              break;
-            }
-            return _context3.abrupt("return");
-          case 6:
-            //checks if any modal is open
+            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) {
-              _context3.next = 9;
+              _context.next = 7;
               break;
             }
-            return _context3.abrupt("return");
-          case 9:
+            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({}, prevState.isModalOpen), {}, {
+                  isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
                     login: true
                   })
                 });
@@ -254,60 +129,41 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
             if (isSignUp && !user && !signUp) {
               _this.setState(function (prevState) {
                 return _objectSpread(_objectSpread({}, prevState), {}, {
-                  isModalOpen: _objectSpread(_objectSpread({}, prevState.isModalOpen), {}, {
+                  isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
                     signUp: true
                   })
                 });
               });
             }
-            if (isResetPassword && !user && !resetPassword && !forgot) {
-              if (isPasswordResetLinkExpired) {
-                // open forgot password modal if token is expired/invalid
-                console.log('Opening forgot password modal - token expired/invalid');
-                _this.setState(function (prevState) {
-                  return _objectSpread(_objectSpread({}, prevState), {}, {
-                    isModalOpen: _objectSpread(_objectSpread({}, prevState.isModalOpen), {}, {
-                      forgot: true
-                    }),
-                    popupError: {
-                      popup: 'forgot',
-                      message: 'This password reset link has expired or is invalid. Please request a new one.',
-                      field: undefined
-                    }
-                  });
-                });
-              } else {
-                // open usual reset password modal if token is valid
-                console.log('Opening reset password modal - token valid');
-                _this.setState(function (prevState) {
-                  return _objectSpread(_objectSpread({}, prevState), {}, {
-                    isModalOpen: _objectSpread(_objectSpread({}, prevState.isModalOpen), {}, {
-                      resetPassword: 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({}, prevState.isModalOpen), {}, {
+                  isModalOpen: _objectSpread(_objectSpread({}, isModalOpen), {}, {
                     verifyEmail: true
                   })
                 });
               });
             }
-          case 13:
+          case 11:
           case "end":
-            return _context3.stop();
+            return _context.stop();
         }
-      }, _callee3);
+      }, _callee);
     })));
     _defineProperty(_assertThisInitialized(_this), "setOpenModalStatus", function (modalId, status) {
       var isModalOpen = _this.state.isModalOpen;
-      var _this$props3 = _this.props,
-        onSignupModalClose = _this$props3.onSignupModalClose,
-        navigate = _this$props3.navigate;
+      var _this$props2 = _this.props,
+        onSignupModalClose = _this$props2.onSignupModalClose,
+        navigate = _this$props2.navigate;
 
       //if we pass custom onSignupModalClose, we don't want any modification in the url
       if (!onSignupModalClose) {
@@ -315,7 +171,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         window.history.pushState('', '', modalId === 'login' ? '/login' : modalId === 'signUp' ? '/signup' : '/');
 
         //when we close login or signup or reset password modal, we want to remove modal url
-        if ((modalId === 'login' || modalId === 'signUp' || modalId === 'resetPassword' || modalId === 'verifyEmail' || modalId === 'forgot') && !status) {
+        if ((modalId === 'login' || modalId === 'signUp' || modalId === 'resetPassword' || modalId === 'verifyEmail') && !status) {
           navigate('/');
         }
       }
@@ -422,9 +278,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         this.props.navigate('/login');
         this.props.navigate(0);
       }
-
-      // Run after page loaded AND token check is complete
-      if (!isFetchingUser && this.state.tokenCheckComplete) {
+      if (!isFetchingUser) {
         this.checkForModals();
       }
     }
@@ -432,20 +286,20 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$state2 = this.state,
-        isModalOpen = _this$state2.isModalOpen,
-        userInfo = _this$state2.userInfo,
-        isActionLoading = _this$state2.isActionLoading,
-        termsData = _this$state2.termsData;
-      var _this$props4 = this.props,
-        fixed = _this$props4.fixed,
-        activateMenu = _this$props4.activateMenu,
-        activeMenu = _this$props4.activeMenu,
-        withoutLoginSignupButton = _this$props4.withoutLoginSignupButton,
-        useRelativePathForMenu = _this$props4.useRelativePathForMenu,
-        isLoginModalOpen = _this$props4.isLoginModalOpen,
-        setIsLoginModalOpen = _this$props4.setIsLoginModalOpen,
-        cooldown = _this$props4.cooldown;
+      var _this$state = this.state,
+        isModalOpen = _this$state.isModalOpen,
+        userInfo = _this$state.userInfo,
+        isActionLoading = _this$state.isActionLoading,
+        termsData = _this$state.termsData;
+      var _this$props3 = this.props,
+        fixed = _this$props3.fixed,
+        activateMenu = _this$props3.activateMenu,
+        activeMenu = _this$props3.activeMenu,
+        withoutLoginSignupButton = _this$props3.withoutLoginSignupButton,
+        useRelativePathForMenu = _this$props3.useRelativePathForMenu,
+        isLoginModalOpen = _this$props3.isLoginModalOpen,
+        setIsLoginModalOpen = _this$props3.setIsLoginModalOpen,
+        cooldown = _this$props3.cooldown;
       var _this$context2 = this.context,
         getUser = _this$context2.getUser,
         _this$context2$user = _this$context2.user,
@@ -501,47 +355,47 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
             var email, password, errorMessage;
-            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  email = _ref5.email, password = _ref5.password;
+                  email = _ref3.email, password = _ref3.password;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('login');
-                  _context4.prev = 3;
+                  _context2.prev = 3;
                   if (!(password.length > 128)) {
-                    _context4.next = 8;
+                    _context2.next = 8;
                     break;
                   }
                   _this2.setPopupError('login', 'Your password cannot exceed 128 characters');
                   _this2.setIsActionLoading(undefined);
-                  return _context4.abrupt("return");
+                  return _context2.abrupt("return");
                 case 8:
-                  _context4.next = 10;
+                  _context2.next = 10;
                   return loginUser(email, password);
                 case 10:
-                  _context4.next = 12;
+                  _context2.next = 12;
                   return getUser();
                 case 12:
                   _this2.setOpenModalStatus('login', false);
                   setIsLoginModalOpen && setIsLoginModalOpen(false);
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
-                  _context4.next = 28;
+                  _context2.next = 28;
                   break;
                 case 18:
-                  _context4.prev = 18;
-                  _context4.t0 = _context4["catch"](3);
-                  errorMessage = _context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message; //handle switch modal correctly
-                  if (!((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.code) === 'auth/multi-factor-auth-required')) {
-                    _context4.next = 26;
+                  _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;
                     break;
                   }
                   _this2.switchOpenModal('login', 'enter2fa');
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
-                  return _context4.abrupt("return");
+                  return _context2.abrupt("return");
                 case 26:
                   if (errorMessage) {
                     _this2.setPopupError('login', errorMessage);
@@ -551,12 +405,12 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
                   _this2.setIsActionLoading(undefined);
                 case 28:
                 case "end":
-                  return _context4.stop();
+                  return _context2.stop();
               }
-            }, _callee4, null, [[3, 18]]);
+            }, _callee2, null, [[3, 18]]);
           }));
           return function (_x) {
-            return _ref6.apply(this, arguments);
+            return _ref4.apply(this, arguments);
           };
         }()
       }), waitingFor2fa && /*#__PURE__*/_react.default.createElement(_FA.EnterCode, {
@@ -575,46 +429,46 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref7) {
+          var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
             var otpInput;
-            return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
+            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
                 case 0:
-                  otpInput = _ref7.otpInput;
+                  otpInput = _ref5.otpInput;
                   _this2.setIsActionLoading('enter2fa');
-                  _context5.prev = 2;
-                  _context5.next = 5;
+                  _context3.prev = 2;
+                  _context3.next = 5;
                   return loginUserWithTotp(otpInput, firebaseError);
                 case 5:
-                  _context5.next = 7;
+                  _context3.next = 7;
                   return getUser();
                 case 7:
                   _this2.setOpenModalStatus('enter2fa', false);
                   _this2.clearPopupError();
                   _this2.setIsActionLoading(undefined);
-                  _context5.next = 16;
+                  _context3.next = 16;
                   break;
                 case 12:
-                  _context5.prev = 12;
-                  _context5.t0 = _context5["catch"](2);
-                  console.log('🚀 ~ file: HeaderHo.jsx:364 ~ error:', _context5.t0);
-                  if ((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.code) === 'auth/invalid-verification-code') {
-                    _this2.setPopupError('enter2fa', "That's not the right 2FA code. Try again");
-                  } else if ((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.code) === 'auth/code-expired') {
+                  _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') {
+                    _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') {
                     _this2.setPopupError('enter2fa', 'Time out. Please restart the flow and log in again');
                   } else {
-                    _this2.setPopupError('enter2fa', _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message);
+                    _this2.setPopupError('enter2fa', _context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message);
                   }
                 case 16:
                   _this2.setIsActionLoading(undefined);
                 case 17:
                 case "end":
-                  return _context5.stop();
+                  return _context3.stop();
               }
-            }, _callee5, null, [[2, 12]]);
+            }, _callee3, null, [[2, 12]]);
           }));
           return function (_x2) {
-            return _ref8.apply(this, arguments);
+            return _ref6.apply(this, arguments);
           };
         }()
       }), /*#__PURE__*/_react.default.createElement(_FA.ResetCode, {
@@ -669,24 +523,24 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           onSignupModalClose && onSignupModalClose();
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(userInfo) {
-            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+          var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(userInfo) {
+            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('signUp');
 
                   //check password
-                  _context6.prev = 2;
+                  _context4.prev = 2;
                   if (!(userInfo.password.length > 128)) {
-                    _context6.next = 7;
+                    _context4.next = 7;
                     break;
                   }
                   _this2.setPopupError('register', 'Your password cannot exceed 128 characters', 'password');
                   _this2.setIsActionLoading(undefined);
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
                 case 7:
-                  _context6.next = 9;
+                  _context4.next = 9;
                   return createUser(userInfo.email, userInfo.password);
                 case 9:
                   //start the timer to count when user can resend email
@@ -694,10 +548,10 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
 
                   //if user checked newsletter checkbox
                   if (!userInfo.newsletter) {
-                    _context6.next = 13;
+                    _context4.next = 13;
                     break;
                   }
-                  _context6.next = 13;
+                  _context4.next = 13;
                   return (0, _fetchDataPublic.default)('emails/subscribe', {
                     email: userInfo.email,
                     listName: 'newsletter'
@@ -706,28 +560,28 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
                   _this2.setUserInfo(userInfo);
                   _this2.switchOpenModal('signUp', 'confirm');
                   _this2.setIsActionLoading(undefined);
-                  _context6.next = 23;
+                  _context4.next = 23;
                   break;
                 case 18:
-                  _context6.prev = 18;
-                  _context6.t0 = _context6["catch"](2);
-                  console.log(_context6.t0);
+                  _context4.prev = 18;
+                  _context4.t0 = _context4["catch"](2);
+                  console.log(_context4.t0);
                   _this2.setIsActionLoading(undefined);
-                  if ((_context6.t0 === null || _context6.t0 === void 0 ? void 0 : _context6.t0.code) === 'auth/email-already-in-use') {
+                  if ((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.code) === 'auth/email-already-in-use') {
                     _this2.setPopupError('register', 'This email address is already taken', 'email');
-                  } else if ((_context6.t0 === null || _context6.t0 === void 0 ? void 0 : _context6.t0.code) === 'auth/weak-password') {
+                  } else if ((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.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 _context6.stop();
+                  return _context4.stop();
               }
-            }, _callee6, null, [[2, 18]]);
+            }, _callee4, null, [[2, 18]]);
           }));
           return function (_x3) {
-            return _ref9.apply(this, arguments);
+            return _ref7.apply(this, arguments);
           };
         }()
       }), /*#__PURE__*/_react.default.createElement(_TermsModal.default, {
@@ -753,35 +607,35 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.clearPopupError();
           _this2.setIsActionLoading(undefined);
         },
-        onResend: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        onResend: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
           var email;
-          return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-            while (1) switch (_context7.prev = _context7.next) {
+          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
               case 0:
                 _this2.clearPopupSuccess();
                 _this2.clearPopupError();
                 _this2.setIsActionLoading('resend');
-                _context7.prev = 3;
+                _context5.prev = 3;
                 email = _this2.state.userInfo.email;
-                _context7.next = 7;
+                _context5.next = 7;
                 return resendActivationEmail(email);
               case 7:
                 cooldown === null || cooldown === void 0 || cooldown.startCooldown();
                 _this2.setPopupSuccess('resend', 'Email sent.');
                 _this2.setIsActionLoading(undefined);
-                _context7.next = 17;
+                _context5.next = 17;
                 break;
               case 12:
-                _context7.prev = 12;
-                _context7.t0 = _context7["catch"](3);
-                console.log(_context7.t0);
+                _context5.prev = 12;
+                _context5.t0 = _context5["catch"](3);
+                console.log(_context5.t0);
                 _this2.setPopupError('resend', 'Something went wrong.');
                 _this2.setIsActionLoading(undefined);
               case 17:
               case "end":
-                return _context7.stop();
+                return _context5.stop();
             }
-          }, _callee7, null, [[3, 12]]);
+          }, _callee5, null, [[3, 12]]);
         }))
       }), /*#__PURE__*/_react.default.createElement(_ForgotPasswordModal.default, {
         isActionLoading: isActionLoading,
@@ -801,38 +655,38 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref11) {
+          var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref9) {
             var email;
-            return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
-                  email = _ref11.email;
+                  email = _ref9.email;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('forgot');
-                  _context8.prev = 3;
-                  _context8.next = 6;
+                  _context6.prev = 3;
+                  _context6.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);
-                  _context8.next = 15;
+                  _context6.next = 15;
                   break;
                 case 10:
-                  _context8.prev = 10;
-                  _context8.t0 = _context8["catch"](3);
-                  console.log(_context8.t0);
+                  _context6.prev = 10;
+                  _context6.t0 = _context6["catch"](3);
+                  console.log(_context6.t0);
                   _this2.setPopupError('forgot', 'This email is not registered.');
                   _this2.setIsActionLoading(undefined);
                 case 15:
                 case "end":
-                  return _context8.stop();
+                  return _context6.stop();
               }
-            }, _callee8, null, [[3, 10]]);
+            }, _callee6, null, [[3, 10]]);
           }));
           return function (_x4) {
-            return _ref12.apply(this, arguments);
+            return _ref10.apply(this, arguments);
           };
         }()
       }), /*#__PURE__*/_react.default.createElement(_ResetPasswordModal.default, {
@@ -851,38 +705,76 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onFormSend: /*#__PURE__*/function () {
-          var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref13) {
-            var password, oobCode;
-            return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-              while (1) switch (_context9.prev = _context9.next) {
+          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref11) {
+            var password;
+            return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+              while (1) switch (_context7.prev = _context7.next) {
                 case 0:
-                  password = _ref13.password, oobCode = _ref13.oobCode;
+                  password = _ref11.password;
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('resetPassword');
-                  _context9.prev = 3;
-                  _context9.next = 6;
-                  return handleResetPassword(password, oobCode);
+                  _context7.prev = 3;
+                  _context7.next = 6;
+                  return handleResetPassword(password);
                 case 6:
                   _this2.switchOpenModal('resetPassword', 'confirmReset');
                   _this2.setIsActionLoading(undefined);
-                  _context9.next = 15;
+                  _context7.next = 15;
                   break;
                 case 10:
-                  _context9.prev = 10;
-                  _context9.t0 = _context9["catch"](3);
-                  console.log(_context9.t0);
-                  _this2.setPopupError('resetPassword', (_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message) || 'Something went wrong.');
+                  _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.');
                   _this2.setIsActionLoading(undefined);
                 case 15:
                 case "end":
-                  return _context9.stop();
+                  return _context7.stop();
               }
-            }, _callee9, null, [[3, 10]]);
+            }, _callee7, null, [[3, 10]]);
           }));
           return function (_x5) {
-            return _ref14.apply(this, arguments);
+            return _ref12.apply(this, arguments);
           };
-        }()
+        }(),
+        onLoad: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+          var location, query, oobCode;
+          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+            while (1) switch (_context8.prev = _context8.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;
+                  break;
+                }
+                _this2.setIsActionLoading('resetPassword');
+                _context8.prev = 5;
+                _context8.next = 8;
+                return (0, _auth2.checkActionCode)(_firebaseConfig.auth, oobCode);
+              case 8:
+                _this2.setIsActionLoading(undefined);
+                _context8.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') {
+                  _this2.switchOpenModal('resetPassword', 'forgot');
+                  _this2.setPopupError('forgot', 'This password reset link has expired or is invalid. Please request a new one.');
+                } else {
+                  _this2.setPopupError('resetPassword', 'Something went wrong with the password reset link. Please try again.');
+                }
+              case 15:
+                _this2.setIsActionLoading(undefined);
+              case 16:
+              case "end":
+                return _context8.stop();
+            }
+          }, _callee8, null, [[5, 11]]);
+        }))
       }), /*#__PURE__*/_react.default.createElement(_ResetConfirmModal.default, {
         isModalOpen: isModalOpen.confirmReset,
         onModalClose: function onModalClose() {
@@ -919,39 +811,58 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           _this2.setIsActionLoading(undefined);
         },
         onResend: /*#__PURE__*/function () {
-          var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(values) {
+          var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(values) {
             var email;
-            return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-              while (1) switch (_context10.prev = _context10.next) {
+            return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   _this2.clearPopupSuccess();
                   _this2.clearPopupError();
                   _this2.setIsActionLoading('resend');
-                  _context10.prev = 3;
+                  _context9.prev = 3;
                   email = values === null || values === void 0 ? void 0 : values.email;
-                  _context10.next = 7;
+                  _context9.next = 7;
                   return resendActivationEmail(email);
                 case 7:
                   _this2.setPopupSuccess('resend', 'Email sent.');
                   _this2.setIsActionLoading(undefined);
-                  _context10.next = 16;
+                  _context9.next = 16;
                   break;
                 case 11:
-                  _context10.prev = 11;
-                  _context10.t0 = _context10["catch"](3);
-                  console.log(_context10.t0);
-                  _this2.setPopupError('resend', (_context10.t0 === null || _context10.t0 === void 0 ? void 0 : _context10.t0.message) || 'Something went wrong.');
+                  _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.');
                   _this2.setIsActionLoading(undefined);
                 case 16:
                 case "end":
-                  return _context10.stop();
+                  return _context9.stop();
               }
-            }, _callee10, null, [[3, 11]]);
+            }, _callee9, null, [[3, 11]]);
           }));
           return function (_x6) {
-            return _ref15.apply(this, arguments);
+            return _ref14.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');
+        }
       }));
     }
   }]);
@@ -959,7 +870,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
 }(_react.Component);
 _defineProperty(HeaderHoClass, "propTypes", {});
 _defineProperty(HeaderHoClass, "contextType", _AuthContext.AuthContext);
-var HeaderHo = (0, _withRouter.withRouter)((0, _customHooks.cooldownHOC)((0, _customHooks.withUrlParams)(HeaderHoClass), 90));
+var HeaderHo = (0, _withRouter.withRouter)((0, _customHooks.cooldownHOC)(HeaderHoClass, 90));
 exports.HeaderHo = HeaderHo;
 var _default = HeaderHo;
 exports.default = _default;

package/dist/utils/customHooks.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useMobileView = exports.useCooldown = exports.cooldownHOC = void 0;
 exports.usePrevious = usePrevious;
-exports.withUrlParams = exports.useUrlParams = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _rwd = _interopRequireWildcard(require("../styles/rwd"));
-var _reactRouterDom = require("react-router-dom");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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); }
@@ -118,34 +116,4 @@ var cooldownHOC = function cooldownHOC(Component) {
   };
   return Wrapper;
 };
-exports.cooldownHOC = cooldownHOC;
-var useUrlParams = function useUrlParams() {
-  var location = (0, _reactRouterDom.useLocation)();
-  var getUrlParam = function getUrlParam(paramName) {
-    var searchParams = new URLSearchParams(location.search);
-    return searchParams.get(paramName);
-  };
-  var getAllParams = function getAllParams() {
-    var searchParams = new URLSearchParams(location.search);
-    return Object.fromEntries(searchParams.entries());
-  };
-  return {
-    location: location,
-    pathname: location.pathname,
-    search: location.search,
-    getUrlParam: getUrlParam,
-    getAllParams: getAllParams
-  };
-};
-
-// HOC to inject URL data
-exports.useUrlParams = useUrlParams;
-var withUrlParams = function withUrlParams(Component) {
-  return function (props) {
-    var urlParams = useUrlParams();
-    return /*#__PURE__*/_react.default.createElement(Component, _extends({}, props, {
-      urlParams: urlParams
-    }));
-  };
-};
-exports.withUrlParams = withUrlParams;
+exports.cooldownHOC = cooldownHOC;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stokr/components-library",
-  "version": "2.3.41-beta.18",
+  "version": "2.3.41-beta.19",
   "description": "STOKR - Components Library",
   "main": "dist/index.js",
   "module": "dist/index.js",