diff --git a/.circleci/config.yml b/.circleci/config.yml index 539c227375..6ea3bff7c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -245,7 +245,6 @@ workflows: filters: branches: only: - - milestone-20200917 - develop # This is beta env for production soft releases - "build-prod-beta": @@ -262,6 +261,7 @@ workflows: branches: only: - develop + - tcx-202010 # 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 e9dbff8f52..81d414873a 100644 --- a/package.json +++ b/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.6", + "topcoder-react-lib": "1000.22.12", "topcoder-react-ui-kit": "2.0.1", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", diff --git a/src/shared/components/ChallengeTile/index.jsx b/src/shared/components/ChallengeTile/index.jsx index 87f935e7fe..3e90be664f 100644 --- a/src/shared/components/ChallengeTile/index.jsx +++ b/src/shared/components/ChallengeTile/index.jsx @@ -108,7 +108,7 @@ class ChallengeTile extends React.Component { {underscoreReplace(type)}

- {formatDate(challenge.submissionEndDate)} + {challenge.submissionEndDate && formatDate(challenge.submissionEndDate)}

{ challenge.wonFirst && !challenge.isPrivate && ( diff --git a/src/shared/components/Dashboard/CurrentActivity/Header/index.jsx b/src/shared/components/Dashboard/CurrentActivity/Header/index.jsx index e0615cfead..3b42ee67a5 100644 --- a/src/shared/components/Dashboard/CurrentActivity/Header/index.jsx +++ b/src/shared/components/Dashboard/CurrentActivity/Header/index.jsx @@ -9,13 +9,18 @@ import Option from './Option'; import './style.scss'; export default function Header({ - numChallenges, + // numChallenges, numCommunities, switchTab, tab, }) { + /** + * Temporary hide My Active Challenges - community-app#5004 + */ + /* let myChallengesTitle = 'My Active Challenges'; if (numChallenges) myChallengesTitle += ` (${numChallenges})`; + */ let myCommunitiesTitle = 'My Communities'; if (numCommunities) myCommunitiesTitle += ` (${numCommunities})`; @@ -25,11 +30,13 @@ export default function Header({ + {/* {/* Temporary hide My Active Challenges - community-app#5004