cleanup condition adjust scroll view for web

Expensify · Apr 10, 2024 · 283e46f · 283e46f
1 parent 0376ede
commit 283e46f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/hooks/useViewportOffsetTop/index.ts b/src/hooks/useViewportOffsetTop/index.ts
@@ -1,4 +1,5 @@
 import {useCallback, useEffect, useRef, useState} from 'react';
+import * as Browser from '@libs/Browser';
 import addViewportResizeListener from '@libs/VisualViewport';
 
 /**
@@ -15,7 +16,7 @@ export default function useViewportOffsetTop(shouldAdjustScrollView = false): nu
                 targetOffsetTop = event.target.offsetTop;
             }
 
-            if (shouldAdjustScrollView && window.visualViewport) {
+            if (Browser.isMobileSafari() && shouldAdjustScrollView && window.visualViewport) {
                 const clientHeight = document.body.clientHeight;
                 const adjustScrollY = Math.round(clientHeight - window.visualViewport.height);
                 if (cachedDefaultOffsetTop.current === 0) {

diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
@@ -27,7 +27,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Timing from '@libs/actions/Timing';
-import * as Browser from '@libs/Browser';
 import Navigation from '@libs/Navigation/Navigation';
 import clearReportNotifications from '@libs/Notification/clearReportNotifications';
 import Performance from '@libs/Performance';
@@ -275,7 +274,7 @@ function ReportScreen({
         Performance.markStart(CONST.TIMING.CHAT_RENDER);
     }
     const [isComposerFocus, setIsComposerFocus] = useState(false);
-    const shouldAdjustScrollView = useMemo(() => Browser.isMobileSafari() && isComposerFocus && !modal?.willAlertModalBecomeVisible, [isComposerFocus, modal]);
+    const shouldAdjustScrollView = useMemo(() => isComposerFocus && !modal?.willAlertModalBecomeVisible, [isComposerFocus, modal]);
     const viewportOffsetTop = useViewportOffsetTop(shouldAdjustScrollView);
 
     const {reportPendingAction, reportErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);