tg-core-components 5.4.5-bethard → 5.5.1-master

package/lib/widgets/ActivateWidget/index.js

@@ -10,10 +10,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compose = require('recompose/compose');
-
-var _compose2 = _interopRequireDefault(_compose);
-
 var _reactIntl = require('react-intl');
 
 var _Input = require('../../components/Input');
@@ -36,331 +32,93 @@ var _translate = require('../../lib/utils/translate');
 
 var _translate2 = _interopRequireDefault(_translate);
 
-var _classnames = require('classnames');
-
-var _classnames2 = _interopRequireDefault(_classnames);
-
-var _WithValidation = require('../../lib/WithValidation');
-
-var _WithValidation2 = _interopRequireDefault(_WithValidation);
-
-var _email = require('../../lib/WithValidation/rules/email');
-
-var _email2 = _interopRequireDefault(_email);
-
-var _required = require('../../lib/WithValidation/rules/required');
-
-var _required2 = _interopRequireDefault(_required);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
-var KEY_CODE = {
-  BACKSPACE: 'Backspace',
-  DELETE: 'Delete',
-  ARROW_LEFT: 'ArrowLeft',
-  ARROW_RIGHT: 'ArrowRight'
-};
-
-var ActivationCode = function ActivationCode(_ref) {
-  var _ref$length = _ref.length,
-      length = _ref$length === undefined ? 4 : _ref$length,
-      _ref$code = _ref.code,
-      code = _ref$code === undefined ? '' : _ref$code,
-      _ref$autoFocus = _ref.autoFocus,
-      autoFocus = _ref$autoFocus === undefined ? true : _ref$autoFocus,
-      onChange = _ref.onChange,
-      isLoading = _ref.isLoading,
-      name = _ref.name,
-      status = _ref.status,
-      statusText = _ref.statusText;
+var ActivateWidget = function ActivateWidget(_ref) {
+  var intl = _ref.intl,
+      defaultEmail = _ref.email,
+      defaultCode = _ref.code,
+      onSubmit = _ref.onSubmit,
+      onResend = _ref.onResend;
 
-  var boxes = new Array(length).fill('');
-
-  var _useState = (0, _react.useState)(-1),
+  var _useState = (0, _react.useState)(defaultCode),
       _useState2 = _slicedToArray(_useState, 2),
-      activeIndex = _useState2[0],
-      setActiveIndex = _useState2[1];
-
-  var inputRef = (0, _react.useRef)();
-
-  (0, _react.useEffect)(function () {
-    if (autoFocus && !code.length) {
-      inputRef.current.focus();
-      setActiveIndex(0);
-    }
-  }, [autoFocus, code]);
-
-  (0, _react.useEffect)(function () {
-    return inputRef.current.value = code;
-  }, [code]);
+      code = _useState2[0],
+      onCodeChange = _useState2[1];
 
-  var setCaretPosition = function setCaretPosition(from, to) {
-    inputRef.current.focus();
-    inputRef.current.setSelectionRange(from, to);
-  };
-
-  var handleKeyPress = function handleKeyPress(key, v) {
-    switch (key) {
-      case KEY_CODE.BACKSPACE || KEY_CODE.DELETE:
-        {
-          setActiveIndex(v.length);
-          setCaretPosition(v.length, v.length);
-          onChange(v);
-          break;
-        }
-
-      case KEY_CODE.ARROW_LEFT:
-        {
-          if (activeIndex === 0) return;
-          setActiveIndex(activeIndex - 1);
-          setCaretPosition(activeIndex - 1, activeIndex);
-          break;
-        }
-      case KEY_CODE.ARROW_RIGHT:
-        {
-          if (activeIndex === 3) return;
-          setActiveIndex(activeIndex + 1);
-          setCaretPosition(activeIndex + 1, activeIndex + 2);
-          break;
-        }
-
-      default:
-        {
-          setActiveIndex(v.length);
-          setCaretPosition(v.length, v.length + 1);
-          onChange(v);
-        }
-    }
-  };
-
-  var handleFocus = function handleFocus(i) {
-    setCaretPosition(i, i + 1);
-    setActiveIndex(i);
-  };
-
-  var handleBlur = function handleBlur() {
-    setActiveIndex(-1);
-  };
-
-  return _react2.default.createElement(
-    'div',
-    {
-      className: (0, _classnames2.default)('ActivationCode', {
-        'tg-input__status-failure': status === 'failure'
-      }) },
-    _react2.default.createElement(
-      'div',
-      { className: 'ActivationCode__wrapper' },
-      _react2.default.createElement(
-        'div',
-        { className: 'ActivationCode__label' },
-        _react2.default.createElement(_Translate2.default, {
-          id: 'label.activation_code',
-          defaultMessage: 'Activation code'
-        })
-      ),
-      _react2.default.createElement(
-        'div',
-        { className: 'ActivationCode__boxes' },
-        _react2.default.createElement('input', {
-          className: 'ActivationCode__input',
-          type: 'text',
-          autoComplete: 'one-time-code',
-          inputMode: 'decimal',
-          name: name,
-          ref: inputRef,
-          maxLength: length,
-          onKeyUp: function onKeyUp(_ref2) {
-            var key = _ref2.key,
-                target = _ref2.target;
-            return handleKeyPress(key, target.value);
-          },
-          onBlur: handleBlur
-        }),
-        boxes.map(function (_, i) {
-          return _react2.default.createElement(
-            'div',
-            {
-              className: (0, _classnames2.default)('ActivationCode__box', {
-                'ActivationCode__box--focused': !isLoading && i === activeIndex,
-                'ActivationCode__box--error': status === 'failure',
-                'ActivationCode__box--empty': i === activeIndex && !code[i]
-              }),
-              key: i,
-              onClick: function onClick() {
-                return handleFocus(i);
-              } },
-            code[i]
-          );
-        })
-      )
-    ),
-    _react2.default.createElement(
-      'div',
-      { className: 'tg-input__status-text' },
-      statusText
-    )
-  );
-};
-
-var ActivateWidget = function ActivateWidget(_ref3) {
-  var intl = _ref3.intl,
-      _ref3$email = _ref3.email,
-      pEmail = _ref3$email === undefined ? '' : _ref3$email,
-      _ref3$code = _ref3.code,
-      pCode = _ref3$code === undefined ? '' : _ref3$code,
-      onSubmit = _ref3.onSubmit,
-      onResend = _ref3.onResend,
-      errors = _ref3.errors;
-
-  var _useState3 = (0, _react.useState)(pCode),
+  var _useState3 = (0, _react.useState)(defaultEmail),
       _useState4 = _slicedToArray(_useState3, 2),
-      code = _useState4[0],
-      setCode = _useState4[1];
+      email = _useState4[0],
+      onEmailChange = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(pEmail),
+  var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),
-      email = _useState6[0],
-      setEmail = _useState6[1];
+      isLoading = _useState6[0],
+      setIsLoading = _useState6[1];
 
   var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      isLoading = _useState8[0],
-      setIsLoading = _useState8[1];
-
-  var pattern = new RegExp('^[0-9]{4}$');
-
-  (0, _react.useEffect)(function () {
-    if (email && pattern.test(code)) handleSubmit();
-  }, [code, email]);
-
-  var handleResend = function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              setIsLoading(true);
-              _context.prev = 1;
-              _context.next = 4;
-              return onResend(email);
-
-            case 4:
-              setIsLoading(false);
-              _context.next = 9;
-              break;
-
-            case 7:
-              _context.prev = 7;
-              _context.t0 = _context['catch'](1);
-
-            case 9:
-            case 'end':
-              return _context.stop();
-          }
-        }
-      }, _callee, undefined, [[1, 7]]);
-    }));
-
-    return function handleResend() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-
-  var handleSubmit = function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              setIsLoading(true);
-              _context2.prev = 1;
-              _context2.next = 4;
-              return onSubmit(email, code);
-
-            case 4:
-              setCode('');
-              setIsLoading(false);
-              _context2.next = 10;
-              break;
-
-            case 8:
-              _context2.prev = 8;
-              _context2.t0 = _context2['catch'](1);
-
-            case 10:
-            case 'end':
-              return _context2.stop();
-          }
-        }
-      }, _callee2, undefined, [[1, 8]]);
-    }));
+      isResetLoading = _useState8[0],
+      setIsResetLoading = _useState8[1];
+
+  var _onResend = function _onResend(e) {
+    e.preventDefault();
+    setIsResetLoading(true);
+    onResend({
+      Email: email,
+      callback: function callback() {
+        return setIsResetLoading(false);
+      }
+    });
+  };
 
