Skip to content

Commit bdae5e6

Browse files
Merge pull request #5204 from topcoder-platform/issue-5193
Fix prizeSets logical to get 'placements' instead first one
2 parents ed10f41 + d04d108 commit bdae5e6

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"supertest": "^3.1.0",
141141
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
142142
"tc-ui": "^1.0.12",
143-
"topcoder-react-lib": "1.1.2",
143+
"topcoder-react-lib": "1000.25.9",
144144
"topcoder-react-ui-kit": "2.0.1",
145145
"topcoder-react-utils": "0.7.8",
146146
"turndown": "^4.0.2",

src/shared/components/challenge-detail/Header/index.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ export default function ChallengeHeader(props) {
8181
const sortedAllPhases = _.cloneDeep(allPhases)
8282
.sort((a, b) => moment(phaseEndDate(a)).diff(phaseEndDate(b)));
8383

84-
const { prizes } = prizeSets && prizeSets.length ? prizeSets[0] : [];
84+
const placementPrizes = _.find(prizeSets, { type: 'placement' });
85+
const { prizes } = placementPrizes || [];
8586

8687
const checkpointPrizes = _.find(prizeSets, { type: 'checkpoint' });
8788
let numberOfCheckpointsPrizes = 0;

src/shared/containers/challenge-detail/index.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,9 @@ class ChallengeDetailPageContainer extends React.Component {
405405

406406
const { prizeSets } = challenge;
407407
let challengePrizes = [];
408-
if (prizeSets && prizeSets[0] && prizeSets[0].type === 'placement') {
409-
challengePrizes = prizeSets[0].prizes;
408+
const placementPrizes = _.find(prizeSets, { type: 'placement' });
409+
if (placementPrizes) {
410+
challengePrizes = placementPrizes.prizes;
410411
}
411412

412413
return (

src/shared/utils/challenge-detail/helper.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,9 @@ export function getPrizePurseUI(
150150
* @param {Object} challenge challenge info
151151
*/
152152
export function getPrizePointsUI(challenge) {
153-
if (challenge.prizeSets && challenge.prizeSets.length > 0 && challenge.prizeSets[0].prizes) {
154-
const { prizes } = challenge.prizeSets[0];
153+
const placementPrizes = _.find(challenge.prizeSets, { type: 'placement' });
154+
if (placementPrizes) {
155+
const { prizes } = placementPrizes || [];
155156
return (
156157
<Prize
157158
label="Purse"

0 commit comments

Comments
 (0)