From 8ce11527dfa9100a069cccbaa75fdd74cb3fb335 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 12 Nov 2020 15:42:50 -0300
Subject: [PATCH 01/18] Fix route to profile with space in handle name

---
 src/shared/routes/Topcoder/Routes.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/routes/Topcoder/Routes.jsx b/src/shared/routes/Topcoder/Routes.jsx
index 91904b8d53..879148fd6c 100644
--- a/src/shared/routes/Topcoder/Routes.jsx
+++ b/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

From ed10f410690fa2784a06bd0535a5669f9fa5e1ff Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 12 Nov 2020 15:43:00 -0300
Subject: [PATCH 02/18] ci: deploy tcx-202011 to Stag env

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23b1d90989..bfc7d818e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,6 +260,7 @@ workflows:
             branches:
               only:
                 - develop
+                - tcx-202011
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From a8af95b8aa36f3114cb934e6dca97ac74efb6e9f Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 16 Nov 2020 12:18:03 +0200
Subject: [PATCH 03/18] Fix #5174

---
 src/shared/components/MMatchLeaderboard/index.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/MMatchLeaderboard/index.jsx b/src/shared/components/MMatchLeaderboard/index.jsx
index 6ed9c4a95b..b2e3196944 100644
--- a/src/shared/components/MMatchLeaderboard/index.jsx
+++ b/src/shared/components/MMatchLeaderboard/index.jsx
@@ -70,7 +70,8 @@ export default class MMLeaderboard extends Component {
       // Use Lodash to sort array
       data = _.orderBy(
         data,
-        [d => String(d[sortParam.field]).toLowerCase()], [sortParam.order],
+        [d => Number(d[sortParam.field]) || String(d[sortParam.field]).toLowerCase()],
+        [sortParam.order],
       );
     }
 

From 98a062bfdcfdbc886f4c781a69d8616a4670963a Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 16 Nov 2020 12:18:56 +0200
Subject: [PATCH 04/18] ci: on test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23b1d90989..547fc66c97 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -237,7 +237,7 @@ workflows:
           filters:
             branches:
               only:                
-                - free
+                - mml-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      

From 6bb720a4cf829c92029e8b8fadbc9231a54224e2 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 16 Nov 2020 12:22:56 +0200
Subject: [PATCH 05/18] ci: on staging

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 547fc66c97..186ca9bf20 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -237,7 +237,7 @@ workflows:
           filters:
             branches:
               only:                
-                - mml-fix
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -259,7 +259,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - mml-fix
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From 531d0d396de754a6f6afa3624ef0625e90e2c76d Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 19 Nov 2020 18:47:07 -0300
Subject: [PATCH 06/18] Fix prizeSets logical to get 'placements' instead first
 one

---
 src/shared/components/challenge-detail/Header/index.jsx | 3 ++-
 src/shared/containers/challenge-detail/index.jsx        | 5 +++--
 src/shared/utils/challenge-detail/helper.jsx            | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/shared/components/challenge-detail/Header/index.jsx b/src/shared/components/challenge-detail/Header/index.jsx
