tg-core-components 5.4.3-bethard-account-changes.0 → 5.5.0-master

package/lib/widgets/BonusWidget/BonusCode.js

@@ -14,10 +14,6 @@ var _Input = require('tg-core-components/lib/components/Input');
 
 var _Input2 = _interopRequireDefault(_Input);
 
-var _Button = require('tg-core-components/lib/components/Button');
-
-var _Button2 = _interopRequireDefault(_Button);
-
 var _compose = require('recompose/compose');
 
 var _compose2 = _interopRequireDefault(_compose);
@@ -83,23 +79,31 @@ var BonusCodeForm = function BonusCodeForm(_ref3) {
   return _react2.default.createElement(
     'form',
     { className: 'form', onSubmit: onSubmit },
-    _react2.default.createElement(_Input2.default, {
-      label: (0, _translate2.default)({
-        id: 'label.bonus_code',
-        defaultMessage: 'Bonus code'
-      }, intl),
-      type: 'text',
-      name: 'bonusCode',
-      status: errors.bonusCode && 'failure' || 'idle',
-      statusText: errors.bonusCode && (0, _translate2.default)({ id: errors.bonusCode }, intl)
-    }),
     _react2.default.createElement(
-      _Button2.default,
-      { className: 'button primary wide', type: 'submit' },
-      (0, _translate2.default)({
-        id: 'label.activate',
-        defaultMessage: 'Activate'
-      }, intl)
+      'div',
+      { className: 'bonus-code-form' },
+      _react2.default.createElement(_Input2.default, {
+        className: 'layout-item',
+        title: (0, _translate2.default)({
+          id: 'label.bonus_code',
+          defaultMessage: 'Bonus code'
+        }, intl),
+        type: 'text',
+        name: 'bonusCode',
+        error: errors.bonusCode && (0, _translate2.default)({ id: errors.bonusCode }, intl)
+      }),
+      _react2.default.createElement(
+        'div',
+        { className: 'layout-item' },
+        _react2.default.createElement(
+          'button',
+          { className: 'button primary wide', type: 'submit' },
+          (0, _translate2.default)({
+            id: 'label.activate',
+            defaultMessage: 'Activate'
+          }, intl)
+        )
+      )
     )
   );
 };

package/lib/widgets/BonusWidget/index.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -30,13 +32,68 @@ var _Translate2 = _interopRequireDefault(_Translate);
 
 var _states = require('./states');
 
