Merge branch 'dev' into 'main'

fix: hide update encryption for user not cystack

See merge request locker/web-selfhosted!138

Author: NguyenTienQuyet

src/components/common/NoticeCards.jsx

@@ -32,7 +32,7 @@ function NoticeCards(props) {
   }, [myShares])
 
   const isEncryptionUpdate = useMemo(() => {
-    return userInfo.kdf === global.constants.CORE_JS_INFO.KDF && userInfo.kdf_iterations < global.constants.CORE_JS_INFO.KDF_ITERATIONS
+    return userInfo.kdf === global.constants.CORE_JS_INFO.KDF && userInfo.kdf_iterations < global.constants.CORE_JS_INFO.KDF_ITERATIONS && userInfo.kdf_version >= 1
   }, [userInfo])
 
   useEffect(() => {

src/pages/admin/settings/settings-security.jsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useSelector } from 'react-redux';
 import { useTranslation } from "react-i18next";
 
 import { Divider } from '@lockerpm/design';
@@ -25,6 +26,8 @@ const Security = (props) => {
   const { } = props;
   const { t } = useTranslation();
   const [expand, setExpand] = useState(false);
+
+  const userInfo = useSelector(state => state.auth.userInfo);
 
   return (
     <div className="layout-content">
@@ -60,8 +63,12 @@ const Security = (props) => {
           </div>
         }
       </div>
-      <Divider />
-      <EncryptionKeySettings />
+      {
+        userInfo?.kdf_version >= 1 && <>
+          <Divider />
+          <EncryptionKeySettings />
+        </>
+      }
       <Divider />
       <TwoFA />
       <Divider />