From b950e34ca9564fef6d01317b718e83368a741859 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Fri, 25 Sep 2020 17:00:47 +0200
Subject: [PATCH] fix bug challenge badge
---
.../FinishedChallengeDetailsViewContainer.tsx | 22 ++++++++++---------
.../ChallengeList/ChallengeListItem.tsx | 22 ++++++++++---------
.../ChallengeModal/ChallengeModal.tsx | 22 ++++++++++---------
3 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
index 70cc776d2..0780b7a91 100644
--- a/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
@@ -36,16 +36,18 @@ const FinishedChallengeDetailsViewContainer: React.FC<FinishedChallengeDetailsVi
const { screenType } = useContext(AppContext)
async function importRightBadge(id: string, badgeStatus: number) {
- // Les png doivent être au format idchallenge-badgestate.png
- const importedBadge =
- id === 'CHA00000001'
- ? await import(
- /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png`
- )
- : await import(
- /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png`
- )
- setBadgeIcon(importedBadge.default)
+ if (badgeStatus !== -1) {
+ // Les png doivent être au format idchallenge-badgestate.png
+ const importedBadge =
+ id === 'CHA00000001'
+ ? await import(
+ /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png`
+ )
+ : await import(
+ /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png`
+ )
+ setBadgeIcon(importedBadge.default)
+ }
}
const defineHeaderHeight = (height: number) => {
diff --git a/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx b/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx
index 13e46e33e..55aae9892 100644
--- a/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx
+++ b/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx
@@ -31,16 +31,18 @@ const ChallengeListItem: React.FC<ChallengeListItemProps> = ({
const [badgeIcon, setBadgeIcon] = useState<string | undefined>()
async function importRightBadge(id: string, badgeStatus: number) {
- // Les png doivent être au format idchallenge-badgestate.png
- const importedBadge =
- id === 'CHA00000001'
- ? await import(
- /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png`
- )
- : await import(
- /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png`
- )
- setBadgeIcon(importedBadge.default)
+ if (badgeStatus !== -1) {
+ // Les png doivent être au format idchallenge-badgestate.png
+ const importedBadge =
+ id === 'CHA00000001'
+ ? await import(
+ /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png`
+ )
+ : await import(
+ /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png`
+ )
+ setBadgeIcon(importedBadge.default)
+ }
}
const defineBadge = () => {
diff --git a/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx b/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx
index 70918d353..c4ee3a2d5 100644
--- a/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx
+++ b/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx
@@ -31,16 +31,18 @@ const ChallengeModal: React.FC<ChallengeModalProps> = ({
const { screenType } = useContext(AppContext)
async function importRightBadge(id: string, badgeStatus: number) {
- // Les png doivent être au format idchallenge-badgestate.png
- const importedBadge =
- id === 'CHA00000001'
- ? await import(
- /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png`
- )
- : await import(
- /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png`
- )
- setBadgeIcon(importedBadge.default)
+ if (badgeStatus !== -1) {
+ // Les png doivent être au format idchallenge-badgestate.png
+ const importedBadge =
+ id === 'CHA00000001'
+ ? await import(
+ /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png`
+ )
+ : await import(
+ /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png`
+ )
+ setBadgeIcon(importedBadge.default)
+ }
}
const showTheRightBadge = (badgeStatus: number | null) => {
--
GitLab