diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d4e5b3fd1..9a3d5241af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -237,7 +237,7 @@ workflows:
filters:
branches:
only:
- - apollo-site
+ - free
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
index 8ebdbb6725..f9e83ed626 100644
--- a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
+++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
@@ -116,7 +116,7 @@ class ChallengeHistoryModal extends Component {
challengesOrdered.map(challenge => (
-
+
{challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}
|
diff --git a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx
index 33c49b62e9..9b46aa65d1 100644
--- a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx
+++ b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx
@@ -65,6 +65,9 @@ export default function LeaderboardTable(props) {
photoUrl = `${config.CDN.PUBLIC}/avatar/${
encodeURIComponent(photoUrl)}?size=40`;
}
+ const fulfillment = competitor['tco_leaderboard.fulfillment']
+ ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+ : competitor.fulfillment;
return (
{competitor.rank} |
@@ -105,7 +108,7 @@ export default function LeaderboardTable(props) {
{
isCopilot ? (
- {competitor.fulfillment} |
+ {fulfillment} |
) : null
}
{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount} |
@@ -122,7 +125,7 @@ export default function LeaderboardTable(props) {
}
{
isAlgo ? (
- {competitor['srm_tco19.score']} |
+ {competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']} |
) : null
}
@@ -141,7 +144,13 @@ export default function LeaderboardTable(props) {
Fulfillment |
) : null
}
- # of Challenges |
+ {
+ isAlgo ? (
+ # of Matches |
+ ) : (
+ # of Challenges |
+ )
+ }
Points |
{
isTopGear ? (
diff --git a/src/shared/components/Leaderboard/PodiumSpot/index.jsx b/src/shared/components/Leaderboard/PodiumSpot/index.jsx
index 72fc4869d8..ad1795e42e 100644
--- a/src/shared/components/Leaderboard/PodiumSpot/index.jsx
+++ b/src/shared/components/Leaderboard/PodiumSpot/index.jsx
@@ -107,6 +107,9 @@ export default function PodiumSpot(props) {
}
let rootStyle = `${stylesName}.PodiumSpot`;
if (PODIUM_ITEM_MODIFIER[competitor.rank]) rootStyle += ` ${stylesName}.PodiumSpot--${PODIUM_ITEM_MODIFIER[competitor.rank]}`;
+ const fulfillment = competitor['tco_leaderboard.fulfillment']
+ ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+ : competitor.fulfillment;
return (
@@ -175,14 +178,20 @@ export default function PodiumSpot(props) {
{
isCopilot ? (
- {competitor.fulfillment}
+ {fulfillment}
fulfillment
) : null
}
{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}
- challenges
+ {
+ isAlgo ? (
+ # of matches
+ ) : (
+ challenges
+ )
+ }
{formatPoints(competitor['tco_leaderboard.tco_points'] || competitor.points)}
@@ -207,7 +216,7 @@ export default function PodiumSpot(props) {
{
isAlgo ? (
- {competitor['srm_tco19.score']}
+ {competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}
total score
) : null