npm - @stokr/components-library - Versions diffs - 2.3.41-beta.1 → 2.3.41-beta.11 - Mend

@stokr/components-library 2.3.41-beta.1 → 2.3.41-beta.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/components/ResetPasswordModal/ResetPasswordModal.js +364 -273
package/dist/context/AuthContext.js +14 -25
package/package.json +1 -1

package/dist/components/ResetPasswordModal/ResetPasswordModal.js CHANGED Viewed

@@ -1,9 +1,10 @@
 "use strict";
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.ResetPasswordModal = void 0;
+exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _formik = require("formik");
@@ -16,300 +17,390 @@ var _Button = _interopRequireDefault(require("../Button/Button.styles"));
 var _Grid = require("../Grid/Grid.styles");
 var _ComponentWrapper = _interopRequireDefault(require("../ComponentWrapper/ComponentWrapper.styles"));
 var _AuthContext = require("../../context/AuthContext");
+var _reactRouterDom = require("react-router-dom");
+var _Input = _interopRequireDefault(require("../Input/Input"));
+var _Auth = _interopRequireDefault(require("../../context/Auth"));
 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 _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 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 _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 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 _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; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var ResetPasswordModal = /*#__PURE__*/function (_PureComponent) {
-  _inherits(ResetPasswordModal, _PureComponent);
-  var _super = _createSuper(ResetPasswordModal);
-  function ResetPasswordModal() {
-    var _this;
-    _classCallCheck(this, ResetPasswordModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "state", {
-      isTokenExpired: false,
-      isCheckingToken: true,
-      tokenError: null
-    });
-    _defineProperty(_assertThisInitialized(_this), "initialValues", {
-      password: '',
-      confirmPassword: ''
-    });
-    _defineProperty(_assertThisInitialized(_this), "validationSchema", Yup.object().shape({
-      password: Yup.string().required('Oops, this can‘t be blank'),
-      confirmPassword: Yup.string().required('Oops, this can‘t be blank')
-    }));
-    return _this;
-  }
-  _createClass(ResetPasswordModal, [{
-    key: "checkTokenExpiration",
-    value: function () {
-      var _checkTokenExpiration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var routeLocation, query, oobCode, result;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              routeLocation = this.props.routeLocation;
-              if (routeLocation) {
-                _context.next = 4;
-                break;
-              }
-              this.setState({
-                isTokenExpired: true,
-                isCheckingToken: false,
-                tokenError: {
-                  message: 'No location information available'
-                }
-              });
-              return _context.abrupt("return");
-            case 4:
-              _context.prev = 4;
-              query = new URLSearchParams(routeLocation.search);
-              oobCode = query.get('oobCode');
-              if (oobCode) {
-                _context.next = 10;
-                break;
-              }
-              this.setState({
-                isTokenExpired: true,
-                isCheckingToken: false,
-                tokenError: {
-                  message: 'No activation code found in the URL'
-                }
-              });
-              return _context.abrupt("return");
-            case 10:
-              _context.next = 12;
-              return this.context.checkActivationLinkExpired(oobCode);
-            case 12:
-              result = _context.sent;
-              console.log('Token check result:', result); // Debug log
+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 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var ResetPasswordModal = function ResetPasswordModal(_ref) {
+  var isModalOpen = _ref.isModalOpen,
+    onModalClose = _ref.onModalClose,
+    onFormSend = _ref.onFormSend,
+    onModalSwitch = _ref.onModalSwitch,
+    _ref$popupError = _ref.popupError,
+    popupError = _ref$popupError === void 0 ? {
+      popup: null,
+      message: ''
+    } : _ref$popupError,
+    _ref$isActionLoading = _ref.isActionLoading,
+    isActionLoading = _ref$isActionLoading === void 0 ? false : _ref$isActionLoading;
+  var authContext = (0, _react.useContext)(_AuthContext.AuthContext);
+  var _useState = (0, _react.useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isTokenExpired = _useState2[0],
+    setIsTokenExpired = _useState2[1];
+  var _useState3 = (0, _react.useState)(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isCheckingToken = _useState4[0],
+    setIsCheckingToken = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isSubmitting = _useState6[0],
+    setIsSubmitting = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    activationSuccess = _useState8[0],
+    setActivationSuccess = _useState8[1];
+  var location = (0, _reactRouterDom.useLocation)();
+  var initialValues = {
+    password: '',
+    confirmPassword: '',
+    email: ''
+  };
-              this.setState({
-                isTokenExpired: result.expired || result.error != null,
-                tokenError: result.error,
-                isCheckingToken: false
-              });
-              _context.next = 21;
+  // main form validation schema (password reset)
+  var validationSchema = Yup.object().shape({
+    password: Yup.string().required("Oops, this can't be blank"),
+    confirmPassword: Yup.string().required("Oops, this can't be blank")
+  });
+  // email-only validation schema (for expired token form)
+  var emailValidationSchema = Yup.object().shape({
+    email: Yup.string().required("Oops, this can't be blank").matches(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, 'Please enter a valid email address')
+  });
+  var checkTokenExpiration = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var search, query, oobCode, result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (location) {
+              _context.next = 5;
               break;
-            case 17:
-              _context.prev = 17;
-              _context.t0 = _context["catch"](4);
-              console.error('Error checking token expiration:', _context.t0);
-              this.setState({
-                isTokenExpired: true,
-                tokenError: _context.t0,
-                isCheckingToken: false
-              });
-            case 21:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this, [[4, 17]]);
-      }));
-      function checkTokenExpiration() {
-        return _checkTokenExpiration.apply(this, arguments);
+            }
+            console.log('Location null ?! ');
+            setIsTokenExpired(true);
+            setIsCheckingToken(false);
+            return _context.abrupt("return");
+          case 5:
+            _context.prev = 5;
+            search = location.search;
+            query = new URLSearchParams(search);
+            oobCode = query.get('oobCode');
+            console.log('oobCode from URL params: ', oobCode);
+            if (oobCode) {
+              _context.next = 15;
+              break;
+            }
+            console.log('oobCode was not found at all. value: ', oobCode);
+            setIsTokenExpired(true);
+            setIsCheckingToken(false);
+            return _context.abrupt("return");
+          case 15:
+            _context.next = 17;
+            return authContext.checkActivationLinkExpired(oobCode);
+          case 17:
+            result = _context.sent;
+            setIsTokenExpired(result.expired);
+            setIsCheckingToken(false);
+            _context.next = 27;
+            break;
+          case 22:
+            _context.prev = 22;
+            _context.t0 = _context["catch"](5);
+            console.error('Error checking token expiration:', _context.t0);
+            setIsTokenExpired(true);
+            setIsCheckingToken(false);
+          case 27:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[5, 22]]);
+    }));
+    return function checkTokenExpiration() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var handleResendActivationMail = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values, formikActions) {
+      var response, urlObj, params, newOobCode, currentUrl;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            setIsSubmitting(true);
+            _context2.next = 4;
+            return _Auth.default.resendActivationEmail(values.email);
+          case 4:
+            response = _context2.sent;
+            // new oobCode is in response URL
+            if (response) {
+              urlObj = new URL(response);
+              params = new URLSearchParams(urlObj.search);
+              newOobCode = params.get('oobCode');
+              if (newOobCode) {
+                // update the URL with the new oobCode without reloading the page
+                currentUrl = new URL(window.location.href);
+                currentUrl.searchParams.set('oobCode', newOobCode);
+                window.history.replaceState({}, '', currentUrl.toString());
+                // reset states to show the password reset form
+                setIsTokenExpired(false);
+                setActivationSuccess(true);
+                // small delay for UI sakes
+                setTimeout(function () {
+                  setIsSubmitting(false);
+                }, 1000);
+              } else {
+                console.error('New oobCode not found in response');
+                setIsSubmitting(false);
+              }
+            } else {
+              console.error('Unexpected response format', response);
+              setIsSubmitting(false);
+            }
+            return _context2.abrupt("return", response);
+          case 9:
+            _context2.prev = 9;
+            _context2.t0 = _context2["catch"](0);
+            console.error('There was an error while resending the activation email.', _context2.t0);
+            setIsSubmitting(false);
+            formikActions.setSubmitting(false);
+          case 14:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[0, 9]]);
+    }));
+    return function handleResendActivationMail(_x, _x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var renderExpiredTokenContent = function renderExpiredTokenContent() {
+    return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
+      isOpen: true,
+      onClose: onModalClose
+    }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+      part: 8
+    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
+      modalTop: true
+    }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "THIS INVITE LINK HAS EXPIRED"), /*#__PURE__*/_react.default.createElement("p", null, "To continue, request a new one using your email, and access will be sent shortly."))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
+      modalBot: true
+    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, 'Need to reset your password? ', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
+      to: "/forgot-password",
+      as: "button",
+      onClick: onModalSwitch
+    }, "Request a new link")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+      part: 8
+    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_formik.Formik, {
+      initialValues: {
+        email: ''
+      },
+      validationSchema: emailValidationSchema,
+      onSubmit: function onSubmit(values, formikActions) {
+        handleResendActivationMail(values, formikActions);
       }
-      return checkTokenExpiration;
-    }()
-  }, {
-    key: "renderExpiredTokenContent",
-    value: function renderExpiredTokenContent() {
-      var tokenError = this.state.tokenError;
-      var _this$props = this.props,
-        onModalClose = _this$props.onModalClose,
-        onModalSwitch = _this$props.onModalSwitch;
-      return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
-        isOpen: true,
-        onClose: onModalClose
-      }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
-        part: 8
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
-        modalTop: true
-      }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "LINK EXPIRED"), /*#__PURE__*/_react.default.createElement("p", null, "Your password reset link has expired or is invalid."))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
-        modalBot: true
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, 'Need to reset your password? ', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
-        to: "/forgot-password",
-        as: "button",
-        onClick: onModalSwitch
-      }, "Request a new link")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
-        part: 8
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, (tokenError === null || tokenError === void 0 ? void 0 : tokenError.message) || 'The password reset link you used is no longer valid. Please request a new one.')), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+    }, function (_ref4) {
+      var values = _ref4.values,
+        errors = _ref4.errors,
+        touched = _ref4.touched,
+        handleBlur = _ref4.handleBlur,
+        setFieldValue = _ref4.setFieldValue,
+        setFieldTouched = _ref4.setFieldTouched,
+        isSubmitting = _ref4.isSubmitting;
+      var onChangeWithTouch = function onChangeWithTouch(e) {
+        var field = e.target;
+        setFieldValue(field.name, field.value, false);
+        setFieldTouched(field.name);
+      };
+      return /*#__PURE__*/_react.default.createElement(_Form.default, null, /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+        noPadding: true
+      }, /*#__PURE__*/_react.default.createElement(_Form.FormField, null, /*#__PURE__*/_react.default.createElement(_Input.default, {
+        id: "resend-activation-email",
+        name: "email",
+        type: "email",
+        label: "Email",
+        value: values.email,
+        onChange: onChangeWithTouch,
+        onBlur: handleBlur,
+        error: !!errors.email && touched.email,
+        touched: !!touched.email,
+        info: "Please provide your email so you can receive the new activation email."
+      }), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+        show: errors.email && touched.email
+      }, errors.email))), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
         noPaddingBottom: true,
         noPaddingHorizontal: true
       }, /*#__PURE__*/_react.default.createElement(_Button.default, {
-        type: "button",
+        type: "submit",
         fluid: true,
-        onClick: onModalSwitch
-      }, "Request a new link")))))));
-    }
-  }, {
-    key: "renderLoadingContent",
-    value: function renderLoadingContent() {
-      return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
-        isOpen: true,
-        onClose: this.props.onModalClose
-      }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
-        part: 16
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Verifying your reset link..."))))));
-    }
-  }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      console.log('Component mounted, checking token');
-      this.checkTokenExpiration();
+        disabled: isSubmitting || isActionLoading === 'resetPassword'
+      }, isSubmitting || isActionLoading === 'resetPassword' ? 'Sending' : 'Resend link')), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+        paddingVeticalHalf: true,
+        noPaddingHorizontal: true
+      }, /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+        show: popupError.popup === 'resetPassword'
+      }, popupError.message)));
+    })))));
+  };
+  var renderLoadingContent = function renderLoadingContent() {
+    return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
+      isOpen: true,
+      onClose: onModalClose
+    }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+      part: 16
+    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Verifying your reset link..."))))));
+  };
+  var renderSuccessNotification = function renderSuccessNotification() {
+    return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
+      isOpen: true,
+      onClose: onModalClose
+    }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+      part: 16
+    }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "NEW LINK GENERATED"), /*#__PURE__*/_react.default.createElement("p", null, "Your new activation link has been processed successfully. You can now reset your password."))))));
+  };
+  (0, _react.useEffect)(function () {
+    console.log('Component mounted, checking token');
+    checkTokenExpiration();
+  }, []);
+  // show the success message briefly then reset to show the password form
+  (0, _react.useEffect)(function () {
+    if (activationSuccess) {
+      setTimeout(function () {
+        setActivationSuccess(false);
+      }, 2000); // Show success message for 2 seconds
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$state = this.state,
-        isTokenExpired = _this$state.isTokenExpired,
-        isCheckingToken = _this$state.isCheckingToken;
-      var _this$props2 = this.props,
-        isModalOpen = _this$props2.isModalOpen,
-        onModalClose = _this$props2.onModalClose,
-        onFormSend = _this$props2.onFormSend,
-        onModalSwitch = _this$props2.onModalSwitch,
-        popupError = _this$props2.popupError,
-        isActionLoading = _this$props2.isActionLoading,
-        routeLocation = _this$props2.routeLocation;
-      console.log('Render state:', {
-        isTokenExpired: isTokenExpired,
-        isCheckingToken: isCheckingToken,
-        isModalOpen: isModalOpen
-      });
-      if (!isModalOpen) {
-        return null;
-      }
-      if (isCheckingToken) {
-        return this.renderLoadingContent();
-      }
-      if (isTokenExpired) {
-        return this.renderExpiredTokenContent();
-      }
-      return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
-        isOpen: true,
-        onClose: onModalClose
-      }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
-        part: 8
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
-        modalTop: true
-      }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "RESET YOUR PASSWORD"), /*#__PURE__*/_react.default.createElement("p", null, "Please set your new password."))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
-        modalBot: true
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, 'Remember your password? ', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
-        to: "#",
-        as: "button",
-        onClick: onModalSwitch
-      }, "Log in")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
-        part: 8
-      }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_formik.Formik, {
-        initialValues: this.initialValues,
-        validationSchema: this.validationSchema,
-        onSubmit: function onSubmit(values) {
-          var query = new URLSearchParams((routeLocation === null || routeLocation === void 0 ? void 0 : routeLocation.search) || '');
-          var oobCode = query.get('oobCode');
-          onFormSend(_objectSpread(_objectSpread({}, values), {}, {
-            oobCode: oobCode
-          }));
-        }
-      }, function (_ref) {
-        var values = _ref.values,
-          errors = _ref.errors,
-          touched = _ref.touched,
-          handleBlur = _ref.handleBlur,
-          setFieldValue = _ref.setFieldValue,
-          setFieldTouched = _ref.setFieldTouched;
-        var onChangeWithTouch = function onChangeWithTouch(e) {
-          var field = e.target;
-          setFieldValue(field.name, field.value, false);
-          setFieldTouched(field.name);
-        };
-        var submitDisabled = values.password.length <= 5 || values.password !== values.confirmPassword || isActionLoading === 'resetPassword';
-        return /*#__PURE__*/_react.default.createElement(_Form.default, null, /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
-          noPadding: true
-        }, /*#__PURE__*/_react.default.createElement(_Form.FormField, null, /*#__PURE__*/_react.default.createElement(_InputPassword.default, {
-          id: "reset-password",
-          name: "password",
-          type: "password",
-          label: "Password",
-          value: values.password,
-          onChange: onChangeWithTouch,
-          onBlur: handleBlur,
-          error: !!errors.password,
-          touched: !!touched.password,
-          info: "For a stronger password, try a mix of lowercase, capitals, numbers and special characters."
-          // showStrength
-        }), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
-          show: errors.password && touched.password
-        }, errors.password), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
-          show: !errors.password && touched.password && values.password.length <= 5
-        }, "The password must be at least 6 characters long"))), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
-          noPadding: true
-        }, /*#__PURE__*/_react.default.createElement(_Form.FormField, null, /*#__PURE__*/_react.default.createElement(_InputPassword.default, {
-          id: "confirm-reset-password",
-          name: "confirmPassword",
-          type: "password",
-          label: "Confirm password",
-          value: values.confirmPassword,
-          onChange: onChangeWithTouch,
-          onBlur: handleBlur,
-          error: !!errors.confirmPassword,
-          touched: !!touched.confirmPassword
-        }), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
-          show: errors.confirmPassword && touched.confirmPassword
-        }, errors.confirmPassword))), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
-          noPaddingBottom: true,
-          noPaddingHorizontal: true
-        }, /*#__PURE__*/_react.default.createElement(_Button.default, {
-          type: "submit",
-          fluid: true,
-          disabled: submitDisabled
-        }, isActionLoading === 'resetPassword' ? 'Resetting' : 'Reset')), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
-          paddingVeticalHalf: true,
-          noPaddingHorizontal: true
-        }, /*#__PURE__*/_react.default.createElement(_Form.FormError, {
-          show: touched.password && touched.confirmPassword && values.password !== values.confirmPassword
-        }, "The passwords must match")), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
-          paddingVeticalHalf: true,
-          noPaddingHorizontal: true
-        }, /*#__PURE__*/_react.default.createElement(_Form.FormError, {
-          show: popupError.popup === 'resetPassword'
-        }, popupError.message)));
-      })))));
+  }, [activationSuccess]);
+  console.log('Render state:', {
+    isTokenExpired: isTokenExpired,
+    isCheckingToken: isCheckingToken,
+    isModalOpen: isModalOpen,
+    activationSuccess: activationSuccess
+  });
+  if (!isModalOpen) {
+    return null;
+  }
+  if (isCheckingToken) {
+    return renderLoadingContent();
+  }
+  if (activationSuccess) {
+    return renderSuccessNotification();
+  }
+  if (isTokenExpired) {
+    return renderExpiredTokenContent();
+  }
+  return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
+    isOpen: true,
+    onClose: onModalClose
+  }, /*#__PURE__*/_react.default.createElement(_Grid.Row, null, /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+    part: 8
+  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
+    modalTop: true
+  }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "RESET YOUR PASSWORD"), /*#__PURE__*/_react.default.createElement("p", null, "Please set your new password."))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
+    modalBot: true
+  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, 'Remember your password? ', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
+    to: "#",
+    as: "button",
+    onClick: onModalSwitch
+  }, "Log in")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+    part: 8
+  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_formik.Formik, {
+    initialValues: initialValues,
+    validationSchema: validationSchema,
+    onSubmit: function onSubmit(values) {
+      var search = location.search;
+      var query = new URLSearchParams(search);
+      var oobCode = query.get('oobCode');
+      onFormSend(_objectSpread(_objectSpread({}, values), {}, {
+        oobCode: oobCode
+      }));
     }
-  }]);
-  return ResetPasswordModal;
-}(_react.PureComponent);
-exports.ResetPasswordModal = ResetPasswordModal;
-_defineProperty(ResetPasswordModal, "contextType", _AuthContext.AuthContext);
+  }, function (_ref5) {
+    var values = _ref5.values,
+      errors = _ref5.errors,
+      touched = _ref5.touched,
+      handleBlur = _ref5.handleBlur,
+      setFieldValue = _ref5.setFieldValue,
+      setFieldTouched = _ref5.setFieldTouched;
+    var onChangeWithTouch = function onChangeWithTouch(e) {
+      var field = e.target;
+      setFieldValue(field.name, field.value, false);
+      setFieldTouched(field.name);
+    };
+    var submitDisabled = values.password.length <= 5 || values.password !== values.confirmPassword || isActionLoading === 'resetPassword';
+    return /*#__PURE__*/_react.default.createElement(_Form.default, null, /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+      noPadding: true
+    }, /*#__PURE__*/_react.default.createElement(_Form.FormField, null, /*#__PURE__*/_react.default.createElement(_InputPassword.default, {
+      id: "reset-password",
+      name: "password",
+      type: "password",
+      label: "Password",
+      value: values.password,
+      onChange: onChangeWithTouch,
+      onBlur: handleBlur,
+      error: !!errors.password,
+      touched: !!touched.password,
+      info: "For a stronger password, try a mix of lowercase, capitals, numbers and special characters."
+    }), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+      show: errors.password && touched.password
+    }, errors.password), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+      show: !errors.password && touched.password && values.password.length <= 5
+    }, "The password must be at least 6 characters long"))), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+      noPadding: true
+    }, /*#__PURE__*/_react.default.createElement(_Form.FormField, null, /*#__PURE__*/_react.default.createElement(_InputPassword.default, {
+      id: "confirm-reset-password",
+      name: "confirmPassword",
+      type: "password",
+      label: "Confirm password",
+      value: values.confirmPassword,
+      onChange: onChangeWithTouch,
+      onBlur: handleBlur,
+      error: !!errors.confirmPassword,
+      touched: !!touched.confirmPassword
+    }), /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+      show: errors.confirmPassword && touched.confirmPassword
+    }, errors.confirmPassword))), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+      noPaddingBottom: true,
+      noPaddingHorizontal: true
+    }, /*#__PURE__*/_react.default.createElement(_Button.default, {
+      type: "submit",
+      fluid: true,
+      disabled: submitDisabled
+    }, isActionLoading === 'resetPassword' ? 'Resetting' : 'Reset')), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+      paddingVeticalHalf: true,
+      noPaddingHorizontal: true
+    }, /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+      show: touched.password && touched.confirmPassword && values.password !== values.confirmPassword
+    }, "The passwords must match")), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+      paddingVeticalHalf: true,
+      noPaddingHorizontal: true
+    }, /*#__PURE__*/_react.default.createElement(_Form.FormError, {
+      show: popupError.popup === 'resetPassword'
+    }, popupError.message)));
+  })))));
+};
 ResetPasswordModal.propTypes = {
   isModalOpen: _propTypes.default.bool.isRequired,
   onModalClose: _propTypes.default.func.isRequired,
   onFormSend: _propTypes.default.func.isRequired,
   onModalSwitch: _propTypes.default.func.isRequired,
-  routeLocation: _propTypes.default.object,
   popupError: _propTypes.default.object,
   isActionLoading: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.string])
 };

