tg-core-components 6.3.0 → 6.3.2

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

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

package/es/widgets/AccountDetail/index.js

@@ -3,10 +3,6 @@ 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';
@@ -48,9 +44,7 @@ var AccountDetail = function AccountDetail(_ref) {
       onSubmit = _ref.onSubmit,
       jurisdiction = _ref.jurisdiction,
       countries = _ref.countries,
-      isLoading = _ref.isLoading,
-      isComplete = _ref.isComplete,
-      showCallingCode = _ref.showCallingCode;
+      isLoading = _ref.isLoading;
 
   return React.createElement(
     'form',
@@ -125,7 +119,7 @@ var AccountDetail = function AccountDetail(_ref) {
       React.createElement(
         Select,
         {
-          disabled: isComplete,
+          disabled: Boolean(data.Country),
           className: 'layout-item-6',
           value: data.Country,
           label: translate({
@@ -162,14 +156,6 @@ 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',
@@ -262,9 +248,7 @@ AccountDetail.propTypes = {
   /** Array of validation errors where the error display depends on which invalid rule it breaks */
   error: PropTypes.array,
   /** The submission function firing when submitting the form */
-  onSubmit: PropTypes.func,
-  /** If the user profile is complete or not */
-  isComplete: PropTypes.bool
+  onSubmit: PropTypes.func
 };
 
 AccountDetail.defaultProps = {
@@ -274,15 +258,14 @@ AccountDetail.defaultProps = {
   value: '',
   name: '',
   error: [],
-  onSubmit: Function,
-  isComplete: false
+  onSubmit: Function
 };
 
 var rules = {
-  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']],
+  MobilePhoneNumber: [[require, 'error.empty.mobilePhoneNumber']],
+  Address1: [[require, 'error.empty.address']],
+  Zip: [[require, 'error.empty.zip_code']],
+  City: [[require, 'error.empty.city']],
   Password: [[require, 'error.empty.password']],
   Country: [[require, 'error.empty.country']],
   Gender: [[require, 'error.empty.gender']]

package/es/widgets/Cashier/Deposit/PaymentForm/index.js

@@ -94,6 +94,7 @@ var PaymentForm = function (_Component) {
     return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref3 = PaymentForm.__proto__ || Object.getPrototypeOf(PaymentForm)).call.apply(_ref3, [this].concat(args))), _this), _this.onMessage = function (message) {
       var operatingSystem = _this.props.operatingSystem;
 
+      console.log({ message: message });
       var data = JSON.parse(message.data);
 
       if (data.method === 'OPEN_APP') {

package/es/widgets/ResponsibleGaming/Amount.js

@@ -31,7 +31,7 @@ var Amount = function Amount(_ref) {
     React.createElement('p', { dangerouslySetInnerHTML: { __html: content } }),
     React.createElement(Select, {
       className: 'layout-item',
-      title: translate({ id: 'label.choose_limit' }),
+      title: translate({ id: 'label.choose_limit' }, intl),
       options: types,
       name: 'Timespan',
       error: errors.Timespan && translate({ id: errors.Timespan }, intl)

package/es/widgets/SignUp/ContactInfoStep.js

@@ -102,7 +102,7 @@ var ContactInfo = function (_Component) {
             onBlur: function onBlur(value) {
               return _onBlur('FirstName', value);
             },
-            error: (errors.FirstName && translate({ id: errors.FirstName }), intl)
+            error: (errors.FirstName && translate({ id: errors.FirstName }, intl))
           }),
           React.createElement(Input, {
             className: 'layout-item-6',

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

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

package/lib/widgets/AccountDetail/index.js

@@ -22,22 +22,6 @@ 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);
@@ -101,9 +85,7 @@ var AccountDetail = function AccountDetail(_ref) {
       onSubmit = _ref.onSubmit,
       jurisdiction = _ref.jurisdiction,
       countries = _ref.countries,
-      isLoading = _ref.isLoading,
-      isComplete = _ref.isComplete,
-      showCallingCode = _ref.showCallingCode;
+      isLoading = _ref.isLoading;
 
   return _react2.default.createElement(
     'form',
@@ -178,7 +160,7 @@ var AccountDetail = function AccountDetail(_ref) {
       _react2.default.createElement(
         _Select2.default,
         {
-          disabled: isComplete,
+          disabled: Boolean(data.Country),
           className: 'layout-item-6',
           value: data.Country,
           label: (0, _translate2.default)({
@@ -215,14 +197,6 @@ 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',
@@ -315,9 +289,7 @@ AccountDetail.propTypes = {
   /** Array of validation errors where the error display depends on which invalid rule it breaks */
   error: _propTypes2.default.array,
   /** The submission function firing when submitting the form */
-  onSubmit: _propTypes2.default.func,
-  /** If the user profile is complete or not */
-  isComplete: _propTypes2.default.bool
+  onSubmit: _propTypes2.default.func
 };
 
 AccountDetail.defaultProps = {
@@ -327,15 +299,14 @@ AccountDetail.defaultProps = {
   value: '',
   name: '',
   error: [],
-  onSubmit: Function,
-  isComplete: false
+  onSubmit: Function
 };
 
 var rules = {
-  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']],
+  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']],
   Password: [[_required2.default, 'error.empty.password']],
   Country: [[_required2.default, 'error.empty.country']],
   Gender: [[_required2.default, 'error.empty.gender']]

package/lib/widgets/Cashier/Deposit/PaymentForm/index.js

@@ -126,6 +126,7 @@ var PaymentForm = function (_Component) {
     return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref3 = PaymentForm.__proto__ || Object.getPrototypeOf(PaymentForm)).call.apply(_ref3, [this].concat(args))), _this), _this.onMessage = function (message) {
       var operatingSystem = _this.props.operatingSystem;
 
+      console.log({ message: message });
       var data = JSON.parse(message.data);
 
       if (data.method === 'OPEN_APP') {

package/lib/widgets/ResponsibleGaming/Amount.js

@@ -48,7 +48,7 @@ var Amount = function Amount(_ref) {
     _react2.default.createElement('p', { dangerouslySetInnerHTML: { __html: content } }),
     _react2.default.createElement(_Select2.default, {
       className: 'layout-item',
-      title: translate({ id: 'label.choose_limit' }),
+      title: translate({ id: 'label.choose_limit' }, intl),
       options: types,
       name: 'Timespan',
       error: errors.Timespan && translate({ id: errors.Timespan }, intl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-core-components",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "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": "06f3cdf713c2b8973a68fab04e7c0a74c125d723"
+  "gitHead": "655fb1956cc5f772c25bcb3a193836eb387d5122"
 }

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

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

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

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

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

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

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

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