diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js
index e74a962e..b160430c 100644
--- a/src/components/ActivityFeed/ActivityFeed.example.js
+++ b/src/components/ActivityFeed/ActivityFeed.example.js
@@ -15,11 +15,11 @@ import {
TRANSITION_EXPIRE_REVIEW_PERIOD,
TRANSITION_REQUEST,
TRANSITION_REVIEW_1_BY_PROVIDER,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_ACTOR_CUSTOMER,
TX_TRANSITION_ACTOR_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
} from '../../util/types';
import ActivityFeed from './ActivityFeed';
@@ -211,7 +211,7 @@ export const WithAReviewFromBothUsers = {
{ author: createUser('user2'), subject: createUser('user1') }
),
],
- lastTransition: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
+ lastTransition: TRANSITION_REVIEW_2_BY_PROVIDER,
transitions: [
createTxTransition({
at: new Date(Date.UTC(2017, 10, 9, 8, 10)),
@@ -221,7 +221,7 @@ export const WithAReviewFromBothUsers = {
createTxTransition({
at: new Date(Date.UTC(2017, 10, 10, 8, 10)),
by: TX_TRANSITION_ACTOR_PROVIDER,
- transition: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
+ transition: TRANSITION_REVIEW_2_BY_PROVIDER,
}),
],
}),
diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js
index 17abc87b..9db51f1f 100644
--- a/src/components/ActivityFeed/ActivityFeed.js
+++ b/src/components/ActivityFeed/ActivityFeed.js
@@ -15,11 +15,11 @@ import {
TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_PROVIDER,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_ACTOR_CUSTOMER,
TX_TRANSITION_ACTOR_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
areReviewsCompleted,
propTypes,
} from '../../util/types';
@@ -95,9 +95,9 @@ const shouldRenderTransition = transition => {
TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_PROVIDER,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
].includes(transition);
};
@@ -106,9 +106,9 @@ const shouldRenderTransition = transition => {
const isReviewTransition = transition => {
return [
TRANSITION_REVIEW_1_BY_PROVIDER,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
].includes(transition);
};
@@ -197,7 +197,7 @@ const resolveTransitionMessage = (
/>
);
}
- case TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND:
+ case TRANSITION_REVIEW_2_BY_PROVIDER:
case TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND:
if (isOwnTransition) {
return ;
@@ -269,7 +269,7 @@ const Transition = props => {
currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND;
const providerReview =
currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER ||
- currentTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND;
+ currentTransition === TRANSITION_REVIEW_2_BY_PROVIDER;
if (customerReview) {
const review = reviewByAuthorId(currentTransaction, customer.id);
reviewComponent = (
diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js
index e4d30cef..7632c79c 100644
--- a/src/containers/TransactionPage/TransactionPage.duck.js
+++ b/src/containers/TransactionPage/TransactionPage.duck.js
@@ -5,9 +5,9 @@ import {
TRANSITION_ACCEPT,
TRANSITION_DECLINE,
TRANSITION_REVIEW_1_BY_PROVIDER,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
} from '../../util/types';
import * as log from '../../util/log';
import { updatedEntities, denormalisedEntities } from '../../util/data';
@@ -377,9 +377,7 @@ const REVIEW_TX_INCLUDES = ['reviews', 'reviews.author', 'reviews.subject'];
// TX_TRANSITION_REVIEW_BY__SECOND
const sendReviewAsSecond = (id, params, role, dispatch, sdk) => {
const transition =
- role === CUSTOMER
- ? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND
- : TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND;
+ role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND : TRANSITION_REVIEW_2_BY_PROVIDER;
const include = REVIEW_TX_INCLUDES;
diff --git a/src/util/types.js b/src/util/types.js
index 281dfeba..6f95622c 100644
--- a/src/util/types.js
+++ b/src/util/types.js
@@ -187,7 +187,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered';
// Reviews are given through transaction transitions.
// Either party (provider or customer) can be the first to give a review.
export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first';
-export const TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND = 'transition/review-by-provider-second';
+export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second';
export const TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST = 'transition/review-by-customer-first';
export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second';
export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer';
@@ -205,11 +205,11 @@ export const TX_TRANSITIONS = [
TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_PROVIDER,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER,
TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
];
// Roles of actors that perform transaction transitions
@@ -267,10 +267,10 @@ const firstReviewTransitions = [
export const areReviewsCompleted = transition => {
return [
TRANSITION_EXPIRE_REVIEW_PERIOD,
+ TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER,
TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
- TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
].includes(transition);
};