From 897cbf6754db2efc70d5c4870fb83dd1ff8a505d Mon Sep 17 00:00:00 2001
From: meganrm <meganrm@gmail.com>
Date: Mon, 9 Oct 2023 15:33:58 -0700
Subject: [PATCH 1/2] fix menus offsets

---
 src/components/HelpMenu/index.tsx     | 87 ++++++++++++++++-----------
 src/components/HelpMenu/style.css     |  2 -
 src/components/LoadFileMenu/style.css |  2 -
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/components/HelpMenu/index.tsx b/src/components/HelpMenu/index.tsx
index 32b559c1b..9a5c81abb 100644
--- a/src/components/HelpMenu/index.tsx
+++ b/src/components/HelpMenu/index.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useLocation, Link } from "react-router-dom";
-import { Menu, Dropdown, Button } from "antd";
+import { Dropdown, Button, MenuProps } from "antd";
 
 import { TUTORIAL_PATHNAME } from "../../routes";
 import { DownArrow } from "../Icons";
@@ -27,49 +27,64 @@ const HelpMenu = (): JSX.Element => {
         ) : (
             <Link to={TUTORIAL_PATHNAME}>Quick start</Link>
         );
-    const menu = (
-        <Menu theme="dark" className={styles.menu}>
-            <Menu.Item key="tutorial">{tutorialLink}</Menu.Item>
-            <Menu.Item key="forum">
+
+    const items: MenuProps["items"] = [
+        {
+            key: "tutorial",
+            label: tutorialLink,
+        },
+        {
+            key: "forum",
+            label: (
                 <a href={FORUM_URL} target="_blank" rel="noopener noreferrer">
                     Forum
                 </a>
-            </Menu.Item>
-            <Menu.Item key="github">
+            ),
+        },
+        {
+            key: "github",
+            label: (
                 <a href={GITHUB_URL} target="_blank" rel="noopener noreferrer">
                     GitHub
                 </a>
-            </Menu.Item>
-            <Menu.SubMenu
-                title="Submit issue"
-                popupClassName={styles.submenu}
-                popupOffset={[-0.45, -4]}
-                key="submit-issue"
-            >
-                <Menu.Item key="submit-issue-github">
-                    <a
-                        href={ISSUE_URL}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                    >
-                        via GitHub (preferred)
-                    </a>
-                </Menu.Item>
-                <Menu.Item key="web-form">
-                    <a
-                        href={FORUM_BUG_REPORT_URL}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                    >
-                        via Forum (for non-GitHub users)
-                    </a>
-                </Menu.Item>
-            </Menu.SubMenu>
-        </Menu>
-    );
+            ),
+        },
+        {
+            key: "submit-issue",
+            label: "Submit issue",
+            popupClassName: styles.submenu,
+            popupOffset: [-0.45, -4],
+            children: [
+                {
+                    key: "via-github",
+                    label: (
+                        <a
+                            href={ISSUE_URL}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                        >
+                            via GitHub (preferred)
+                        </a>
+                    ),
+                },
+                {
+                    key: "via-forum",
+                    label: (
+                        <a
+                            href={FORUM_BUG_REPORT_URL}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                        >
+                            via Forum (for non-GitHub users)
+                        </a>
+                    ),
+                },
+            ],
+        },
+    ];
 
     return (
-        <Dropdown overlay={menu} placement="bottomRight">
+        <Dropdown menu={{ items, theme: "dark", className: styles.menu }}>
             <Button onClick={(e) => e.preventDefault()} type="ghost">
                 Help {DownArrow}
             </Button>
diff --git a/src/components/HelpMenu/style.css b/src/components/HelpMenu/style.css
index 3b9cd371d..d820fea83 100644
--- a/src/components/HelpMenu/style.css
+++ b/src/components/HelpMenu/style.css
@@ -11,6 +11,4 @@
     box-shadow: 0 1px 3px black;
     padding: 0;
     width: fit-content;
-    right: 160px !important;
-    left: auto !important;
 }
\ No newline at end of file
diff --git a/src/components/LoadFileMenu/style.css b/src/components/LoadFileMenu/style.css
index 7ba5c1b34..25a7889df 100644
--- a/src/components/LoadFileMenu/style.css
+++ b/src/components/LoadFileMenu/style.css
@@ -28,6 +28,4 @@
     box-shadow: 0 1px 3px black;
     padding: 0;
     width: fit-content;
-    right: 300px !important;
-    left: auto !important;
 }
\ No newline at end of file

From 308425d9af66301182bdc1e256b1c1eb472a3bf6 Mon Sep 17 00:00:00 2001
From: meganrm <meganrm@gmail.com>
Date: Thu, 12 Oct 2023 12:08:01 -0700
Subject: [PATCH 2/2] move version info

---
 src/components/HelpMenu/index.tsx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/HelpMenu/index.tsx b/src/components/HelpMenu/index.tsx
index 3bb65b9a9..10ca28dac 100644
--- a/src/components/HelpMenu/index.tsx
+++ b/src/components/HelpMenu/index.tsx
@@ -83,20 +83,20 @@ const HelpMenu = (): JSX.Element => {
                         </a>
                     ),
                 },
-                {
-                    key: "version",
-                    label: (
-                        <a
-                            onClick={() => {
-                                setModalVisible(!modalVisible);
-                            }}
-                        >
-                            Version inf
-                        </a>
-                    ),
-                },
             ],
         },
+        {
+            key: "version",
+            label: (
+                <a
+                    onClick={() => {
+                        setModalVisible(!modalVisible);
+                    }}
+                >
+                    Version info
+                </a>
+            ),
+        },
     ];
 
     return (