tg-core-components 6.2.0-crypto.1 → 6.2.0-edit-profile.1

package/es/lib/WithValidation/rules/blacklistedCharacters.js

@@ -0,0 +1,3 @@
+export default (function (value) {
+  return !value.match(/[\+\=?!@%&<>\[\]{}()<>|$€£#\/\\]/);
+});

package/es/lib/WithValidation/rules/noSpecialCharacters.js

@@ -0,0 +1,3 @@
+export default (function (value) {
+  return !value.match(/[\s!"#\$%&'\(\)\*\+,\-\.\/:;<>\?@\[\\\]\^_`{|}~]/);
+});

package/es/lib/WithValidation/rules/phone.js

@@ -1,3 +1,3 @@
-export default (function (phone) {
-  return phone ? /^[\+]?[0-9]{0,4}[0-9]{8,12}$/.test(phone) : true;
+export default (function (value) {
+  return value.match(/^\+?\d{9,17}$/);
 });

package/es/widgets/AccountDetail/index.js

@@ -3,6 +3,10 @@ import compose from 'recompose/compose';
 import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
 import require from '../../lib/WithValidation/rules/required';
+import phone from '../../lib/WithValidation/rules/phone';
+import blacklistedCharacters from '../../lib/WithValidation/rules/blacklistedCharacters';
+import noSpecialCharacters from '../../lib/WithValidation/rules/noSpecialCharacters';
+import stringWithoutNumbers from '../../lib/WithValidation/rules/stringWithoutNumbers';
 import WithValidation from '../../lib/WithValidation';
 import Input from '../../components/Input';
 import Select from '../../components/Select';
@@ -45,7 +49,8 @@ var AccountDetail = function AccountDetail(_ref) {
       jurisdiction = _ref.jurisdiction,
       countries = _ref.countries,
       isLoading = _ref.isLoading,
-      isComplete = _ref.isComplete;
+      isComplete = _ref.isComplete,
+      showCallingCode = _ref.showCallingCode;
 
   return React.createElement(
     'form',
@@ -157,6 +162,14 @@ var AccountDetail = function AccountDetail(_ref) {
         id: 'title.mobile_number',
         defaultMessage: 'Mobile number'
       }, intl),
+      callingCodes: showCallingCode && countries ? countries.sort(function (a, b) {
+        return Number(a.callingCode) - Number(b.callingCode);
+      }).map(function (i) {
+        return {
+          value: '00' + i.callingCode,
+          label: '+' + i.callingCode + ' ' + (countryEmojiFlags[i.value] || '')
+        };
+      }) : [],
       name: 'MobilePhoneNumber',
       autoComplete: 'off',
       status: errors.MobilePhoneNumber && 'failure' || 'idle',
@@ -266,10 +279,10 @@ AccountDetail.defaultProps = {
 };
 
 var rules = {
-  MobilePhoneNumber: [[require, 'error.empty.mobilePhoneNumber']],
-  Address1: [[require, 'error.empty.address']],
-  Zip: [[require, 'error.empty.zip_code']],
-  City: [[require, 'error.empty.city']],
+  MobilePhoneNumber: [[require, 'error.empty.mobilePhoneNumber'], [phone, 'error.condition.phone']],
+  Address1: [[require, 'error.empty.address'], [blacklistedCharacters, 'error.format.address']],
+  Zip: [[require, 'error.empty.zip_code'], [noSpecialCharacters, 'error.format.zip']],
+  City: [[require, 'error.empty.city'], [stringWithoutNumbers, 'error.invalid.city'], [blacklistedCharacters, 'error.invalid.city']],
   Password: [[require, 'error.empty.password']],
   Country: [[require, 'error.empty.country']],
   Gender: [[require, 'error.empty.gender']]

package/lib/lib/WithValidation/rules/blacklistedCharacters.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (value) {
+  return !value.match(/[\+\=?!@%&<>\[\]{}()<>|$€£#\/\\]/);
+};

package/lib/lib/WithValidation/rules/noSpecialCharacters.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (value) {
+  return !value.match(/[\s!"#\$%&'\(\)\*\+,\-\.\/:;<>\?@\[\\\]\^_`{|}~]/);
+};

package/lib/lib/WithValidation/rules/phone.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.default = function (phone) {
-  return phone ? /^[\+]?[0-9]{0,4}[0-9]{8,12}$/.test(phone) : true;
+exports.default = function (value) {
+  return value.match(/^\+?\d{9,17}$/);
 };

package/lib/widgets/AccountDetail/index.js

@@ -22,6 +22,22 @@ var _required = require('../../lib/WithValidation/rules/required');
 
 var _required2 = _interopRequireDefault(_required);
 
+var _phone = require('../../lib/WithValidation/rules/phone');
+
+var _phone2 = _interopRequireDefault(_phone);
+
+var _blacklistedCharacters = require('../../lib/WithValidation/rules/blacklistedCharacters');
+
+var _blacklistedCharacters2 = _interopRequireDefault(_blacklistedCharacters);
+
+var _noSpecialCharacters = require('../../lib/WithValidation/rules/noSpecialCharacters');
+
+var _noSpecialCharacters2 = _interopRequireDefault(_noSpecialCharacters);
+
+var _stringWithoutNumbers = require('../../lib/WithValidation/rules/stringWithoutNumbers');
+
+var _stringWithoutNumbers2 = _interopRequireDefault(_stringWithoutNumbers);
+
 var _WithValidation = require('../../lib/WithValidation');
 
 var _WithValidation2 = _interopRequireDefault(_WithValidation);
@@ -86,7 +102,8 @@ var AccountDetail = function AccountDetail(_ref) {
       jurisdiction = _ref.jurisdiction,
       countries = _ref.countries,
       isLoading = _ref.isLoading,
-      isComplete = _ref.isComplete;
+      isComplete = _ref.isComplete,
+      showCallingCode = _ref.showCallingCode;
 
   return _react2.default.createElement(
     'form',
@@ -198,6 +215,14 @@ var AccountDetail = function AccountDetail(_ref) {
         id: 'title.mobile_number',
         defaultMessage: 'Mobile number'
       }, intl),
+      callingCodes: showCallingCode && countries ? countries.sort(function (a, b) {
+        return Number(a.callingCode) - Number(b.callingCode);
+      }).map(function (i) {
+        return {
+          value: '00' + i.callingCode,
+          label: '+' + i.callingCode + ' ' + (_countryEmojiFlags2.default[i.value] || '')
+        };
+      }) : [],
       name: 'MobilePhoneNumber',
       autoComplete: 'off',
       status: errors.MobilePhoneNumber && 'failure' || 'idle',
@@ -307,10 +332,10 @@ AccountDetail.defaultProps = {
 };
 
 var rules = {
-  MobilePhoneNumber: [[_required2.default, 'error.empty.mobilePhoneNumber']],
-  Address1: [[_required2.default, 'error.empty.address']],
-  Zip: [[_required2.default, 'error.empty.zip_code']],
-  City: [[_required2.default, 'error.empty.city']],
+  MobilePhoneNumber: [[_required2.default, 'error.empty.mobilePhoneNumber'], [_phone2.default, 'error.condition.phone']],
+  Address1: [[_required2.default, 'error.empty.address'], [_blacklistedCharacters2.default, 'error.format.address']],
+  Zip: [[_required2.default, 'error.empty.zip_code'], [_noSpecialCharacters2.default, 'error.format.zip']],
+  City: [[_required2.default, 'error.empty.city'], [_stringWithoutNumbers2.default, 'error.invalid.city'], [_blacklistedCharacters2.default, 'error.invalid.city']],
   Password: [[_required2.default, 'error.empty.password']],
   Country: [[_required2.default, 'error.empty.country']],
   Gender: [[_required2.default, 'error.empty.gender']]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-core-components",
-  "version": "6.2.0-crypto.1",
+  "version": "6.2.0-edit-profile.1",
   "description": "tg-core-components",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -76,5 +76,5 @@
     "webpack": "^3.0.0",
     "webpack-blocks": "^1.0.0"
   },
-  "gitHead": "726081c8015f50a46ad63c86ca9b4e0ac32a0864"
+  "gitHead": "a86b4bd5cbd94731bfee1dce5f01b558a17dd1f4"
 }