From 73fb60bee6093f8427425f9bca36931e74cf7dac Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Wed, 27 May 2020 19:42:48 +0200
Subject: [PATCH] feat: display modal border for unlocked ecogesture
---
src/components/CommonKit/Modal/Modal.tsx | 5 ++---
.../ContentComponents/EcogestureList/EcogestureList.tsx | 7 -------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/components/CommonKit/Modal/Modal.tsx b/src/components/CommonKit/Modal/Modal.tsx
index 8a8fa49da..444ea3a70 100644
--- a/src/components/CommonKit/Modal/Modal.tsx
+++ b/src/components/CommonKit/Modal/Modal.tsx
@@ -17,12 +17,11 @@ const Modal: React.FC<ModalProps> = ({
children,
yellowBorder,
}: ModalProps) => {
+ const yellow = yellowBorder ? yellowBorder : ''
return (
<div className={`modal-overlay ${open ? 'modal-opened' : ''}`}>
<div
- className={`modal-box ${
- border ? 'modal-box-bordered' : ''
- }${yellowBorder}`}
+ className={`modal-box ${border ? 'modal-box-bordered' : ''} ${yellow}`}
>
<StyledIconButton
className="modal-close-button"
diff --git a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
index fc4d49828..f81a02ff2 100644
--- a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
+++ b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
@@ -106,13 +106,6 @@ const EcogesturesList: React.FC<EcogesturesListProps> = ({
opened={openEcogestureModal}
ecogesture={selectedEcogesture}
handleCloseClick={handleCloseClick}
- border={
- selectedEcogesture
- ? selectedEcogesture.unlocked
- ? selectedEcogesture.unlocked
- : false
- : false
- }
/>
</div>
)
--
GitLab