Skip to content

Commit afcfa2f

Browse files
authored
Merge pull request #1180 from Vips19/feature/fix-issue-#1172
fix issue #1172
2 parents 51c2948 + 0270c2f commit afcfa2f

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
.button {
264264
height: 40px;
265265
span {
266-
padding: 0 20px;
266+
padding: 0 15px;
267267
}
268268
}
269269
.buttonContainer {

src/components/ChallengeEditor/ChallengeView/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,13 @@ const ChallengeView = ({
112112
isTask && challenge.status === 'Active' && (
113113
<div className={styles.button}>
114114
{ assignedMemberDetails ? (
115-
<PrimaryButton text={'Close Task'} type={'danger'} onClick={onCloseTask} />
115+
<Tooltip content={MESSAGE.MARK_COMPLETE}>
116+
<PrimaryButton text={'Mark Complete'} type={'success'} onClick={onCloseTask} />
117+
</Tooltip>
116118
) : (
117119
<Tooltip content={MESSAGE.NO_TASK_ASSIGNEE}>
118120
{/* Don't disable button for real inside tooltip, otherwise mouseEnter/Leave events work not good */}
119-
<PrimaryButton text={'Close Task'} type={'disabled'} />
121+
<PrimaryButton text={'Mark Complete'} type={'disabled'} />
120122
</Tooltip>
121123
)}
122124
</div>

src/config/constants.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,5 +228,6 @@ export const MESSAGE = {
228228
TASK_CLOSE_SUCCESS: 'Task closed successfully',
229229
CHALLENGE_LAUNCH_SUCCESS: 'Challenge activated successfully',
230230
COMMUNITY_REVIEW_DISABLED: 'Community review is NOT available for Design challenges',
231-
INTERNAL_REVIEW_DISABLED: 'Internal review is NOT available for QA challenges'
231+
INTERNAL_REVIEW_DISABLED: 'Internal review is NOT available for QA challenges',
232+
MARK_COMPLETE: 'This will close the task and generate a payment for the assignee and copilot.'
232233
}

0 commit comments

Comments
 (0)