From 030b8a4a5e0a6f9edc140377d26ae94548540aa5 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Wed, 15 Jan 2020 17:27:10 +0800
Subject: [PATCH 1/2] fix issue 2632

---
 .../challenge-listing/Filters/ChallengeFilters.jsx  | 13 -------------
 .../Filters/ChallengeSearchBar/style.scss           |  5 +++--
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index 2278768083..9a36b18739 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -1,8 +1,6 @@
 /**
  * Challenge search & filters panel.
  */
-
-import _ from 'lodash';
 import React from 'react';
 import PT from 'prop-types';
 import SwitchWithLabel from 'components/SwitchWithLabel';
@@ -14,7 +12,6 @@ import EditTrackPanel from './EditTrackPanel';
 import FiltersIcon from './FiltersSwitch/filters-icon.svg';
 import FiltersPanel from './FiltersPanel';
 import FiltersSwitch from './FiltersSwitch';
-import FiltersCardsType from './FiltersCardsType';
 
 import './ChallengeFilters.scss';
 
@@ -29,14 +26,12 @@ export default function ChallengeFilters({
   filterState,
   isAuth,
   auth,
-  hideSrm,
   isCardTypeSet,
   isReviewOpportunitiesBucket,
   saveFilter,
   searchText,
   selectCommunity,
   selectedCommunityId,
-  setCardType,
   setExpanded,
   setFilterState,
   setSearchText,
@@ -61,11 +56,6 @@ export default function ChallengeFilters({
   return (
     <div styleName="challenge-filters">
       <div styleName="filter-header">
-        <FiltersCardsType
-          hideSrm={hideSrm}
-          isCardTypeSet={isCardTypeSet}
-          setCardType={setCardType}
-        />
         <ChallengeSearchBar
           onSearch={text => setFilterState(Filter.setText(filterState, text))}
           label={isReviewOpportunitiesBucket ? 'Search Review Opportunities:' : 'Search Challenges:'}
@@ -187,7 +177,6 @@ ChallengeFilters.defaultProps = {
   isCardTypeSet: '',
   isReviewOpportunitiesBucket: false,
   isSavingFilter: false,
-  setCardType: _.noop,
   challenges: [],
 };
 
@@ -200,14 +189,12 @@ ChallengeFilters.propTypes = {
   filterState: PT.shape().isRequired,
   isAuth: PT.bool,
   auth: PT.shape().isRequired,
-  hideSrm: PT.bool.isRequired,
   isCardTypeSet: PT.string,
   isSavingFilter: PT.bool,
   isReviewOpportunitiesBucket: PT.bool,
   saveFilter: PT.func.isRequired,
   selectCommunity: PT.func.isRequired,
   selectedCommunityId: PT.string.isRequired,
-  setCardType: PT.func,
   setExpanded: PT.func.isRequired,
   setFilterState: PT.func.isRequired,
   searchText: PT.string.isRequired,
diff --git a/src/shared/components/challenge-listing/Filters/ChallengeSearchBar/style.scss b/src/shared/components/challenge-listing/Filters/ChallengeSearchBar/style.scss
index eee3628734..0c295c25cf 100644
--- a/src/shared/components/challenge-listing/Filters/ChallengeSearchBar/style.scss
+++ b/src/shared/components/challenge-listing/Filters/ChallengeSearchBar/style.scss
@@ -9,7 +9,7 @@ $challenge-radius-4: $corner-radius * 2;
 
 /* -100px is necessary to compensate for the temporarly added `Alpha preview`
  * banner. Should be modified / removed together with banner. */
-$search-bar-width: '100% - 705px';
+$search-bar-width: '100% - 475px';
 $search-input-width: '100% - 56px';
 
 .ChallengeSearchBar {
@@ -17,7 +17,8 @@ $search-input-width: '100% - 56px';
   vertical-align: middle;
   margin-right: 40px;
   position: relative;
-  top: 1px;
+  top: 10px;
+  height: 60px;
 
   label {
     font-size: 12px;

From 8c29858e2194c04a8f7148c182a2e7261b8a7e14 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Wed, 15 Jan 2020 17:32:07 +0800
Subject: [PATCH 2/2] fix test

---
 .../challenge-listing/Filters/ChallengeFilters.jsx        | 3 ---
 .../Filters/__snapshots__/ChallengeFilters.jsx.snap       | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
index ce9bbd032c..f1d3b99750 100644
--- a/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
+++ b/__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -16,7 +16,6 @@ afterAll(() => {
 
 const saveFilter = jest.fn();
 const selectCommunity = jest.fn();
-const setCardType = jest.fn();
 const setExpanded = jest.fn();
 const setFilterState = jest.fn();
 const setSearchText = jest.fn();
@@ -33,7 +32,6 @@ const mockDatas = [{
   saveFilter,
   selectCommunity,
   selectedCommunityId: '3',
-  setCardType,
   setExpanded,
   setFilterState,
   searchText: '',
@@ -54,7 +52,6 @@ const mockDatas = [{
   saveFilter,
   selectCommunity,
   selectedCommunityId: '3',
-  setCardType,
   setExpanded,
   setFilterState,
   searchText: '',
diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap
index d52b6ebde4..c514a7b0c4 100644
--- a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap
+++ b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap
@@ -7,10 +7,6 @@ exports[`Matches shallow shapshot shapshot 1`] = `
   <div
     className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-header___2l3Jh"
   >
-    <FiltersCardsType
-      isCardTypeSet="type"
-      setCardType={[MockFunction]}
-    />
     <ChallengeSearchBar
       label="Search Challenges:"
       onSearch={[Function]}
@@ -97,10 +93,6 @@ exports[`Matches shallow shapshot shapshot 2`] = `
   <div
     className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-header___2l3Jh"
   >
-    <FiltersCardsType
-      isCardTypeSet="Challenges"
-      setCardType={[MockFunction]}
-    />
     <ChallengeSearchBar
       label="Search Challenges:"
       onSearch={[Function]}