Merge pull request #5209 from topcoder-platform/tcx-202011

Smoke Testing 2020/11/24 - tcx-202011

Author: luizrrodrigues

.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

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",

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;

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 (

src/shared/routes/Topcoder/Routes.jsx

@@ -83,7 +83,7 @@ export default function Topcoder() {
               <Route
                 component={Profile}
                 exact
-                path="/members/:handle([\w\-\[\].{}]{2,15})"
+                path="/members/:handle([\w\-\[\].{} ]{2,15})"
               />
               <Route
                 component={() => <Settings base="/settings" />}
@@ -92,7 +92,7 @@ export default function Topcoder() {
               <Route
                 component={ProfileStats}
                 exact
-                path="/members/:handle([\w\-\[\].{}]{2,15})/details"
+                path="/members/:handle([\w\-\[\].{} ]{2,15})/details"
               />
               {/* EDU Portal */}
               <Route

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

@@ -150,8 +150,9 @@ export function getPrizePurseUI(
  * @param {Object} challenge challenge info
  */
 export function getPrizePointsUI(challenge) {
-  if (challenge.prizeSets && challenge.prizeSets.length > 0 && challenge.prizeSets[0].prizes) {
-    const { prizes } = challenge.prizeSets[0];
+  const placementPrizes = _.find(challenge.prizeSets, { type: 'placement' });
+  if (placementPrizes) {
+    const { prizes } = placementPrizes || [];
     return (
       <Prize
         label="Purse"