Merge branch 'develop' into fix-circleci-deployment

Author: luizrrodrigues

.circleci/config.yml

@@ -361,15 +361,14 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - thrive-bug-fixes
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters: &filters-staging
             branches:
               only:
                 - develop
-                - fix-circleci-deployment
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

src/assets/images/icon-gesture.svg

@@ -110,7 +110,7 @@ export class SearchPageFilterInner extends Component {
             <div className={theme.section}>
               <button
                 type="button"
-                className={`${theme['section-header']} ${isShowSubCategory ? theme.expanded : ''}`}
+                className={`${theme['section-header']} ${!isShowSubCategory ? theme.expanded : ''}`}
                 onClick={() => { this.setState({ isShowSubCategory: !isShowSubCategory }); }}
               >
                 <span className={theme['section-title']}>sub category</span>

src/assets/images/tc-logo-pride.svg

@@ -102,6 +102,8 @@ $green-color: #137d60;
 }
 
 .expanded {
+  margin-bottom: 0 !important;
+
   svg {
     -moz-transform: scale(-1, -1);
     -o-transform: scale(-1, -1);

src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx

@@ -77,7 +77,7 @@ $text-gray: #7f7f7f;
   flex-direction: column;
   margin-left: 22px;
   color: $text-black;
-  cursor: pointer;
+  align-items: flex-start;
 
   > div {
     position: relative;

src/shared/components/Contentful/SearchPageFilter/themes/default.scss

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import React, { useState, useEffect } from 'react';
 import PT from 'prop-types';
 import { config } from 'topcoder-react-utils';
-import Logo from 'assets/images/tc-logo.svg';
+import Logo from 'assets/images/tc-logo-pride.svg';
 import { tracking } from '../../actions';
 
 import './style.scss';

src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss

@@ -146,7 +146,7 @@
           align-items: center;
           background-image: url(assets/images/data-back.svg);
           width: 78px;
-          height: 69px;
+          height: 71px;
         }
 
         .trackIconDesign {
@@ -207,6 +207,7 @@
 
           @include xs-to-sm {
             margin: 32px 0 0 0;
+            text-align: center;
           }
 
           .trackTitle {
@@ -219,7 +220,7 @@
             text-align: left;
             text-transform: uppercase;
             margin-bottom: 13px;
-            display: block;
+            display: inline-block;
 
             @include xs-to-sm {
               text-align: center;

src/shared/components/Header/index.jsx

@@ -363,8 +363,12 @@ class ChallengeDetailPageContainer extends React.Component {
       metadata,
     } = challenge;
 
-    const { track } = legacy || {};
+    let { track } = legacy || {};
 
+    if (!track) {
+      /* eslint-disable prefer-destructuring */
+      track = challenge.track || '';
+    }
     const submissionsViewable = _.find(metadata, { type: 'submissionsViewable' });
 
     const isLoggedIn = !_.isEmpty(auth.tokenV3);