Merge branch 'benjaminking-confirm-danger-update' into 'master'

Update Confirm Danger Modal

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125256



Merged-by: Olena Horal-Koretska <ohoralkoretska@gitlab.com>
Approved-by: Olena Horal-Koretska <ohoralkoretska@gitlab.com>
Approved-by: Ankit Panchal <apanchal@gitlab.com>
Reviewed-by: Ankit Panchal <apanchal@gitlab.com>
Co-authored-by: Ben King <bking@gitlab.com>

app/assets/javascripts/vue_shared/components/confirm_danger/constants.js

@@ -6,7 +6,5 @@ export const CONFIRM_DANGER_MODAL_BUTTON = __('Confirm');
 export const CONFIRM_DANGER_WARNING = __(
   'This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention.',
 );
-export const CONFIRM_DANGER_PHRASE_TEXT = __(
-  'Please type %{phrase_code} to proceed or close this modal to cancel.',
-);
+export const CONFIRM_DANGER_PHRASE_TEXT = __('Please type %{phrase_code} to proceed.');
 export const CONFIRM_DANGER_MODAL_CANCEL = __('Cancel');

ee/spec/features/groups/sso_spec.rb

@@ -55,7 +55,7 @@
           click_button('Transfer ownership')
 
           expect(page).to have_content('This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention.')
-          expect(page).to have_content("Please type #{user.username} to proceed or close this modal to cancel.")
+          expect(page).to have_content("Please type #{user.username} to proceed.")
 
           fill_in 'confirm_name_input', with: user.username
           click_button 'Confirm'

locale/gitlab.pot

@@ -34334,7 +34334,7 @@ msgstr ""
 msgid "Please try and refresh the page. If the problem persists please contact support."
 msgstr ""
-msgid "Please type %{phrase_code} to proceed or close this modal to cancel."
+msgid "Please type %{phrase_code} to proceed."
 msgstr ""
 msgid "Please use this form to report to the administrator users who create spam issues, comments or behave inappropriately."

spec/frontend/vue_shared/components/confirm_danger/confirm_danger_modal_spec.js

@@ -60,9 +60,7 @@ describe('Confirm Danger Modal', () => {
   });
 
   it('renders the correct confirmation phrase', () => {
-    expect(findConfirmationPhrase().text()).toBe(
-      `Please type ${phrase} to proceed or close this modal to cancel.`,
-    );
+    expect(findConfirmationPhrase().text()).toBe(`Please type ${phrase} to proceed.`);
   });
 
   describe('without injected data', () => {