Skip to content

fix issue #1172 #1180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2021
Merged

fix issue #1172 #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
817651d
fix issue #1172
Vips19 Jun 15, 2021
0270c2f
fix button layout issue
Vips19 Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
.button {
height: 40px;
span {
padding: 0 20px;
padding: 0 15px;
}
}
.buttonContainer {
Expand Down
6 changes: 4 additions & 2 deletions src/components/ChallengeEditor/ChallengeView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,13 @@ const ChallengeView = ({
isTask && challenge.status === 'Active' && (
<div className={styles.button}>
{ assignedMemberDetails ? (
<PrimaryButton text={'Close Task'} type={'danger'} onClick={onCloseTask} />
<Tooltip content={MESSAGE.MARK_COMPLETE}>
<PrimaryButton text={'Mark Complete'} type={'success'} onClick={onCloseTask} />
</Tooltip>
) : (
<Tooltip content={MESSAGE.NO_TASK_ASSIGNEE}>
{/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
<PrimaryButton text={'Close Task'} type={'disabled'} />
<PrimaryButton text={'Mark Complete'} type={'disabled'} />
</Tooltip>
)}
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/config/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,6 @@ export const MESSAGE = {
TASK_CLOSE_SUCCESS: 'Task closed successfully',
CHALLENGE_LAUNCH_SUCCESS: 'Challenge activated successfully',
COMMUNITY_REVIEW_DISABLED: 'Community review is NOT available for Design challenges',
INTERNAL_REVIEW_DISABLED: 'Internal review is NOT available for QA challenges'
INTERNAL_REVIEW_DISABLED: 'Internal review is NOT available for QA challenges',
MARK_COMPLETE: 'This will close the task and generate a payment for the assignee and copilot.'
}