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

package/dist/components/2FA/EnterCode.js

@@ -36,7 +36,7 @@ var EnterCode = function EnterCode(props) {
     modalTop: true
   }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "Enter 2FA code"))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
     modalBot: true
-  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
+  }, onModalSwitch && /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
     as: "button",
     onClick: onModalSwitch
   }, "Lost your device")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {

package/dist/components/2FA/ResetCode.js

@@ -33,14 +33,18 @@ var ResetCode = function ResetCode(props) {
     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 2FA"), /*#__PURE__*/_react.default.createElement("p", null, "Lost your device? No problem! We are here to help you"))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
+  }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h3", null, "Lost your device?"), /*#__PURE__*/_react.default.createElement("p", null, "No problem! We are here to help you..."))), /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, {
     modalBot: true
-  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, "Know your 2FA code?", ' ', /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
+  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalLinkWrap, null, /*#__PURE__*/_react.default.createElement(_Modal.ModalLink, {
     as: "button",
     onClick: onModalSwitch
-  }, "Enter code")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
+  }, "Enter 2FA code")))), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
     part: 8
-  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Please contact our support team at support@stokr.io to help you reset your 2fa"))))));
+  }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Contact us to reset your 2FA", ' ', /*#__PURE__*/_react.default.createElement("a", {
+    href: "https://stokr.zendesk.com/hc/en-us/requests/new",
+    target: "_blank",
+    rel: "noreferrer"
+  }, ' ', "https://stokr.zendesk.com/hc/en-us/requests/new")))))));
 };
 exports.ResetCode = ResetCode;
 var _default = ResetCode;

package/dist/components/2FA/Sucess2FA.js

@@ -28,6 +28,9 @@ var Sucess2FA = function Sucess2FA(_ref) {
   })), /*#__PURE__*/_react.default.createElement(_Grid.Column, {
     part: 8
   }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+    noPaddingVertical: true,
+    noPaddingHorizontal: true
+  }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Your sign-in 2FA authentication is now set"))), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
     noPaddingHorizontal: true
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     minWidth: "240px",

package/dist/components/2FA/enable-2fa-flow.js

@@ -47,6 +47,13 @@ var Enable2FAFlow = function Enable2FAFlow(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     totpData = _useState4[0],
     settotpData = _useState4[1];
+  var _useState5 = (0, _react.useState)({
+      popup: undefined,
+      message: undefined
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    popupError = _useState6[0],
+    setpopupError = _useState6[1];
   (0, _react.useEffect)(function () {
     if (user) {
       generateTotpSecret(user).then(function (data) {
@@ -76,20 +83,33 @@ var Enable2FAFlow = function Enable2FAFlow(_ref) {
             return enrollUserToTotp(user, totpData.totpSecret, data.otpInput, user.displayName);
           case 5:
             setshowSuccess(true);
-            _context.next = 13;
+            _context.next = 17;
             break;
           case 8:
             _context.prev = 8;
             _context.t0 = _context["catch"](2);
             console.log('🚀 ~ file: enable-2fa-flow.js:60 ~ error:', _context.t0);
             if (!(_context.t0.code === 'auth/invalid-verification-code')) {
-              _context.next = 13;
+              _context.next = 16;
               break;
             }
+            setpopupError({
+              popup: 'enter2fa',
+              message: 'The verification code is not correct. Try again?'
+            });
             return _context.abrupt("return", {
               otpInput: 'Invalid code'
             });
-          case 13:
+          case 16:
+            if (_context.t0.code === 'auth/requires-recent-login') {
+              onRequiresRecentLoginError && onRequiresRecentLoginError();
+            } else {
+              setpopupError({
+                popup: 'enter2fa',
+                message: "".concat(_context.t0 !== null && _context.t0 !== void 0 && _context.t0.message ? _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message : 'Something went wrong. Try again?')
+              });
+            }
+          case 17:
           case "end":
             return _context.stop();
         }
@@ -100,18 +120,6 @@ var Enable2FAFlow = function Enable2FAFlow(_ref) {
     };
   }();
   var onBackButtonClick = function onBackButtonClick(stepController, prevStepIndex) {
-    if (prevStepIndex === 0) {
-      //setselectedProject({})
-    }
-    // if (prevStepIndex === 0 || prevStepIndex === 1) {
-    //   setWallet(null)
-    //   setAddressToRegister(null)
-    //   setNameToRegister(null)
-    //   setRegisteredAddress(false)
-    //   setError('')
-    //   setverifiedAddress(false)
-    // }
-
     stepController.changeStep(stepsNames[prevStepIndex], prevStepIndex);
   };
   return /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
@@ -168,7 +176,7 @@ var Enable2FAFlow = function Enable2FAFlow(_ref) {
       changeStep: function changeStep() {
         console.log('here');
       },
-      popupError: {},
+      popupError: popupError,
       onFormSend: onSubmit
     })));
   }))));

