From 749e09071a58b2a6a11447a42acbed53c40985dc Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Thu, 22 Jul 2021 10:20:03 +0300
Subject: [PATCH 1/2] fix #5651

---
 .../components/Contentful/ContentSlider/ContentSlider.jsx     | 2 +-
 .../components/Leaderboard/ChallengeHistoryModal/index.jsx    | 4 +++-
 .../components/Leaderboard/ChallengeHistoryModal/styles.scss  | 4 ++--
 .../tco/Leaderboard/ChallengeHistoryModal/index.jsx           | 4 ++++
 src/shared/containers/tco/Leaderboard/index.jsx               | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/Contentful/ContentSlider/ContentSlider.jsx b/src/shared/components/Contentful/ContentSlider/ContentSlider.jsx
index c6faf8bf21..fd84bf3b46 100644
--- a/src/shared/components/Contentful/ContentSlider/ContentSlider.jsx
+++ b/src/shared/components/Contentful/ContentSlider/ContentSlider.jsx
@@ -101,7 +101,7 @@ ContentSlider.defaultProps = {
   cellSpacing: null,
   cellAlign: 'center',
   wrapAround: true,
-  heightMode: 'current',
+  heightMode: 'max',
   arrowTheme: 'Gray',
 };
 
diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
index 0f8ac9c596..f71e7a0de4 100644
--- a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
+++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
@@ -28,6 +28,7 @@ class ChallengeHistoryModal extends Component {
       loading,
       isCopilot,
       isAlgo,
+      themeName,
     } = this.props;
     const { sortParam } = this.state;
     const challengesOrdered = _.orderBy(challenges, [sortParam.field], [sortParam.order]);
@@ -44,7 +45,7 @@ class ChallengeHistoryModal extends Component {
             competitor={competitor}
             isCopilot={isCopilot}
             isAlgo={isAlgo}
-            themeName="TCO22"
+            themeName={themeName}
           />
         </div>
         <table styleName="history-table">
@@ -178,6 +179,7 @@ ChallengeHistoryModal.propTypes = {
   loading: PT.bool.isRequired,
   isAlgo: PT.bool,
   isCopilot: PT.bool,
+  themeName: PT.string.isRequired,
 };
 
 export default ChallengeHistoryModal;
diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/styles.scss b/src/shared/components/Leaderboard/ChallengeHistoryModal/styles.scss
index 0dbd5754aa..bfae5ccc70 100644
--- a/src/shared/components/Leaderboard/ChallengeHistoryModal/styles.scss
+++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/styles.scss
@@ -12,7 +12,7 @@ $light-gray: #d4d4d4;
   width: 70%;
   max-height: 90%;
   overflow-y: auto;
-  padding: 80px 78px;
+  padding: 60px 78px 80px;
 
   @media (max-width: 768px) {
     width: 90%;
@@ -26,7 +26,7 @@ $light-gray: #d4d4d4;
     font-weight: 500;
     line-height: 38px;
     text-align: center;
-    margin-bottom: 60px;
+    margin-bottom: 40px;
     text-transform: uppercase;
 
     @media (max-width: 768px) {
diff --git a/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
index 165c8c4a7a..b0afd48a41 100644
--- a/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
+++ b/src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx
@@ -13,6 +13,7 @@ function ChallengeHistoryModalContainer({
   loading,
   isCopilot,
   isAlgo,
+  themeName,
 }) {
   useEffect(() => {
     getChallengesHistory(dataUrl, competitor);
@@ -26,6 +27,7 @@ function ChallengeHistoryModalContainer({
       loading={loading}
       isCopilot={isCopilot}
       isAlgo={isAlgo}
+      themeName={themeName}
     />
   );
 }
@@ -36,6 +38,7 @@ ChallengeHistoryModalContainer.defaultProps = {
   loading: false,
   isCopilot: false,
   isAlgo: false,
+  themeName: 'Default',
 };
 
 const CHALLENGES_TYPE = PT.arrayOf(PT.shape({
@@ -61,6 +64,7 @@ ChallengeHistoryModalContainer.propTypes = {
   loading: PT.bool,
   isAlgo: PT.bool,
   isCopilot: PT.bool,
+  themeName: PT.string,
 };
 
 function mapStateToProps(state, ownProps) {
diff --git a/src/shared/containers/tco/Leaderboard/index.jsx b/src/shared/containers/tco/Leaderboard/index.jsx
index 5e3c04c60d..4a5564347b 100644
--- a/src/shared/containers/tco/Leaderboard/index.jsx
+++ b/src/shared/containers/tco/Leaderboard/index.jsx
@@ -97,6 +97,7 @@ class LeaderboardPageContainer extends React.Component {
                   dataUrl={tcoPointsApiUrl}
                   isCopilot={isCopilot}
                   isAlgo={isAlgo}
+                  themeName={themeName}
                 />
               ) : null
             }

From ef9b3e60f768be8ab061a95a0144cb9337665cf7 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Thu, 22 Jul 2021 10:21:26 +0300
Subject: [PATCH 2/2] ci: on beta

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd05ec2a41..7a7e5c0e87 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - tco21-leaderboard-fix
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global