diff --git a/.circleci/config.yml b/.circleci/config.yml index 186ca9bf20..23b1d90989 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -259,7 +259,7 @@ workflows: filters: branches: only: - - mml-fix + - develop # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration diff --git a/package.json b/package.json index b13114a3d0..d6676ed4be 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "supertest": "^3.1.0", "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3", "tc-ui": "^1.0.12", - "topcoder-react-lib": "1.1.2", + "topcoder-react-lib": "1000.25.10", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", diff --git a/src/shared/components/challenge-detail/Header/index.jsx b/src/shared/components/challenge-detail/Header/index.jsx index aeb897aa17..69b735a61f 100644 --- a/src/shared/components/challenge-detail/Header/index.jsx +++ b/src/shared/components/challenge-detail/Header/index.jsx @@ -81,7 +81,8 @@ export default function ChallengeHeader(props) { const sortedAllPhases = _.cloneDeep(allPhases) .sort((a, b) => moment(phaseEndDate(a)).diff(phaseEndDate(b))); - const { prizes } = prizeSets && prizeSets.length ? prizeSets[0] : []; + const placementPrizes = _.find(prizeSets, { type: 'placement' }); + const { prizes } = placementPrizes || []; const checkpointPrizes = _.find(prizeSets, { type: 'checkpoint' }); let numberOfCheckpointsPrizes = 0; diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx index d088940562..a4df062538 100644 --- a/src/shared/containers/challenge-detail/index.jsx +++ b/src/shared/containers/challenge-detail/index.jsx @@ -405,8 +405,9 @@ class ChallengeDetailPageContainer extends React.Component { const { prizeSets } = challenge; let challengePrizes = []; - if (prizeSets && prizeSets[0] && prizeSets[0].type === 'placement') { - challengePrizes = prizeSets[0].prizes; + const placementPrizes = _.find(prizeSets, { type: 'placement' }); + if (placementPrizes) { + challengePrizes = placementPrizes.prizes; } return ( diff --git a/src/shared/routes/Topcoder/Routes.jsx b/src/shared/routes/Topcoder/Routes.jsx index 91904b8d53..879148fd6c 100644 --- a/src/shared/routes/Topcoder/Routes.jsx +++ b/src/shared/routes/Topcoder/Routes.jsx @@ -83,7 +83,7 @@ export default function Topcoder() { } @@ -92,7 +92,7 @@ export default function Topcoder() { {/* EDU Portal */} 0 && challenge.prizeSets[0].prizes) { - const { prizes } = challenge.prizeSets[0]; + const placementPrizes = _.find(challenge.prizeSets, { type: 'placement' }); + if (placementPrizes) { + const { prizes } = placementPrizes || []; return (