tg-core-components 5.2.1-history-time-label.0 → 5.3.0-master.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/es/components/AcceptUpdatedTaC/index.js +8 -3
  2. package/es/components/Checkbox/index.js +93 -0
  3. package/es/components/Deposit/CardInput/index.js +1 -3
  4. package/es/components/Input/index.js +222 -22
  5. package/es/components/InputWrapper/index.js +69 -0
  6. package/es/components/Notification.js +4 -4
  7. package/es/components/Select/index.js +202 -64
  8. package/es/components/Select/test.js +111 -0
  9. package/es/index.js +2 -1
  10. package/es/lib/utils/translate.js +1 -8
  11. package/es/widgets/AccountDetail/index.js +53 -77
  12. package/es/widgets/ActivateWidget/index.js +59 -293
  13. package/es/widgets/BonusWidget/BonusCode.js +24 -17
  14. package/es/widgets/BonusWidget/index.js +83 -45
  15. package/es/widgets/Cashier/Deposit/PaymentForm/NewTab.js +28 -0
  16. package/es/widgets/Cashier/Deposit/PaymentForm/index.js +6 -2
  17. package/es/widgets/CashierAccordion/Deposit/BonusCodeInput/index.js +9 -6
  18. package/es/widgets/CashierAccordion/Deposit/DepositWidget/index.js +19 -29
  19. package/es/widgets/CashierAccordion/Payment/PaymentAccountForms/index.js +163 -347
  20. package/es/widgets/CashierAccordion/Payment/PaymentAccountParser.js +0 -6
  21. package/es/widgets/CashierAccordion/Withdraw/WithdrawWidget/index.js +8 -22
  22. package/es/widgets/ChangePassword/index.js +53 -40
  23. package/es/widgets/HistoryWidget/index.js +69 -51
  24. package/es/widgets/HistoryWidget/message.js +17 -20
  25. package/es/widgets/RequestResetPassword/index.js +15 -14
  26. package/es/widgets/ResetPassword/index.js +22 -18
  27. package/es/widgets/ResponsibleGamingAccordion/LimitStatus/index.js +5 -2
  28. package/es/widgets/ResponsibleGamingAccordion/PeriodItemContent/index.js +1 -2
  29. package/es/widgets/ResponsibleGamingSingleSignUp/AmountItem/index.js +1 -2
  30. package/es/widgets/ResponsibleGamingWidget/Timespan.js +14 -24
  31. package/es/widgets/ResponsibleGamingWidget/helpers.js +2 -2
  32. package/es/widgets/ResponsibleGamingWidget/validate.js +1 -1
  33. package/es/widgets/Settings/index.js +2 -2
  34. package/es/widgets/SignIn/SignInForm.js +4 -6
  35. package/es/widgets/SignIn/index.js +21 -21
  36. package/es/widgets/SignUp/ContactInfoStep.js +5 -6
  37. package/es/widgets/SportsbookSettings/index.js +10 -24
  38. package/es/widgets/Subscriptions/index.js +3 -5
  39. package/lib/components/AcceptUpdatedTaC/index.js +11 -3
  40. package/lib/components/Checkbox/index.js +106 -0
  41. package/lib/components/Deposit/CardInput/index.js +1 -3
  42. package/lib/components/Input/index.js +223 -26
  43. package/lib/components/InputWrapper/index.js +85 -0
  44. package/lib/components/Notification.js +3 -3
  45. package/lib/components/Select/index.js +209 -63
  46. package/lib/components/Select/test.js +121 -0
  47. package/lib/index.js +9 -4
  48. package/lib/lib/utils/translate.js +1 -8
  49. package/lib/widgets/AccountDetail/index.js +53 -86
  50. package/lib/widgets/ActivateWidget/index.js +58 -305
  51. package/lib/widgets/BonusWidget/BonusCode.js +24 -20
  52. package/lib/widgets/BonusWidget/index.js +85 -44
  53. package/lib/widgets/Cashier/Deposit/PaymentForm/NewTab.js +44 -0
  54. package/lib/widgets/Cashier/Deposit/PaymentForm/index.js +9 -2
  55. package/lib/widgets/CashierAccordion/Deposit/BonusCodeInput/index.js +13 -7
  56. package/lib/widgets/CashierAccordion/Deposit/DepositWidget/index.js +22 -32
  57. package/lib/widgets/CashierAccordion/Payment/PaymentAccountForms/index.js +195 -378
  58. package/lib/widgets/CashierAccordion/Payment/PaymentAccountParser.js +0 -6
  59. package/lib/widgets/CashierAccordion/Withdraw/WithdrawWidget/index.js +10 -24
  60. package/lib/widgets/ChangePassword/index.js +53 -43
  61. package/lib/widgets/HistoryWidget/index.js +69 -51
  62. package/lib/widgets/HistoryWidget/message.js +17 -20
  63. package/lib/widgets/RequestResetPassword/index.js +15 -17
  64. package/lib/widgets/ResetPassword/index.js +25 -21
  65. package/lib/widgets/ResponsibleGamingAccordion/LimitStatus/index.js +5 -2
  66. package/lib/widgets/ResponsibleGamingAccordion/PeriodItemContent/index.js +1 -2
  67. package/lib/widgets/ResponsibleGamingSingleSignUp/AmountItem/index.js +1 -2
  68. package/lib/widgets/ResponsibleGamingWidget/Timespan.js +14 -24
  69. package/lib/widgets/ResponsibleGamingWidget/helpers.js +2 -2
  70. package/lib/widgets/ResponsibleGamingWidget/validate.js +1 -1
  71. package/lib/widgets/Settings/index.js +6 -6
  72. package/lib/widgets/SignIn/SignInForm.js +7 -6
  73. package/lib/widgets/SignIn/index.js +25 -25
  74. package/lib/widgets/SignUp/ContactInfoStep.js +8 -6
  75. package/lib/widgets/SportsbookSettings/index.js +10 -24
  76. package/lib/widgets/Subscriptions/index.js +3 -11
  77. package/package.json +8 -3
  78. package/es/components/Input/BirthdateInput.js +0 -171
  79. package/es/components/Input/Checkbox.js +0 -51
  80. package/es/components/Input/Input.js +0 -73
  81. package/es/components/Input/PasswordInput.js +0 -84
  82. package/es/components/Input/PhoneNumberInput.js +0 -110
  83. package/es/components/Input/input.test.js +0 -80
  84. package/es/components/Input/old-input.test.js +0 -100
  85. package/es/components/common.js +0 -339
  86. package/lib/components/Input/BirthdateInput.js +0 -192
  87. package/lib/components/Input/Checkbox.js +0 -65
  88. package/lib/components/Input/Input.js +0 -87
  89. package/lib/components/Input/PasswordInput.js +0 -101
  90. package/lib/components/Input/PhoneNumberInput.js +0 -127
  91. package/lib/components/Input/input.test.js +0 -89
  92. package/lib/components/Input/old-input.test.js +0 -107
  93. package/lib/components/common.js +0 -359
