Merge branch 'dev' into 'main'

fix: erro

See merge request locker/web-selfhosted!136

Author: NguyenTienQuyet

src/pages/admin/settings/components/security/EncryptionKeySettings.jsx

@@ -61,10 +61,10 @@ const EncryptionKeySettings = (props) => {
         </p>
         <p><span className="font-semibold">{t('security.encryption_key_settings.iterations')}</span>: { common.separatorNumber(userInfo.kdf_iterations) }</p>
         {
-          !!userInfo.kdf_memory && <p><span className="font-semibold">{t('security.encryption_key_settings.memory')}</span>: { common.separatorNumber(userInfo.kdf_memory / 1024) }</p>
-        }
-        {
-          !!userInfo.kdf_parallelism && <p><span className="font-semibold">{t('security.encryption_key_settings.parallelism')}</span>: { common.separatorNumber(userInfo.kdf_parallelism) }</p>
+          userInfo?.kdf === KdfType.ARGON2ID && <>
+            <p><span className="font-semibold">{t('security.encryption_key_settings.memory')}</span>: { common.separatorNumber((userInfo?.kdf_memory || 0) / 1024) }</p>
+            <p><span className="font-semibold">{t('security.encryption_key_settings.parallelism')}</span>: { common.separatorNumber(userInfo.kdf_parallelism || 0) }</p>
+          </>
         }
       </div>
       <UpdateEncryptionSettingsDrawer