maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-28 03:43:28 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use tx state helpers in Inbox

Browse source
This commit is contained in:
Kimmo Puputti 2017-09-29 15:10:19 +03:00
parent 449d47b199
commit df9bd83e80
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/containers/InboxPage/InboxPage.js
View file

@ -39,8 +39,7 @@ const formatDate = (intl, date) => {
// Translated name of the state of the given transaction
const txState = (intl, tx, isOrder) => {
const { attributes: { lastTransition } } = tx;
if (lastTransition === propTypes.TX_TRANSITION_ACCEPT) {
if (propTypes.txIsAccepted(tx)) {
return {
nameClassName: css.nameAccepted,
bookingClassName: css.bookingAccepted,
@ -50,7 +49,7 @@ const txState = (intl, tx, isOrder) => {
id: 'InboxPage.stateAccepted',
}),
};
} else if (lastTransition === propTypes.TX_TRANSITION_REJECT) {
} else if (propTypes.txIsRejectedOrAutorejected(tx)) {
return {
nameClassName: css.nameDeclined,
bookingClassName: css.bookingDeclined,
@ -60,7 +59,7 @@ const txState = (intl, tx, isOrder) => {
id: 'InboxPage.stateDeclined',
}),
};
} else if (lastTransition === propTypes.TX_TRANSITION_MARK_DELIVERED) {
} else if (propTypes.txIsDelivered(tx)) {
return {
nameClassName: css.nameDelivered,
bookingClassName: css.bookingDelivered,
@ -101,8 +100,7 @@ export const InboxItem = props => {
const otherUserDisplayName = userDisplayName(otherUser, bannedUserDisplayName);
const stateData = txState(intl, tx, isOrder);
const isPreauthorized = tx.attributes.lastTransition === propTypes.TX_TRANSITION_PREAUTHORIZE;
const isSaleNotification = !isOrder && isPreauthorized;
const isSaleNotification = !isOrder && propTypes.txIsPreauthorized(tx);
const rowNotificationDot = isSaleNotification ? <div className={css.notificationDot} /> : null;
const lastTransitionedAt = formatDate(intl, tx.attributes.lastTransitionedAt);
const bookingStart = formatDate(intl, booking.attributes.start);