Merge branch 'dev' into 'main'

fix: bugs

See merge request locker/web-selfhosted!140

Author: NguyenTienQuyet

src/pages/admin/settings/components/security/drawers/UpdateEncryptionSettings.jsx

@@ -165,21 +165,6 @@ function UpdateEncryptionSettingsDrawer(props) {
           labelAlign={'left'}
           disabled={userInfo.is_require_passwordless || callingAPI}
         >
-          <Form.Item
-            name={'password'}
-            label={
-              <p className='font-semibold'>{commonT('auth_pages.password')}</p>
-            }
-            rules={[
-              global.rules.REQUIRED(commonT('auth_pages.password')),
-            ]}
-          >
-            <Input.Password
-              autoFocus={true}
-              size="large"
-              placeholder={commonT('placeholder.enter')}
-            />
-          </Form.Item>
           <Form.Item
             name={'kdf'}
             label={
@@ -271,6 +256,21 @@ function UpdateEncryptionSettingsDrawer(props) {
               </Form.Item>
             </>
           }
+          <Form.Item
+            name={'password'}
+            label={
+              <p className='font-semibold'>{commonT('auth_pages.password')}</p>
+            }
+            rules={[
+              global.rules.REQUIRED(commonT('auth_pages.password')),
+            ]}
+          >
+            <Input.Password
+              autoFocus={true}
+              size="large"
+              placeholder={commonT('placeholder.enter')}
+            />
+          </Form.Item>
         </Form>
       </Drawer>
       <ConfirmEncryptionUpdateModal