diff --git a/client/components/Footer.jsx b/client/components/Footer.jsx index 11418da53..f8d5594e5 100644 --- a/client/components/Footer.jsx +++ b/client/components/Footer.jsx @@ -46,7 +46,7 @@ const Footer = ({ }; const mapStateToProps = state => ({ - lastUpdated: state.metadata.lastPulled, + lastUpdated: state.metadata.lastPulledLocal, }); Footer.propTypes = { diff --git a/client/components/Map/index.js b/client/components/Map/index.js index 114469c59..f2e5f85ff 100644 --- a/client/components/Map/index.js +++ b/client/components/Map/index.js @@ -121,7 +121,7 @@ class MapContainer extends React.Component { const mapStateToProps = state => ({ pins: state.data.pins, position: state.ui.map, - lastUpdated: state.metadata.lastPulled, + lastUpdated: state.metadata.lastPulledLocal, activeMode: state.ui.map.activeMode, requestTypes: state.mapFilters.requestTypes, }); diff --git a/client/redux/reducers/metadata.js b/client/redux/reducers/metadata.js index 9ebf10dab..24e41979b 100644 --- a/client/redux/reducers/metadata.js +++ b/client/redux/reducers/metadata.js @@ -37,10 +37,12 @@ export const getRegionsSuccess = response => ({ }); const initialState = { - currentTime: null, + currentTimeUTC: null, + currentTimeLocal: null, gitSha: null, version: null, - lastPulled: null, + lastPulledUTC: null, + lastPulledLocal: null, requestTypes: null, councils: null, regions: null, diff --git a/client/redux/sagas/metadata.js b/client/redux/sagas/metadata.js index 1ac00c49e..cad1b4d80 100644 --- a/client/redux/sagas/metadata.js +++ b/client/redux/sagas/metadata.js @@ -20,9 +20,9 @@ function* getMetadata() { try { const [metadata, requestTypes, councils, regions] = yield all([ call(axios.get, `${baseUrl}/status/api`), - call(axios.get, `${baseUrl}/types/`), - call(axios.get, `${baseUrl}/councils/`), - call(axios.get, `${baseUrl}/regions/`), + call(axios.get, `${baseUrl}/types`), + call(axios.get, `${baseUrl}/councils`), + call(axios.get, `${baseUrl}/regions`), ]); const { data: statusMetadata } = metadata; const { data: typesMetadata } = requestTypes;