From 1aa1e015863cbe727ecfd4225d87955a22db87a1 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 22:20:22 +0530
Subject: [PATCH 01/23] Update index.jsx

---
 src/shared/components/challenge-listing/Sidebar/index.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/challenge-listing/Sidebar/index.jsx b/src/shared/components/challenge-listing/Sidebar/index.jsx
index 903d90cde0..13a150688f 100644
--- a/src/shared/components/challenge-listing/Sidebar/index.jsx
+++ b/src/shared/components/challenge-listing/Sidebar/index.jsx
@@ -39,7 +39,7 @@ export default function SideBarFilters({
   // editSavedFiltersMode,
   // extraBucket,
   // filterState,
-  hideTcLinksInFooter,
+  // hideTcLinksInFooter,
   isAuth,
   // resetFilterName,
   // savedFilters,
@@ -84,7 +84,7 @@ export default function SideBarFilters({
         />
         {/* )} */}
       </div>
-      <Footer hideTcLinksInFooter={hideTcLinksInFooter} />
+      <Footer hideTcLinksInFooter={true} />
     </div>
   );
 }
@@ -94,7 +94,7 @@ SideBarFilters.defaultProps = {
   disabled: false,
   // dragState: {},
   // extraBucket: null,
-  hideTcLinksInFooter: false,
+  // hideTcLinksInFooter: false,
   isAuth: false,
   expanding: false,
 };
@@ -116,7 +116,7 @@ SideBarFilters.propTypes = {
   // editSavedFiltersMode: PT.bool.isRequired,
   // extraBucket: PT.string,
   // filterState: PT.shape().isRequired,
-  hideTcLinksInFooter: PT.bool,
+  // hideTcLinksInFooter: PT.bool,
   isAuth: PT.bool,
   // resetFilterName: PT.func.isRequired,
   // savedFilters: PT.arrayOf(PT.shape()).isRequired,

From e8b6b8906d822be33402dc1549ac65cb077a83e0 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 22:28:22 +0530
Subject: [PATCH 02/23] Update ChallengeFilters.jsx

---
 .../components/challenge-listing/Filters/ChallengeFilters.jsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index 6bc2bd13c7..7abd0658ea 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -49,6 +49,7 @@ export default function ChallengeFilters({
   if (filterState.events && filterState.events.length) filterRulesCount += 1;
   if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
   if (filterState.types && filterState.types.length) filterRulesCount += 1;
+  if (filterState.status) filterRulesCount += 1;
   if (filterState.endDateStart || filterState.startDateEnd) {
     filterRulesCount += 1;
   }

From ae9933335b2629b3fb39083be67694d5c4738b10 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 22:31:09 +0530
Subject: [PATCH 03/23] Update index.jsx

---
 .../components/challenge-listing/Filters/FiltersPanel/index.jsx  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index 8b0147a9fb..244b5343e7 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -433,6 +433,7 @@ export default function FiltersPanel({
               events: [],
               endDateStart: null,
               startDateEnd: null,
+              status: 'Active',
             });
             selectCommunity(defaultCommunityId);
             setSearchText('');

From d18b2b1b683b9ee7a8a9652372879ab5713e9542 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 22:36:46 +0530
Subject: [PATCH 04/23] Update index.jsx

---
 src/shared/components/challenge-listing/Sidebar/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Sidebar/index.jsx b/src/shared/components/challenge-listing/Sidebar/index.jsx
index 13a150688f..cfa51585c7 100644
--- a/src/shared/components/challenge-listing/Sidebar/index.jsx
+++ b/src/shared/components/challenge-listing/Sidebar/index.jsx
@@ -84,7 +84,7 @@ export default function SideBarFilters({
         />
         {/* )} */}
       </div>
-      <Footer hideTcLinksInFooter={true} />
+      <Footer hideTcLinksInFooter />
     </div>
   );
 }

From 312d56b265fa2ebcaf6244a7d9bb67da7091f7f5 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 22:49:03 +0530
Subject: [PATCH 05/23] Update index.jsx

---
 .../challenge-detail/Header/DeadlinesPanel/Card/index.jsx      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx b/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
index 5efc2339be..154e95a46b 100644
--- a/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
+++ b/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
@@ -10,6 +10,7 @@ import './style.scss';
 
 /* Date/time format to use in the card. */
 const FORMAT = 'MMM DD, HH:mm';
+const FORMAT_YEAR = 'MMM DD YYYY, HH:mm';
 
 export default function Card({ past, time, title }) {
   const time2 = moment(time);
@@ -20,7 +21,7 @@ export default function Card({ past, time, title }) {
         {title}
       </p>
       <p styleName="date">
-        {time2.format(FORMAT)}
+        {time2.format(time2.year() !== moment().year() ? FORMAT_YEAR : FORMAT)}
       </p>
     </div>
   );

From fa753aea72bfefb56cae4b28da52a75c2b3d9a90 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 22:52:43 +0530
Subject: [PATCH 06/23] Update index.jsx.snap

---
 .../challenge-listing/Sidebar/__snapshots__/index.jsx.snap    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
index abe4b7d0da..f37f92bc07 100644
--- a/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
@@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
     />
   </div>
   <Footer
-    hideTcLinksInFooter={false}
+    hideTcLinksInFooter={true}
   />
 </div>
 `;
@@ -37,7 +37,7 @@ exports[`Matches shallow shapshot 2`] = `
     />
   </div>
   <Footer
-    hideTcLinksInFooter={false}
+    hideTcLinksInFooter={true}
   />
 </div>
 `;

From 595ff748c28060346b5b1dd6c7cef08323a12b63 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Fri, 16 Oct 2020 00:46:52 +0700
Subject: [PATCH 07/23] fix: no challenges message when sorting all challenges

---
 .../components/challenge-listing/Listing/Bucket/index.jsx   | 2 +-
 src/shared/components/challenge-listing/Listing/index.jsx   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
index 371326cc55..abf6bda83b 100644
--- a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
+++ b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
@@ -184,7 +184,7 @@ export default function Bucket({
       {placeholders}
       {
       // (expandable || loadMore) && (expandable || !keepPlaceholders) && !loading && !expanded ? (
-        (expanding || expandable || loadMore) && !loading && !expanded ? (
+        (expanding || expandable || loadMore) && !loading && (expandable ? expanded : !expanded) ? (
           <a
             // href={`${challengesUrl}?${bucketQuery}`}
             href={`${challengesUrl}`}
diff --git a/src/shared/components/challenge-listing/Listing/index.jsx b/src/shared/components/challenge-listing/Listing/index.jsx
index a7441474d6..479684a962 100644
--- a/src/shared/components/challenge-listing/Listing/index.jsx
+++ b/src/shared/components/challenge-listing/Listing/index.jsx
@@ -182,8 +182,7 @@ function Listing({
     );
   };
 
-  if (!expanding && (activeBucket !== BUCKETS.ALL)
-  && (activeBucket !== BUCKETS.SAVED_FILTER)) {
+  if ((activeBucket !== BUCKETS.SAVED_FILTER)) {
     return (
       <div styleName="challengeCardContainer">
         {getBucket(activeBucket, true)}
@@ -207,7 +206,8 @@ function Listing({
   // }
   const loading = loadingMyChallenges
     || loadingOpenForRegistrationChallenges
-    || loadingOnGoingChallenges;
+    || loadingOnGoingChallenges
+    || loadingAllChallenges;
   const placeholders = [];
   if (challenges.length > 0 || (activeBucket === BUCKETS.ALL && allChallenges.length > 0)) {
     return (

From e2b07f2017b1127a9f87e7d9cafb04b1f84877a9 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Thu, 15 Oct 2020 23:52:56 +0530
Subject: [PATCH 08/23] Update ChallengeFilters.jsx

---
 .../components/challenge-listing/Filters/ChallengeFilters.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index 7abd0658ea..56e37800c4 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -49,7 +49,7 @@ export default function ChallengeFilters({
   if (filterState.events && filterState.events.length) filterRulesCount += 1;
   if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
   if (filterState.types && filterState.types.length) filterRulesCount += 1;
-  if (filterState.status) filterRulesCount += 1;
+  if (filterState.status && filterState.status !== 'Active') filterRulesCount += 1;
   if (filterState.endDateStart || filterState.startDateEnd) {
     filterRulesCount += 1;
   }

From 1ba06923b3619f0660fa9e310caf2d6729cbfdf4 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 00:19:32 +0530
Subject: [PATCH 09/23] Update index.jsx

---
 src/shared/components/TopcoderFooter/index.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
index 1910102404..de46f20ff2 100644
--- a/src/shared/components/TopcoderFooter/index.jsx
+++ b/src/shared/components/TopcoderFooter/index.jsx
@@ -54,10 +54,10 @@ export default function TopcoderFooter() {
             <div styleName="sep-line" />
             <ul styleName="navi-col-links">
               <Link to={`${base}/thrive/tracks?track=Competitive%20Programming`}>Competitive Programming</Link>
-              <Link to={`${base}/thrive/tracks?track=Data%20Science`}>Data Science</Link>
-              <Link to={`${base}/thrive/tracks?track=Design`}>Design</Link>
-              <Link to={`${base}/thrive/tracks?track=Development`}>Development</Link>
-              <Link to={`${base}/thrive/tracks?track=QA`}>QA</Link>
+              <Link to={`${base}/thrive/tracks?track=Data%20Science&tax=`}>Data Science</Link>
+              <Link to={`${base}/thrive/tracks?track=Design&tax=`}>Design</Link>
+              <Link to={`${base}/thrive/tracks?track=Development&tax=`}>Development</Link>
+              <Link to={`${base}/thrive/tracks?track=QA&tax=`}>QA</Link>
             </ul>
           </div>
           <div styleName="navi-col">

From 41e049012277bb4518891d9c9dcc6ffd1dc105e1 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 01:11:23 +0530
Subject: [PATCH 10/23] Update TopcoderFooter.jsx.snap

---
 .../components/__snapshots__/TopcoderFooter.jsx.snap      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
index 387a544a65..c07e4813a9 100644
--- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
+++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
             >
               Data Science
             </a>
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=Design"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
             >
               Design
             </a>
@@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=Development"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
             >
               Development
             </a>
@@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=QA"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
             >
               QA
             </a>

From 7213ca84061014aff82b6bae4c859ff533fd9a8c Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Fri, 16 Oct 2020 02:59:03 +0700
Subject: [PATCH 11/23] fix: empty values in dashboard sub-community

---
 src/shared/containers/Dashboard/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/shared/containers/Dashboard/index.jsx b/src/shared/containers/Dashboard/index.jsx
index 552fa5cd59..d137ca7e74 100644
--- a/src/shared/containers/Dashboard/index.jsx
+++ b/src/shared/containers/Dashboard/index.jsx
@@ -150,8 +150,7 @@ export class DashboardPageContainer extends React.Component {
     // if (now - tcBlogTimestamp > CACHE_MAX_AGE
     // && !tcBlogLoading) getTopcoderBlogFeed();
 
-    if (now - communitiesTimestamp < CACHE_MAX_AGE
-    && now - activeChallengesTimestamp < CACHE_MAX_AGE) {
+    if (now - communitiesTimestamp < CACHE_MAX_AGE) {
       updateCommunityStats(this.props);
     }
   }

From b25dd098af3d806e2fb92c42cf2c7abb3caeaef2 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 01:47:09 +0530
Subject: [PATCH 12/23] Update ChallengeFilters.jsx

---
 .../components/challenge-listing/Filters/ChallengeFilters.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index 56e37800c4..4ce26b5740 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -49,7 +49,7 @@ export default function ChallengeFilters({
   if (filterState.events && filterState.events.length) filterRulesCount += 1;
   if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
   if (filterState.types && filterState.types.length) filterRulesCount += 1;
-  if (filterState.status && filterState.status !== 'Active') filterRulesCount += 1;
+  if (filterState.status && filterState.status !== 'All') filterRulesCount += 1;
   if (filterState.endDateStart || filterState.startDateEnd) {
     filterRulesCount += 1;
   }

From b99c9add04fd63768ec862e60b0b5e6238be5342 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 01:50:47 +0530
Subject: [PATCH 13/23] Update index.jsx

---
 .../components/challenge-listing/Filters/FiltersPanel/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index 244b5343e7..c4f1113e62 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -433,7 +433,7 @@ export default function FiltersPanel({
               events: [],
               endDateStart: null,
               startDateEnd: null,
-              status: 'Active',
+              status: 'All',
             });
             selectCommunity(defaultCommunityId);
             setSearchText('');

From 5d3c3aa4ed0f440b25b1fca92b318e0b12fe23fa Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 02:32:45 +0530
Subject: [PATCH 14/23] Update ChallengeFilters.jsx

---
 .../components/challenge-listing/Filters/ChallengeFilters.jsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index 4ce26b5740..ea89fb7b42 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -7,6 +7,7 @@ import SwitchWithLabel from 'components/SwitchWithLabel';
 import { challenge as challengeUtils } from 'topcoder-react-lib';
 // import { COMPETITION_TRACKS as TRACKS } from 'utils/tc';
 import _ from 'lodash';
+import { BUCKETS } from 'utils/challenge-listing/buckets';
 
 // import localStorage from 'localStorage';
 import ChallengeSearchBar from './ChallengeSearchBar';
@@ -49,7 +50,7 @@ export default function ChallengeFilters({
   if (filterState.events && filterState.events.length) filterRulesCount += 1;
   if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
   if (filterState.types && filterState.types.length) filterRulesCount += 1;
-  if (filterState.status && filterState.status !== 'All') filterRulesCount += 1;
+  if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'Active') filterRulesCount += 1;
   if (filterState.endDateStart || filterState.startDateEnd) {
     filterRulesCount += 1;
   }

From 27199390cf3ba979a1afeb88d770245a10849aca Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 03:32:25 +0530
Subject: [PATCH 15/23] Update ChallengeFilters.jsx

---
 .../components/challenge-listing/Filters/ChallengeFilters.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index ea89fb7b42..3e7f9848f1 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -50,7 +50,7 @@ export default function ChallengeFilters({
   if (filterState.events && filterState.events.length) filterRulesCount += 1;
   if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
   if (filterState.types && filterState.types.length) filterRulesCount += 1;
-  if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'Active') filterRulesCount += 1;
+  if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'All') filterRulesCount += 1;
   if (filterState.endDateStart || filterState.startDateEnd) {
     filterRulesCount += 1;
   }

From fa78ea705fb6f7c1d0ded8d8a53852eb7f5d9c6e Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 03:40:20 +0530
Subject: [PATCH 16/23] Update index.jsx

---
 src/shared/components/Dashboard/SRM/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/Dashboard/SRM/index.jsx b/src/shared/components/Dashboard/SRM/index.jsx
index 9c267ca2cf..d3460230ef 100644
--- a/src/shared/components/Dashboard/SRM/index.jsx
+++ b/src/shared/components/Dashboard/SRM/index.jsx
@@ -35,7 +35,7 @@ const SRM = (props) => {
               <a href={`${config.URL.COMMUNITY}/tc?module=ProblemArchive`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
                 Problem Archive
               </a>
-              <a href={`${config.URL.BASE}/member-onboarding/learning-practicing-skills/`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
+              <a href={`${config.URL.BASE}/thrive/articles/How%20To%20Compete%20in%20SRMs`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
                 Learn More
               </a>
             </div>

From 06e9f930c118b17f748a5f58d0f06d54494bda84 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 03:42:59 +0530
Subject: [PATCH 17/23] Update index.jsx.snap

---
 .../components/Dashboard/SRM/__snapshots__/index.jsx.snap       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
index e93e79feae..9eca10f8c4 100644
--- a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
           </a>
           <a
             className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"
-            href="https://www.topcoder-dev.com/member-onboarding/learning-practicing-skills/"
+            href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs/"
           >
             Learn More
           </a>

From 865a898631f17753888c1e4e8236ed0614a12505 Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 03:44:22 +0530
Subject: [PATCH 18/23] Update index.jsx.snap

---
 .../components/Dashboard/SRM/__snapshots__/index.jsx.snap       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
index 9eca10f8c4..5ec908d67c 100644
--- a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
           </a>
           <a
             className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"
-            href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs/"
+            href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs"
           >
             Learn More
           </a>

From 345e9154daee4dabe414efe912a301b0e941374d Mon Sep 17 00:00:00 2001
From: PrakashDurlabhji <prakashseta@gmail.com>
Date: Fri, 16 Oct 2020 05:15:22 +0530
Subject: [PATCH 19/23] Update index.jsx

---
 .../components/challenge-listing/Filters/FiltersPanel/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index c4f1113e62..ed61187a59 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -359,7 +359,7 @@ export default function FiltersPanel({
                   }}
                   options={['Active', 'Completed', 'All'].map(mapOps)}
                   simpleValue
-                  value={filterState.status || 'Active'}
+                  value={filterState.status || 'All'}
                 />
               </div>
             ) : null

From 1605740fd906131880be5c63dbc21925300c869e Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Fri, 16 Oct 2020 19:44:50 +0700
Subject: [PATCH 20/23] fix: #5081 hide view more button when result is less
 than 10

---
 .../components/challenge-listing/Listing/Bucket/index.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
index 371326cc55..48a513216b 100644
--- a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
+++ b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
@@ -184,7 +184,7 @@ export default function Bucket({
       {placeholders}
       {
       // (expandable || loadMore) && (expandable || !keepPlaceholders) && !loading && !expanded ? (
-        (expanding || expandable || loadMore) && !loading && !expanded ? (
+        (expanding || expandable) && !loading && !expanded && loadMore ? (
           <a
             // href={`${challengesUrl}?${bucketQuery}`}
             href={`${challengesUrl}`}

From 169c172426a2b8d24361d19912cfe0fed2ed003e Mon Sep 17 00:00:00 2001
From: roger <dengjun@huobi.com>
Date: Sat, 17 Oct 2020 14:23:59 +0800
Subject: [PATCH 21/23] issue-5072

---
 .../Filters/FiltersPanel/style.scss               | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
index c918eb2043..8e44349086 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
@@ -293,8 +293,11 @@ $panel-radius-4: $corner-radius * 2;
 
   .filter-row {
     display: flex;
+    flex-direction: row;
     align-items: center;
+    flex-wrap: wrap;
     margin-right: $panel-space-100 + 17;
+    width: auto;
 
     @include xs-to-md {
       display: block;
@@ -397,6 +400,7 @@ $panel-radius-4: $corner-radius * 2;
         z-index: 3;
       }
 
+      min-width: 206px;
       margin-right: $panel-space-30;
 
       :global(.Select-value) {
@@ -407,6 +411,17 @@ $panel-radius-4: $corner-radius * 2;
         color: $tc-gray-50;
         line-height: $panel-space-30 - 2;
       }
+
+      @media screen and (max-width: 1024px) {
+        width: 100%;
+        margin-top: 15px;
+      }
+
+      @media screen and (min-width: 1025px) and (max-width: 1346px) {
+        margin-top: 15px;
+
+        @include calc(width, '50% - 30px');
+      }
     }
   }
 }

From fe857a950fe900d8a85f3a804caf7e364283c362 Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Sun, 18 Oct 2020 06:58:21 -0300
Subject: [PATCH 22/23] ci: Deploy develop to Stag and QA env

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e58d6ae06..2b92709fa1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -244,7 +244,8 @@ workflows:
           filters:
             branches:
               only:
-                - listing-develop-sync
+                - develop
+                - bug-bash
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
@@ -260,7 +261,7 @@ workflows:
             branches:
               only:
                 - develop
-                - listing-develop-sync
+                - bug-bash
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From 6a7c9e667996c08b55d5212d66cae4c4f548317e Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 3 Nov 2020 03:59:32 -0300
Subject: [PATCH 23/23] ci: remove bug-bash from QA env

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 970f70b8ef..89a3f65d8d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -246,7 +246,6 @@ workflows:
             branches:
               only:
                 - develop
-                - bug-bash
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global