From 9a3776ba69de6c7028ec848d44eacaee7e0284c9 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Fri, 5 Mar 2021 15:56:11 +0100
Subject: [PATCH] Fix default icon
---
src/components/Ecogesture/EcogestureCard.tsx | 16 +++-------------
src/components/Ecogesture/EcogestureModal.tsx | 4 +++-
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/components/Ecogesture/EcogestureCard.tsx b/src/components/Ecogesture/EcogestureCard.tsx
index 39392b614..76322d514 100644
--- a/src/components/Ecogesture/EcogestureCard.tsx
+++ b/src/components/Ecogesture/EcogestureCard.tsx
@@ -20,16 +20,12 @@ const EcogestureCard: React.FC<EcogestureCardProps> = ({
const handleCardclick = () => {
handleClick && ecogesture && handleClick(ecogesture)
}
- const [ecogestureIcon, setEcogestureIcon] = useState<string>()
+ const [ecogestureIcon, setEcogestureIcon] = useState<string>('')
useEffect(() => {
if (ecogesture) {
importIconbyId(ecogesture.id, 'ecogesture').then(icon => {
- if (icon) {
- setEcogestureIcon(icon)
- } else {
- setEcogestureIcon(defaultIcon)
- }
+ icon ? setEcogestureIcon(icon) : setEcogestureIcon(defaultIcon)
})
}
}, [ecogesture])
@@ -40,13 +36,7 @@ const EcogestureCard: React.FC<EcogestureCardProps> = ({
<div className="ec">
<div className={`ec-content `}>
<div className="ec-content-icon">
- {ecogestureIcon && (
- <StyledIcon
- className="Icon"
- icon={ecogestureIcon || ''}
- size={50}
- />
- )}
+ <StyledIcon className="Icon" icon={ecogestureIcon} size={50} />
</div>
<div className="ec-content-short-name text-15-bold">
{ecogesture.shortName}
diff --git a/src/components/Ecogesture/EcogestureModal.tsx b/src/components/Ecogesture/EcogestureModal.tsx
index e5ffcee07..c8982edb7 100644
--- a/src/components/Ecogesture/EcogestureModal.tsx
+++ b/src/components/Ecogesture/EcogestureModal.tsx
@@ -14,6 +14,8 @@ import { useSelector } from 'react-redux'
import MuiButton from '@material-ui/core/Button'
import EfficientyRating from './EfficientyRating'
import classNames from 'classnames'
+import defaultIcon from 'assets/icons/visu/ecogesture/default.svg'
+
interface EcogestureModalProps {
ecogesture: Ecogesture
isAction: boolean
@@ -41,7 +43,7 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({
useEffect(() => {
if (ecogesture) {
importIconbyId(ecogesture.id, 'ecogesture').then(icon => {
- icon && setEcogestureIcon(icon)
+ icon ? setEcogestureIcon(icon) : setEcogestureIcon(defaultIcon)
})
if (
currentChallenge &&
--
GitLab