-    return function handleSubmit() {
-      return _ref5.apply(this, arguments);
-    };
-  }();
+  var _onSubmit = function _onSubmit(e) {
+    e.preventDefault();
+    setIsLoading(true);
+    onSubmit({
+      Email: email,
+      Code: code,
+      callback: function callback() {
+        return setIsLoading(false);
+      }
+    });
+  };
 
   return _react2.default.createElement(
     'div',
     { className: 'ActivateWidget' },
     _react2.default.createElement(
-      'div',
-      { className: 'ActivateWidget__message' },
-      _react2.default.createElement(_Translate2.default, {
-        id: 'label.activation_code_received',
-        defaultMessage: 'An activation code has been sent to your email address and your phone number'
-      })
-    ),
-    _react2.default.createElement(
-      'div',
-      { className: 'form' },
-      !pEmail && _react2.default.createElement(_Input2.default, {
-        autoFocus: true,
-        label: (0, _translate2.default)({ id: 'label.email', defaultMessage: 'Email' }, intl),
-        value: email || '',
+      'form',
+      { onSubmit: _onSubmit },
+      _react2.default.createElement(_Input2.default, {
+        title: (0, _translate2.default)({ id: 'label.email' }, intl),
+        value: email,
         onChange: function onChange(e) {
-          return setEmail(e.target.value);
+          return onEmailChange(e.target.value);
         },
-        name: 'Email',
-        status: errors.Email ? 'failure' : 'idle',
-        statusText: errors.Email && (0, _translate2.default)({ id: errors.Email }, intl)
+        name: 'Email'
       }),
-      _react2.default.createElement(ActivationCode, {
-        onChange: setCode,
-        code: code,
-        autoFocus: Boolean(pEmail),
-        isLoading: isLoading,
-        name: 'ActivationCode',
-        status: errors.ActivationCode ? 'failure' : 'idle',
-        statusText: errors.ActivationCode && (0, _translate2.default)({ id: errors.ActivationCode }, intl)
+      _react2.default.createElement(_Input2.default, {
+        title: (0, _translate2.default)({ id: 'label.activation_code' }, intl),
+        value: code,
+        onChange: function onChange(e) {
+          return onCodeChange(e.target.value);
+        },
+        name: 'Code',
+        autoComplete: 'one-time-code'
       }),
       _react2.default.createElement(
         _Button2.default,
-        {
-          isLoading: isLoading,
-          className: 'button primary wide',
-          onClick: handleSubmit },
+        { isLoading: isLoading, className: 'button primary wide' },
         _react2.default.createElement(_Translate2.default, { id: 'action.activate', defaultMessage: 'Activate' })
       )
     ),
-    _react2.default.createElement('hr', { className: 'hr--1' }),
-    _react2.default.createElement(
-      'div',
-      { className: 'ActivateWidget__resend' },
-      _react2.default.createElement(_Translate2.default, {
-        id: 'action.send_new_code',
-        defaultMessage: 'Didn\'t get code?'
-      })
-    ),
     _react2.default.createElement(
       _Button2.default,
       {
-        isLoading: isLoading,
+        isLoading: isResetLoading,
         className: 'button tertiary wide',
-        onClick: handleResend },
+        onClick: _onResend },
       _react2.default.createElement(_Translate2.default, {
         id: 'action.resend_activation_code',
         defaultMessage: 'Resend activation code'
@@ -385,9 +143,4 @@ ActivateWidget.defaultProps = {
   onResend: Function
 };
 
-var rules = {
-  Email: [[_required2.default, 'error.empty.email'], [_email2.default, 'error.condition.email']],
-  ActivationCode: [[_required2.default, 'error.empty.activation_code']]
-};
-
-exports.default = (0, _compose2.default)((0, _WithValidation2.default)(rules), _reactIntl.injectIntl)(ActivateWidget);
+exports.default = (0, _reactIntl.injectIntl)(ActivateWidget);

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();
 };