not highlighting the end date in red if the date in future

Emurgo · Sep 30, 2024 · 92280a0 · 92280a0
1 parent c02d6c2
commit 92280a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/packages/yoroi-extension/app/components/wallet/export/DateRange.js b/packages/yoroi-extension/app/components/wallet/export/DateRange.js
@@ -8,7 +8,6 @@ import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import moment from 'moment';
 
 const messages = defineMessages({
   startDate: {
@@ -71,7 +70,6 @@ export default class ExportTransactionDialog extends Component<Props> {
             key={id}
             label={intl.formatMessage(label)}
             value={value}
-            maxDate={moment()} // Today
             minDate={minDate}
             onChange={setDateHandler}
             slotProps={{

diff --git a/packages/yoroi-extension/app/components/wallet/export/ExportTransactionDialog.js b/packages/yoroi-extension/app/components/wallet/export/ExportTransactionDialog.js
@@ -13,7 +13,7 @@ import globalMessages from '../../../i18n/global-messages';
 import CheckboxLabel from '../../common/CheckboxLabel';
 import DateRange from './DateRange';
 import { Box } from '@mui/system';
-import moment, { Moment } from 'moment';
+import { Moment } from 'moment';
 import { withLayout } from '../../../styles/context/layout';
 import type { InjectedLayoutProps } from '../../../styles/context/layout';
 import { Checkbox, FormControlLabel } from '@mui/material';
@@ -85,20 +85,15 @@ class ExportTransactionDialog extends Component<Props & InjectedLayoutProps, Sta
       </Box>
     );
 
-    const startDateIsCorrect = (): boolean => {
-      return startDate !== null && startDate.isValid() && startDate.isSameOrBefore(endDate)
-    }
-
-    const endDateIsCorrect = (): boolean => {
-      return endDate !== null && endDate.isValid() && endDate.isSameOrBefore(moment());
-    }
+    const startDateIsCorrect = startDate !== null && startDate.isValid() && startDate.isSameOrBefore(endDate);
+    const endDateIsCorrect = endDate !== null && endDate.isValid();
 
     const dialogActions = [
       {
         label: intl.formatMessage(globalMessages.exportButtonLabel),
         primary: true,
         isSubmitting: isActionProcessing || false,
-        disabled: !startDateIsCorrect() || !endDateIsCorrect(),
+        disabled: !startDateIsCorrect || !endDateIsCorrect,
         onClick: () => submit({ startDate, endDate }),
       },
     ];