@@ -24,10 +24,6 @@ var _Input = require('../../components/Input');
24
24
 
25
25
  var _Input2 = _interopRequireDefault(_Input);
26
26
 
27
- var _Button = require('../../components/Button');
28
-
29
- var _Button2 = _interopRequireDefault(_Button);
30
-
31
27
  var _required = require('../../lib/WithValidation/rules/required');
32
28
 
33
29
  var _required2 = _interopRequireDefault(_required);
@@ -70,8 +66,7 @@ var RequestResetPassword = function (_Component) {
70
66
  errors = _props.errors,
71
67
  intl = _props.intl,
72
68
  onSubmit = _props.onSubmit,
73
- _onBlur = _props.onBlur,
74
- isLoading = _props.isLoading;
69
+ _onBlur = _props.onBlur;
75
70
 
76
71
 
77
72
  if (status == 'COMPLETE') {
@@ -82,22 +77,25 @@ var RequestResetPassword = function (_Component) {
82
77
  'form',
83
78
  { className: 'form', onSubmit: onSubmit },
84
79
  _react2.default.createElement(_Input2.default, {
85
- label: (0, _translate2.default)({ id: 'label.username_or_email' }, intl),
80
+ className: 'layout-item send-email-input',
81
+ title: (0, _translate2.default)({ id: 'label.username_or_email' }, intl),
86
82
  type: 'text',
87
83
  name: 'UsernameOrEmail',
88
- onBlur: function onBlur(e) {
89
- return _onBlur('UsernameOrEmail', e.target.value);
84
+ onBlur: function onBlur(value) {
85
+ return _onBlur('UsernameOrEmail', value);
90
86
  },
91
- status: errors.UsernameOrEmail && 'failure' || 'idle',
92
- statusText: errors.UsernameOrEmail && (0, _translate2.default)({ id: errors.UsernameOrEmail }, intl)
87
+ error: errors.UsernameOrEmail && (0, _translate2.default)({ id: errors.UsernameOrEmail }, intl)
93
88
  }),
94
89
  _react2.default.createElement(
95
- _Button2.default,
96
- {
97
- className: 'button primary wide',
98
- type: 'submit',
99
- isLoading: isLoading },
100
- (0, _translate2.default)({ id: 'label.request_reset_password' }, intl)
90
+ 'div',
91
+ { className: 'layout-item' },
92
+ _react2.default.createElement(
93
+ 'button',
94
+ {
95
+ className: 'button primary request-reset-password-button',
96
+ type: 'submit' },
97
+ (0, _translate2.default)({ id: 'label.request_reset_password' }, intl)
98
+ )
101
99
  )
102
100
  );
103
101
  }
@@ -24,10 +24,6 @@ var _Input = require('../../components/Input');
24
24
 
25
25
  var _Input2 = _interopRequireDefault(_Input);
26
26
 
27
- var _Button = require('../../components/Button');
28
-
29
- var _Button2 = _interopRequireDefault(_Button);
30
-
31
27
  var _required = require('../../lib/WithValidation/rules/required');
32
28
 
33
29
  var _required2 = _interopRequireDefault(_required);
@@ -44,6 +40,10 @@ var _translate = require('../../lib/utils/translate');
44
40
 
45
41
  var _translate2 = _interopRequireDefault(_translate);
46
42
 
43
+ var _index = require('../../components/Button/index');
44
+
45
+ var _index2 = _interopRequireDefault(_index);
46
+
47
47
  var _propTypes = require('prop-types');
48
48
 
49
49
  var _propTypes2 = _interopRequireDefault(_propTypes);
@@ -73,39 +73,43 @@ var ResetPassword = function (_Component) {
73
73
  intl = _props.intl,
74
74
  onSubmit = _props.onSubmit,
75
75
  _onBlur = _props.onBlur,
76
- isLoading = _props.isLoading;
76
+ disabled = _props.disabled;
77
77
 
78
78
 
79
79
  return _react2.default.createElement(
80
80
  'form',
81
81
  { className: 'form', onSubmit: onSubmit },
82
82
  _react2.default.createElement(_Input2.default, {
83
- label: (0, _translate2.default)({ id: 'label.new_password' }, intl),
83
+ className: 'layout-item',
84
+ placeholder: (0, _translate2.default)({ id: 'label.new_password' }, intl),
84
85
  type: 'password',
85
86
  name: 'NewPassword',
86
- onBlur: function onBlur(e) {
87
- return _onBlur('NewPassword', e.target.value);
87
+ onBlur: function onBlur(value) {
88
+ return _onBlur('NewPassword', value);
88
89
  },
89
- status: errors.NewPassword && 'failure' || 'idle',
90
- statusText: errors.NewPassword && (0, _translate2.default)({ id: errors.NewPassword }, intl)
90
+ error: errors.NewPassword && (0, _translate2.default)({ id: errors.NewPassword }, intl)
91
91
  }),
92
92
  _react2.default.createElement(_Input2.default, {
93
- label: (0, _translate2.default)({ id: 'label.confirm_password' }, intl),
93
+ className: 'layout-item',
94
+ placeholder: (0, _translate2.default)({ id: 'label.confirm_password' }, intl),
94
95
  type: 'password',
95
96
  name: 'confirm_password',
96
- onBlur: function onBlur(e) {
97
- return _onBlur('confirm_password', e.target.value);
97
+ onBlur: function onBlur(value) {
98
+ return _onBlur('confirm_password', value);
98
99
  },
99
- status: errors.confirm_password && 'failure' || 'idle',
100
- statusText: errors.confirm_password && (0, _translate2.default)({ id: errors.confirm_password }, intl)
100
+ error: errors.confirm_password && (0, _translate2.default)({ id: errors.confirm_password }, intl)
101
101
  }),
102
102
  _react2.default.createElement(
103
- _Button2.default,
104
- {
105
- className: 'button primary wide',
106
- type: 'submit',
107
- isLoading: isLoading },
108
- (0, _translate2.default)({ id: 'label.reset_password' }, intl)
103
+ 'div',
104
+ { className: 'layout-item' },
105
+ _react2.default.createElement(
106
+ _index2.default,
107
+ {
108
+ isLoading: disabled,
109
+ className: 'button primary reset-password-button',
110
+ type: 'submit' },
111
+ (0, _translate2.default)({ id: 'label.reset_password' }, intl)
112
+ )
109
113
  )
110
114
  );
111
115
  }
@@ -162,8 +162,11 @@ var TransactionLimit = function TransactionLimit(_ref3) {
162
162
  { className: 'transaction-limit-value' },
163
163
  _react2.default.createElement(
164
164
  'a',
165
- { href: '#', onClick: function onClick() {
166
- return handleCancel(id);
165
+ {
166
+ href: '#',
167
+ onClick: function onClick(e) {
168
+ e.preventDefault();
169
+ handleCancel(id);
167
170
  } },
168
171
  _react2.default.createElement(_Translate2.default, { id: 'action.delete.limit', defaultMessage: 'Delete' })
169
172
  )
@@ -90,8 +90,7 @@ var PeriodItemContent = function PeriodItemContent(_ref) {
90
90
  value: displayLimit ? displayLimit.Amount : null,
91
91
  name: 'Amount',
92
92
  disabled: confirmLimit || cooldownLimit || pendingLimit,
93
- status: errors.Amount && 'failure',
94
- statusText: errors.Amount && (0, _translate2.default)({ id: errors.Amount }, intl)
93
+ error: errors.Amount && (0, _translate2.default)({ id: errors.Amount }, intl)
95
94
  }),
96
95
  confirmLimit && _react2.default.createElement(
97
96
  'div',
@@ -77,8 +77,7 @@ var AmountItem = function (_Component) {
77
77
  },
78
78
  name: timespan,
79
79
  value: value,
80
- status: !!error && 'failure',
81
- statusText: error,
80
+ error: error,
82
81
  currency: currency,
83
82
  type: 'number',
84
83
  inputMode: 'numeric',
@@ -282,10 +282,8 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
282
282
  setValue = _useState2[1];
283
283
 
284
284
  (0, _react.useEffect)(function () {
285
- if (newLimit && newLimit.Amount) {
286
- setValue(newLimit.Amount);
287
- }
288
- }, [newLimit]);
285
+ return setValue(newLimit ? newLimit.Amount : currentLimit ? currentLimit.Amount : 0);
286
+ }, [newLimit, currentLimit]);
289
287
 
290
288
  var _useState3 = (0, _react.useState)('select'),
291
289
  _useState4 = _slicedToArray(_useState3, 2),
@@ -336,7 +334,9 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
336
334
  }).sort();
337
335
  }
338
336
 
339
- var closeCustomAmount = function closeCustomAmount() {
337
+ var closeCustomAmount = function closeCustomAmount(e) {
338
+ e.preventDefault();
339
+ e.stopPropagation();
340
340
  _onChange(currentLimit ? currentLimit.Amount : 0);
341
341
  setInputMode('select');
342
342
  };
@@ -354,24 +354,15 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
354
354
  _react.Fragment,
355
355
  null,
356
356
  _react2.default.createElement(
357
- 'div',
357
+ 'form',
358
358
  { className: 'ResponsibleGamingWidget__timespan-limit-selector' },
359
- inputMode === 'select' && _react2.default.createElement(
360
- _Select2.default,
361
- {
362
- options: options,
363
- value: value,
364
- onChange: function onChange(e, value) {
365
- return _onChange(value);
366
- } },
367
- options.map(function (o) {
368
- return _react2.default.createElement(
369
- _Select2.default.Option,
370
- { value: o.value },
371
- o.label
372
- );
373
- })
374
- ),
359
+ inputMode === 'select' && _react2.default.createElement(_Select2.default, {
360
+ options: options,
361
+ value: value,
362
+ onChange: function onChange(e, name, value) {
363
+ return _onChange(value);
364
+ }
365
+ }),
375
366
  inputMode === 'input' && _react2.default.createElement(
376
367
  _react.Fragment,
377
368
  null,
@@ -379,7 +370,7 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
379
370
  type: 'number',
380
371
  pattern: '\\d*',
381
372
  value: value,
382
- onChange: function onChange(e, value) {
373
+ onChange: function onChange(e, name, value) {
383
374
  setValue(parseInt(value));
384
375
  if (value > 0) _onChange(value);
385
376
  },
@@ -390,7 +381,6 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
390
381
  _react2.default.createElement(
391
382
  _Button2.default,
392
383
  {
393
- type: 'button',
394
384
  onClick: closeCustomAmount,
395
385
  className: 'button mini tertiary' },
396
386
  _react2.default.createElement(_Icon2.default, { icon: 'times' })
@@ -17,8 +17,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
17
17
  * Helper function to get values using currency and timespan
18
18
  */
19
19
  var getValues = exports.getValues = function getValues(values, currency, timespan) {
20
- values = (0, _get2.default)(values, '[' + (currency || '').toUpperCase() + ']') || values;
21
- return (Array.isArray(values) ? values : []).filter(function (v) {
20
+ values = (0, _get2.default)(values, '[' + (currency || '').toUpperCase() + ']') || values || [];
21
+ return values.filter(function (v) {
22
22
  return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' && v.timespan === timespan || typeof v === 'number';
23
23
  }).map(function (v) {
24
24
  return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' ? v.amount : v;
@@ -58,7 +58,7 @@ var validate = function validate(_ref) {
58
58
  var sga = (_sga = {}, _defineProperty(_sga, 'insufficient-limit-count', type === 'Deposit' && limitCount < 3), _defineProperty(_sga, 'limit-remove-blocked', type === 'Deposit'), _sga);
59
59
  var uk = {};
60
60
  var dga = (_dga = {}, _defineProperty(_dga, 'insufficient-limit-count', type === 'Deposit' && limitCount < 1), _defineProperty(_dga, 'limit-remove-blocked', type === 'Deposit' && limitCount <= 1), _dga);
61
- var es = (_es = {}, _defineProperty(_es, 'insufficient-limit-count', type === 'Deposit' && limitCount < 3), _defineProperty(_es, 'limit-remove-blocked', type === 'Deposit'), _defineProperty(_es, 'limit-increase-blocked', type === 'Deposit' && limitIncreaseInfo.HasDepositLimitIncreaseBlock), _defineProperty(_es, 'support-pending', type === 'Deposit' && limitIncreaseInfo.HasValidPgsiScore && limitIncreaseInfo.RequiresSupportApproval), _defineProperty(_es, 'requires-self-test', isIncreasingLimit && type === 'Deposit' && !limitIncreaseInfo.HasDepositLimitIncreaseBlock), _defineProperty(_es, 'self-test-fail-cooldown', type === 'Deposit' && !limitIncreaseInfo.HasValidPgsiScore && limitIncreaseInfo.HasDepositLimitIncreaseBlock), _es);
61
+ var es = (_es = {}, _defineProperty(_es, 'insufficient-limit-count', type === 'Deposit' && limitCount < 3), _defineProperty(_es, 'limit-remove-blocked', type === 'Deposit'), _defineProperty(_es, 'limit-increase-blocked', type === 'Deposit' && limitIncreaseInfo.HasDepositLimitIncreaseBlock), _defineProperty(_es, 'support-pending', type === 'Deposit' && limitIncreaseInfo.HasValidPgsiScore && limitIncreaseInfo.RequiresSupportApproval), _defineProperty(_es, 'requires-self-test', isIncreasingLimit && type === 'Deposit' && !limitIncreaseInfo.HasValidPgsiScore && !limitIncreaseInfo.HasDepositLimitIncreaseBlock), _defineProperty(_es, 'self-test-fail-cooldown', type === 'Deposit' && !limitIncreaseInfo.HasValidPgsiScore && limitIncreaseInfo.HasDepositLimitIncreaseBlock), _es);
62
62
 
63
63
  switch (jurisdiction) {
64
64
  case 'mga':
@@ -14,6 +14,10 @@ var _propTypes = require('prop-types');
14
14
 
15
15
  var _propTypes2 = _interopRequireDefault(_propTypes);
16
16
 
17
+ var _Checkbox = require('../../components/Checkbox');
18
+
19
+ var _Checkbox2 = _interopRequireDefault(_Checkbox);
20
+
17
21
  var _Select = require('../../components/Select');
18
22
 
19
23
  var _Select2 = _interopRequireDefault(_Select);
@@ -22,10 +26,6 @@ var _Input = require('../../components/Input');
22
26
 
23
27
  var _Input2 = _interopRequireDefault(_Input);
24
28
 
25
- var _Button = require('../../components/Button');
26
-
27
- var _Button2 = _interopRequireDefault(_Button);
28
-
29
29
  var _Translate = require('../../components/Translate');
30
30
 
31
31
  var _Translate2 = _interopRequireDefault(_Translate);
@@ -40,7 +40,7 @@ var Settings = function Settings(_ref) {
40
40
  onSave = _ref.onSave;
41
41
 
42
42
  var types = {
43
- checkbox: Checkbox,
43
+ checkbox: _Checkbox2.default,
44
44
  select: _Select2.default,
45
45
  input: _Input2.default
46
46
  };
@@ -57,7 +57,7 @@ var Settings = function Settings(_ref) {
57
57
  return Component && _react2.default.createElement(Component, _extends({ key: key }, props, { onChange: onChange }));
58
58
  }),
59
59
  _react2.default.createElement(
60
- _Button2.default,
60
+ 'button',
61
61
  { onClick: onSave, className: 'button primary' },
62
62
  _react2.default.createElement(_Translate2.default, { id: 'action.save', defaultMessage: 'Save' })
63
63
  )
@@ -18,6 +18,10 @@ var _Input = require('../../components/Input');
18
18
 
19
19
  var _Input2 = _interopRequireDefault(_Input);
20
20
 
21
+ var _Checkbox = require('../../components/Checkbox');
22
+
23
+ var _Checkbox2 = _interopRequireDefault(_Checkbox);
24
+
21
25
  var _ButtonLoader = require('../../components/ButtonLoader');
22
26
 
23
27
  var _ButtonLoader2 = _interopRequireDefault(_ButtonLoader);
@@ -61,8 +65,7 @@ var SignIn = function SignIn(_ref) {
61
65
  return _onBlur('username', value);
62
66
  },
63
67
  title: (0, _translate2.default)({ id: 'label.username' }, intl),
64
- status: errors.username && 'failure' || 'idle',
65
- statusText: errors.username && (0, _translate2.default)({ id: errors.username }, intl),
68
+ error: errors.username && (0, _translate2.default)({ id: errors.username }, intl),
66
69
  autoFocus: shouldAutoFocus && !email
67
70
  }),
68
71
  _react2.default.createElement(_Input2.default, {
@@ -74,13 +77,11 @@ var SignIn = function SignIn(_ref) {
74
77
  return _onBlur('password', value);
75
78
  },
76
79
  title: (0, _translate2.default)({ id: 'label.password' }, intl),
77
- status: errors.password && 'failure' || 'idle',
78
- statusText: errors.password && (0, _translate2.default)({ id: errors.password }, intl),
80
+ error: errors.password && (0, _translate2.default)({ id: errors.password }, intl),
79
81
  autoFocus: shouldAutoFocus && email
80
82
  }),
81
- _react2.default.createElement(_Input2.default, {
83
+ _react2.default.createElement(_Checkbox2.default, {
82
84
  className: 'layout-item-full-width remember-email-checkbox',
83
- type: 'checkbox',
84
85
  label: (0, _translate2.default)({
85
86
  id: 'label.remember-email',
86
87
  defaultMessage: 'Remember email'
@@ -18,9 +18,13 @@ var _Input = require('../../components/Input');
18
18
 
19
19
  var _Input2 = _interopRequireDefault(_Input);
20
20
 
21
- var _Button = require('../../components/Button');
21
+ var _Checkbox = require('../../components/Checkbox');
22
22
 
23
- var _Button2 = _interopRequireDefault(_Button);
23
+ var _Checkbox2 = _interopRequireDefault(_Checkbox);
24
+
25
+ var _ButtonLoader = require('../../components/ButtonLoader');
26
+
27
+ var _ButtonLoader2 = _interopRequireDefault(_ButtonLoader);
24
28
 
25
29
  var _WithValidation = require('../../lib/WithValidation');
26
30
 
@@ -34,10 +38,6 @@ var _translate = require('../../lib/utils/translate');
34
38
 
35
39
  var _translate2 = _interopRequireDefault(_translate);
36
40
 
37
- var _Icon = require('../../components/Icon');
38
-
39
- var _Icon2 = _interopRequireDefault(_Icon);
40
-
41
41
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
42
42
 
43
43
  var SignIn = function SignIn(_ref) {
@@ -61,44 +61,44 @@ var SignIn = function SignIn(_ref) {
61
61
  name: 'username',
62
62
  value: email,
63
63
  onChange: handleChangeEmail,
64
- onBlur: function onBlur() {
65
- return _onBlur('username', email);
64
+ onBlur: function onBlur(value) {
65
+ return _onBlur('username', value);
66
66
  },
67
- label: (0, _translate2.default)({ id: 'label.username_or_email' }, intl),
67
+ title: (0, _translate2.default)({ id: 'label.username_or_email' }, intl),
68
+ error: errors.username && (0, _translate2.default)({ id: errors.username }, intl),
68
69
  autoFocus: shouldAutoFocus && !email,
69
- autoComplete: 'username',
70
- icon: _react2.default.createElement(_Icon2.default, { icon: 'envelope' }),
71
- status: errors.username && 'failure',
72
- statusText: errors.username && (0, _translate2.default)({ id: errors.username }, intl)
70
+ autoComplete: 'username'
73
71
  }),
74
72
  _react2.default.createElement(_Input2.default, {
75
73
  className: 'layout-item-full-width',
76
74
  type: 'password',
77
75
  name: 'password',
78
- label: (0, _translate2.default)({ id: 'label.password' }, intl),
76
+ showToggleIcon: true,
77
+ onBlur: function onBlur(value) {
78
+ return _onBlur('password', value);
79
+ },
80
+ title: (0, _translate2.default)({ id: 'label.password' }, intl),
81
+ error: errors.password && (0, _translate2.default)({ id: errors.password }, intl),
79
82
  autoFocus: shouldAutoFocus && email,
80
- autoComplete: 'current-password',
81
- icon: _react2.default.createElement(_Icon2.default, { icon: 'lock' }),
82
- status: errors.password && 'failure',
83
- statusText: errors.password && (0, _translate2.default)({ id: errors.password }, intl)
83
+ autoComplete: 'current-password'
84
84
  }),
85
- _react2.default.createElement(_Input2.default, {
85
+ _react2.default.createElement(_Checkbox2.default, {
86
86
  className: 'layout-item-full-width remember-email-checkbox',
87
- type: 'checkbox',
88
- label: (0, _translate2.default)({
87
+ title: (0, _translate2.default)({
89
88
  id: 'label.remember-email',
90
89
  defaultMessage: 'Remember email'
91
90
  }, intl),
92
- value: shouldRememberEmail,
91
+ checked: shouldRememberEmail,
93
92
  onChange: handleToggleRememberEmail,
94
93
  name: 'remember-email'
95
94
  }),
96
95
  _react2.default.createElement(
97
- _Button2.default,
96
+ 'button',
98
97
  {
99
- className: 'button primary wide',
98
+ className: 'button primary wide ' + (isLoading && 'loading'),
100
99
  type: 'submit',
101
- isLoading: !!isLoading },
100
+ disabled: !!isLoading },
101
+ isLoading && _react2.default.createElement(_ButtonLoader2.default, null),
102
102
  (0, _translate2.default)({ id: 'action.button.login' }, intl)
103
103
  )
104
104
  );
@@ -26,6 +26,10 @@ var _Select = require('../../components/Select');
26
26
 
27
27
  var _Select2 = _interopRequireDefault(_Select);
28
28
 
29
+ var _Checkbox = require('../../components/Checkbox');
30
+
31
+ var _Checkbox2 = _interopRequireDefault(_Checkbox);
32
+
29
33
  var _WithValidation = require('../../lib/WithValidation');
30
34
 
31
35
  var _WithValidation2 = _interopRequireDefault(_WithValidation);
@@ -306,18 +310,16 @@ var ContactInfo = function (_Component) {
306
310
  },
307
311
  defaultValue: 'Male'
308
312
  }),
309
- _react2.default.createElement(_Input2.default, {
310
- type: 'checkbox',
311
- label: intl.formatMessage({ id: 'label.terms-of-conditions' }),
313
+ _react2.default.createElement(_Checkbox2.default, {
314
+ title: intl.formatMessage({ id: 'label.terms-of-conditions' }),
312
315
  name: 'AcceptTerms',
313
316
  onChange: function onChange(e, name, val) {
314
317
  return _onChange(name, val);
315
318
  },
316
319
  error: errors.AcceptTerms && (0, _translate2.default)({ id: errors.AcceptTerms }, intl)
317
320
  }),
318
- _react2.default.createElement(_Input2.default, {
319
- type: 'checkbox',
320
- label: intl.formatMessage({
321
+ _react2.default.createElement(_Checkbox2.default, {
322
+ title: intl.formatMessage({
321
323
  id: 'label.optin.marketing',
322
324
  defaultMessage: 'I want to receive marketing material'
323
325
  }),