Merge pull request #3663 from Emurgo/denis/yoext-733/fixed-conditions

Fixed conditions for disabling the export button
Emurgo · Sep 30, 2024 · ab22417 · ab22417
2 parents 68d9026 + 92280a0
commit ab22417
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 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
@@ -85,12 +85,15 @@ class ExportTransactionDialog extends Component<Props & InjectedLayoutProps, Sta
       </Box>
     );
 
+    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: !startDate || !endDate || startDate.isAfter(endDate) || !startDate.isValid() || !endDate.isValid(),
+        disabled: !startDateIsCorrect || !endDateIsCorrect,
         onClick: () => submit({ startDate, endDate }),
       },
     ];