@comicrelief/component-library 5.8.3 → 5.8.4

package/cypress/integration/components/Atoms/MarketingPreferencesDSForm.spec.js

@@ -154,13 +154,13 @@ describe('MarketingPreferencesDSForm component', () => {
       cy.get('@default')
         .find('.field-sms span[data-test=error-message] span')
         .should('exist')
-        .contains('Please enter a valid mobile number');
+        .contains('Please enter a valid UK mobile number');
 
       // Phone
       cy.get('@default')
         .find('.field-phone span[data-test=error-message] span')
         .should('exist')
-        .contains('Please enter a valid phone number');
+        .contains('Please enter a valid UK phone number');
 
       // Address1
       cy.get('@default')
@@ -424,7 +424,7 @@ describe('MarketingPreferencesDSForm component', () => {
       cy.get('@customised')
         .find('.field-phone span[data-test=error-message] span')
         .should('exist')
-        .contains('Please enter a valid phone number');
+        .contains('Please enter a valid UK phone number');
 
       // Address1
       cy.get('@customised')

package/dist/components/Organisms/MarketingPreferencesDS/_MarketingPrefsConfig.js

@@ -7,8 +7,6 @@ exports.buildValidationSchema = exports.setInitialValues = void 0;
 
 var yup = _interopRequireWildcard(require("yup"));
 
-require("yup-phone");
-
 var _lodash = require("lodash");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -75,6 +73,7 @@ var buildValidationSchema = function buildValidationSchema(overrideOptions) {
   }; // Override with any custom options supplied
 
   var mpValidationOptions = (0, _lodash.merge)(defaultOptions, overrideOptions);
+  var phoneRegex = /^(((((\+44)|(0044))\s?\d{4}|\(?0\d{4}\)?)\s?\d{3}\s?\d{3})|((((\+44)|(0044))\s?\d{3}|\(?0\d{3}\)?)\s?\d{3}\s?\d{4})|((((\+44)|(0044))\s?\d{2}|\(?0\d{2}\)?)\s?\d{4}\s?\d{4}))(\s?\\#(\d{4}|\d{3}))?$/;
   var mpValidationSchema = yup.object({
     mp_email: yup.string().when('mp_permissionEmail', {
       is: function is(val) {
@@ -86,13 +85,13 @@ var buildValidationSchema = function buildValidationSchema(overrideOptions) {
       is: function is(val) {
         return !mpValidationOptions.mp_permissionSMS.disableOption && mpValidationOptions.mp_permissionSMS[val];
       },
-      then: yup.string().required('Please enter your mobile number').phone('GB', false, 'Please enter a valid mobile number')
+      then: yup.string().required('Please enter your mobile number').matches(phoneRegex, 'Please enter a valid UK mobile number')
     }),
     mp_phone: yup.string().when('mp_permissionPhone', {
       is: function is(val) {
         return !mpValidationOptions.mp_permissionPhone.disableOption && mpValidationOptions.mp_permissionPhone[val];
       },
-      then: yup.string().required('Please enter your phone number').phone('GB', false, 'Please enter a valid phone number')
+      then: yup.string().required('Please enter your phone number').matches(phoneRegex, 'Please enter a valid UK phone number')
     }),
     mp_address1: yup.string().when('mp_permissionPost', {
       is: function is(val) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comicrelief/component-library",
   "author": "Comic Relief Engineering Team",
-  "version": "5.8.3",
+  "version": "5.8.4",
   "main": "dist/index.js",
   "license": "ISC",
   "jest": {
@@ -41,8 +41,7 @@
     "react-uid": "^2.2.0",
     "styled-components": "^5.3.1",
     "youtube-player": "^5.5.2",
-    "yup": "^0.32.9",
-    "yup-phone": "^1.2.19"
+    "yup": "^0.32.9"
   },
   "resolutions": {
     "react-scripts/workbox-webpack-plugin/workbox-build/@surma/rollup-plugin-off-main-thread/ejs": "3.1.6"

package/src/components/Organisms/MarketingPreferencesDS/_MarketingPrefsConfig.js

@@ -1,5 +1,4 @@
 import * as yup from 'yup';
-import 'yup-phone';
 import { merge } from 'lodash';
 
 const setInitialValues = overrideValues => {
@@ -65,6 +64,8 @@ const buildValidationSchema = overrideOptions => {
   // Override with any custom options supplied
   const mpValidationOptions = merge(defaultOptions, overrideOptions);
 
+  const phoneRegex = /^(((((\+44)|(0044))\s?\d{4}|\(?0\d{4}\)?)\s?\d{3}\s?\d{3})|((((\+44)|(0044))\s?\d{3}|\(?0\d{3}\)?)\s?\d{3}\s?\d{4})|((((\+44)|(0044))\s?\d{2}|\(?0\d{2}\)?)\s?\d{4}\s?\d{4}))(\s?\\#(\d{4}|\d{3}))?$/;
+
   const mpValidationSchema = yup.object({
     mp_email: yup.string()
       .when('mp_permissionEmail', {
@@ -77,14 +78,16 @@ const buildValidationSchema = overrideOptions => {
       .when('mp_permissionSMS', {
         is: val => (!(mpValidationOptions.mp_permissionSMS.disableOption)
         && mpValidationOptions.mp_permissionSMS[val]),
-        then: yup.string().required('Please enter your mobile number').phone('GB', false, 'Please enter a valid mobile number')
+        then: yup.string().required('Please enter your mobile number')
+          .matches(phoneRegex, 'Please enter a valid UK mobile number')
       }),
 
     mp_phone: yup.string()
       .when('mp_permissionPhone', {
         is: val => (!(mpValidationOptions.mp_permissionPhone.disableOption)
         && mpValidationOptions.mp_permissionPhone[val]),
-        then: yup.string().required('Please enter your phone number').phone('GB', false, 'Please enter a valid phone number')
+        then: yup.string().required('Please enter your phone number')
+          .matches(phoneRegex, 'Please enter a valid UK phone number')
       }),
 
     mp_address1: yup.string()