diff --git a/client/src/App.js b/client/src/App.js index 160120e..5b0861b 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -89,7 +89,20 @@ function ChartContainer({name, data, lastFormatter, loading, children, topMargin ); } - const last = data.length ? lastFormatter(data.slice(-1)[0]) : null; + if (data.length === 0) { + return false; + } + + const dataGood = (x) => !['undefined', 'null'].some(y => lastFormatter(x).includes(y)); + let last = null; + if (data.length) { + const data_end = data.slice(-2); + if (dataGood(data_end[1])) { + last = lastFormatter(data_end[1]); + } else if (dataGood(data_end[0])) { + last = lastFormatter(data_end[0]); + } + } return (