From 2f734e3495026718d70ec20d470a14387846b051 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Thu, 10 Sep 2020 17:28:03 +0700
Subject: [PATCH 01/12] #4294: Fix dropdown issue being hidden behind footer on
 profile settings page.

---
 .../shared/components/Header/__snapshots__/index.jsx.snap | 8 +++++++-
 src/shared/components/Header/index.jsx                    | 2 +-
 src/shared/components/TopcoderFooter/style.scss           | 1 +
 src/shared/routes/Topcoder/styles.scss                    | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
index 9f0f7a4186..8f3f8376f7 100644
--- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -1,7 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Default render 1`] = `
-<div>
+<div
+  style={
+    Object {
+      "zIndex": 2,
+    }
+  }
+>
   <TopNav
     loggedIn={true}
     logo={
diff --git a/src/shared/components/Header/index.jsx b/src/shared/components/Header/index.jsx
index 356f268e3a..821ec149e6 100644
--- a/src/shared/components/Header/index.jsx
+++ b/src/shared/components/Header/index.jsx
@@ -69,7 +69,7 @@ const Header = ({
 
   if (TopNavRef) {
     return (
-      <div>
+      <div style={{ zIndex: 2 }}>
         <TopNavRef
           menu={headerMenu || config.HEADER_MENU}
           rightMenu={(
diff --git a/src/shared/components/TopcoderFooter/style.scss b/src/shared/components/TopcoderFooter/style.scss
index a5d20be0b4..523667a4d8 100644
--- a/src/shared/components/TopcoderFooter/style.scss
+++ b/src/shared/components/TopcoderFooter/style.scss
@@ -72,6 +72,7 @@
   font-weight: 400;
   line-height: 21px;
   position: relative;
+  z-index: 0;
 
   @include xs-to-sm {
     padding: 30px 30px 21px 30px;
diff --git a/src/shared/routes/Topcoder/styles.scss b/src/shared/routes/Topcoder/styles.scss
index 1af7c46852..517fe321bc 100644
--- a/src/shared/routes/Topcoder/styles.scss
+++ b/src/shared/routes/Topcoder/styles.scss
@@ -8,6 +8,6 @@
     display: flex;
     flex: 1 0 auto;
     position: relative;
-    z-index: 0;
+    z-index: 1;
   }
 }

From 6520f19c326a2cdc76080d0f2aaa4948957833c9 Mon Sep 17 00:00:00 2001
From: rashmi73 <41687423+rashmi73@users.noreply.github.com>
Date: Sat, 12 Sep 2020 16:03:41 +0530
Subject: [PATCH 02/12] Update ChallengeTags.jsx

---
 src/shared/components/challenge-detail/Header/ChallengeTags.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index bbea412300..bc9ef6c5b6 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -62,7 +62,7 @@ export default function ChallengeTags(props) {
         challengeType
         && (
           <TrackTag
-            onClick={() => setImmediate(() => setChallengeListingFilter(challengeType.id))
+            onClick={() => setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
             }
             to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
           >

From 334596ee7fbd9d74b8320c66bc9325cbaae94f33 Mon Sep 17 00:00:00 2001
From: rashmi73 <41687423+rashmi73@users.noreply.github.com>
Date: Sat, 12 Sep 2020 17:02:27 +0530
Subject: [PATCH 03/12] Update ChallengeTags.jsx

---
 .../components/challenge-detail/Header/ChallengeTags.jsx       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index bc9ef6c5b6..9e660d1a05 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -62,7 +62,8 @@ export default function ChallengeTags(props) {
         challengeType
         && (
           <TrackTag
-            onClick={() => setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+            onClick={() => 
+              setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
             }
             to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
           >

From f719dcd35ee4d8b352bfe6eb8af72766beaa8ab5 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Mon, 14 Sep 2020 11:43:42 +0700
Subject: [PATCH 04/12] Move out inline style to .scss file

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

diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
index 6887259318..8470a7c6c5 100644
--- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -2,11 +2,7 @@
 
 exports[`Default render 1`] = `
 <div
-  style={
-    Object {
-      "zIndex": 2,
-    }
-  }
+  className="src-shared-components-Header-___style__nav-header-wrapper___2HtiH"
 >
   <TopNav
     loggedIn={true}
diff --git a/src/shared/components/Header/index.jsx b/src/shared/components/Header/index.jsx
index 821ec149e6..0bbb6fa494 100644
--- a/src/shared/components/Header/index.jsx
+++ b/src/shared/components/Header/index.jsx
@@ -5,6 +5,8 @@ import { config } from 'topcoder-react-utils';
 import Logo from 'assets/images/tc-logo.svg';
 import { tracking } from '../../actions';
 
+import './style.scss';
+
 let TopNavRef;
 let LoginNavRef;
 
@@ -69,7 +71,7 @@ const Header = ({
 
   if (TopNavRef) {
     return (
-      <div style={{ zIndex: 2 }}>
+      <div styleName="nav-header-wrapper">
         <TopNavRef
           menu={headerMenu || config.HEADER_MENU}
           rightMenu={(

From d30766498d356bdae4a2d47ef3d52c6dcbd89e05 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Mon, 14 Sep 2020 11:45:23 +0700
Subject: [PATCH 05/12] New scss for header

---
 src/shared/components/Header/style.scss | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/shared/components/Header/style.scss

diff --git a/src/shared/components/Header/style.scss b/src/shared/components/Header/style.scss
new file mode 100644
index 0000000000..5f470ea788
--- /dev/null
+++ b/src/shared/components/Header/style.scss
@@ -0,0 +1,3 @@
+.nav-header-wrapper {
+  z-index: 2;
+}

From 980bbc4fedbc41c52d5791d00f56c0d0a36b707f Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Mon, 14 Sep 2020 11:53:59 +0700
Subject: [PATCH 06/12] Fix test snapshot.

---
 __tests__/shared/components/Header/__snapshots__/index.jsx.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
index 8470a7c6c5..e82f28e5b7 100644
--- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -2,7 +2,7 @@
 
 exports[`Default render 1`] = `
 <div
-  className="src-shared-components-Header-___style__nav-header-wrapper___2HtiH"
+  className="src-shared-components-Header-___style__nav-header-wrapper___3oH9J"
 >
   <TopNav
     loggedIn={true}

From 94e068e5d104134d08061eb27d80124c6f4faab1 Mon Sep 17 00:00:00 2001
From: Cagdas U <cagdasugurlu01@gmail.com>
Date: Tue, 15 Sep 2020 19:16:02 +0300
Subject: [PATCH 07/12] fix(profile-page): add spacing before wins count

---
 src/shared/components/ProfilePage/Header/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/components/ProfilePage/Header/index.jsx b/src/shared/components/ProfilePage/Header/index.jsx
index 51e716b1cd..e9732bc969 100644
--- a/src/shared/components/ProfilePage/Header/index.jsx
+++ b/src/shared/components/ProfilePage/Header/index.jsx
@@ -72,6 +72,7 @@ class ProfileHeader extends React.Component {
             <span>
               {' '}
               |
+              {' '}
               {wins}
               {' '}
               Wins

From 941984daf45ea6697da88dc632ddc8660eac673c Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Wed, 16 Sep 2020 16:54:54 -0300
Subject: [PATCH 08/12] ci: Deploy milestone-20200924 to Dev and Stag

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0bb2747b75..652998cca3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,6 +260,7 @@ workflows:
           filters:
             branches:
               only:
+                - milestone-20200924
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

From 5c34df6c819954c31b74b848188ddbcbac9c323a Mon Sep 17 00:00:00 2001
From: rashmi73 <rashmiseta73@gmail.com>
Date: Thu, 17 Sep 2020 02:24:16 +0530
Subject: [PATCH 09/12] tests fix

---
 .../components/challenge-detail/Header/ChallengeTags.jsx     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index 9e660d1a05..d2e29df8c0 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -62,8 +62,9 @@ export default function ChallengeTags(props) {
         challengeType
         && (
           <TrackTag
-            onClick={() => 
-              setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+            onClick={() => {
+                return setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+              }
             }
             to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
           >

From ba22b45b6b2f5723387781070e5ad2ede88c0d84 Mon Sep 17 00:00:00 2001
From: rashmi73 <rashmiseta73@gmail.com>
Date: Thu, 17 Sep 2020 02:47:52 +0530
Subject: [PATCH 10/12] test fix

---
 .../components/challenge-detail/Header/ChallengeTags.jsx     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index d2e29df8c0..e128b7dc6b 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -62,10 +62,7 @@ export default function ChallengeTags(props) {
         challengeType
         && (
           <TrackTag
-            onClick={() => {
-                return setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
-              }
-            }
+            onClick={() => setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))}
             to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
           >
             {challengeType.name}

From 3c2347a09b666f6e3a8e788ed10b9165df8ddc20 Mon Sep 17 00:00:00 2001
From: rashmi73 <rashmiseta73@gmail.com>
Date: Thu, 17 Sep 2020 03:02:19 +0530
Subject: [PATCH 11/12] test fix

---
 .../components/challenge-detail/Header/ChallengeTags.jsx     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index e128b7dc6b..67c51669db 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -62,7 +62,10 @@ export default function ChallengeTags(props) {
         challengeType
         && (
           <TrackTag
-            onClick={() => setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))}
+            onClick={() => (
+              setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+            )
+            }
             to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
           >
             {challengeType.name}

From ae3382e7f85880d407474f5c4d19ba9c7c0b6171 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Thu, 17 Sep 2020 04:41:32 -0300
Subject: [PATCH 12/12] ci: Remove milestone-20200924 form Stag and Dev

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 652998cca3..4a590c1e08 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,7 +230,6 @@ workflows:
           filters:
             branches:
               only:
-                - milestone-20200924
                 - develop
       # This is alternate dev env for parallel testing
       - "build-test":
@@ -260,7 +259,6 @@ workflows:
           filters:
             branches:
               only:
-                - milestone-20200924
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master