Merge pull request #5976 from beyondessential/dev

merge: update branch with latest dev
beyondessential · Oct 22, 2024 · 0772329 · 0772329
2 parents b0bc7fe + d1d048e
commit 0772329
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/tupaia-web/src/features/Dashboard/ExportDashboard/ExportConfig.tsx b/packages/tupaia-web/src/features/Dashboard/ExportDashboard/ExportConfig.tsx
@@ -163,16 +163,16 @@ export const ExportConfig = ({ onClose, selectedDashboardItems }: ExportDashboar
               <ExportSubtitle>Edit export settings and click 'Download'.</ExportSubtitle>
             </ExportSettingsInstructionsContainer>
             <ExportSetting>
-              {hasChartItems && (
-                <section>
-                  <ExportSettingsWrapper>
-                    <DisplayFormatSettings />
-                  </ExportSettingsWrapper>
+              <section>
+                <ExportSettingsWrapper>
+                  <DisplayFormatSettings />
+                </ExportSettingsWrapper>
+                {hasChartItems && (
                   <ExportSettingsWrapper>
                     <DisplayOptionsSettings />
                   </ExportSettingsWrapper>
-                </section>
-              )}
+                )}
+              </section>
               <MailingListSection
                 selectedDashboardItems={selectedDashboardItems}
                 settings={{