@stokr/components-library 2.0.0-beta.21 → 2.0.0-beta.22

package/dist/components/LoginModal/LoginModal.js

@@ -30,11 +30,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 LoginModal = function LoginModal(props) {
-  var _React$useState = _react.default.useState(null),
+  var _React$useState = _react.default.useState(),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     email = _React$useState2[0],
     setemail = _React$useState2[1];
   var location = (0, _reactRouterDom.useLocation)();
+  var emailSetRef = _react.default.useRef(false);
   _react.default.useEffect(function () {
     //the URL will look like this: /login?email=some.email@email.com
     var search = location.search;
@@ -97,8 +98,9 @@ var LoginModal = function LoginModal(props) {
       setFieldValue(field.name, field.value, false);
       setFieldTouched(field.name);
     };
-    if (email && values.email !== email) {
+    if (email && values.email !== email && !emailSetRef.current) {
       setFieldValue('email', email);
+      emailSetRef.current = true;
     }
 
     //hack to avoid error when autofill from browser
@@ -114,7 +116,7 @@ var LoginModal = function LoginModal(props) {
       name: "email",
       type: "email",
       label: "Your email",
-      value: email || values.email,
+      value: values.email,
       onChange: onChangeWithTouch,
       onBlur: handleBlur,
       error: !!errors.email,

package/dist/components/VerifyEmailModal/VerifyEmailModal.js

@@ -77,9 +77,9 @@ var RenderErrorModal = function RenderErrorModal(props) {
 
   //send activation email automatically if link is expired
   _react.default.useEffect(function () {
-    if ((error === null || error === void 0 ? void 0 : error.code) === 'auth/invalid-action-code') {
-      onModalSwitch && onModalSwitch();
-    }
+    // if (error?.code === 'auth/invalid-action-code') {
+    //   onModalSwitch && onModalSwitch()
+    // }
     if (error !== null && error !== void 0 && error.email && !isDisabled) {
       startCooldown();
       onResend({

package/dist/components/headerHo/HeaderHo.js

@@ -257,7 +257,9 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         return popup;
       });
       var mobileMenuOpen = this.state.mobileMenuOpen;
-      var isFetchingUser = this.context.isFetchingUser;
+      var _this$context = this.context,
+        isFetchingUser = _this$context.isFetchingUser,
+        verifyEmailError = _this$context.verifyEmailError;
       if (!mobileMenuOpen) {
         if (isOpenCurrent) {
           document.body.style.overflow = 'hidden';
@@ -265,6 +267,9 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
           document.body.style.overflow = 'unset';
         }
       }
+      if ((verifyEmailError === null || verifyEmailError === void 0 ? void 0 : verifyEmailError.code) === 'auth/invalid-action-code' && !window.location.href.includes('login')) {
+        this.props.navigate('/login');
+      }
 
       // Run after page loaded
       if (!isFetchingUser) {
@@ -289,21 +294,21 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         isLoginModalOpen = _this$props3.isLoginModalOpen,
         setIsLoginModalOpen = _this$props3.setIsLoginModalOpen,
         cooldown = _this$props3.cooldown;
-      var _this$context = this.context,
-        getUser = _this$context.getUser,
-        _this$context$user = _this$context.user,
-        user = _this$context$user === void 0 ? {} : _this$context$user,
-        avatar = _this$context.avatar,
-        logoutUser = _this$context.logoutUser,
-        loginUser = _this$context.loginUser,
-        waitingFor2fa = _this$context.waitingFor2fa,
-        firebaseError = _this$context.firebaseError,
-        loginUserWithTotp = _this$context.loginUserWithTotp,
-        createUser = _this$context.createUser,
-        handleResetPassword = _this$context.handleResetPassword,
-        resendActivationEmail = _this$context.resendActivationEmail,
-        verifyEmailError = _this$context.verifyEmailError,
-        isVerifyingEmail = _this$context.isVerifyingEmail;
+      var _this$context2 = this.context,
+        getUser = _this$context2.getUser,
+        _this$context2$user = _this$context2.user,
+        user = _this$context2$user === void 0 ? {} : _this$context2$user,
+        avatar = _this$context2.avatar,
+        logoutUser = _this$context2.logoutUser,
+        loginUser = _this$context2.loginUser,
+        waitingFor2fa = _this$context2.waitingFor2fa,
+        firebaseError = _this$context2.firebaseError,
+        loginUserWithTotp = _this$context2.loginUserWithTotp,
+        createUser = _this$context2.createUser,
+        handleResetPassword = _this$context2.handleResetPassword,
+        resendActivationEmail = _this$context2.resendActivationEmail,
+        verifyEmailError = _this$context2.verifyEmailError,
+        isVerifyingEmail = _this$context2.isVerifyingEmail;
       return /*#__PURE__*/_react.default.createElement(Outer, {
         fixed: fixed
       }, /*#__PURE__*/_react.default.createElement(_Header.default, {

package/dist/context/AuthContext.js

@@ -439,11 +439,11 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
       if (!user) {
         throw new Error('User is not defined');
       }
-      if (!(user !== null && user !== void 0 && user.emailVerified) && !window.location.href.includes('signup.')) {
+      if (!(user !== null && user !== void 0 && user.emailVerified) && !window.location.href.includes('resend-activation-email')) {
         window.location.href = "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/resend-activation-email");
         return false;
       }
-      if (!(user !== null && user !== void 0 && user.country) && (user === null || user === void 0 ? void 0 : user.user_type) === 'investor' && !window.location.href.includes('signup.')) {
+      if (!(user !== null && user !== void 0 && user.country) && (user === null || user === void 0 ? void 0 : user.user_type) === 'investor' && !window.location.href.includes('/welcome')) {
         window.location.href = "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/welcome");
         return false;
       }
@@ -538,18 +538,17 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               _yield$Auth$updateUse = _context10.sent;
               user = _yield$Auth$updateUse.user;
               _this.setUser(user);
-              _context10.next = 12;
-              break;
-            case 8:
-              _context10.prev = 8;
+              return _context10.abrupt("return", user);
+            case 9:
+              _context10.prev = 9;
               _context10.t0 = _context10["catch"](0);
               console.log("Error updating the user: ".concat(_context10.t0));
               throw _context10.t0;
-            case 12:
+            case 13:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, null, [[0, 8]]);
+        }, _callee10, null, [[0, 9]]);
       }));
       return function (_x14) {
         return _ref10.apply(this, arguments);

package/package.json

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