From c33afc9b0cef2e9055248a48d0b6dc28e7fa5f26 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 22 Jan 2019 21:46:11 +0200 Subject: [PATCH] Expose which transitions lead to request --- src/ducks/user.duck.js | 4 ++-- src/util/transaction.js | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ducks/user.duck.js b/src/ducks/user.duck.js index be852606..c37ddebc 100644 --- a/src/ducks/user.duck.js +++ b/src/ducks/user.duck.js @@ -3,7 +3,7 @@ import isUndefined from 'lodash/isUndefined'; import config from '../config'; import { denormalisedResponseEntities, ensureOwnListing } from '../util/data'; import { storableError } from '../util/errors'; -import { TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY } from '../util/transaction'; +import { transitionsToRequested } from '../util/transaction'; import { LISTING_STATE_DRAFT } from '../util/types'; import * as log from '../util/log'; import { authInfo } from './Auth.duck'; @@ -316,7 +316,7 @@ export const fetchCurrentUserNotifications = () => (dispatch, getState, sdk) => const apiQueryParams = { only: 'sale', - last_transitions: [TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY], + last_transitions: transitionsToRequested, page: 1, per_page: NOTIFICATION_PAGE_SIZE, }; diff --git a/src/util/transaction.js b/src/util/transaction.js index b5aed189..ff28dafe 100644 --- a/src/util/transaction.js +++ b/src/util/transaction.js @@ -56,10 +56,8 @@ const txLastTransition = tx => ensureTransaction(tx).attributes.lastTransition; export const txIsEnquired = tx => txLastTransition(tx) === TRANSITION_ENQUIRE; -export const txIsRequested = tx => { - const transition = txLastTransition(tx); - return transition === TRANSITION_REQUEST || transition === TRANSITION_REQUEST_AFTER_ENQUIRY; -}; +export const transitionsToRequested = [TRANSITION_REQUEST, TRANSITION_REQUEST_AFTER_ENQUIRY]; +export const txIsRequested = tx => transitionsToRequested.includes(txLastTransition(tx)); export const txIsAccepted = tx => txLastTransition(tx) === TRANSITION_ACCEPT;