fix: Prevent the Change Password dialog from allowing the new passwor…

…d to be the same as the current password #1203

.changeset/lovely-balloons-behave.md

@@ -0,0 +1,5 @@
+---
+"fuels-wallet": patch
+---
+
+Prevent the Change Password dialog from allowing the new password to be the same as the current password #1203

packages/app/playwright/e2e/ChangePassword.test.ts

@@ -66,4 +66,23 @@ test.describe('ChangePassword', () => {
 
     await hasText(page, 'Passwords must match');
   });
+
+  test('should not change the user current and new passwords are the same', async () => {
+    // goes to the change password page
+    await visit(page, '/settings/change-password');
+
+    // ensure that the page has changed
+    await hasText(page, /Change Password/i);
+
+    // fills form data
+    await getByAriaLabel(page, 'Current Password').fill('newPass12345$');
+    await getByAriaLabel(page, 'New Password').fill('newPass12345$');
+    await getByAriaLabel(page, 'Confirm Password').fill('newPass123456$');
+    await getByAriaLabel(page, 'Confirm Password').blur();
+
+    await hasText(
+      page,
+      'New password cannot be the same as the current password'
+    );
+  });
 });

packages/app/src/systems/Settings/pages/ChangePassword/ChangePassword.tsx

@@ -24,7 +24,11 @@ const schema = yup
     }),
     confirmPassword: yup
       .string()
-      .oneOf([yup.ref('password'), undefined], 'Passwords must match'),
+      .oneOf([yup.ref('password'), undefined], 'Passwords must match')
+      .notOneOf(
+        [yup.ref('currentPassword')],
+        'New password cannot be the same as the current password'
+      ),
     currentPassword: yup.string().required('Current password is required'),
     strength: yup.string().required(),
   })
@@ -74,6 +78,11 @@ export function ChangePassword() {
   }, [error]);
 
   function onSubmit(values: ChangePasswordFormValues) {
+    if (values.currentPassword === values.password) {
+      return setError('confirmPassword', {
+        message: 'New password cannot be the same as the current password',
+      });
+    }
     if (values.confirmPassword !== values.password) {
       return setError('confirmPassword', {
         message: 'Passwords must match',