From bdeb19424bd31d02333b1c3aa36a2091090d1cda Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Mon, 7 Oct 2024 21:07:58 +0100
Subject: [PATCH] :sparkles: (dashboards) making "all widget" button always
 visible (#3588)

---
 .../src/components/reports/Overview.tsx       | 48 +++++++++----------
 upcoming-release-notes/3588.md                |  6 +++
 2 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 upcoming-release-notes/3588.md

diff --git a/packages/desktop-client/src/components/reports/Overview.tsx b/packages/desktop-client/src/components/reports/Overview.tsx
index 82c2f38fca7..36692aea017 100644
--- a/packages/desktop-client/src/components/reports/Overview.tsx
+++ b/packages/desktop-client/src/components/reports/Overview.tsx
@@ -351,7 +351,7 @@ export function Overview() {
             >
               {currentBreakpoint === 'desktop' && (
                 <>
-                  {isEditing ? (
+                  {isDashboardsFeatureEnabled && (
                     <>
                       <Button
                         ref={triggerRef}
@@ -361,12 +361,6 @@ export function Overview() {
                       >
                         <Trans>Add new widget</Trans>
                       </Button>
-                      <Button
-                        isDisabled={isImporting}
-                        onPress={() => setIsEditing(false)}
-                      >
-                        <Trans>Finish editing dashboard</Trans>
-                      </Button>
 
                       <Popover
                         triggerRef={triggerRef}
@@ -440,24 +434,30 @@ export function Overview() {
                         />
                       </Popover>
                     </>
+                  )}
+
+                  {isEditing ? (
+                    <Button
+                      isDisabled={isImporting}
+                      onPress={() => setIsEditing(false)}
+                    >
+                      <Trans>Finish editing dashboard</Trans>
+                    </Button>
+                  ) : isDashboardsFeatureEnabled ? (
+                    <Button
+                      isDisabled={isImporting}
+                      onPress={() => setIsEditing(true)}
+                    >
+                      <Trans>Edit dashboard</Trans>
+                    </Button>
                   ) : (
-                    <>
-                      <Button
-                        variant="primary"
-                        isDisabled={isImporting}
-                        onPress={() => navigate('/reports/custom')}
-                      >
-                        <Trans>Create new custom report</Trans>
-                      </Button>
-                      {isDashboardsFeatureEnabled && (
-                        <Button
-                          isDisabled={isImporting}
-                          onPress={() => setIsEditing(true)}
-                        >
-                          <Trans>Edit dashboard</Trans>
-                        </Button>
-                      )}
-                    </>
+                    <Button
+                      variant="primary"
+                      isDisabled={isImporting}
+                      onPress={() => navigate('/reports/custom')}
+                    >
+                      <Trans>Create new custom report</Trans>
+                    </Button>
                   )}
 
                   {isDashboardsFeatureEnabled && (
diff --git a/upcoming-release-notes/3588.md b/upcoming-release-notes/3588.md
new file mode 100644
index 00000000000..35b7376209c
--- /dev/null
+++ b/upcoming-release-notes/3588.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [MatissJanis]
+---
+
+Dashboards: make "add widgets" button always visible.