From f32f5f4bee51956701f171febbb6c75e87aecb13 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinin <dmitry.kalinin@intel.com>
Date: Thu, 29 Apr 2021 06:42:18 +0300
Subject: [PATCH] Fixed reset password link unavailable (#3140)

* Fixed action call order

* Added CHANGELOG, incresed npm version
---
 CHANGELOG.md                        | 1 +
 cvat-ui/package-lock.json           | 2 +-
 cvat-ui/package.json                | 2 +-
 cvat-ui/src/components/cvat-app.tsx | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f1e84cf..19c3951d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Export of instance masks with holes (<https://github.com/openvinotoolkit/cvat/pull/3044>)
 - Changing a label on canvas does not work when 'Show object details' enabled (<https://github.com/openvinotoolkit/cvat/pull/3084>)
 - Make sure frame unzip web worker correctly terminates after unzipping all images in a requested chunk (<https://github.com/openvinotoolkit/cvat/pull/3096>)
+- Reset password link was unavailable before login (<https://github.com/openvinotoolkit/cvat/pull/3140>)
 
 ### Security
 
diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
index cb3424a9..ce18fc07 100644
--- a/cvat-ui/package-lock.json
+++ b/cvat-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
index e0854271..67b5eed8 100644
--- a/cvat-ui/package.json
+++ b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
diff --git a/cvat-ui/src/components/cvat-app.tsx b/cvat-ui/src/components/cvat-app.tsx
index ae11e366..7740bcc0 100644
--- a/cvat-ui/src/components/cvat-app.tsx
+++ b/cvat-ui/src/components/cvat-app.tsx
@@ -129,14 +129,14 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             return;
         }
 
-        if (user == null || !user.isVerified) {
-            return;
-        }
-
         if (!authActionsInitialized && !authActionsFetching) {
             loadAuthActions();
         }
 
+        if (user == null || !user.isVerified) {
+            return;
+        }
+
         if (!formatsInitialized && !formatsFetching) {
             loadFormats();
         }