From 3aaf3287f0d007ec3d9cf0b8553953394b132cc5 Mon Sep 17 00:00:00 2001
From: Muffin <muffin@muffin.ink>
Date: Thu, 1 Aug 2024 00:35:00 -0500
Subject: [PATCH] Use overridden showFilePicker in "Save now" button too

Fixes oversight in previous commit
---
 src/components/menu-bar/menu-bar.jsx       |  4 +-
 src/components/menu-bar/tw-save-status.jsx | 56 ++++++++++++----------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index 4ba677ab9ac..e10f51ff20e 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/src/components/menu-bar/menu-bar.jsx
@@ -1026,7 +1026,9 @@ class MenuBar extends React.Component {
                 </div>
 
                 <div className={styles.accountInfoGroup}>
-                    <TWSaveStatus />
+                    <TWSaveStatus
+                        showSaveFilePicker={this.props.showSaveFilePicker}
+                    />
                 </div>
 
                 {aboutButton}
diff --git a/src/components/menu-bar/tw-save-status.jsx b/src/components/menu-bar/tw-save-status.jsx
index 576c27bd32f..1c9ed47f41d 100644
--- a/src/components/menu-bar/tw-save-status.jsx
+++ b/src/components/menu-bar/tw-save-status.jsx
@@ -11,34 +11,39 @@ import styles from './save-status.css';
 const TWSaveStatus = ({
     alertsList,
     fileHandle,
-    projectChanged
+    projectChanged,
+    showSaveFilePicker
 }) => (
     filterInlineAlerts(alertsList).length > 0 ? (
         <InlineMessages />
     ) : projectChanged && (
-        <SB3Downloader>{(_className, _downloadProjectCallback, {smartSave}) => (
-            <div
-                onClick={smartSave}
-                className={styles.saveNow}
-            >
-                {fileHandle ? (
-                    <FormattedMessage
-                        defaultMessage="Save as {file}"
-                        description="Menu bar item to save project to an existing file on the user's computer"
-                        id="tw.menuBar.saveAs"
-                        values={{
-                            file: fileHandle.name
-                        }}
-                    />
-                ) : (
-                    <FormattedMessage
-                        defaultMessage="Save to your computer"
-                        description="Menu bar item for downloading a project to your computer"
-                        id="gui.menuBar.downloadToComputer"
-                    />
-                )}
-            </div>
-        )}</SB3Downloader>
+        <SB3Downloader
+            showSaveFilePicker={showSaveFilePicker}
+        >
+            {(_className, _downloadProjectCallback, {smartSave}) => (
+                <div
+                    onClick={smartSave}
+                    className={styles.saveNow}
+                >
+                    {fileHandle ? (
+                        <FormattedMessage
+                            defaultMessage="Save as {file}"
+                            description="Menu bar item to save project to an existing file on the user's computer"
+                            id="tw.menuBar.saveAs"
+                            values={{
+                                file: fileHandle.name
+                            }}
+                        />
+                    ) : (
+                        <FormattedMessage
+                            defaultMessage="Save to your computer"
+                            description="Menu bar item for downloading a project to your computer"
+                            id="gui.menuBar.downloadToComputer"
+                        />
+                    )}
+                </div>
+            )}
+        </SB3Downloader>
     ));
 
 TWSaveStatus.propTypes = {
@@ -46,7 +51,8 @@ TWSaveStatus.propTypes = {
     fileHandle: PropTypes.shape({
         name: PropTypes.string
     }),
-    projectChanged: PropTypes.bool
+    projectChanged: PropTypes.bool,
+    showSaveFilePicker: PropTypes.func
 };
 
 const mapStateToProps = state => ({