package/dist/components/2FA/main-flow.js

@@ -16,6 +16,7 @@ var _loginWithOtpFlow = _interopRequireDefault(require("./login-with-otp-flow"))
 var _enable2faFlow = _interopRequireDefault(require("./enable-2fa-flow"));
 var _disable2faFlow = _interopRequireDefault(require("./disable-2fa-flow"));
 var _colors = _interopRequireDefault(require("../../styles/colors"));
+var _InfoIcon = _interopRequireDefault(require("components/InfoIcon/InfoIcon"));
 var _excluded = ["onRequiresRecentLoginError"];
 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); }
@@ -81,6 +82,11 @@ var Main2FAFlow = function Main2FAFlow(_ref) {
     noPaddingHorizontal: true
   }, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("h5", null, "SET UP YOUR TWO FACTOR AUTHENTICATION"))), /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Protect your account with an additional layer of security to sign in")), /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
     noPaddingHorizontal: true
+  }, /*#__PURE__*/_react.default.createElement(_InfoIcon.default, {
+    position: 'top',
+    html: is2FAEnabled ? 'Enabled' : 'Disabled',
+    noIcon: true,
+    noMarginLeft: true
   }, /*#__PURE__*/_react.default.createElement(_Switch.default, {
     value1: "enabled",
     value2: "disabled",
@@ -99,7 +105,7 @@ var Main2FAFlow = function Main2FAFlow(_ref) {
         switchOpenFlow('enable2fa', 'disable2fa');
       }
     }
-  })), successMessage && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+  }))), successMessage && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
     alignVertically: true,
     noPaddingHorizontal: true,
     noPaddingTop: true

package/dist/components/CryptoAddress/CryptoAddress.js

@@ -111,7 +111,7 @@ exports.CryptoAddress = CryptoAddress;
 var copyToClipBoard = function copyToClipBoard(value, isCopied, setCopy) {
   return /*#__PURE__*/_react.default.createElement(_reactTippy.Tooltip, {
     position: "top",
-    title: isCopied ? 'Copied to clipboard!' : 'Click to copy address to clipboard',
+    title: isCopied ? 'Copied to clipboard!' : 'Click to copy to clipboard',
     theme: "light",
     arrow: true,
     hideOnClick: false,

package/dist/components/InfoIcon/InfoIcon.js

@@ -8,14 +8,19 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactTippy = require("react-tippy");
 var _InfoIcon = require("./InfoIcon.styles");
+var _excluded = ["title", "html", "position", "noMargin", "noMarginLeft", "noMarginRight", "noIcon"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var InfoIcon = function InfoIcon(_ref) {
   var title = _ref.title,
     html = _ref.html,
     position = _ref.position,
     noMargin = _ref.noMargin,
     noMarginLeft = _ref.noMarginLeft,
-    noMarginRight = _ref.noMarginRight;
+    noMarginRight = _ref.noMarginRight,
+    noIcon = _ref.noIcon,
+    props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_InfoIcon.Container, {
     noMargin: noMargin,
     noMarginLeft: noMarginLeft,
@@ -27,7 +32,7 @@ var InfoIcon = function InfoIcon(_ref) {
     theme: "light",
     arrow: true,
     duration: 200
-  }, /*#__PURE__*/_react.default.createElement(_InfoIcon.Icon, null)));
+  }, noIcon ? props.children : /*#__PURE__*/_react.default.createElement(_InfoIcon.Icon, null)));
 };
 exports.InfoIcon = InfoIcon;
 InfoIcon.propTypes = {

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,10 @@ 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');
+        this.props.navigate(0);
+      }
 
       // Run after page loaded
       if (!isFetchingUser) {
@@ -289,21 +295,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

@@ -161,8 +161,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              mfaResolver = (0, _auth.getMultiFactorResolver)((0, _auth.getAuth)(), error); // const enrolledFactors = mfaResolver.hints.map(info => info.displayName);
-              //console.log(enrolledFactors);
+              mfaResolver = (0, _auth.getMultiFactorResolver)((0, _auth.getAuth)(), error);
               selectedIndex = 0;
               _context3.t0 = mfaResolver.hints[selectedIndex].factorId;
               _context3.next = _context3.t0 === _auth.TotpMultiFactorGenerator.FACTOR_ID ? 5 : _context3.t0 === _auth.PhoneMultiFactorGenerator.FACTOR_ID ? 21 : 22;
@@ -178,7 +177,8 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               user = userCredential.user;
               _Auth.default.setAccessToken(user.accessToken);
               _this.setState({
-                firebaseUser: user
+                firebaseUser: user,
+                waitingFor2fa: false
               });
               _context3.next = 20;
               break;
@@ -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.23",
   "description": "STOKR - Components Library",
   "main": "dist/index.js",
   "module": "dist/index.js",