From bd5df278be0fd21ee85ec4d43a0ffca9dd777cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Fri, 4 Nov 2022 00:20:06 +0000 Subject: [PATCH 1/2] fix: correct date range when selecting later dates first --- .../src/components/date-range-picker/DateRangePicker.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js index 7552c5d4..75c68b9d 100644 --- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js +++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js @@ -1,6 +1,7 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import { compareAsc, differenceInDays, set } from 'date-fns/fp' +import * as R from 'ramda' import React, { useState, useEffect } from 'react' import Calendar from './Calendar' @@ -37,7 +38,12 @@ const DateRangePicker = ({ minDate, maxDate, className, onRangeChange }) => { set({ hours: 23, minutes: 59, seconds: 59, milliseconds: 999 }, day) ) } else { - setTo(from) + setTo( + set( + { hours: 23, minutes: 59, seconds: 59, milliseconds: 999 }, + R.clone(from) + ) + ) setFrom(day) } return From c5e4efdcd26c64050f4cd7c4e32184ba182c5791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Fri, 4 Nov 2022 18:00:46 +0000 Subject: [PATCH 2/2] fix: remove empty files to be downloaded from transaction raw logs --- new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js index 52af182c..83a7734a 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js @@ -107,7 +107,7 @@ const DetailsRow = ({ it: tx, timezone }) => { const zip = new JSZip() const [fetchSummary] = useLazyQuery(TX_SUMMARY, { - onCompleted: data => createCsv(data) + onCompleted: data => createCsv(R.filter(it => !R.isEmpty(it), data)) }) const [cancelTransaction] = useMutation(