Merge pull request #731 from cowprotocol/release/1.16-fix

[RELEASE 1.16.0] FIX
cowprotocol · Jun 22, 2022 · d2fc26a · d2fc26a
2 parents 5f583d0 + 0b84541
commit d2fc26a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/custom/components/Header/MobileMenuIcon/index.tsx b/src/custom/components/Header/MobileMenuIcon/index.tsx
@@ -67,7 +67,6 @@ interface IconProps {
   width?: number
   height?: number
   lineSize?: number
-  onTouchStart?: () => void
   onClick?: () => void
 }
 

diff --git a/src/custom/components/Header/index.tsx b/src/custom/components/Header/index.tsx
@@ -84,7 +84,6 @@ export default function Header() {
   const isUpToSmall = useMediaQuery(upToSmall)
   const isLargeAndUp = useMediaQuery(LargeAndUp)
 
-  const [isTouch, setIsTouch] = useState<boolean>(false)
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false)
   const handleMobileMenuOnClick = useCallback(() => {
     isUpToLarge && setIsMobileMenuOpen(!isMobileMenuOpen)
@@ -94,8 +93,6 @@ export default function Header() {
   // This removes the inner scrollbar on the page body, to prevent showing double scrollbars.
   useEffect(() => {
     isMobileMenuOpen ? addBodyClass('noScroll') : removeBodyClass('noScroll')
-    // Set if device has touch capabilities
-    setIsTouch('ontouchstart' in document.documentElement)
   }, [isOrdersPanelOpen, isMobileMenuOpen, isUpToLarge, isUpToMedium, isUpToSmall, isLargeAndUp])
 
   return (
@@ -137,13 +134,7 @@ export default function Header() {
           </HeaderElement>
         </HeaderControls>
 
-        {isUpToLarge && (
-          <MobileMenuIcon
-            isMobileMenuOpen={isMobileMenuOpen}
-            onTouchStart={handleMobileMenuOnClick}
-            onClick={isTouch ? undefined : handleMobileMenuOnClick} // Disable onClick on touch devices and use onTouchStart
-          />
-        )}
+        {isUpToLarge && <MobileMenuIcon isMobileMenuOpen={isMobileMenuOpen} onClick={handleMobileMenuOnClick} />}
         {isOrdersPanelOpen && <OrdersPanel handleCloseOrdersPanel={handleCloseOrdersPanel} />}
       </HeaderModWrapper>
     </Wrapper>

diff --git a/src/custom/theme/baseTheme.tsx b/src/custom/theme/baseTheme.tsx
@@ -399,6 +399,10 @@ export const ThemedGlobalStyle = createGlobalStyle`
       right: initial!important;
       position: fixed!important;
     }
+
+    body.noScroll div[id^='appzi-wfo-'] {
+      display: none!important;
+    }
   `}
 
   // START - Modal overrides