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

Fix bug in review link

Browse source
This commit is contained in:
Jenni Nurmi 2019-05-31 11:07:38 +03:00
parent 9262d5c617
commit 0e1d39cb86
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/components/ActivityFeed/ActivityFeed.js
View file

@ -25,6 +25,7 @@ import {
isCustomerReview,
isProviderReview,
txRoleIsProvider,
txRoleIsCustomer,
getUserTxRole,
isRelevantPastTransition,
} from '../../util/transaction';
@ -94,10 +95,10 @@ Review.propTypes = {
};
const hasUserLeftAReviewFirst = (userRole, transaction) => {
const isProvider = txRoleIsProvider(userRole);
return isProvider
? txIsInFirstReviewBy(transaction, isProvider)
: txIsInFirstReviewBy(transaction, !isProvider);
// Because function txIsInFirstReviewBy uses isCustomer to check in which state the reviews are
// we should also use isCustomer insted of isProvider
const isCustomer = txRoleIsCustomer(userRole);
return txIsInFirstReviewBy(transaction, isCustomer);
};
const resolveTransitionMessage = (
@ -145,20 +146,21 @@ const resolveTransitionMessage = (
case TRANSITION_CANCEL:
return <FormattedMessage id="ActivityFeed.transitionCancel" />;
case TRANSITION_COMPLETE:
// Show the leave a review link if the state is delivered or
// if current user is not the first to leave a review
// Show the leave a review link if the state is delivered and if the current user is the first to leave a review
const reviewPeriodJustStarted = txIsDelivered(transaction);
const reviewPeriodIsOver = txIsReviewed(transaction);
const userHasLeftAReview = hasUserLeftAReviewFirst(ownRole, transaction);
const reviewLink =
reviewPeriodJustStarted || !(reviewPeriodIsOver || userHasLeftAReview) ? (
<InlineTextButton onClick={onOpenReviewModal}>
<FormattedMessage id="ActivityFeed.leaveAReview" values={{ displayName }} />
</InlineTextButton>
) : null;
const reviewAsFirstLink = reviewPeriodJustStarted ? (
<InlineTextButton onClick={onOpenReviewModal}>
<FormattedMessage id="ActivityFeed.leaveAReview" values={{ displayName }} />
</InlineTextButton>
) : null;
return <FormattedMessage id="ActivityFeed.transitionComplete" values={{ reviewLink }} />;
return (
<FormattedMessage
id="ActivityFeed.transitionComplete"
values={{ reviewLink: reviewAsFirstLink }}
/>
);
case TRANSITION_REVIEW_1_BY_PROVIDER:
case TRANSITION_REVIEW_1_BY_CUSTOMER:
@ -169,7 +171,7 @@ const resolveTransitionMessage = (
// one to leave a review
const reviewPeriodIsOver = txIsReviewed(transaction);
const userHasLeftAReview = hasUserLeftAReviewFirst(ownRole, transaction);
const reviewLink = !(reviewPeriodIsOver || userHasLeftAReview) ? (
const reviewAsSecondLink = !(reviewPeriodIsOver || userHasLeftAReview) ? (
<InlineTextButton onClick={onOpenReviewModal}>
<FormattedMessage id="ActivityFeed.leaveAReviewSecond" values={{ displayName }} />
</InlineTextButton>
@ -177,7 +179,7 @@ const resolveTransitionMessage = (
return (
<FormattedMessage
id="ActivityFeed.transitionReview"
values={{ displayName, reviewLink }}
values={{ displayName, reviewLink: reviewAsSecondLink }}
/>
);
}