Merge branch 'develop' into fix-dao

Author: devchenyan

packages/neuron-ui/src/containers/Navbar/index.tsx

@@ -125,17 +125,7 @@ const Navbar = () => {
       return
     }
 
-    // isUpdated is true or version is not empty means check update has return
-    if (!verifyCkbResult || (isUpdated !== true && !version)) {
-      return
-    }
-    if (version && verifyCkbResult.shouldUpdate) {
-      showGlobalAlertDialog({
-        type: 'warning',
-        message: t('navbar.update-neuron-with-ckb', { version: getVersion() }),
-        action: 'ok',
-      })(dispatch)
-    } else if (!verifyCkbResult.ckbIsCompatible) {
+    if (verifyCkbResult && !verifyCkbResult.ckbIsCompatible) {
       showGlobalAlertDialog({
         type: 'warning',
         message: (
@@ -152,6 +142,18 @@ const Navbar = () => {
         action: 'ok',
       })(dispatch)
     }
+
+    // isUpdated is true or version is not empty means check update has return
+    if (!verifyCkbResult || (isUpdated !== true && !version)) {
+      return
+    }
+    if (version && verifyCkbResult.shouldUpdate) {
+      showGlobalAlertDialog({
+        type: 'warning',
+        message: t('navbar.update-neuron-with-ckb', { version: getVersion() }),
+        action: 'ok',
+      })(dispatch)
+    }
   }, [verifyCkbResult, version, isUpdated])
 
   useEffect(() => {