Merge branch 'vs/adjust-text-cc-validation-modal' into 'master'

Change texts for CC validation

See merge request gitlab-org/gitlab!61657

ee/app/assets/javascripts/billings/components/account_verification_modal.vue

@@ -10,15 +10,14 @@ const IFRAME_QUERY = Object.freeze({
 // 350 is the mininum required height to get all iframe inputs visible
 const IFRAME_MINIMUM_HEIGHT = 350;
 const i18n = Object.freeze({
-  title: s__('Billings|Verify User Account'),
+  title: s__('Billings|Validate user account'),
   description: s__(`
-Billings|To discourage and reduce abuse GitLab will require some users to provide a valid credit card to use free pipeline minutes on GitLab.com.
-To use free pipeline minutes, you will need to validate your account with a credit card.
-%{strongStart}GitLab will not add permanent charges to your credit card as we will only use it for validation.%{strongEnd}`),
+Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure.
+%{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
   iframeNotSupported: __('Your browser does not support iFrames'),
   actions: {
     primary: {
-      text: s__('Billings|Verify account'),
+      text: s__('Billings|Validate account'),
     },
   },
 });

ee/app/assets/javascripts/billings/components/cc_validation_required_alert.vue

@@ -5,17 +5,17 @@ import AccountVerificationModal from './account_verification_modal.vue';
 
 const i18n = {
   successAlert: {
-    title: s__('Billings|User successfully verified'),
+    title: s__('Billings|User successfully validated'),
     text: s__(
-      'Billings|Your user account has been successfully verified. You will now be able to run pipelines on any free or trial namespace.',
+      'Billings|Your user account has been successfully validated. You can now use free pipeline minutes.',
     ),
   },
   dangerAlert: {
-    title: s__('Billings|User Verification Required'),
-    text: s__(`Billings|As a user on a free or trial namespace, you'll need to verify your account with a credit card to run pipelines. This is required to help prevent
-cryptomining attacks on GitLab infrastructure.
+    title: s__('Billings|User validation required'),
+    text: s__(`Billings|To use free pipeline minutes, you'll need to validate your account with a credit card.
+    This is required to discourage and reduce abuse on GitLab infrastructure.
 %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
-    primaryButtonText: s__('Billings|Verify account'),
+    primaryButtonText: s__('Billings|Validate account'),
   },
 };
 

ee/spec/frontend/billings/components/account_verification_modal_spec.js

@@ -50,13 +50,11 @@ describe('Account verification modal', () => {
     });
 
     it('renders the title', () => {
-      expect(wrapper.findComponent(GlModal).attributes('title')).toBe('Verify User Account');
+      expect(wrapper.findComponent(GlModal).attributes('title')).toBe('Validate user account');
     });
 
     it('renders the description', () => {
-      expect(wrapper.find('p').text()).toContain(
-        'To discourage and reduce abuse GitLab will require',
-      );
+      expect(wrapper.find('p').text()).toContain('To use free pipeline minutes');
     });
   });
 });

ee/spec/frontend/billings/components/cc_validation_required_alert_spec.js

@@ -33,11 +33,11 @@ describe('CreditCardValidationRequiredAlert', () => {
   });
 
   it('renders title', () => {
-    expect(findGlAlert().attributes('title')).toBe('User Verification Required');
+    expect(findGlAlert().attributes('title')).toBe('User validation required');
   });
 
   it('renders description', () => {
-    expect(findGlAlert().text()).toContain('As a user on a free or trial namespace');
+    expect(findGlAlert().text()).toContain('To use free pipeline minutes');
   });
 
   it('renders danger alert', () => {

locale/gitlab.pot

@@ -5054,25 +5054,22 @@ msgstr ""
 msgid "BillingPlan|Upgrade for free"
 msgstr ""
 
-msgid "Billings|As a user on a free or trial namespace, you'll need to verify your account with a credit card to run pipelines. This is required to help prevent cryptomining attacks on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}"
+msgid "Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}"
 msgstr ""
 
-msgid "Billings|To discourage and reduce abuse GitLab will require some users to provide a valid credit card to use free pipeline minutes on GitLab.com. To use free pipeline minutes, you will need to validate your account with a credit card. %{strongStart}GitLab will not add permanent charges to your credit card as we will only use it for validation.%{strongEnd}"
+msgid "Billings|User successfully validated"
 msgstr ""
 
-msgid "Billings|User Verification Required"
+msgid "Billings|User validation required"
 msgstr ""
 
-msgid "Billings|User successfully verified"
+msgid "Billings|Validate account"
 msgstr ""
 
-msgid "Billings|Verify User Account"
+msgid "Billings|Validate user account"
 msgstr ""
 
-msgid "Billings|Verify account"
-msgstr ""
-
-msgid "Billings|Your user account has been successfully verified. You will now be able to run pipelines on any free or trial namespace."
+msgid "Billings|Your user account has been successfully validated. You can now use free pipeline minutes."
 msgstr ""
 
 msgid "Billing|An email address is only visible for users with public emails."