tg-core-components 6.3.4-3.2 → 6.3.4-3.21

package/es/widgets/ResponsibleGamingWidget/Timespan.js

@@ -242,7 +242,6 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
       hideRemainingLimit = _ref10.hideRemainingLimit,
       showCurrentValue = _ref10.showCurrentValue,
       hideOther = _ref10.hideOther,
-      maxAmounts = _ref10.maxAmounts,
       values = _ref10.values,
       messages = _ref10.messages,
       isTime = _ref10.isTime,
@@ -349,7 +348,6 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
       inputMode === 'input' && React.createElement(
         Fragment,
         null,
-        console.log(newLimit),
         React.createElement(Input, {
           type: 'number',
           pattern: '\\d*',

package/es/widgets/ResponsibleGamingWidget/helpers.js

@@ -10,7 +10,7 @@ export var getValues = function getValues(values, currency, timespan) {
   return (Array.isArray(values) ? values : []).filter(function (v) {
     return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' && v.timespan === timespan || typeof v === 'number';
   }).map(function (v) {
-    return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' ? v.amount : v;
+    return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' ? v.amount ? v.amount : v.maxAmount : v;
   });
 };
 

package/es/widgets/ResponsibleGamingWidget/index.js

@@ -16,6 +16,7 @@ import messages from './messages';
 import Timespan from './Timespan';
 import getByPath from 'lodash/get';
 import marked from 'marked';
+import { getValues } from './helpers';
 
 var ResponsibleGaming = function ResponsibleGaming(_ref) {
   var limits = _ref.limits,
@@ -103,24 +104,23 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
    * Add a new limit with status "NewLimit"
    * There can only be one limit with status "NewLimit" for each type/timespan
    */
-  var onChangeLimit = function onChangeLimit(type, product) {
+  var onChangeLimit = function onChangeLimit(type, product, maxAmounts) {
     return function (timespan) {
       return function (amount) {
-        return function (maxAmounts) {
-          console.log(maxAmounts);
-          var newLimit = {
-            Id: getByPath(normalizedLimits, '[' + type + '].timespans[' + timespan + '].currentLimit.Id'),
-            Type: type,
-            Product: product,
-            Timespan: timespan,
-            Amount: amount,
-            Status: 'NewLimit'
-          };
-          var limits = localLimits.filter(function (l) {
-            return !(l.Type === newLimit.Type && l.Product === newLimit.Product && l.Timespan === newLimit.Timespan && l.Status === newLimit.Status);
-          });
-          setLocalLimits([].concat(_toConsumableArray(limits), [newLimit]));
+        var newLimit = {
+          Id: getByPath(normalizedLimits, '[' + type + '].timespans[' + timespan + '].currentLimit.Id'),
+          Type: type,
+          Product: product,
+          Timespan: timespan,
+          Amount: amount,
+          MaxAmount: maxAmounts ? getValues(maxAmounts, currency, timespan)[0] : Infinity,
+          Status: 'NewLimit'
         };
+        console.log(type);
+        var limits = localLimits.filter(function (l) {
+          return !(l.Type === newLimit.Type && l.Product === newLimit.Product && l.Timespan === newLimit.Timespan && l.Status === newLimit.Status);
+        });
+        setLocalLimits([].concat(_toConsumableArray(limits), [newLimit]));
       };
     };
   };
@@ -143,8 +143,8 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
             tooltipOpen: normalizedLimits.tooltipOpen
           }),
           React.createElement(LimitContent, _extends({
-            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product),
-            onChangeLimit: onChangeLimit(normalizedLimits.type, normalizedLimits.product),
+            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product, normalizedLimits.maxAmounts),
+            onChangeLimit: onChangeLimit(normalizedLimits.type, normalizedLimits.product, normalizedLimits.maxAmounts),
             hideSubmit: hideSubmit,
             onConfirmLimit: onConfirmLimit,
             onDeclineLimit: onDeclineLimit,
@@ -182,7 +182,6 @@ var LimitContent = function LimitContent(_ref3) {
       getAlerts = _ref3.getAlerts,
       isLoading = _ref3.isLoading,
       currency = _ref3.currency,
-      maxAmounts = _ref3.maxAmounts,
       values = _ref3.values,
       valueType = _ref3.valueType,
       hideRemainingLimit = _ref3.hideRemainingLimit,
@@ -196,8 +195,6 @@ var LimitContent = function LimitContent(_ref3) {
 
   var alerts = getAlerts(Object.keys(timespans));
 
-  console.log(Object.values);
-
   var onSubmit = function onSubmit(e) {
     e.preventDefault();
     var limits = Object.values(timespans).filter(function (t) {
@@ -230,36 +227,30 @@ var LimitContent = function LimitContent(_ref3) {
       currency: currency
     }),
     Object.values(timespans).map(function (t) {
-      return React.createElement(
-        'div',
-        null,
-        console.log(t),
-        React.createElement(Timespan, _extends({
-          key: t.timespan,
-          title: Object.values(timespans).length > 1 && messages.get('header.responsible-gaming.timespan.' + t.timespan),
-          onChangeLimit: onChangeLimit(t.timespan),
-          onResetLimit: function onResetLimit() {
-            return onSubmitLimits([t.currentLimit]);
-          },
-          onConfirmLimit: onConfirmLimit,
-          onDeclineLimit: onDeclineLimit,
-          onPickLimit: function onPickLimit(id) {
-            return onSubmitLimits(t.pickLimits.filter(function (l) {
-              return l.Id !== id;
-            }).map(function (l) {
-              return _extends({}, l, { Amount: 0 });
-            }));
-          },
-          validationState: getValidationState(t.timespan),
-          currency: currency,
-          maxAmounts: maxAmounts,
-          values: values,
-          valueType: valueType,
-          hideRemainingLimit: hideRemainingLimit,
-          showCurrentValue: showCurrentValue,
-          hideOther: hideOther
-        }, t))
-      );
+      return React.createElement(Timespan, _extends({
+        key: t.timespan,
+        title: Object.values(timespans).length > 1 && messages.get('header.responsible-gaming.timespan.' + t.timespan),
+        onChangeLimit: onChangeLimit(t.timespan),
+        onResetLimit: function onResetLimit() {
+          return onSubmitLimits([t.currentLimit]);
+        },
+        onConfirmLimit: onConfirmLimit,
+        onDeclineLimit: onDeclineLimit,
+        onPickLimit: function onPickLimit(id) {
+          return onSubmitLimits(t.pickLimits.filter(function (l) {
+            return l.Id !== id;
+          }).map(function (l) {
+            return _extends({}, l, { Amount: 0 });
+          }));
+        },
+        validationState: getValidationState(t.timespan),
+        currency: currency,
+        values: values,
+        valueType: valueType,
+        hideRemainingLimit: hideRemainingLimit,
+        showCurrentValue: showCurrentValue,
+        hideOther: hideOther
+      }, t));
     }),
     !hideSubmit && React.createElement(
       Button,

package/es/widgets/ResponsibleGamingWidget/validate.js

@@ -50,7 +50,7 @@ var validate = function validate(_ref) {
    * Compose jurisdictions with rules
    */
   var common = (_common = {}, _defineProperty(_common, 'show-confirm-on-submit', type === 'Block' || type === 'SelfExclude'), _defineProperty(_common, 'insufficient-limit-count', false), _defineProperty(_common, 'limits-are-pristine', limitsArePristine), _defineProperty(_common, 'limit-increase-blocked', false), _defineProperty(_common, 'limit-remove-blocked', false), _defineProperty(_common, 'limit-above-maxlimit', exceedingMaxLimitAmount), _defineProperty(_common, 'isValid', function isValid() {
-    return !this['insufficient-limit-count'] && !(this['limit-increase-blocked'] && isIncreasingLimit) && !(this['limit-remove-blocked'] && isRemovingLimit);
+    return !this['insufficient-limit-count'] && !(this['limit-increase-blocked'] && isIncreasingLimit) && !(this['limit-remove-blocked'] && isRemovingLimit) && !this['limit-above-maxlimit'];
   }), _common);
   var mga = {};
   var sga = (_sga = {}, _defineProperty(_sga, 'insufficient-limit-count', type === 'Deposit' && limitCount < 3), _defineProperty(_sga, 'limit-remove-blocked', type === 'Deposit'), _defineProperty(_sga, 'monthly-deposit-above-10k', getByPath(newMonthlyDepositLimit, 'newLimit.Amount') >= 10000), _sga);

package/lib/widgets/ResponsibleGamingWidget/Timespan.js

@@ -273,7 +273,6 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
       hideRemainingLimit = _ref10.hideRemainingLimit,
       showCurrentValue = _ref10.showCurrentValue,
       hideOther = _ref10.hideOther,
-      maxAmounts = _ref10.maxAmounts,
       values = _ref10.values,
       messages = _ref10.messages,
       isTime = _ref10.isTime,
@@ -380,7 +379,6 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
       inputMode === 'input' && _react2.default.createElement(
         _react.Fragment,
         null,
-        console.log(newLimit),
         _react2.default.createElement(_Input2.default, {
           type: 'number',
           pattern: '\\d*',

package/lib/widgets/ResponsibleGamingWidget/helpers.js

@@ -21,7 +21,7 @@ var getValues = exports.getValues = function getValues(values, currency, timespa
   return (Array.isArray(values) ? values : []).filter(function (v) {
     return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' && v.timespan === timespan || typeof v === 'number';
   }).map(function (v) {
-    return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' ? v.amount : v;
+    return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' ? v.amount ? v.amount : v.maxAmount : v;
   });
 };
 

package/lib/widgets/ResponsibleGamingWidget/index.js

@@ -55,6 +55,8 @@ var _marked = require('marked');
 
 var _marked2 = _interopRequireDefault(_marked);
 
+var _helpers = require('./helpers');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
@@ -145,24 +147,23 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
    * Add a new limit with status "NewLimit"
    * There can only be one limit with status "NewLimit" for each type/timespan
    */
-  var onChangeLimit = function onChangeLimit(type, product) {
+  var onChangeLimit = function onChangeLimit(type, product, maxAmounts) {
     return function (timespan) {
       return function (amount) {
-        return function (maxAmounts) {
-          console.log(maxAmounts);
-          var newLimit = {
-            Id: (0, _get2.default)(normalizedLimits, '[' + type + '].timespans[' + timespan + '].currentLimit.Id'),
-            Type: type,
-            Product: product,
-            Timespan: timespan,
-            Amount: amount,
-            Status: 'NewLimit'
-          };
-          var limits = localLimits.filter(function (l) {
-            return !(l.Type === newLimit.Type && l.Product === newLimit.Product && l.Timespan === newLimit.Timespan && l.Status === newLimit.Status);
-          });
-          setLocalLimits([].concat(_toConsumableArray(limits), [newLimit]));
+        var newLimit = {
+          Id: (0, _get2.default)(normalizedLimits, '[' + type + '].timespans[' + timespan + '].currentLimit.Id'),
+          Type: type,
+          Product: product,
+          Timespan: timespan,
+          Amount: amount,
+          MaxAmount: maxAmounts ? (0, _helpers.getValues)(maxAmounts, currency, timespan)[0] : Infinity,
+          Status: 'NewLimit'
         };
+        console.log(type);
+        var limits = localLimits.filter(function (l) {
+          return !(l.Type === newLimit.Type && l.Product === newLimit.Product && l.Timespan === newLimit.Timespan && l.Status === newLimit.Status);
+        });
+        setLocalLimits([].concat(_toConsumableArray(limits), [newLimit]));
       };
     };
   };
@@ -185,8 +186,8 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
             tooltipOpen: normalizedLimits.tooltipOpen
           }),
           _react2.default.createElement(LimitContent, _extends({
-            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product),
-            onChangeLimit: onChangeLimit(normalizedLimits.type, normalizedLimits.product),
+            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product, normalizedLimits.maxAmounts),
+            onChangeLimit: onChangeLimit(normalizedLimits.type, normalizedLimits.product, normalizedLimits.maxAmounts),
             hideSubmit: hideSubmit,
             onConfirmLimit: onConfirmLimit,
             onDeclineLimit: onDeclineLimit,
@@ -224,7 +225,6 @@ var LimitContent = function LimitContent(_ref3) {
       getAlerts = _ref3.getAlerts,
       isLoading = _ref3.isLoading,
       currency = _ref3.currency,
-      maxAmounts = _ref3.maxAmounts,
       values = _ref3.values,
       valueType = _ref3.valueType,
       hideRemainingLimit = _ref3.hideRemainingLimit,
@@ -238,8 +238,6 @@ var LimitContent = function LimitContent(_ref3) {
 
   var alerts = getAlerts(Object.keys(timespans));
 
-  console.log(Object.values);
-
   var onSubmit = function onSubmit(e) {
     e.preventDefault();
     var limits = Object.values(timespans).filter(function (t) {
@@ -272,36 +270,30 @@ var LimitContent = function LimitContent(_ref3) {
       currency: currency
     }),
     Object.values(timespans).map(function (t) {
-      return _react2.default.createElement(
-        'div',
-        null,
-        console.log(t),
-        _react2.default.createElement(_Timespan2.default, _extends({
-          key: t.timespan,
-          title: Object.values(timespans).length > 1 && _messages2.default.get('header.responsible-gaming.timespan.' + t.timespan),
-          onChangeLimit: onChangeLimit(t.timespan),
-          onResetLimit: function onResetLimit() {
-            return onSubmitLimits([t.currentLimit]);
-          },
-          onConfirmLimit: onConfirmLimit,
-          onDeclineLimit: onDeclineLimit,
-          onPickLimit: function onPickLimit(id) {
-            return onSubmitLimits(t.pickLimits.filter(function (l) {
-              return l.Id !== id;
-            }).map(function (l) {
-              return _extends({}, l, { Amount: 0 });
-            }));
-          },
-          validationState: getValidationState(t.timespan),
-          currency: currency,
-          maxAmounts: maxAmounts,
-          values: values,
-          valueType: valueType,
-          hideRemainingLimit: hideRemainingLimit,
-          showCurrentValue: showCurrentValue,
-          hideOther: hideOther
-        }, t))
-      );
+      return _react2.default.createElement(_Timespan2.default, _extends({
+        key: t.timespan,
+        title: Object.values(timespans).length > 1 && _messages2.default.get('header.responsible-gaming.timespan.' + t.timespan),
+        onChangeLimit: onChangeLimit(t.timespan),
+        onResetLimit: function onResetLimit() {
+          return onSubmitLimits([t.currentLimit]);
+        },
+        onConfirmLimit: onConfirmLimit,
+        onDeclineLimit: onDeclineLimit,
+        onPickLimit: function onPickLimit(id) {
+          return onSubmitLimits(t.pickLimits.filter(function (l) {
+            return l.Id !== id;
+          }).map(function (l) {
+            return _extends({}, l, { Amount: 0 });
+          }));
+        },
+        validationState: getValidationState(t.timespan),
+        currency: currency,
+        values: values,
+        valueType: valueType,
+        hideRemainingLimit: hideRemainingLimit,
+        showCurrentValue: showCurrentValue,
+        hideOther: hideOther
+      }, t));
     }),
     !hideSubmit && _react2.default.createElement(
       _Button2.default,

package/lib/widgets/ResponsibleGamingWidget/validate.js

@@ -60,7 +60,7 @@ var validate = function validate(_ref) {
    * Compose jurisdictions with rules
    */
   var common = (_common = {}, _defineProperty(_common, 'show-confirm-on-submit', type === 'Block' || type === 'SelfExclude'), _defineProperty(_common, 'insufficient-limit-count', false), _defineProperty(_common, 'limits-are-pristine', limitsArePristine), _defineProperty(_common, 'limit-increase-blocked', false), _defineProperty(_common, 'limit-remove-blocked', false), _defineProperty(_common, 'limit-above-maxlimit', exceedingMaxLimitAmount), _defineProperty(_common, 'isValid', function isValid() {
-    return !this['insufficient-limit-count'] && !(this['limit-increase-blocked'] && isIncreasingLimit) && !(this['limit-remove-blocked'] && isRemovingLimit);
+    return !this['insufficient-limit-count'] && !(this['limit-increase-blocked'] && isIncreasingLimit) && !(this['limit-remove-blocked'] && isRemovingLimit) && !this['limit-above-maxlimit'];
   }), _common);
   var mga = {};
   var sga = (_sga = {}, _defineProperty(_sga, 'insufficient-limit-count', type === 'Deposit' && limitCount < 3), _defineProperty(_sga, 'limit-remove-blocked', type === 'Deposit'), _defineProperty(_sga, 'monthly-deposit-above-10k', (0, _get2.default)(newMonthlyDepositLimit, 'newLimit.Amount') >= 10000), _sga);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-core-components",
-  "version": "6.3.4-3.2",
+  "version": "6.3.4-3.21",
   "description": "tg-core-components",
   "main": "lib/index.js",
   "module": "es/index.js",