From c20a52b909823c1330ec2b1fb1de4ddfc89a0c45 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Tue, 7 Jul 2020 18:20:31 +0300
Subject: [PATCH 1/8] Updates for #4611

---
 src/server/tc-communities/wipro/metadata.json |  2 +-
 .../communities/wipro/Home/index.jsx          | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/server/tc-communities/wipro/metadata.json b/src/server/tc-communities/wipro/metadata.json
index 451de9ff9e..fed156fca6 100644
--- a/src/server/tc-communities/wipro/metadata.json
+++ b/src/server/tc-communities/wipro/metadata.json
@@ -42,7 +42,7 @@
       "url": "/leaderboard"
     }, {
       "title": "FAQ",
-      "url": "/faq"
+      "url": "https://topgear-app.wipro.com/faq-categories"
     }
   ],
   "newsFeed": "http://www.topcoder.com/feed",
diff --git a/src/shared/components/tc-communities/communities/wipro/Home/index.jsx b/src/shared/components/tc-communities/communities/wipro/Home/index.jsx
index a5b06f068c..9d316ff1ec 100644
--- a/src/shared/components/tc-communities/communities/wipro/Home/index.jsx
+++ b/src/shared/components/tc-communities/communities/wipro/Home/index.jsx
@@ -149,15 +149,23 @@ export default function Home(props) {
       >
         <div>
           <ImageText
-            title="Improve Your Skills"
-            text="Our continuously evolving structured learning paths are customized to deepen your knowledge and help you acquire industry specific software capabilities. To keep abreast of emerging new technologies and succeed in this rapidly changing technology landscape. Click below to visit TopGear."
-            link={{
+            title="Leverage The Crowd"
+            text="Access your on-demand community of designers and technology experts."
+            link={[{
               newTab: true,
-              title: 'Start Learning',
-              url: 'https://topgear-app.wipro.com/',
-            }}
+              title: 'Initiate Project',
+              url: `${config.URL.TOPGEAR}/topcoder_projects/initiate_project?user_id=${userId}`,
+            }, {
+              newTab: true,
+              title: 'Add me to account groups',
+              url: 'https://topgear-app.wipro.com/topgear_groups/confirm_group_membership',
+            }, {
+              newTab: true,
+              title: 'Reusable Components',
+              url: 'https://wipro365.sharepoint.com/sites/ipgateway/SiteContent/Components.aspx',
+            }]}
             theme={ImageTextStyles}
-            imageSrc="/community-app-assets/themes/wipro/home/image-text-learn.png"
+            imageSrc="/community-app-assets/themes/wipro/home/image-text-leverage.png"
           />
           <ImageText
             title="Get Involved"
@@ -170,19 +178,15 @@ export default function Home(props) {
             imageSrc="/community-app-assets/themes/wipro/home/image-text-do.png"
           />
           <ImageText
-            title="Leverage The Crowd"
-            text="Access your on-demand community of designers and technology experts."
-            link={[{
-              newTab: true,
-              title: 'Initiate Project',
-              url: `${config.URL.TOPGEAR}/topcoder_projects/initiate_project?user_id=${userId}`,
-            }, {
+            title="Improve Your Skills"
+            text="Our continuously evolving structured learning paths are customized to deepen your knowledge and help you acquire industry specific software capabilities. To keep abreast of emerging new technologies and succeed in this rapidly changing technology landscape. Click below to visit TopGear."
+            link={{
               newTab: true,
-              title: 'Request Group',
-              url: 'https://help.topcoder.com/hc/en-us/requests/new?ticket_form_id=779747',
-            }]}
+              title: 'Start Learning',
+              url: 'https://topgear-app.wipro.com/',
+            }}
             theme={ImageTextStyles}
-            imageSrc="/community-app-assets/themes/wipro/home/image-text-leverage.png"
+            imageSrc="/community-app-assets/themes/wipro/home/image-text-learn.png"
           />
         </div>
       </Section>

From 177c701e28b2ad866a728a1b0882a5b5fe10ead0 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 8 Jul 2020 10:41:43 +0300
Subject: [PATCH 2/8] Updates for #4626

---
 config/default.js    | 2 +-
 config/production.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/default.js b/config/default.js
index c79b6aadab..8b7a9d178b 100644
--- a/config/default.js
+++ b/config/default.js
@@ -309,7 +309,7 @@ module.exports = {
             },
             {
               title: 'Competitive Programming',
-              href: 'https://arena.topcoder-dev.com',
+              href: '/community/arena',
             },
             {
               title: 'Gig Work',
diff --git a/config/production.js b/config/production.js
index 63e11ad694..35adcd73a3 100644
--- a/config/production.js
+++ b/config/production.js
@@ -111,7 +111,7 @@ module.exports = {
             },
             {
               title: 'Competitive Programming',
-              href: 'https://arena.topcoder.com',
+              href: '/community/arena',
             },
             {
               title: 'Gig Work',

From c561e5e8a5c0a88fb99ebc45818c6c58c612ac2d Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 8 Jul 2020 11:14:25 +0300
Subject: [PATCH 3/8] Fixed snap test for #4626

---
 .../shared/components/Header/__snapshots__/index.jsx.snap     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
index a8b4bb9208..9ef50e5635 100644
--- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -58,7 +58,7 @@ exports[`Default render 1`] = `
                   "title": "All Challenges",
                 },
                 Object {
-                  "href": "https://arena.topcoder-dev.com",
+                  "href": "/community/arena",
                   "title": "Competitive Programming",
                 },
                 Object {
@@ -208,4 +208,4 @@ exports[`Default render 1`] = `
     }
   />
 </div>
-`;
\ No newline at end of file
+`;

From c3875b468b23b44c3deed8c89efe08e8c0ce7e04 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 8 Jul 2020 11:50:46 +0300
Subject: [PATCH 4/8] #4626 and #4636

---
 .../components/__snapshots__/TopcoderFooter.jsx.snap  | 11 ++++++++++-
 src/shared/components/TopcoderFooter/index.jsx        |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
index f95e017b49..a7e61afc70 100644
--- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
+++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
@@ -54,7 +54,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://arena.topcoder.com/"
+              href="https://www.topcoder-dev.com/community/arena"
             >
               Competitive Programming
             </a>
@@ -68,6 +68,15 @@ exports[`Matches shallow shapshot 1`] = `
               Gig Work
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/practice"
+            >
+              Practice
+            </a>
+          </li>
         </ul>
       </div>
       <div
diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
index 6f89707c7c..4da5b7ef49 100644
--- a/src/shared/components/TopcoderFooter/index.jsx
+++ b/src/shared/components/TopcoderFooter/index.jsx
@@ -44,8 +44,9 @@ export default function TopcoderFooter() {
             <div styleName="sep-line" />
             <ul styleName="navi-col-links">
               <Link to={`${base}/challenges`}>All Challenges</Link>
-              <Link to="https://arena.topcoder.com/">Competitive Programming</Link>
+              <Link to={`${base}/community/arena`}>Competitive Programming</Link>
               <Link to={`${base}/community/taas`}>Gig Work</Link>
+              <Link to={`${base}/community/practice`}>Practice</Link>
             </ul>
           </div>
           <div styleName="navi-col">

From a680471c81b72aee46604f32ea6a9d212b8807a9 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Thu, 9 Jul 2020 07:45:02 +0300
Subject: [PATCH 5/8] Update for #4468

---
 .../components/__snapshots__/TopcoderFooter.jsx.snap     | 9 +++++++++
 src/shared/components/TopcoderFooter/index.jsx           | 1 +
 2 files changed, 10 insertions(+)

diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
index a7e61afc70..adf5d611f5 100644
--- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
+++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
@@ -163,6 +163,15 @@ exports[`Matches shallow shapshot 1`] = `
               Blog
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/pipeline"
+            >
+              Challenge Pipeline
+            </a>
+          </li>
           <li
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
index 4da5b7ef49..34d774af68 100644
--- a/src/shared/components/TopcoderFooter/index.jsx
+++ b/src/shared/components/TopcoderFooter/index.jsx
@@ -65,6 +65,7 @@ export default function TopcoderFooter() {
             <div styleName="sep-line" />
             <ul styleName="navi-col-links">
               <Link to={`${base}/blog`}>Blog</Link>
+              <Link to={`${base}/community/pipeline`}>Challenge Pipeline</Link>
               <Link to={`${base}/community/events`}>Events Calendar</Link>
               <Link to="https://apps.topcoder.com/forums">Forums</Link>
               <Link to={`${base}/community/member-programs`}>Programs</Link>

From 022429548d1ecf18af6bba8ea690130ec39f3746 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Thu, 9 Jul 2020 07:45:17 +0300
Subject: [PATCH 6/8] ci: only on dev

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b9a41af6a..5b0ff4a40b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -238,7 +238,7 @@ workflows:
           filters:
             branches:
               only:                
-                - feature-contentful
+                - integration-v5-challenge-api
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -259,7 +259,7 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - develop
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From 229163cff5534df6257d08e079f5c0a334847291 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Thu, 9 Jul 2020 07:52:34 +0300
Subject: [PATCH 7/8] Fix #4635

---
 src/shared/components/buttons/themed/tc.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/buttons/themed/tc.scss b/src/shared/components/buttons/themed/tc.scss
index b990bf4abc..952fd18d83 100644
--- a/src/shared/components/buttons/themed/tc.scss
+++ b/src/shared/components/buttons/themed/tc.scss
@@ -44,7 +44,7 @@
 
   &:active,
   &:visited {
-    border: 1px solid #0ab88a !important;
+    border: 1px solid #137d60 !important;
     box-shadow: none !important;
   }
 }

From 61880ac1c2b17b65d0e83c267b1cddbf0e2df2b4 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Thu, 9 Jul 2020 14:02:29 +0300
Subject: [PATCH 8/8] ci: on dev

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbe4c60282..fb830465bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,7 +231,7 @@ workflows:
             branches:
               only:
                 - develop
-                - tco21
+                - topgear-to-contentful
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global