diff --git a/src/components/ActivityFeed/ActivityFeed.example.js b/src/components/ActivityFeed/ActivityFeed.example.js index f216b34d..81679255 100644 --- a/src/components/ActivityFeed/ActivityFeed.example.js +++ b/src/components/ActivityFeed/ActivityFeed.example.js @@ -16,10 +16,10 @@ import { TRANSITION_REQUEST, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, } from '../../util/types'; import ActivityFeed from './ActivityFeed'; @@ -115,7 +115,7 @@ export const WithMessagesTransitionsAndReviews = { customer: createUser('user1'), provider: createUser('user2'), listing: createListing('Listing'), - lastTransition: TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + lastTransition: TRANSITION_REVIEW_2_BY_CUSTOMER, transitions: [ createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 8, 10)), @@ -145,7 +145,7 @@ export const WithMessagesTransitionsAndReviews = { createTxTransition({ at: new Date(Date.UTC(2017, 10, 9, 12, 34)), by: TX_TRANSITION_ACTOR_CUSTOMER, - transition: TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, + transition: TRANSITION_REVIEW_2_BY_CUSTOMER, }), ], reviews: [ diff --git a/src/components/ActivityFeed/ActivityFeed.js b/src/components/ActivityFeed/ActivityFeed.js index 035f046e..18af5eae 100644 --- a/src/components/ActivityFeed/ActivityFeed.js +++ b/src/components/ActivityFeed/ActivityFeed.js @@ -16,10 +16,10 @@ import { TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, areReviewsCompleted, propTypes, } from '../../util/types'; @@ -96,8 +96,8 @@ const shouldRenderTransition = transition => { TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; @@ -107,8 +107,8 @@ const isReviewTransition = transition => { return [ TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); }; @@ -198,7 +198,7 @@ const resolveTransitionMessage = ( ); } case TRANSITION_REVIEW_2_BY_PROVIDER: - case TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND: + case TRANSITION_REVIEW_2_BY_CUSTOMER: if (isOwnTransition) { return ; } else { @@ -266,7 +266,7 @@ const Transition = props => { if (isReviewTransition(currentTransition) && areReviewsCompleted(lastTransition)) { const customerReview = currentTransition === TRANSITION_REVIEW_1_BY_CUSTOMER || - currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND; + currentTransition === TRANSITION_REVIEW_2_BY_CUSTOMER; const providerReview = currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER || currentTransition === TRANSITION_REVIEW_2_BY_PROVIDER; diff --git a/src/containers/TransactionPage/TransactionPage.duck.js b/src/containers/TransactionPage/TransactionPage.duck.js index 755f0e87..069bb552 100644 --- a/src/containers/TransactionPage/TransactionPage.duck.js +++ b/src/containers/TransactionPage/TransactionPage.duck.js @@ -6,8 +6,8 @@ import { TRANSITION_DECLINE, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, } from '../../util/types'; import * as log from '../../util/log'; import { updatedEntities, denormalisedEntities } from '../../util/data'; @@ -377,7 +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 : TRANSITION_REVIEW_2_BY_PROVIDER; + role === CUSTOMER ? TRANSITION_REVIEW_2_BY_CUSTOMER : TRANSITION_REVIEW_2_BY_PROVIDER; const include = REVIEW_TX_INCLUDES; diff --git a/src/util/types.js b/src/util/types.js index 4f2b45ff..70526487 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -189,7 +189,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered'; export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first'; -export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; +export const TRANSITION_REVIEW_2_BY_CUSTOMER = 'transition/review-by-customer-second'; export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; export const TRANSITION_EXPIRE_REVIEW_PERIOD = 'transition/auto-complete-without-reviews'; @@ -206,10 +206,10 @@ export const TX_TRANSITIONS = [ TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ]; // Roles of actors that perform transaction transitions @@ -264,10 +264,10 @@ const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVI export const areReviewsCompleted = transition => { return [ TRANSITION_EXPIRE_REVIEW_PERIOD, + TRANSITION_REVIEW_2_BY_CUSTOMER, TRANSITION_REVIEW_2_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, - TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, ].includes(transition); };