Merge branch 'develop' into gig-pages-chatbot

Author: luizrrodrigues

.circleci/config.yml

@@ -245,7 +245,6 @@ workflows:
           filters:
             branches:
               only:
-                - gig-pages-chatbot
                 - develop
       # This is beta env for production soft releases
       - "build-prod-beta":

__tests__/shared/components/Settings/Preferences/Email/__snapshots__/index.jsx.snap

@@ -65,6 +65,14 @@ exports[`renders email preferences setting page correctly 1`] = `
       secondaryText="For all the latest updates surrounding the <a href=\\"https://www.topcoder.com/community/member-programs/topcoder-open\\" style=\\"color:#0d61bf;text-decoration:underline\\">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!"
       value="TCO Tuesdays"
     />
+    <ToggleableItem
+      checked={false}
+      id="RDM"
+      onToggle={[Function]}
+      primaryText="Rapid Development Match (RDM) Reminders"
+      secondaryText="Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!"
+      value="RDM"
+    />
   </div>
 </div>
 `;

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.5",
+    "topcoder-react-lib": "1000.22.13",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/shared/components/ChallengeTile/index.jsx

@@ -108,7 +108,7 @@ class ChallengeTile extends React.Component {
                 {underscoreReplace(type)}
               </p>
               <p styleName="date-completed">
-                {formatDate(challenge.submissionEndDate)}
+                {challenge.submissionEndDate && formatDate(challenge.submissionEndDate)}
               </p>
               { challenge.wonFirst && !challenge.isPrivate
               && (

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({
       <Carousel
         alignItems="start"
       >
+        {/* {/* Temporary hide My Active Challenges - community-app#5004
         <Option
           selected={tab === TABS.MY_ACTIVE_CHALLENGES}
           select={() => switchTab(TABS.MY_ACTIVE_CHALLENGES)}
           title={myChallengesTitle}
         />
+        */}
         <Option
           selected={tab === TABS.COMMUNITIES}
           select={() => switchTab(TABS.COMMUNITIES)}
@@ -46,7 +53,7 @@ export default function Header({
 }
 
 Header.propTypes = {
-  numChallenges: PT.number.isRequired,
+  // numChallenges: PT.number.isRequired,
   numCommunities: PT.number.isRequired,
   switchTab: PT.func.isRequired,
   tab: PT.string.isRequired,

src/shared/components/Settings/Preferences/Email/index.jsx

@@ -55,6 +55,11 @@ const newsletters = [
     name: 'TCO Newsletter',
     desc: 'For all the latest updates surrounding the <a href="https://www.topcoder.com/community/member-programs/topcoder-open" style="color:#0d61bf;text-decoration:underline">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!',
   },
+  {
+    id: 'RDM',
+    name: 'Rapid Development Match (RDM) Reminders',
+    desc: 'Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!',
+  },
 ];
 
 export default class EmailPreferences extends React.Component {

src/shared/components/SubmissionManagement/Submission/index.jsx

@@ -15,7 +15,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
 import { config } from 'topcoder-react-utils';
-import { COMPETITION_TRACKS } from 'utils/tc';
+import { COMPETITION_TRACKS, CHALLENGE_STATUS } from 'utils/tc';
 
 import PT from 'prop-types';
 
@@ -85,7 +85,8 @@ export default function Submission(props) {
             onClick={() => onDownload(submissionObject.id)}
           ><DownloadIcon /></button>
           */ }
-          {status !== 'COMPLETED'
+          {status !== CHALLENGE_STATUS.COMPLETED
+            && track !== COMPETITION_TRACKS.DESIGN
             && (
             <button
               styleName="delete-icon"