diff --git a/src/components/Inputs/EndDate.js b/src/components/Inputs/EndDate.js
index 18b488a88..0ddd4656c 100644
--- a/src/components/Inputs/EndDate.js
+++ b/src/components/Inputs/EndDate.js
@@ -10,7 +10,7 @@ const DATATEST = 'input-end-date'
 const LABEL = i18n.t('End date')
 const VALIDATOR = composeValidators(hasValue, DATE_VALIDATOR)
 
-const EndDate = ({name, label}) => (
+const EndDate = ({ name, label }) => (
     <DatePickerField
         name={name ?? NAME}
         validator={VALIDATOR}
@@ -21,7 +21,7 @@ const EndDate = ({name, label}) => (
 
 EndDate.propTypes = {
     label: PropTypes.string,
-    name:  PropTypes.string
+    name: PropTypes.string,
 }
 
 export { EndDate }
diff --git a/src/components/Inputs/StartDate.js b/src/components/Inputs/StartDate.js
index 1499a1d7a..23c41904e 100644
--- a/src/components/Inputs/StartDate.js
+++ b/src/components/Inputs/StartDate.js
@@ -5,13 +5,12 @@ import React from 'react'
 import { DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-
 const NAME = 'startDate'
 const DATATEST = 'input-start-date'
 const LABEL = i18n.t('Start date')
 const VALIDATOR = composeValidators(hasValue, DATE_VALIDATOR)
 
-const StartDate = ({name, label}) => (
+const StartDate = ({ name, label }) => (
     <DatePickerField
         name={name ?? NAME}
         validator={VALIDATOR}
@@ -22,6 +21,6 @@ const StartDate = ({name, label}) => (
 
 StartDate.propTypes = {
     label: PropTypes.string,
-    name:  PropTypes.string
+    name: PropTypes.string,
 }
 export { StartDate }
diff --git a/src/pages/EventExport/EventExport.js b/src/pages/EventExport/EventExport.js
index e7cc15db7..a00aa71ad 100644
--- a/src/pages/EventExport/EventExport.js
+++ b/src/pages/EventExport/EventExport.js
@@ -65,7 +65,7 @@ const initialValues = {
     orgUnitIdScheme: defaultOrgUnitIdSchemeOption,
     idScheme: defaultIdSchemeOption,
     inclusion: defaultInclusionOption,
-    skipPaging: true
+    skipPaging: true,
 }
 
 const EventExport = () => {
diff --git a/src/pages/EventImport/form-helper.js b/src/pages/EventImport/form-helper.js
index 81f335c75..5dd6c3a1f 100644
--- a/src/pages/EventImport/form-helper.js
+++ b/src/pages/EventImport/form-helper.js
@@ -34,7 +34,8 @@ const onImport =
                 type: 'TRACKER_IMPORT_JOB',
                 isAsync,
                 setProgress,
-                addEntry: (id, entry) => addTask('event', id, { ...entry, jobDetails: values })
+                addEntry: (id, entry) =>
+                    addTask('event', id, { ...entry, jobDetails: values }),
             })
             return jobStartedMessage
         } catch (e) {
diff --git a/src/pages/TEIExport/TEIExport.js b/src/pages/TEIExport/TEIExport.js
index e039acc1d..2c6f717e4 100644
--- a/src/pages/TEIExport/TEIExport.js
+++ b/src/pages/TEIExport/TEIExport.js
@@ -154,9 +154,7 @@ const TEIExport = () => {
                             </MoreOptions>
                             <ValidationSummary />
                             <ExportButton
-                                label={i18n.t(
-                                    'Export tracked entities'
-                                )}
+                                label={i18n.t('Export tracked entities')}
                                 disabled={!exportEnabled}
                             />
                             <FormAlerts alerts={submitError} />
diff --git a/src/pages/TEIExport/form-helper.js b/src/pages/TEIExport/form-helper.js
index d0ed98e39..49dda1e0b 100644
--- a/src/pages/TEIExport/form-helper.js
+++ b/src/pages/TEIExport/form-helper.js
@@ -44,7 +44,7 @@ const valuesToParams = (
         orgUnitIdScheme: orgUnitIdScheme,
         idScheme: idScheme,
         attachment: filename,
-        skipPaging: true
+        skipPaging: true,
     }
 
     // include selected org.units only when manual selection is selected
@@ -72,7 +72,7 @@ const valuesToParams = (
 
         console.log('>>>>>', followup, minParams.followup)
 
-        if(followup !== 'ALL') {
+        if (followup !== 'ALL') {
             minParams.followup = followup
         }
 
diff --git a/src/pages/TEIImport/form-helper.js b/src/pages/TEIImport/form-helper.js
index dc089691a..fd6d8e59d 100644
--- a/src/pages/TEIImport/form-helper.js
+++ b/src/pages/TEIImport/form-helper.js
@@ -59,9 +59,8 @@ const onImport =
                 isAsync: isAsync,
                 setProgress,
                 addEntry: (id, entry) => {
-                    addTask('tei', id, { ...entry, jobDetails: values });
-                }
-                    
+                    addTask('tei', id, { ...entry, jobDetails: values })
+                },
             })
             return jobStartedMessage
         } catch (e) {