package/dist/context/AuthContext.js CHANGED Viewed

@@ -767,46 +767,35 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context15.prev = 0;
-              _context15.next = 3;
+              console.log('does this even run??');
+              _context15.prev = 1;
+              _context15.next = 4;
               return (0, _auth.checkActionCode)(_firebaseConfig.auth, actionCode);
-            case 3:
+            case 4:
               actionCodeInfo = _context15.sent;
+              console.log('actionCodeInfo', actionCodeInfo);
               return _context15.abrupt("return", {
                 expired: false,
                 info: actionCodeInfo
               });
-            case 7:
-              _context15.prev = 7;
-              _context15.t0 = _context15["catch"](0);
-              console.log('🚀 ~ file: AuthContext.js ~ checkActivationLinkExpired error:', _context15.t0);
-              // If the action code is expired or invalid, we'll get an error
-              if (!(_context15.t0.code === 'auth/expired-action-code')) {
-                _context15.next = 14;
+            case 9:
+              _context15.prev = 9;
+              _context15.t0 = _context15["catch"](1);
+              console.log('checkActivationLinkExpired error:', _context15.t0);
+              if (!(_context15.t0.code === 'auth/expired-action-code' || _context15.t0.code === 'auth/invalid-action-code')) {
+                _context15.next = 15;
                 break;
               }
+              console.log('checkActivationLink error was either auth/expired-action-code or auth/invalid-action-code, setting token to EXPIRED! ');
               return _context15.abrupt("return", {
                 expired: true,
                 error: _context15.t0
               });
-            case 14:
-              if (!(_context15.t0.code === 'auth/invalid-action-code')) {
-                _context15.next = 16;
-                break;
-              }
-              return _context15.abrupt("return", {
-                expired: false,
-                // Not expired but invalid
-                error: _context15.t0
-              });
-            case 16:
-              throw _context15.t0;
-            case 17:
+            case 15:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, null, [[0, 7]]);
+        }, _callee15, null, [[1, 9]]);
       }));
       return function (_x18) {
         return _ref15.apply(this, arguments);

package/package.json CHANGED Viewed

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