Merge pull request #4870 from topcoder-platform/milestone-20200910

Milestone-20200910

Author: sushilshinde

.circleci/config.yml

@@ -230,7 +230,7 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - milestone-20200910
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -259,7 +259,7 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - milestone-20200910
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

package.json

@@ -137,7 +137,7 @@
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1.0.3",
+    "topcoder-react-lib": "1000.22.3",
     "topcoder-react-ui-kit": "2.0.0",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/shared/components/ProfilePage/Stats/HistoryGraph/index.jsx

@@ -211,7 +211,7 @@ export default class HistoryGraph extends React.Component {
       }
       if (track === 'DATA_SCIENCE') {
         if (subTrack === 'MARATHON_MATCH') {
-          return `/challenges/${challengeId}`;
+          return `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${challengeId}`;
         }
         if (subTrack === 'SRM') {
           return `${config.URL.COMMUNITY}/stat?c=round_overview&rd=${challengeId}`;

src/shared/components/SubmissionPage/Submit/index.jsx

@@ -150,8 +150,8 @@ class Submit extends React.Component {
         const topGearCommunity = _.find(communitiesList.data, { mainSubdomain: 'topgear' });
         if (topGearCommunity) {
           // check the group info match with group list
-          _.forOwn(groups, (value, key) => {
-            if (value && _.includes(topGearCommunity.groupIds, key)) {
+          _.forOwn(groups, (value) => {
+            if (value && _.includes(topGearCommunity.groupIds, value)) {
               isChallengeBelongToTopgearGroup = true;
               return false;
             }