From f68cf153af31476ddd65fcaab3efba9bfe558c8f Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 17 Oct 2017 19:46:26 +0300 Subject: [PATCH] SalePage and panel uses storableError func and correct proptype validation. --- src/components/SaleDetailsPanel/SaleDetailsPanel.js | 6 +++--- src/containers/SalePage/SalePage.duck.js | 7 ++++--- src/containers/SalePage/SalePage.js | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/SaleDetailsPanel/SaleDetailsPanel.js b/src/components/SaleDetailsPanel/SaleDetailsPanel.js index 968c6096..6ff28774 100644 --- a/src/components/SaleDetailsPanel/SaleDetailsPanel.js +++ b/src/components/SaleDetailsPanel/SaleDetailsPanel.js @@ -267,7 +267,7 @@ SaleDetailsPanelComponent.defaultProps = { declineSaleError: null, }; -const { string, func, bool, instanceOf } = PropTypes; +const { bool, func, string } = PropTypes; SaleDetailsPanelComponent.propTypes = { rootClassName: string, @@ -277,8 +277,8 @@ SaleDetailsPanelComponent.propTypes = { onDeclineSale: func.isRequired, acceptInProgress: bool.isRequired, declineInProgress: bool.isRequired, - acceptSaleError: instanceOf(Error), - declineSaleError: instanceOf(Error), + acceptSaleError: propTypes.error, + declineSaleError: propTypes.error, // from injectIntl intl: intlShape.isRequired, diff --git a/src/containers/SalePage/SalePage.duck.js b/src/containers/SalePage/SalePage.duck.js index 09d1c28a..5283b157 100644 --- a/src/containers/SalePage/SalePage.duck.js +++ b/src/containers/SalePage/SalePage.duck.js @@ -1,4 +1,5 @@ import { types } from '../../util/sdkLoader'; +import { storableError } from '../../util/errors'; import * as propTypes from '../../util/propTypes'; import * as log from '../../util/log'; import { addMarketplaceEntities } from '../../ducks/marketplaceData.duck'; @@ -122,7 +123,7 @@ export const fetchSale = id => (dispatch, getState, sdk) => { return response; }) .catch(e => { - dispatch(fetchSaleError(e)); + dispatch(fetchSaleError(storableError(e))); throw e; }); }; @@ -142,7 +143,7 @@ export const acceptSale = id => (dispatch, getState, sdk) => { return response; }) .catch(e => { - dispatch(acceptSaleError(e)); + dispatch(acceptSaleError(storableError(e))); log.error(e, 'accept-sale-failed', { txId: id, transition: propTypes.TX_TRANSITION_ACCEPT, @@ -166,7 +167,7 @@ export const declineSale = id => (dispatch, getState, sdk) => { return response; }) .catch(e => { - dispatch(declineSaleError(e)); + dispatch(declineSaleError(storableError(e))); log.error(e, 'redect-sale-failed', { txId: id, transition: propTypes.TX_TRANSITION_DECLINE, diff --git a/src/containers/SalePage/SalePage.js b/src/containers/SalePage/SalePage.js index 250d8f46..66cc6916 100644 --- a/src/containers/SalePage/SalePage.js +++ b/src/containers/SalePage/SalePage.js @@ -103,18 +103,18 @@ SalePageComponent.defaultProps = { transaction: null, }; -const { bool, func, instanceOf, oneOf, shape, string } = PropTypes; +const { bool, func, oneOf, shape, string } = PropTypes; SalePageComponent.propTypes = { - authInfoError: instanceOf(Error), + authInfoError: propTypes.error, currentUser: propTypes.currentUser, - fetchSaleError: instanceOf(Error), - acceptSaleError: instanceOf(Error), - declineSaleError: instanceOf(Error), + fetchSaleError: propTypes.error, + acceptSaleError: propTypes.error, + declineSaleError: propTypes.error, acceptInProgress: bool.isRequired, declineInProgress: bool.isRequired, intl: intlShape.isRequired, - logoutError: instanceOf(Error), + logoutError: propTypes.error, onAcceptSale: func.isRequired, onDeclineSale: func.isRequired, params: shape({ id: string }).isRequired,