+var _marked = require('marked');
+
+var _marked2 = _interopRequireDefault(_marked);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var ALEACC_BONUS_CLAIM_STATE = ['Initiated', 'PreClaimed'];
+var ALEACC_BONUS_REJECT_STATE = ['Initiated', 'PreClaimed', 'Pending', 'PreWager'];
+var ALEACC_BONUS_ACTION_STATE = [].concat(ALEACC_BONUS_CLAIM_STATE, ALEACC_BONUS_REJECT_STATE);
+
 var BonusAction = function BonusAction(_ref) {
   var bonus = _ref.bonus,
-      claimBonus = _ref.claimBonus,
-      device = _ref.device,
-      redirect = _ref.redirect;
+      onClaimBonus = _ref.onClaimBonus,
+      onRejectBonus = _ref.onRejectBonus;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isLoadingClaim = _useState2[0],
+      setIsLoadingClaim = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isLoadingReject = _useState4[0],
+      setIsLoadingReject = _useState4[1];
+
+  var claimBonus = function claimBonus(e) {
+    onClaimBonus(bonus, function (isLoading) {
+      return setIsLoadingClaim(isLoading);
+    }, e);
+  };
+
+  var rejectBonus = function rejectBonus(e) {
+    onRejectBonus(bonus, function (isLoading) {
+      return setIsLoadingReject(isLoading);
+    }, e);
+  };
+
+  return _react2.default.createElement(
+    'div',
+    { className: 'actions' },
+    ALEACC_BONUS_CLAIM_STATE.includes(bonus.State) && _react2.default.createElement(
+      _Button2.default,
+      {
+        className: 'button primary small',
+        onClick: claimBonus,
+        isLoading: isLoadingClaim },
+      _react2.default.createElement(_Translate2.default, { id: 'action.bonus.claim', defaultMessage: 'Claim' })
+    ),
+    ALEACC_BONUS_REJECT_STATE.includes(bonus.State) && _react2.default.createElement(
+      _Button2.default,
+      {
+        className: 'button secondary small',
+        onClick: rejectBonus,
+        isLoading: isLoadingReject },
+      _react2.default.createElement(_Translate2.default, { id: 'action.bonus.reject', defaultMessage: 'Reject' })
+    )
+  );
+};
+
+var BonusActionFT = function BonusActionFT(_ref2) {
+  var bonus = _ref2.bonus,
+      onClaimBonus = _ref2.onClaimBonus;
 
   // Atm it's only fasttrack that supports actions.
   if (bonus.Provider !== 'fasttrack') return null;
@@ -44,9 +101,6 @@ var BonusAction = function BonusAction(_ref) {
   // Expired bonuses has no actions
   if (bonus.State === 'Expired') return null;
 
-  var gameUrl = '/casino';
-  if (device === 'Desktop' && bonus.DesktopGameUrl && bonus.DesktopGameUrl.trim()) gameUrl = bonus.DesktopGameUrl.trim();else if (device !== 'Desktop' && bonus.MobileGameUrl && bonus.MobileGameUrl.trim()) gameUrl = bonus.MobileGameUrl.trim();
-
   // FTType 1 - Pending Bonus
   // Claim bonus and redirect to game of present.
   if (bonus.FTType === 1) {
@@ -54,10 +108,8 @@ var BonusAction = function BonusAction(_ref) {
     return _react2.default.createElement(
       _Button2.default,
       {
-        onClick: function onClick() {
-          claimBonus(bonus.Id).then(function () {
-            redirect(gameUrl);
-          });
+        onClick: function onClick(e) {
+          return onClaimBonus(bonus, null, e);
         },
         className: 'button primary action wide ' + (bonus.IsLocked && 'locked') },
       _react2.default.createElement(_Translate2.default, { id: 'action.bonus.type1', defaultMessage: 'Action type1' })
@@ -70,14 +122,8 @@ var BonusAction = function BonusAction(_ref) {
     return _react2.default.createElement(
       _Button2.default,
       {
-        onClick: function onClick() {
-          return redirect({
-            pathname: '/dashboard/deposit',
-            search: gameUrl ? '?ref_url=' + encodeURIComponent(gameUrl) : '',
-            state: {
-              bonusCode: bonus.PromoCode
-            }
-          });
+        onClick: function onClick(e) {
+          return onClaimBonus(bonus, null, e);
         },
         className: 'button primary action wide ' + (bonus.IsLocked && 'locked') },
       _react2.default.createElement(_Translate2.default, { id: 'action.bonus.type2', defaultMessage: 'Action type2' })
@@ -90,20 +136,8 @@ var BonusAction = function BonusAction(_ref) {
     return _react2.default.createElement(
       _Button2.default,
       {
-        onClick: function onClick() {
-          if (!bonus.IsLocked) {
-            claimBonus(bonus.Id).then(function () {
-              redirect(gameUrl);
-            });
-          } else {
-            redirect({
-              pathname: '/dashboard/deposit',
-              search: '?ref_url=/dashboard/bonus',
-              state: {
-                bonusCode: bonus.PromoCode
-              }
-            });
-          }
+        onClick: function onClick(e) {
+          return onClaimBonus(bonus, null, e);
         },
         className: 'button primary action wide ' + (bonus.IsLocked && 'locked') },
       !!bonus.IsLocked && _react2.default.createElement(_Translate2.default, {
@@ -117,12 +151,11 @@ var BonusAction = function BonusAction(_ref) {
   return null;
 };
 
-var BonusWidget = function BonusWidget(_ref2) {
-  var bonuses = _ref2.bonuses,
-      handleBonusCodeSubmit = _ref2.handleBonusCodeSubmit,
-      claimBonus = _ref2.claimBonus,
-      device = _ref2.device,
-      redirect = _ref2.redirect;
+var BonusWidget = function BonusWidget(_ref3) {
+  var bonuses = _ref3.bonuses,
+      handleBonusCodeSubmit = _ref3.handleBonusCodeSubmit,
+      onClaimBonus = _ref3.onClaimBonus,
+      onRejectBonus = _ref3.onRejectBonus;
 
   var bonusList = { active: null, available: null, finished: null };
 
@@ -174,12 +207,13 @@ var BonusWidget = function BonusWidget(_ref2) {
       })]];
 
       // Add bonus actions to not expired Fasttrack bonuses
-      if (item.Provider === 'fasttrack' && item.State !== 'Expired') info.push(_react2.default.createElement(BonusAction, {
-        bonus: item,
-        claimBonus: claimBonus,
-        device: device,
-        redirect: redirect
-      }));
+      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)) info.push(_react2.default.createElement(BonusAction, {
+          bonus: item,
+          onClaimBonus: onClaimBonus,
+          onRejectBonus: onRejectBonus
+        }));
 
       var detail = [[_react2.default.createElement(
         'span',
@@ -239,6 +273,13 @@ var BonusWidget = function BonusWidget(_ref2) {
         })
       )]];
 
+      info.push([_react2.default.createElement('div', {
+        className: 'disclaimer',
+        dangerouslySetInnerHTML: {
+          __html: item.content && item.content.disclaimer && (0, _marked2.default)(item.content.disclaimer || '') || item.promotion && item.promotion.shortDisclaimer
+        }
+      })]);
+
       return {
         id: item.Id,
         info: info,

package/lib/widgets/Cashier/Payment/index.js

@@ -29,5 +29,7 @@ var matchProviderType = exports.matchProviderType = function matchProviderType(f
   if (first.service) fType = fType + first.service;
   if (second.service) sType = sType + second.service;
 
+  if (!fType || !sType) return;
+
   return sType.toLowerCase() === fType.toLowerCase();
 };

package/lib/widgets/CashierAccordion/Deposit/BonusCodeInput/index.js

@@ -10,9 +10,13 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _Input = require('../../../../components/Input');
+var _TextInput = require('../../../../components/Deposit/TextInput');
 
-var _Input2 = _interopRequireDefault(_Input);
+var _TextInput2 = _interopRequireDefault(_TextInput);
+
+var _Icon = require('../../../../components/Icon');
+
+var _Icon2 = _interopRequireDefault(_Icon);
 
 var _reactIntl = require('react-intl');
 
@@ -66,14 +70,16 @@ var BonusCodeInput = function (_Component) {
         return _react2.default.createElement(
           'div',
           { className: 'bonus-code-input-wrapper' },
-          _react2.default.createElement(_Input2.default, {
+          _react2.default.createElement(_TextInput2.default, {
             name: 'bonusCode',
-            value: bonusCode,
-            onChange: onChange,
             autoFocus: true,
-            label: (0, _translate2.default)({ id: 'cashier.bonus_code' }, intl),
+            placeholder: (0, _translate2.default)({ id: 'cashier.bonus_code' }, intl),
             disabled: disabled,
-            status: status === 'active' && 'success' || status === 'pending' && 'loading'
+            onChange: onChange
+          }),
+          status && _react2.default.createElement(_Icon2.default, {
+            icon: status === 'active' ? 'check' : '',
+            className: 'bonus-icon bonus-' + status
           })
         );
       }

package/lib/widgets/CashierAccordion/Deposit/DepositWidget/index.js

@@ -46,9 +46,9 @@ var _marked = require('marked');
 
 var _marked2 = _interopRequireDefault(_marked);
 
-var _Input = require('../../../../components/Input');
+var _TextInput = require('../../../../components/Deposit/TextInput');
 
-var _Input2 = _interopRequireDefault(_Input);
+var _TextInput2 = _interopRequireDefault(_TextInput);
 
 var _PaymentAmountSelector = require('../../Payment/PaymentAmountSelector');
 
@@ -90,6 +90,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 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); } }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -233,8 +235,7 @@ var DepositWidget = function (_Component) {
           renderAllowBonusWarning = _props.renderAllowBonusWarning,
           paymentStats = _props.paymentStats,
           _props$shouldAutoFocu = _props.shouldAutoFocus,
-          shouldAutoFocus = _props$shouldAutoFocu === undefined ? false : _props$shouldAutoFocu,
-          hideSelectedBonus = _props.hideSelectedBonus;
+          shouldAutoFocus = _props$shouldAutoFocu === undefined ? false : _props$shouldAutoFocu;
 
 
       var accountExclusions = payments.filter(function (provider) {
@@ -247,7 +248,11 @@ var DepositWidget = function (_Component) {
       }).map(function (provider) {
         return provider.providerType.toUpperCase();
       });
-      var customAmountExclusions = ['reversewithdrawal'];
+      var customAmountExclusions = [].concat(_toConsumableArray(payments.filter(function (provider) {
+        return provider.hideCustomAmount;
+      }).map(function (provider) {
+        return provider.providerType.toLowerCase();
+      })), ['reversewithdrawal']);
       var minMaxExclusions = ['reversewithdrawal'];
 
       var minDepositBonusAmount = this.getMinDepositBonusAmount();
@@ -258,8 +263,6 @@ var DepositWidget = function (_Component) {
         return (0, _Payment.matchProviderType)(payment, selectedMethod);
       });
 
-      var hasCustomAmounts = selectedMethodDetail && selectedMethodDetail.customAmounts;
-
       var selectedBonus = bonuses.find(function (b) {
         return b.PromoCode === bonusCode;
       });
@@ -286,13 +289,13 @@ var DepositWidget = function (_Component) {
             bonuses: bonuses,
             onSelect: this.onSelectBonus,
             selectedBonus: selectedBonus
-          }) : !hideSelectedBonus ? _react2.default.createElement(SelectedBonus, {
+          }) : _react2.default.createElement(SelectedBonus, {
             selectedBonus: selectedBonus,
             onClick: function onClick() {
               _this2.onSelectBonus('');
               _this2.setState({ showBonusSlider: true });
             }
-          }) : null),
+          })),
           _react2.default.createElement(_reactFinalForm.Form, {
             onSubmit: this.handleNextStep,
             initialValues: {
@@ -356,7 +359,7 @@ var DepositWidget = function (_Component) {
                   onSelectMethod: _this2.onSelectMethod,
                   onDeleteAccount: _this2.onDeleteAccount,
                   methodContent: function methodContent(method) {
-                    if (method.txType !== selectedMethod.txType || method.service !== selectedMethod.service) return null;
+                    if (method.txType !== selectedMethod.txType) return null;
 
                     return _react2.default.createElement(
                       _react.Fragment,
@@ -366,7 +369,7 @@ var DepositWidget = function (_Component) {
                       renderNotVerifiedNotice && renderNotVerifiedNotice(currentAmount),
                       renderCanceledNotice && renderCanceledNotice(),
                       renderAllowBonusWarning && renderAllowBonusWarning(selectedMethodDetail, _this2.state.bonusCode),
-                      selectedMethod.txType === 'SwishDeposit' && _react2.default.createElement(_Input2.default, {
+                      selectedMethod.txType === 'SwishDeposit' && _react2.default.createElement(_TextInput2.default, {
                         className: 'swish-number',
                         name: 'swishNumber',
                         type: 'tel',
@@ -374,6 +377,7 @@ var DepositWidget = function (_Component) {
                           id: 'label.mobile_number_placeholder',
                           defaultMessage: 'eg. 0701234567'
                         }, intl),
+                        isControlled: true,
                         value: _this2.state.swishNumber,
                         title: (0, _translate2.default)({
                           id: 'label.mobile_number'
@@ -402,30 +406,26 @@ var DepositWidget = function (_Component) {
                           return _this2.setState({ buttonLoading: buttonLoading });
                         }
                       }),
-                      !customAmountExclusions.includes(selectedMethod.providerType.toLowerCase()) && !hasCustomAmounts && _react2.default.createElement(
+                      !customAmountExclusions.includes(selectedMethod.providerType.toLowerCase()) && _react2.default.createElement(
                         'div',
                         { className: 'custom-amount-and-submit' },
-                        _react2.default.createElement(_Input2.default, {
-                          required: true,
+                        _react2.default.createElement(_TextInput2.default, {
                           pattern: '[0-9]*',
                           className: 'custom-amount',
                           name: 'amount',
                           type: 'number',
                           step: '0.01',
-                          label: (0, _translate2.default)({
+                          placeholder: (0, _translate2.default)({
                             id: 'label.amount'
                           }, intl),
-                          status: errors && errors.amount && errors.amount.length ? 'failure' : '',
-                          value: currentAmount,
+                          showErrorText: false,
+                          showErrorIcon: errors && errors.amount && errors.amount.length > 0,
                           onChange: function onChange(e) {
                             return _this2.setState({
                               currentAmount: e.target.value
                             });
                           },
-                          autoFocus: shouldAutoFocus,
-                          setRef: function setRef(ref) {
-                            return _this2.amountInputRef = ref;
-                          }
+                          autoFocus: shouldAutoFocus
                         }),
                         _react2.default.createElement(
                           _Button2.default,
@@ -449,7 +449,7 @@ var DepositWidget = function (_Component) {
                       _react2.default.createElement(
                         'div',
                         { className: 'bonus-limit' },
-                        !minMaxExclusions.includes(selectedMethod.providerType.toLowerCase()) && !hasCustomAmounts && selectedMethod && selectedMethod.limit && _react2.default.createElement(_MethodMinMax2.default, {
+                        !minMaxExclusions.includes(selectedMethod.providerType.toLowerCase()) && !customAmountExclusions.includes(selectedMethod.providerType.toLowerCase()) && selectedMethod && selectedMethod.limit && _react2.default.createElement(_MethodMinMax2.default, {
                           method: selectedMethod,
                           currency: currency,
                           minDepositBonusAmount: minDepositBonusAmount,
@@ -521,8 +521,7 @@ var DepositWidget = function (_Component) {
             render: function render(_ref5) {
               var handleSubmit = _ref5.handleSubmit,
                   values = _ref5.values,
-                  change = _ref5.change,
-                  form = _ref5.form;
+                  change = _ref5.change;
               return _react2.default.createElement(
                 _react.Fragment,
                 null,
@@ -547,10 +546,7 @@ var DepositWidget = function (_Component) {
                     _react2.default.createElement(
                       'div',
                       { className: 'account-details' },
-                      _react2.default.createElement(PaymentAccountForm, _extends({}, paymentAccountFormProps, {
-                        change: form.change,
-                        values: values
-                      }))
+                      _react2.default.createElement(PaymentAccountForm, paymentAccountFormProps)
                     ),
                     _react2.default.createElement(
                       _Button2.default,
@@ -605,45 +601,18 @@ var DepositWidget = function (_Component) {
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
-  this.componentDidUpdate = function (prevProps) {
-    if (prevProps.shouldRenderSgaWarning !== _this3.props.shouldRenderSgaWarning) {
-      var _state2 = _this3.state,
-          currentAmount = _state2.currentAmount,
-          bonusCode = _state2.bonusCode;
-
-      _this3.handleNextStep({ amount: currentAmount, bonusCode: bonusCode });
-    }
-  };
-
   this.handleNextStep = function (_ref6) {
     var amount = _ref6.amount,
         bonusCode = _ref6.bonusCode;
-    var _state3 = _this3.state,
-        selectedMethod = _state3.selectedMethod,
-        preDepositBonus = _state3.preDepositBonus,
-        selectedAccount = _state3.selectedAccount;
-    var _props2 = _this3.props,
-        paymentStats = _props2.paymentStats,
-        renderSgaWarningPopup = _props2.renderSgaWarningPopup,
-        shouldRenderSgaWarning = _props2.shouldRenderSgaWarning;
+    var _state2 = _this3.state,
+        selectedMethod = _state2.selectedMethod,
+        preDepositBonus = _state2.preDepositBonus,
+        selectedAccount = _state2.selectedAccount;
 
 
     var formExists = !!PaymentAccountForms[(0, _Payment.getPaymentForm)(selectedMethod)];
     var skipFillInStep = ['skrill', 'bestpay', 'jeton', 'bankiban', 'bankintl'];
 
-    var remainingAmount = 5000 - Number(paymentStats.TotalDepositLast7Days);
-    var renderSgaWarning = shouldRenderSgaWarning && Number(paymentStats.TotalDepositLast7Days) + Number(amount) > 5000;
-
-    if (renderSgaWarning) {
-      _this3.setState({
-        buttonLoading: null,
-        currentAmount: amount,
-        bonusCode: bonusCode
-      });
-      renderSgaWarningPopup(remainingAmount);
-      return;
-    }
-
     if (!formExists || selectedAccount.accountId && skipFillInStep.includes(selectedMethod.providerType.toLowerCase())) {
       return _this3.onSubmit({
         currentAmount: amount,
@@ -661,9 +630,9 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.handleBackStep = function () {
-    var _state4 = _this3.state,
-        currentStep = _state4.currentStep,
-        buttonLoading = _state4.buttonLoading;
+    var _state3 = _this3.state,
+        currentStep = _state3.currentStep,
+        buttonLoading = _state3.buttonLoading;
 
 
     if (buttonLoading === 'fill-in-submit') return null;
@@ -680,13 +649,13 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.onSubmit = function (data) {
-    var _props3 = _this3.props,
-        onSubmit = _props3.onSubmit,
-        countries = _props3.countries,
-        user = _props3.user;
-    var _state5 = _this3.state,
-        selectedMethod = _state5.selectedMethod,
-        swishNumber = _state5.swishNumber;
+    var _props2 = _this3.props,
+        onSubmit = _props2.onSubmit,
+        countries = _props2.countries,
+        user = _props2.user;
+    var _state4 = _this3.state,
+        selectedMethod = _state4.selectedMethod,
+        swishNumber = _state4.swishNumber;
 
 
     var submitData = _extends({}, _this3.state, data);
@@ -719,19 +688,12 @@ var _initialiseProps = function _initialiseProps() {
 
   this.onSelectMethod = function (_ref7) {
     var method = _ref7.method;
-    var _props4 = _this3.props,
-        currency = _props4.currency,
-        paymentStats = _props4.paymentStats,
-        remainingDepositLimit = _props4.remainingDepositLimit,
-        payments = _props4.payments,
-        shouldAutoFocus = _props4.shouldAutoFocus;
-
+    var _props3 = _this3.props,
+        currency = _props3.currency,
+        paymentStats = _props3.paymentStats,
+        remainingDepositLimit = _props3.remainingDepositLimit,
+        payments = _props3.payments;
 
-    if (shouldAutoFocus) {
-      setTimeout(function () {
-        _this3.amountInputRef && _this3.amountInputRef.focus();
-      }, 1);
-    }
 
     var selectedMethodDetail = payments.find(function (payment) {
       return (0, _Payment.matchProviderType)(payment, method);
@@ -789,9 +751,9 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.getMinDepositBonusAmount = function () {
-    var _props5 = _this3.props,
-        bonuses = _props5.bonuses,
-        currency = _props5.currency;
+    var _props4 = _this3.props,
+        bonuses = _props4.bonuses,
+        currency = _props4.currency;
     var bonusCode = _this3.state.bonusCode;
 
 
@@ -814,10 +776,10 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.getSpainRemainingDepositAmount = function () {
-    var _props6 = _this3.props,
-        jurisdiction = _props6.jurisdiction,
-        hasIdApproved = _props6.hasIdApproved,
-        paymentStats = _props6.paymentStats;
+    var _props5 = _this3.props,
+        jurisdiction = _props5.jurisdiction,
+        hasIdApproved = _props5.hasIdApproved,
+        paymentStats = _props5.paymentStats;
 
     return jurisdiction.toLowerCase() === 'es' && !hasIdApproved && (150 - parseFloat(paymentStats.TotalDeposit) < 0 ? 0 : 150 - parseFloat(paymentStats.TotalDeposit));
   };

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

@@ -29,10 +29,6 @@ var _PaymentResult = require('./PaymentResult');
 
 var _PaymentResult2 = _interopRequireDefault(_PaymentResult);
 
-var _NewTab = require('./NewTab');
-
-var _NewTab2 = _interopRequireDefault(_NewTab);
-
 var _flatten = require('lodash/flatten');
 
 var _flatten2 = _interopRequireDefault(_flatten);
@@ -114,8 +110,7 @@ var PaymentForm = function (_Component) {
     value: function render() {
       var _props = this.props,
           data = _props.data,
-          onClose = _props.onClose,
-          details = _props.details;
+          onClose = _props.onClose;
 
       if (!data.success) {
         return _react2.default.createElement(PaymentError, { data: data, onClose: onClose });
@@ -134,9 +129,7 @@ var PaymentForm = function (_Component) {
         frameBorder: 0
       };
 
-      if (details && details.newTab) {
-        return _react2.default.createElement(_NewTab2.default, { url: data.redirectOutput.url });
-      } else if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'POST' && data.redirectOutput.html == null) {
+      if (data.redirectOutput.container == 'iframe' && data.redirectOutput.method == 'POST' && data.redirectOutput.html == null) {
         return _react2.default.createElement(FormWithIframe, _extends({
           frameProps: frameProps,
           target: frameId

package/lib/widgets/CashierAccordion/Payment/PaymentAccountForms/astroPayBankTransaltions.js

@@ -38,6 +38,18 @@ exports.default = function (intl, category, type) {
           id: 'cashier.details.accountTypes.I',
           defaultMessage: 'International account'
         }, intl);
+      },
+      M: function M() {
+        return (0, _translate2.default)({
+          id: 'cashier.details.accountTypes.M',
+          defaultMessage: 'Master account'
+        }, intl);
+      },
+      V: function V() {
+        return (0, _translate2.default)({
+          id: 'cashier.details.accountTypes.V',
+          defaultMessage: 'Salary account'
+        }, intl);
       }
     },
     services: {