tg-core-components 6.3.1 → 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/BonusWidget/index.js

@@ -46,7 +46,7 @@ var BonusAction = function BonusAction(_ref) {
   return React.createElement(
     'div',
     { className: 'actions' },
-    ALEACC_BONUS_CLAIM_STATE.includes(bonus.State) || bonus.Type === 'Deposit' && React.createElement(
+    ALEACC_BONUS_CLAIM_STATE.includes(bonus.State) && React.createElement(
       Button,
       {
         className: 'button primary small',
@@ -149,7 +149,7 @@ var BonusWidget = function BonusWidget(_ref3) {
 
   Object.keys(bonusList).forEach(function (bonusState) {
     var listData = bonuses.filter(function (bonus) {
-      return bonusMapping[bonus.State] === bonusState || bonus.Type === 'Deposit' && bonusState === 'available';
+      return bonusMapping[bonus.State] === bonusState;
     });
 
     bonusList[bonusState] = listData.map(function (item) {
@@ -168,7 +168,7 @@ var BonusWidget = function BonusWidget(_ref3) {
         'div',
         null,
         getBonusState(item.State)
-      )], [item.Amount && React.createElement(
+      )], [React.createElement(
         'div',
         { className: 'amount' },
         item.Type.toLowerCase() == 'freespins' ? React.createElement(FormattedNumber, { value: item.Amount, style: 'decimal' }) : React.createElement(Money, { value: item.Amount, currency: item.Currency })
@@ -177,7 +177,7 @@ var BonusWidget = function BonusWidget(_ref3) {
       // Add bonus actions to not expired Fasttrack bonuses
       if (item.Provider === 'fasttrack' && item.State !== 'Expired') info.push(React.createElement(BonusActionFT, { bonus: item, onClaimBonus: onClaimBonus }));
       // Add bonus actions to post claim bonuses from Aleacc
-      else if (item.Provider !== 'fasttrack' && ALEACC_BONUS_ACTION_STATE.includes(item.State) || item.Type === 'Deposit') info.push(React.createElement(BonusAction, {
+      else if (item.Provider !== 'fasttrack' && ALEACC_BONUS_ACTION_STATE.includes(item.State)) info.push(React.createElement(BonusAction, {
           bonus: item,
           onClaimBonus: onClaimBonus,
           onRejectBonus: onRejectBonus

package/es/widgets/BonusWidget/types.js

@@ -12,8 +12,7 @@ export var getBonusType = function getBonusType(type) {
     FreeBetsMonetary: React.createElement(Translate, {
       id: 'label.type.bonus.freeBetsMonetary',
       defaultMessage: 'Free Bets Monetary'
-    }),
-    Deposit: React.createElement(Translate, { id: 'label.type.bonus.deposit', defaultMessage: 'Deposit' })
+    })
   };
 
   return translations[type] || React.createElement(

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') {
@@ -166,7 +167,7 @@ var PaymentForm = function (_Component) {
       } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'GET' && data.redirectOutput.html != null) {
         return React.createElement(InjectedIframeHTML, { data: data, iframeProps: iframeProps });
       } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'GET' && redirect) {
-        window.location.replace(data.redirectOutput.url);
+        window.location.href = data.redirectOutput.url;
         return null;
       } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'GET') {
         return React.createElement('iframe', _extends({

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/BonusWidget/index.js

@@ -78,7 +78,7 @@ var BonusAction = function BonusAction(_ref) {
   return _react2.default.createElement(
     'div',
     { className: 'actions' },
-    ALEACC_BONUS_CLAIM_STATE.includes(bonus.State) || bonus.Type === 'Deposit' && _react2.default.createElement(
+    ALEACC_BONUS_CLAIM_STATE.includes(bonus.State) && _react2.default.createElement(
       _Button2.default,
       {
         className: 'button primary small',
@@ -181,7 +181,7 @@ var BonusWidget = function BonusWidget(_ref3) {
 
   Object.keys(bonusList).forEach(function (bonusState) {
     var listData = bonuses.filter(function (bonus) {
-      return bonusMapping[bonus.State] === bonusState || bonus.Type === 'Deposit' && bonusState === 'available';
+      return bonusMapping[bonus.State] === bonusState;
     });
 
     bonusList[bonusState] = listData.map(function (item) {
@@ -200,7 +200,7 @@ var BonusWidget = function BonusWidget(_ref3) {
         'div',
         null,
         (0, _states.getBonusState)(item.State)
-      )], [item.Amount && _react2.default.createElement(
+      )], [_react2.default.createElement(
         'div',
         { className: 'amount' },
         item.Type.toLowerCase() == 'freespins' ? _react2.default.createElement(_reactIntl.FormattedNumber, { value: item.Amount, style: 'decimal' }) : _react2.default.createElement(_Money2.default, { value: item.Amount, currency: item.Currency })
@@ -209,7 +209,7 @@ var BonusWidget = function BonusWidget(_ref3) {
       // Add bonus actions to not expired Fasttrack bonuses
       if (item.Provider === 'fasttrack' && item.State !== 'Expired') info.push(_react2.default.createElement(BonusActionFT, { bonus: item, onClaimBonus: onClaimBonus }));
       // Add bonus actions to post claim bonuses from Aleacc
-      else if (item.Provider !== 'fasttrack' && ALEACC_BONUS_ACTION_STATE.includes(item.State) || item.Type === 'Deposit') info.push(_react2.default.createElement(BonusAction, {
+      else if (item.Provider !== 'fasttrack' && ALEACC_BONUS_ACTION_STATE.includes(item.State)) info.push(_react2.default.createElement(BonusAction, {
           bonus: item,
           onClaimBonus: onClaimBonus,
           onRejectBonus: onRejectBonus

package/lib/widgets/BonusWidget/types.js

@@ -26,8 +26,7 @@ var getBonusType = exports.getBonusType = function getBonusType(type) {
     FreeBetsMonetary: _react2.default.createElement(_Translate2.default, {
       id: 'label.type.bonus.freeBetsMonetary',
       defaultMessage: 'Free Bets Monetary'
-    }),
-    Deposit: _react2.default.createElement(_Translate2.default, { id: 'label.type.bonus.deposit', defaultMessage: 'Deposit' })
+    })
   };
 
   return translations[type] || _react2.default.createElement(

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') {
@@ -198,7 +199,7 @@ var PaymentForm = function (_Component) {
       } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'GET' && data.redirectOutput.html != null) {
         return _react2.default.createElement(_InjectedIframeHTML2.default, { data: data, iframeProps: iframeProps });
       } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'GET' && redirect) {
-        window.location.replace(data.redirectOutput.url);
+        window.location.href = data.redirectOutput.url;
         return null;
       } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'GET') {
         return _react2.default.createElement('iframe', _extends({

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.1",
+  "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": "137ed74f254eb62f24332b84d4047688e6dc22b6"
+  "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!"#\$%&'\(\)\*\+,\-\.\/:;<>\?@\[\\\]\^_`{|}~]/);
-};