index aeb897aa17..69b735a61f 100644
--- a/src/shared/components/challenge-detail/Header/index.jsx
+++ b/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;
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
index d088940562..a4df062538 100644
--- a/src/shared/containers/challenge-detail/index.jsx
+++ b/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 (
diff --git a/src/shared/utils/challenge-detail/helper.jsx b/src/shared/utils/challenge-detail/helper.jsx
index 38b8317f90..562f91f066 100644
--- a/src/shared/utils/challenge-detail/helper.jsx
+++ b/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"

From d04d108449a7423c61c64087cd4632028ea05aa2 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 19 Nov 2020 19:05:36 -0300
Subject: [PATCH 07/18] fix: for issue #5193

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b13114a3d0..898ed37cab 100644
--- a/package.json
+++ b/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.9",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

From 2a20c5423b6978dc063df1516de04facb87854f8 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 19 Nov 2020 23:51:57 -0300
Subject: [PATCH 08/18] Add Submission Review tab to challenge spec

---
 config/default.js                                   |  1 +
 config/production.js                                |  1 +
 .../challenge-detail/Header/TabSelector/index.jsx   | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/config/default.js b/config/default.js
index 0d6224aada..9f7fed509e 100644
--- a/config/default.js
+++ b/config/default.js
@@ -112,6 +112,7 @@ module.exports = {
     COMMUNITY: 'https://community.topcoder-dev.com',
     FORUMS: 'https://apps.topcoder-dev.com/forums',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
+    SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
 
     THRIVE: 'https://www.topcoder.com/thrive',
 
diff --git a/config/production.js b/config/production.js
index 44f89c1ef9..f068357d6e 100644
--- a/config/production.js
+++ b/config/production.js
@@ -32,6 +32,7 @@ module.exports = {
     COMMUNITY: 'https://community.topcoder.com',
     FORUMS: 'https://apps.topcoder.com/forums',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
+    SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
     MEMBER: 'https://member.topcoder.com',
     ONLINE_REVIEW: 'https://software.topcoder.com',
     PAYMENT_TOOL: 'https://payment.topcoder.com',
diff --git a/src/shared/components/challenge-detail/Header/TabSelector/index.jsx b/src/shared/components/challenge-detail/Header/TabSelector/index.jsx
index 0445677aa7..289bd641d4 100644
--- a/src/shared/components/challenge-detail/Header/TabSelector/index.jsx
+++ b/src/shared/components/challenge-detail/Header/TabSelector/index.jsx
@@ -160,6 +160,18 @@ export default function ChallengeViewSelector(props) {
             </a>
           ) : null
         }
+        {
+          (hasRegistered && mySubmissions.length > 0) && (
+            <a
+              href={`${config.URL.SUBMISSION_REVIEW}/challenges/${challenge.legacyId}`}
+              styleName="challenge-selector-common challenge-unselected-view"
+              target="_blank"
+              rel="oopener noreferrer"
+            >
+              SUBMISSION REVIEW
+            </a>
+          )
+        }
         {
           numWinners ? (
             <a
@@ -225,6 +237,7 @@ ChallengeViewSelector.defaultProps = {
 ChallengeViewSelector.propTypes = {
   isLoggedIn: PT.bool,
   challenge: PT.shape({
+    legacyId: PT.string,
     legacy: PT.shape({
       forumId: PT.number,
     }),

From 87fab15ee375273c36e1a7ed4aff175c7a015b6e Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 19 Nov 2020 23:53:14 -0300
Subject: [PATCH 09/18] ci: deploy submission-review to Dev env

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23b1d90989..7325656ca4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,6 +231,7 @@ workflows:
             branches:
               only:
                 - develop
+                - submission-review
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      

From 5a3a930928c10d97932949488a453994a02404a7 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Fri, 20 Nov 2020 02:06:34 -0300
Subject: [PATCH 10/18] ci: deploy ubmission-review to Stag env

Issue #5201
---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7325656ca4..398c9b80f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -261,6 +261,7 @@ workflows:
             branches:
               only:
                 - develop
+                - submission-review
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From 74b695548538d68210d157f703ad4ac364e1d34e Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Fri, 20 Nov 2020 02:48:14 -0300
Subject: [PATCH 11/18] Submission Review - Fix prod URL

---
 config/production.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/production.js b/config/production.js
index f068357d6e..1ab2d4fb87 100644
--- a/config/production.js
+++ b/config/production.js
@@ -32,7 +32,7 @@ module.exports = {
     COMMUNITY: 'https://community.topcoder.com',
     FORUMS: 'https://apps.topcoder.com/forums',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
-    SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
+    SUBMISSION_REVIEW: 'https://submission-review.topcoder.com',
     MEMBER: 'https://member.topcoder.com',
     ONLINE_REVIEW: 'https://software.topcoder.com',
     PAYMENT_TOOL: 'https://payment.topcoder.com',

From f3391dbc2f4392760080b69146541669df82b000 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Tue, 24 Nov 2020 00:27:40 -0300
Subject: [PATCH 12/18] Move MetaTags from utils lib to community-app

---
 src/shared/components/Contentful/Route.jsx    |  2 +-
 src/shared/components/MetaTags.jsx            | 82 +++++++++++++++++++
 src/shared/components/Settings/index.jsx      |  2 +-
 src/shared/containers/Profile.jsx             |  2 +-
 src/shared/containers/ProfileStats.jsx        |  2 +-
 .../containers/challenge-detail/index.jsx     |  3 +-
 .../challenge-listing/Listing/index.jsx       |  2 +-
 src/shared/containers/terms-detail/index.jsx  |  2 +-
 .../routes/Communities/Blockchain/Routes.jsx  |  3 +-
 .../routes/Communities/Cognitive/Routes.jsx   |  3 +-
 .../routes/Communities/Mobile/Routes.jsx      |  3 +-
 src/shared/routes/index.jsx                   |  3 +-
 12 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 src/shared/components/MetaTags.jsx

diff --git a/src/shared/components/Contentful/Route.jsx b/src/shared/components/Contentful/Route.jsx
index 18c23943f8..cce6a728f4 100644
--- a/src/shared/components/Contentful/Route.jsx
+++ b/src/shared/components/Contentful/Route.jsx
@@ -7,7 +7,7 @@ import _ from 'lodash';
 import ContentfulLoader from 'containers/ContentfulLoader';
 import Error404 from 'components/Error404';
 import LoadingIndicator from 'components/LoadingIndicator';
-import { MetaTags } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import PT from 'prop-types';
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
diff --git a/src/shared/components/MetaTags.jsx b/src/shared/components/MetaTags.jsx
new file mode 100644
index 0000000000..bca2314f22
--- /dev/null
+++ b/src/shared/components/MetaTags.jsx
@@ -0,0 +1,82 @@
+/**
+ * Auxiliary wrapper around React Helmet that helps to generate meta tags for
+ * generic use cases.
+ *
+ * NOTE: This component relies on `domain` path of Redux store to hold
+ * the current app domain, which will serve as the base path for the bundled
+ * images.
+ */
+
+import PT from 'prop-types';
+import React from 'react';
+import { connect } from 'react-redux';
+import { Helmet } from 'react-helmet';
+
+function MetaTags({
+  description,
+  domain,
+  image,
+  siteName,
+  socialDescription,
+  socialTitle,
+  title,
+  url,
+}) {
+  const img = `${domain}${image}`;
+  const socTitle = socialTitle || title;
+  const socDesc = socialDescription || description;
+  return (
+    <Helmet>
+      {/* General tags. */}
+      <title>
+        {title}
+      </title>
+      <meta name="description" content={description} />
+
+      {/* Twitter cards. */}
+      <meta name="twitter:card" content="summary_large_image" />
+      <meta name="twitter:title" content={socTitle} />
+      <meta name="twitter:description" content={socDesc} />
+      { image ? <meta name="twitter:image" content={img} /> : null }
+      {
+        siteName ? (
+          <meta name="twitter:site" content={`@${siteName}`} />
+        ) : null
+      }
+
+      {/* Open Graph data. */}
+      <meta property="og:title" content={socTitle} />
+      { image ? <meta property="og:image" content={img} /> : null }
+      { image ? <meta property="og:image:alt" content={socTitle} /> : null }
+      <meta property="og:description" content={socDesc} />
+      {
+        siteName ? (<meta property="og:sitename" content={siteName} />) : null
+      }
+      { url ? (<meta property="og:url" content={url} />) : null }
+    </Helmet>
+  );
+}
+
+MetaTags.defaultProps = {
+  image: null,
+  siteName: null,
+  socialDescription: null,
+  socialTitle: null,
+  url: null,
+};
+
+MetaTags.propTypes = {
+  description: PT.string.isRequired,
+  domain: PT.string.isRequired,
+  image: PT.string,
+  siteName: PT.string,
+  socialDescription: PT.string,
+  socialTitle: PT.string,
+  title: PT.string.isRequired,
+  url: PT.string,
+};
+
+/* TODO: It is not good to depend on the domain written into redux state here,
+ * better pass it via the renderer context at the server side, and get it from
+ * the location at the frontend side, or something similar? */
+export default connect(state => ({ domain: state.domain }))(MetaTags);
diff --git a/src/shared/components/Settings/index.jsx b/src/shared/components/Settings/index.jsx
index f535d39618..9585bb8a31 100644
--- a/src/shared/components/Settings/index.jsx
+++ b/src/shared/components/Settings/index.jsx
@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import PT from 'prop-types';
-import { MetaTags } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 
 import { TABS } from 'actions/page/settings';
 
diff --git a/src/shared/containers/Profile.jsx b/src/shared/containers/Profile.jsx
index 90a95b91f6..8c12c66334 100644
--- a/src/shared/containers/Profile.jsx
+++ b/src/shared/containers/Profile.jsx
@@ -7,7 +7,7 @@ import PT from 'prop-types';
 import { connect } from 'react-redux';
 
 import { actions } from 'topcoder-react-lib';
-import { MetaTags } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import Error404 from 'components/Error404';
 import LoadingIndicator from 'components/LoadingIndicator';
 import ProfilePage from 'components/ProfilePage';
diff --git a/src/shared/containers/ProfileStats.jsx b/src/shared/containers/ProfileStats.jsx
index 561ab79d9c..259e95865f 100644
--- a/src/shared/containers/ProfileStats.jsx
+++ b/src/shared/containers/ProfileStats.jsx
@@ -9,7 +9,7 @@ import Error404 from 'components/Error404';
 import LoadingIndicator from 'components/LoadingIndicator';
 import ProfileStatsPage from 'components/ProfilePage/Stats';
 import { shouldShowGraph, isValidTrack } from 'utils/memberStats';
-import { MetaTags } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import _ from 'lodash';
 import qs from 'qs';
 
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
index d088940562..ddbb35160e 100644
--- a/src/shared/containers/challenge-detail/index.jsx
+++ b/src/shared/containers/challenge-detail/index.jsx
@@ -39,7 +39,8 @@ import {
   SUBTRACKS,
   CHALLENGE_STATUS,
 } from 'utils/tc';
-import { config, MetaTags } from 'topcoder-react-utils';
+import { config } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import { actions } from 'topcoder-react-lib';
 import { getService } from 'services/contentful';
 // import {
diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx
index ab8c52a856..77104cb8e6 100644
--- a/src/shared/containers/challenge-listing/Listing/index.jsx
+++ b/src/shared/containers/challenge-listing/Listing/index.jsx
@@ -25,7 +25,7 @@ import sidebarActions from 'actions/challenge-listing/sidebar';
 import communityActions from 'actions/tc-communities';
 // import SORT from 'utils/challenge-listing/sort';
 import { BUCKETS, filterChanged, sortChangedBucket } from 'utils/challenge-listing/buckets';
-import { MetaTags } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import { USER_GROUP_MAXAGE } from 'config';
 import { updateChallengeType } from 'utils/challenge';
 
diff --git a/src/shared/containers/terms-detail/index.jsx b/src/shared/containers/terms-detail/index.jsx
index af5efa5ab0..66755806ec 100644
--- a/src/shared/containers/terms-detail/index.jsx
+++ b/src/shared/containers/terms-detail/index.jsx
@@ -11,7 +11,7 @@ import _ from 'lodash';
 import LoadingIndicator from 'components/LoadingIndicator';
 import TermDetails from 'components/Terms/TermDetails';
 import { actions } from 'topcoder-react-lib';
-import { MetaTags } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import { Modal, PrimaryButton } from 'topcoder-react-ui-kit';
 import SwitchWithLabel from 'components/SwitchWithLabel';
 import { themr } from 'react-css-super-themr';
diff --git a/src/shared/routes/Communities/Blockchain/Routes.jsx b/src/shared/routes/Communities/Blockchain/Routes.jsx
index 6ede568403..e25565ef27 100644
--- a/src/shared/routes/Communities/Blockchain/Routes.jsx
+++ b/src/shared/routes/Communities/Blockchain/Routes.jsx
@@ -27,7 +27,8 @@ import Settings from 'routes/Settings';
 import TermsDetail from 'routes/TermsDetail';
 import { Route, Switch } from 'react-router-dom';
 import { ThemeProvider } from 'react-css-super-themr';
-import { config, MetaTags } from 'topcoder-react-utils';
+import { config } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 
 import primaryButtonStyle from 'components/buttons/outline/round/open-sans/green-uppercase.scss';
 import secondaryButtonStyle from 'components/buttons/outline/round/open-sans/blue-uppercase.scss';
diff --git a/src/shared/routes/Communities/Cognitive/Routes.jsx b/src/shared/routes/Communities/Cognitive/Routes.jsx
index 1e82a637f8..df8e3f2854 100644
--- a/src/shared/routes/Communities/Cognitive/Routes.jsx
+++ b/src/shared/routes/Communities/Cognitive/Routes.jsx
@@ -23,7 +23,8 @@ import socialImage from 'assets/images/communities/cognitive/social.jpg';
 
 import TermsDetail from 'routes/TermsDetail';
 import { Route, Switch } from 'react-router-dom';
-import { config, MetaTags } from 'topcoder-react-utils';
+import { config } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 
 export default function Cognitive({ base, member, meta }) {
   return (
diff --git a/src/shared/routes/Communities/Mobile/Routes.jsx b/src/shared/routes/Communities/Mobile/Routes.jsx
index 92a94cb724..8a5697d40a 100644
--- a/src/shared/routes/Communities/Mobile/Routes.jsx
+++ b/src/shared/routes/Communities/Mobile/Routes.jsx
@@ -17,7 +17,8 @@ import ProfileStats from 'routes/ProfileStats';
 
 import { Route, Switch } from 'react-router-dom';
 import { ThemeProvider } from 'react-css-super-themr';
-import { config, MetaTags } from 'topcoder-react-utils';
+import { config } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 
 import primaryButtonStyle from 'components/buttons/outline/round/open-sans/green-uppercase.scss';
 import secondaryButtonStyle from 'components/buttons/outline/round/open-sans/blue-uppercase.scss';
diff --git a/src/shared/routes/index.jsx b/src/shared/routes/index.jsx
index a69a461bf4..385172a9bc 100644
--- a/src/shared/routes/index.jsx
+++ b/src/shared/routes/index.jsx
@@ -11,7 +11,8 @@ import React from 'react';
 import {
   Switch, Route, withRouter, Redirect,
 } from 'react-router-dom';
-import { MetaTags, config } from 'topcoder-react-utils';
+import { config } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 
 import PT from 'prop-types';
 

From 2e4fa378df1b98bcee93ffbfe9e33b7297f1ae15 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Tue, 24 Nov 2020 00:28:30 -0300
Subject: [PATCH 13/18] Fix SEO to Gigs and Thrive pages

---
 src/shared/containers/EDU/Home.jsx           | 16 +++++------
 src/shared/containers/EDU/Search.jsx         | 28 +++++++++++++-------
 src/shared/containers/EDU/Tracks.jsx         | 28 +++++++++++++-------
 src/shared/containers/EDU/styles/home.scss   |  3 ++-
 src/shared/containers/EDU/styles/search.scss |  3 ++-
 src/shared/containers/EDU/styles/tracks.scss |  3 ++-
 src/shared/containers/GigsPages.jsx          |  8 +++++-
 src/shared/routes/EDUHome.jsx                | 26 ++++++++++++++++++
 src/shared/routes/EDUSearch.jsx              | 26 ++++++++++++++++++
 src/shared/routes/EDUTracks.jsx              | 26 ++++++++++++++++++
 src/shared/routes/GigsPages.jsx              | 11 +++++---
 src/shared/routes/Topcoder/Routes.jsx        |  6 ++---
 12 files changed, 148 insertions(+), 36 deletions(-)
 create mode 100644 src/shared/routes/EDUHome.jsx
 create mode 100644 src/shared/routes/EDUSearch.jsx
 create mode 100644 src/shared/routes/EDUTracks.jsx

diff --git a/src/shared/containers/EDU/Home.jsx b/src/shared/containers/EDU/Home.jsx
index 30c8455a26..6ec731d03e 100644
--- a/src/shared/containers/EDU/Home.jsx
+++ b/src/shared/containers/EDU/Home.jsx
@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import { config } from 'topcoder-react-utils';
-import { Helmet } from 'react-helmet';
+import MetaTags from 'components/MetaTags';
 import Viewport from 'components/Contentful/Viewport';
 import SearchBar from 'components/Contentful/SearchBar/SearchBar';
 import { getService } from 'services/contentful';
@@ -44,15 +44,15 @@ export default class EDUHome extends React.Component {
 
   render() {
     const { taxonomy } = this.state;
+    const title = 'Topcoder Thrive | Topcoder Community | Topcoder';
+    const description = 'Thrive is our vault of content that we have been gathering over the years. It is full of tutorials and workshops that matter. Grow with us!';
+
     return (
       <div className={homeTheme.container}>
-        <Helmet>
-          <title>THRIVE - Grow with us. Tutorials and workshops that matter.</title>
-          <meta name="title" property="og:title" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="description" property="og:description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="description" property="description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="twitter:description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-        </Helmet>
+        <MetaTags
+          description={description}
+          title={title}
+        />
         {/* Banner */}
         <div className={homeTheme.bannerContainer}>
           <div className={homeTheme.bannerImage} />
diff --git a/src/shared/containers/EDU/Search.jsx b/src/shared/containers/EDU/Search.jsx
index 6b311aa68e..b16fcfdf12 100644
--- a/src/shared/containers/EDU/Search.jsx
+++ b/src/shared/containers/EDU/Search.jsx
@@ -5,6 +5,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
 import { config, isomorphy } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import Viewport from 'components/Contentful/Viewport';
 import SearchBar from 'components/Contentful/SearchBar/SearchBar';
 import { getService } from 'services/contentful';
@@ -13,7 +14,6 @@ import { updateQuery } from 'utils/url';
 import qs from 'qs';
 import LoadingIndicator from 'components/LoadingIndicator';
 import SearchPageFilter from 'components/Contentful/SearchPageFilter/SearchPageFilter';
-import { Helmet } from 'react-helmet';
 // Partials
 import ResultTabs from './partials/ResultTabs';
 // CSS
@@ -87,18 +87,28 @@ export default class EDUSearch extends React.Component {
     const {
       taxonomy, query, tree, isShowFilter,
     } = this.state;
+    const title = 'Topcoder Thrive | Topcoder Community | Topcoder';
+    const description = 'Thrive is our vault of content that we have been gathering over the years. It is full of tutorials and workshops that matter. Grow with us!';
+
+    const metaTags = (
+      <MetaTags
+        description={description}
+        title={title}
+      />
+    );
     // This container needs at least those variables
     // to be able to render meaningful data
-    if (!taxonomy) return <LoadingIndicator />;
+    if (!taxonomy) {
+      return (
+        <React.Fragment>
+          { metaTags }
+          <LoadingIndicator />;
+        </React.Fragment>
+      );
+    }
     return (
       <div className={searchTheme.container}>
-        <Helmet>
-          <title>THRIVE - Search {`${query.title}`}</title>
-          <meta name="title" property="og:title" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="description" property="og:description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="description" property="description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="twitter:description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-        </Helmet>
+        { metaTags }
         {/* Banner */}
         <div className={searchTheme.bannerContainer}>
           <div className={searchTheme.searchBarWrapp}>
diff --git a/src/shared/containers/EDU/Tracks.jsx b/src/shared/containers/EDU/Tracks.jsx
index d98099191e..8ede19d331 100644
--- a/src/shared/containers/EDU/Tracks.jsx
+++ b/src/shared/containers/EDU/Tracks.jsx
@@ -5,6 +5,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
 import { config, isomorphy } from 'topcoder-react-utils';
+import MetaTags from 'components/MetaTags';
 import Viewport from 'components/Contentful/Viewport';
 import SearchBar from 'components/Contentful/SearchBar/SearchBar';
 import { getService } from 'services/contentful';
@@ -14,7 +15,6 @@ import qs from 'qs';
 import TracksTree from 'components/Contentful/TracksTree/TracksTree';
 import LoadingIndicator from 'components/LoadingIndicator';
 import TracksFilter from 'components/Contentful/TracksFilter/TracksFilter';
-import { Helmet } from 'react-helmet';
 // SVGs & Assets
 import Dev from 'assets/images/img-development.png';
 import Design from 'assets/images/img_design.png';
@@ -163,18 +163,28 @@ export default class EDUTracks extends React.Component {
       taxonomy, query, tree, isShowFilter,
       articleCnt, videoCnt, forumCnt,
     } = this.state;
+    const title = 'Topcoder Thrive | Topcoder Community | Topcoder';
+    const description = 'Thrive is our vault of content that we have been gathering over the years. It is full of tutorials and workshops that matter. Grow with us!';
+
+    const metaTags = (
+      <MetaTags
+        description={description}
+        title={title}
+      />
+    );
     // This container needs at least those variables
     // to be able to render meaningful data
-    if (!taxonomy) return <LoadingIndicator />;
+    if (!taxonomy) {
+      return (
+        <React.Fragment>
+          { metaTags }
+          <LoadingIndicator />;
+        </React.Fragment>
+      );
+    }
     return (
       <div className={tracksTheme.container}>
-        <Helmet>
-          <title>THRIVE - {`${query.track}`}</title>
-          <meta name="title" property="og:title" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="description" property="og:description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="description" property="description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-          <meta name="twitter:description" content="THRIVE - Grow with us. Tutorials and workshops that matter." />
-        </Helmet>
+        { metaTags }
         {/* Banner */}
         <div
           className={tracksTheme.bannerContainer}
diff --git a/src/shared/containers/EDU/styles/home.scss b/src/shared/containers/EDU/styles/home.scss
index 2b1222816d..d37e3e578c 100644
--- a/src/shared/containers/EDU/styles/home.scss
+++ b/src/shared/containers/EDU/styles/home.scss
@@ -2,8 +2,9 @@
 
 .container {
   display: flex;
+  flex: 1;
   flex-direction: column;
-  overflow: hidden;
+  width: 100%;
 
   .bannerContainer {
     background-image: linear-gradient(98.81deg, #8b41b0 0%, #ef476f 100%);
diff --git a/src/shared/containers/EDU/styles/search.scss b/src/shared/containers/EDU/styles/search.scss
index e28798694b..399932ff35 100644
--- a/src/shared/containers/EDU/styles/search.scss
+++ b/src/shared/containers/EDU/styles/search.scss
@@ -2,8 +2,9 @@
 
 .container {
   display: flex;
+  flex: 1;
   flex-direction: column;
-  overflow: hidden;
+  width: 100%;
 
   .bannerContainer {
     background-color: #2a2a2a;
diff --git a/src/shared/containers/EDU/styles/tracks.scss b/src/shared/containers/EDU/styles/tracks.scss
index 7b44d305bd..c7383e51d3 100644
--- a/src/shared/containers/EDU/styles/tracks.scss
+++ b/src/shared/containers/EDU/styles/tracks.scss
@@ -2,8 +2,9 @@
 
 .container {
   display: flex;
+  flex: 1;
   flex-direction: column;
-  overflow: hidden;
+  width: 100%;
 
   .bannerContainer {
     min-height: 475px;
diff --git a/src/shared/containers/GigsPages.jsx b/src/shared/containers/GigsPages.jsx
index 1c83955d9a..9945ba4962 100644
--- a/src/shared/containers/GigsPages.jsx
+++ b/src/shared/containers/GigsPages.jsx
@@ -9,16 +9,18 @@ import Viewport from 'components/Contentful/Viewport';
 import { config } from 'topcoder-react-utils';
 import RecruitCRMJobDetails from 'containers/Gigs/RecruitCRMJobDetails';
 import { Helmet } from 'react-helmet';
+import MetaTags from 'components/MetaTags';
 
 
 export default function GigsPagesContainer(props) {
   const { match } = props;
   const { id } = match.params;
   const isApply = `${config.GIGS_PAGES_PATH}/${id}/apply` === match.url;
+  const title = 'Gig Work | Topcoder Community | Topcoder';
+  const description = 'Compete and build up your profiles and skills! Topcoder members become eligible to work on Gig Work projects by first proving themselves in various skill sets through Topcoder competitions.';
   return (
     <div>
       <Helmet>
-        <title>Topcoder - Gig Work Opportunities</title>
         <script type="text/javascript">{`
 window._chatlio = window._chatlio||[];
 !function(){ var t=document.getElementById("chatlio-widget-embed");if(t&&window.ChatlioReact&&_chatlio.init)return void _chatlio.init(t,ChatlioReact);for(var e=function(t){return function(){_chatlio.push([t].concat(arguments)) }},i=["configure","identify","track","show","hide","isShown","isOnline", "page", "open", "showOrHide"],a=0;a<i.length;a++)_chatlio[i[a]]||(_chatlio[i[a]]=e(i[a]));var n=document.createElement("script"),c=document.getElementsByTagName("script")[0];n.id="chatlio-widget-embed",n.src="https://w.chatlio.com/w.chatlio-widget.js",n.async=!0,n.setAttribute("data-embed-version","2.3");
@@ -28,6 +30,10 @@ window._chatlio = window._chatlio||[];
         `}
         </script>
       </Helmet>
+      <MetaTags
+        description={description}
+        title={title}
+      />
       <Header />
       {
         id ? (
diff --git a/src/shared/routes/EDUHome.jsx b/src/shared/routes/EDUHome.jsx
new file mode 100644
index 0000000000..ef5db510aa
--- /dev/null
+++ b/src/shared/routes/EDUHome.jsx
@@ -0,0 +1,26 @@
+/**
+ * The loader of EDUHome page webpack chunks.
+ */
+import path from 'path';
+import React from 'react';
+import LoadingPagePlaceholder from 'components/LoadingPagePlaceholder';
+import { AppChunk, webpack } from 'topcoder-react-utils';
+
+export default function EDUHome(props) {
+  return (
+    <AppChunk
+      chunkName="eduHome/chunk"
+      renderClientAsync={() => import(/* webpackChunkName: "eduHome/chunk" */ 'containers/EDU/Home')
+        .then(({ default: Home }) => (
+          <Home {...props} />
+        ))
+      }
+      renderPlaceholder={() => <LoadingPagePlaceholder />}
+      renderServer={() => {
+        const p = webpack.resolveWeak('containers/EDU/Home');
+        const Home = webpack.requireWeak(path.resolve(__dirname, p));
+        return <Home {...props} />;
+      }}
+    />
+  );
+}
diff --git a/src/shared/routes/EDUSearch.jsx b/src/shared/routes/EDUSearch.jsx
new file mode 100644
index 0000000000..be5be4dcfe
--- /dev/null
+++ b/src/shared/routes/EDUSearch.jsx
@@ -0,0 +1,26 @@
+/**
+ * The loader of EDUSearch page webpack chunks.
+ */
+import path from 'path';
+import React from 'react';
+import LoadingPagePlaceholder from 'components/LoadingPagePlaceholder';
+import { AppChunk, webpack } from 'topcoder-react-utils';
+
+export default function EDUSearch(props) {
+  return (
+    <AppChunk
+      chunkName="eduSearch/chunk"
+      renderClientAsync={() => import(/* webpackChunkName: "eduSearch/chunk" */ 'containers/EDU/Search')
+        .then(({ default: Search }) => (
+          <Search {...props} />
+        ))
+      }
+      renderPlaceholder={() => <LoadingPagePlaceholder />}
+      renderServer={() => {
+        const p = webpack.resolveWeak('containers/EDU/Search');
+        const Search = webpack.requireWeak(path.resolve(__dirname, p));
+        return <Search {...props} />;
+      }}
+    />
+  );
+}
diff --git a/src/shared/routes/EDUTracks.jsx b/src/shared/routes/EDUTracks.jsx
new file mode 100644
index 0000000000..2b0c3565d0
--- /dev/null
+++ b/src/shared/routes/EDUTracks.jsx
@@ -0,0 +1,26 @@
+/**
+ * The loader of EDUTracks page webpack chunks.
+ */
+import path from 'path';
+import React from 'react';
+import LoadingPagePlaceholder from 'components/LoadingPagePlaceholder';
+import { AppChunk, webpack } from 'topcoder-react-utils';
+
+export default function EDUTracks(props) {
+  return (
+    <AppChunk
+      chunkName="eduTracks/chunk"
+      renderClientAsync={() => import(/* webpackChunkName: "eduTracks/chunk" */ 'containers/EDU/Tracks')
+        .then(({ default: Tracks }) => (
+          <Tracks {...props} />
+        ))
+      }
+      renderPlaceholder={() => <LoadingPagePlaceholder />}
+      renderServer={() => {
+        const p = webpack.resolveWeak('containers/EDU/Tracks');
+        const Tracks = webpack.requireWeak(path.resolve(__dirname, p));
+        return <Tracks {...props} />;
+      }}
+    />
+  );
+}
diff --git a/src/shared/routes/GigsPages.jsx b/src/shared/routes/GigsPages.jsx
index dca924c079..b822b9ab69 100644
--- a/src/shared/routes/GigsPages.jsx
+++ b/src/shared/routes/GigsPages.jsx
@@ -1,21 +1,26 @@
 /**
  * The loader of Gigs page webpack chunks.
  */
+import path from 'path';
 import React from 'react';
-
 import LoadingPagePlaceholder from 'components/LoadingPagePlaceholder';
-import { AppChunk } from 'topcoder-react-utils';
+import { AppChunk, webpack } from 'topcoder-react-utils';
 
 export default function GigsPagesRoute(props) {
   return (
     <AppChunk
-      chunkName="policyPages/chunk"
+      chunkName="gigsPages/chunk"
       renderClientAsync={() => import(/* webpackChunkName: "gigsPages/chunk" */ 'containers/GigsPages')
         .then(({ default: GigsPagesContainer }) => (
           <GigsPagesContainer {...props} />
         ))
       }
       renderPlaceholder={() => <LoadingPagePlaceholder />}
+      renderServer={() => {
+        const p = webpack.resolveWeak('containers/GigsPages');
+        const GigsPagesContainer = webpack.requireWeak(path.resolve(__dirname, p));
+        return <GigsPagesContainer {...props} />;
+      }}
     />
   );
 }
diff --git a/src/shared/routes/Topcoder/Routes.jsx b/src/shared/routes/Topcoder/Routes.jsx
index 91904b8d53..2c8cd97267 100644
--- a/src/shared/routes/Topcoder/Routes.jsx
+++ b/src/shared/routes/Topcoder/Routes.jsx
@@ -22,9 +22,9 @@ import ContentfulLoader from 'containers/ContentfulLoader';
 import LoadingIndicator from 'components/LoadingIndicator';
 import Article from 'components/Contentful/Article';
 
-import EDUHome from 'containers/EDU/Home';
-import EDUTracks from 'containers/EDU/Tracks';
-import EDUSearch from 'containers/EDU/Search';
+import EDUHome from '../EDUHome';
+import EDUTracks from '../EDUTracks';
+import EDUSearch from '../EDUSearch';
 import ChallengeListing from './ChallengeListing';
 import Dashboard from './Dashboard';
 import Notifications from './Notifications';

From 1d6f5bbddb0582c3ca0f4950d8b131068c0329b3 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Tue, 24 Nov 2020 00:39:27 -0300
Subject: [PATCH 14/18] ci: deploy seo-fix to Stag env

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a3d5241af..a9768e7dc0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,7 +260,7 @@ workflows:
             branches:
               only:
                 - develop
-                - bug-bash-develop-sync
+                - seo-fix
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From d008b34f72fa4f93855080b6d4cfd54b8c9c36a8 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Tue, 24 Nov 2020 01:39:48 -0300
Subject: [PATCH 15/18] Fix title in social SEO

---
 .../containers/challenge-detail/index.jsx      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
index ddbb35160e..e16d11baa0 100644
--- a/src/shared/containers/challenge-detail/index.jsx
+++ b/src/shared/containers/challenge-detail/index.jsx
@@ -370,10 +370,16 @@ class ChallengeDetailPageContainer extends React.Component {
 
     const isLoggedIn = !_.isEmpty(auth.tokenV3);
 
+    const { prizeSets } = challenge;
+    let challengePrizes = [];
+    if (prizeSets && prizeSets[0] && prizeSets[0].type === 'placement') {
+      challengePrizes = _.filter(prizeSets[0].prizes, p => p.value > 0);
+    }
+
     /* Generation of data for SEO meta-tags. */
-    let prizesStr;
-    if (challenge.prizes && challenge.prizes.length) {
-      prizesStr = challenge.prizes.map(p => `$${p}`).join('/');
+    let prizesStr = '';
+    if (!_.isEmpty(challengePrizes)) {
+      prizesStr = challengePrizes.map(p => `$${p.value}`).join('/');
       prizesStr = `[${prizesStr}] - `;
     }
     const title = 'Topcoder Challenge | Topcoder Community | Topcoder';
@@ -404,12 +410,6 @@ class ChallengeDetailPageContainer extends React.Component {
     || (!_.some(phases, { name: 'Submission', isOpen: true })
       && !_.some(phases, { name: 'Checkpoint Submission', isOpen: true }));
 
-    const { prizeSets } = challenge;
-    let challengePrizes = [];
-    if (prizeSets && prizeSets[0] && prizeSets[0].type === 'placement') {
-      challengePrizes = prizeSets[0].prizes;
-    }
-
     return (
       <div styleName="outer-container">
         <div styleName="challenge-detail-container" role="main">

From fdb5d508b905307d9c96d6f76c31438f73734b08 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 24 Nov 2020 07:14:41 -0300
Subject: [PATCH 16/18] fix: for issue #5193 sync with develop

Issue: #5193

PR: https://github.com/topcoder-platform/topcoder-react-lib/pull/285
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 898ed37cab..d6676ed4be 100644
--- a/package.json
+++ b/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": "1000.25.9",
+    "topcoder-react-lib": "1000.25.10",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

From 5a3f40c952c86638ad4ad20aa2c396b4cbb4714e Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 24 Nov 2020 07:37:13 -0300
Subject: [PATCH 17/18] ci: remove develop branch from Dev env

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23b1d90989..086cb438b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,7 +230,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - free
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      

From 538bf84c79f69cd73067cac520dbbb829c882cf8 Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Tue, 24 Nov 2020 18:37:02 +0530
Subject: [PATCH 18/18] release: v1.6.1

https://github.com/topcoder-platform/community-app/milestone/84
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6676ed4be..9716962128 100644
--- a/package.json
+++ b/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": "1000.25.10",
+    "topcoder-react-lib": "1.1.3",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",