Merge branch 'fix/popup-fluid-error' into 'dev'

Fix modal doesn't open

See merge request web-et-numerique/llle_project/ecolyo!303

src/components/Home/OldFluidDataModal.tsx

@@ -4,7 +4,7 @@ import Modal from 'components/CommonKit/Modal/Modal'
 import WarnCross from 'assets/icons/ico/warn-cross.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import MuiButton from '@material-ui/core/Button'
-import { Redirect } from 'react-router-dom'
+import { useHistory } from 'react-router-dom'
 
 import { FluidState, FluidType } from 'enum/fluid.enum'
 import { FluidStatus } from 'models'
@@ -21,9 +21,9 @@ const OldFluidDataModal: React.FC<OldFluidDataModalProps> = ({
   handleCloseClick,
 }: OldFluidDataModalProps) => {
   const { t } = useI18n()
+  const history = useHistory()
   const [konnectorError, setkonnectorError] = useState<boolean>(false)
   const [erroredKonnectors] = useState<FluidType[]>([])
-  const [redirect, setRedirect] = useState(false)
 
   const checkFluidDataDate = useCallback(() => {
     fluidStatus &&
@@ -37,15 +37,9 @@ const OldFluidDataModal: React.FC<OldFluidDataModalProps> = ({
     if (erroredKonnectors.length > 0) setkonnectorError(true)
   }, [erroredKonnectors, fluidStatus])
 
-  const redirectTrue = useCallback(() => {
-    handleCloseClick()
-    setRedirect(true)
-  }, [handleCloseClick])
-
   const redirectToKonnectors = () => {
-    if (redirect) {
-      return <Redirect to="/options" />
-    }
+    handleCloseClick()
+    history.push('/options')
   }
 
   useEffect(() => {
@@ -86,14 +80,13 @@ const OldFluidDataModal: React.FC<OldFluidDataModalProps> = ({
                 {t('modalOldData.later')}
               </MuiButton>
               <MuiButton
-                onClick={redirectTrue}
+                onClick={redirectToKonnectors}
                 classes={{
                   root: 'btn-highlight',
                   label: 'text-16-bold',
                 }}
               >
                 {t('modalOldData.accessButton')}
-                {redirectToKonnectors()}
               </MuiButton>
             </div>
           </div>