From a9988d47068e74a5b19ff8f386acfbd47b5b025a Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 8 Apr 2022 20:37:09 -0700
Subject: [PATCH] Re-enable top menu on small screens

---
 .../web/components/patterns/PrimaryHeader.tsx | 24 +++++++++----------
 .../templates/article/ArticleActionsMenu.tsx  |  9 +++----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/web/components/patterns/PrimaryHeader.tsx b/packages/web/components/patterns/PrimaryHeader.tsx
index f539fa5fd..bcb8b22ab 100644
--- a/packages/web/components/patterns/PrimaryHeader.tsx
+++ b/packages/web/components/patterns/PrimaryHeader.tsx
@@ -186,19 +186,17 @@ function NavHeader(props: NavHeaderProps): JSX.Element {
         </HStack>
 
         <HStack distribution="end" alignment="center" css={{
-  height: '100%',
-  width: '100%',
-  display: 'none',
-  '@lgDown': {
-    display: 'flex',
-  },
-  mr: '16px',
-  }}
->
-        {/* <ArticleActionsMenu layout='horizontal' /> */}
-
-      </HStack>
-
+          height: '100%',
+          width: '100%',
+          display: 'none',
+          '@lgDown': {
+            display: 'flex',
+          },
+          mr: '16px',
+          }}
+        >
+          <ArticleActionsMenu layout='horizontal' articleActionHandler={() => {}} />
+        </HStack>
 
         {props.username ? (
           <HStack
diff --git a/packages/web/components/templates/article/ArticleActionsMenu.tsx b/packages/web/components/templates/article/ArticleActionsMenu.tsx
index 1d989599c..72e2d5c41 100644
--- a/packages/web/components/templates/article/ArticleActionsMenu.tsx
+++ b/packages/web/components/templates/article/ArticleActionsMenu.tsx
@@ -1,6 +1,6 @@
 import { Separator } from "@radix-ui/react-separator"
 import { ArchiveBox, DotsThree, HighlighterCircle, TagSimple, TextAa } from "phosphor-react"
-import { UserPreferences } from "../../../lib/networking/queries/useGetUserPreferences"
+import { useGetUserPreferences, UserPreferences } from "../../../lib/networking/queries/useGetUserPreferences"
 import { Button } from "../../elements/Button"
 import { Dropdown } from "../../elements/DropdownElements"
 import { Box, SpanBox } from "../../elements/LayoutPrimitives"
@@ -12,7 +12,6 @@ export type ArticleActionsMenuLayout = 'horizontal' | 'vertical'
 
 type ArticleActionsMenuProps = {
   layout: ArticleActionsMenuLayout
-  userPreferences?: UserPreferences
   articleActionHandler: (action: string, arg?: number) => void
 }
 
@@ -31,6 +30,8 @@ export function MenuSeparator(props: MenuSeparatorProps) {
 }
 
 export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element {
+  const { preferencesData } = useGetUserPreferences()
+
   return (
     <>
     <Box
@@ -39,7 +40,7 @@ export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element
         flexDirection: props.layout == 'vertical' ? 'column' : 'row',
         alignItems: 'center',
         justifyContent: props.layout == 'vertical' ? 'center' : 'flex-end',
-        gap: props.layout == 'vertical' ? '8px' : '4px',
+        gap: props.layout == 'vertical' ? '8px' : '20px',
         paddingTop: '6px',
         height: '100%',
         width: '100%',
@@ -57,7 +58,7 @@ export function ArticleActionsMenu(props: ArticleActionsMenuProps): JSX.Element
         }
         css={{  m: '0px', p: '0px' }}
       >
-        <ReaderSettings userPreferences={props.userPreferences} articleActionHandler={props.articleActionHandler} />
+        <ReaderSettings userPreferences={preferencesData} articleActionHandler={props.articleActionHandler} />
       </Dropdown>
 
       <MenuSeparator layout={props.layout} />