diff --git a/public/Release_v1.1.0.pdf b/public/Release_v1.1.0.pdf index a3652dc2..65e8c589 100644 Binary files a/public/Release_v1.1.0.pdf and b/public/Release_v1.1.0.pdf differ diff --git a/src/pages/caseDetail/caseDetailController.js b/src/pages/caseDetail/caseDetailController.js index 3bc1afd6..00a58be2 100644 --- a/src/pages/caseDetail/caseDetailController.js +++ b/src/pages/caseDetail/caseDetailController.js @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { useSelector } from 'react-redux'; import CircularProgress from '@material-ui/core/CircularProgress'; import CaseDetailView from './caseDetailView'; -import { Typography } from '../../components/Wrappers/Wrappers'; +import Error from '../error/Error'; import { dataRoot, caseIDField, } from '../../bento/caseDetailData'; @@ -33,9 +33,7 @@ const CaseDetailContainer = ({ match }) => { if (loading) return ; if (error || !data || data[dataRoot][caseIDField] !== match.params.id) { return ( - - {error ? `An error has occurred in loading stats component: ${error}` : 'Recieved wrong data'} - + ); } diff --git a/src/pages/programDetail/programDetailController.js b/src/pages/programDetail/programDetailController.js index 35546b69..65bbc2f8 100644 --- a/src/pages/programDetail/programDetailController.js +++ b/src/pages/programDetail/programDetailController.js @@ -4,7 +4,7 @@ import _ from 'lodash'; import { useQuery } from '@apollo/client'; import CircularProgress from '@material-ui/core/CircularProgress'; import ProgramView from './programDetailView'; -import { Typography } from '../../components/Wrappers/Wrappers'; +import Error from '../error/Error'; import { GET_PROGRAM_DETAIL_DATA_QUERY } from '../../bento/programDetailData'; import { GET_PROJECTS_OVERVIEW_QUERY, @@ -56,11 +56,9 @@ const ProgramDetailContainer = ({ match }) => { } if (programDetailsLoading || projectOverviewLoading) return ; - if (programDetailsError || projectOverviewError || !programDetailsData || !projectOverviewData || programDetailsData.programDetail.program_id !== match.params.id) { + if (programDetailsError || projectOverviewError || !programDetailsData || !projectOverviewData || !programDetailsData.programDetail || programDetailsData.programDetail.program_id !== match.params.id) { return ( - - {programDetailsError ? `An error has occurred in loading stats component: ${programDetailsError}` : projectOverviewError ? `An error has occurred in loading stats component: ${projectOverviewError}` : 'Recieved wrong data'} - + ); } return ;