Merge pull request #6333 from topcoder-platform/develop

Release v1.15.3
topcoder-platform · May 10, 2022 · 587fc0f · 587fc0f
2 parents f7b8420 + 7e01e56
commit 587fc0f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -363,14 +363,15 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - thrive-discord-button
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters: &filters-staging
             branches:
               only:
                 - develop
+                - stat_marathon_match_link
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

diff --git a/src/assets/images/tc-edu/discord-icon-white.svg b/src/assets/images/tc-edu/discord-icon-white.svg
diff --git a/src/shared/components/Contentful/Article/Article.jsx b/src/shared/components/Contentful/Article/Article.jsx
@@ -25,12 +25,15 @@ import {
 import qs from 'qs';
 import LoginModal from 'components/LoginModal';
 import modalStyle from 'components/LoginModal/modal.scss';
+import { PrimaryButton } from 'topcoder-react-ui-kit';
+import tc from 'components/buttons/themed/tc.scss';
 // SVGs and assets
 import GestureIcon from 'assets/images/icon-gesture.svg';
 import ReadMoreArrow from 'assets/images/read-more-arrow.svg';
 import IconFacebook from 'assets/images/icon-facebook.svg';
 import IconTwitter from 'assets/images/icon-twitter.svg';
 import IconLinkedIn from 'assets/images/icon-linkedIn.svg';
+import DiscordIconWhite from 'assets/images/tc-edu/discord-icon-white.svg';
 
 const htmlToText = require('html-to-text');
 
@@ -335,6 +338,18 @@ class Article extends React.Component {
                   <span>{downvotes}</span>
                 </div>
               </div>
+              {/* Discord */}
+              <div className={theme.actionContainer}>
+                <PrimaryButton
+                  to="https://discord.gg/topcoder?ref=thrive-article"
+                  openNewTab
+                  theme={{
+                    button: tc['primary-green-md'],
+                  }}
+                >
+                  <DiscordIconWhite style={{ marginRight: '5px' }} /> Chat on Discord
+                </PrimaryButton>
+              </div>
             </div>
           </div>
           {/* Recommended */}

diff --git a/src/shared/components/ProfilePage/Stats/HistoryGraph/index.jsx b/src/shared/components/ProfilePage/Stats/HistoryGraph/index.jsx
@@ -212,7 +212,7 @@ export default class HistoryGraph extends React.Component {
       }
       if (track === 'DATA_SCIENCE') {
         if (subTrack === 'MARATHON_MATCH') {
-          return `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${challengeId}`;
+          return `${config.URL.CHALLENGES_URL}/${challengeId}`;
         }
         if (subTrack === 'SRM') {
           return `${config.URL.COMMUNITY}/stat?c=round_overview&rd=${challengeId}`;