make both cases to have same behavior

Author: HesterG

Diff for: web_src/js/features/file-fold.js

@@ -5,22 +5,16 @@ import {svg} from '../svg.js';
 // The fold arrow is the icon displayed on the upper left of the file box, especially intended for components having the 'fold-file' class.
 // The file content box is the box that should be hidden or shown, especially intended for components having the 'file-content' class.
 //
-export function setFileFolding(fileContentBox, foldArrow, newFold, isFromViewed = false) {
+export function setFileFolding(fileContentBox, foldArrow, newFold) {
   const diffFileHeader = fileContentBox.querySelector('.diff-file-header');
   foldArrow.innerHTML = svg(`octicon-chevron-${newFold ? 'right' : 'down'}`, 18);
   fileContentBox.setAttribute('data-folded', newFold);
   // scroll position needs to be adjusted only when folding the file
   // and scrollY is greater than current file header's offsetTop
   if (newFold && window.scrollY > diffFileHeader.offsetTop) {
-    // if the file is folded by clicking the "fold file" icon, scroll to current file header
-    let scrollTargetoffsetTop = fileContentBox.offsetTop;
-    if (isFromViewed) {
-      // if the file is folded by clicking viewed, scroll to next file header
-      const nextDiffBox = fileContentBox.nextElementSibling;
-      scrollTargetoffsetTop = nextDiffBox.offsetTop;
-    }
+    // Scroll to current file header
     window.scrollTo({
-      top: scrollTargetoffsetTop - document.querySelector('.diff-detail-box').offsetHeight,
+      top: fileContentBox.offsetTop - document.querySelector('.diff-detail-box').offsetHeight,
       behavior: 'instant'
     });
   }

Diff for: web_src/js/features/pull-view-file.js

@@ -65,7 +65,7 @@ export function initViewedCheckboxListenerFor() {
 
       // Fold the file accordingly
       const parentBox = form.closest('.diff-file-header');
-      setFileFolding(parentBox.closest('.file-content'), parentBox.querySelector('.fold-file'), this.checked, true);
+      setFileFolding(parentBox.closest('.file-content'), parentBox.querySelector('.fold-file'), this.checked);
     });
   }
 }