From 6191a1aee3df2a54ee9895746b3aaa1fbd0e786f Mon Sep 17 00:00:00 2001
From: James Haworth <james@jameshaworth.dev>
Date: Mon, 16 Mar 2026 22:54:23 +0000
Subject: [PATCH 1/3] Fix iOS scroll overscroll by reverting
 contentInsetAdjustmentBehavior to "never"

---
 components/TabScreenScrollView.tsx | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/components/TabScreenScrollView.tsx b/components/TabScreenScrollView.tsx
index d18e399..b2a65f3 100644
--- a/components/TabScreenScrollView.tsx
+++ b/components/TabScreenScrollView.tsx
@@ -1,7 +1,6 @@
-import { useRef, useCallback, useContext, forwardRef, useImperativeHandle } from 'react';
-import { ScrollView, ScrollViewProps, Platform } from 'react-native';
+import { useRef, useContext, forwardRef, useImperativeHandle } from 'react';
+import { ScrollView, ScrollViewProps } from 'react-native';
 import { BottomTabBarHeightContext } from '@react-navigation/bottom-tabs';
-import { useFocusEffect } from '@react-navigation/native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import Constants from 'expo-constants';
 import { useConnectionContext } from '@/contexts/ConnectionContext';
@@ -37,7 +36,6 @@ export const TabScreenScrollView = forwardRef<TabScreenScrollViewRef, TabScreenS
     // Only add top padding for native tabs where TopBar is absolute-positioned.
     // In Expo Go, TopBar is a flex sibling so no extra padding is needed.
     const topInset = isExpoGo ? 0 : insets.top + TOP_BAR_HEIGHT;
-    const isNativeIOS = !isExpoGo && Platform.OS === 'ios';
     const { connectionState } = useConnectionContext();
     const { isOutdated, isForcedUpdate } = useVersionCheckContext();
     const backgroundColor = useThemeColor({}, 'background');
@@ -50,8 +48,12 @@ export const TabScreenScrollView = forwardRef<TabScreenScrollViewRef, TabScreenS
     // Check if version update banner should be shown
     const shouldShowVersionBanner = isOutdated && !isForcedUpdate;
 
+    // Extra breathing room so content doesn't sit flush against the tab bar
+    const BOTTOM_EXTRA_PADDING = 16;
+
     const totalBottomPadding =
       bottomInset +
+      BOTTOM_EXTRA_PADDING +
       (shouldShowConnectionBanner ? CONNECTION_BANNER_HEIGHT : 0) +
       (shouldShowVersionBanner ? VERSION_BANNER_HEIGHT : 0);
 
@@ -65,26 +67,13 @@ export const TabScreenScrollView = forwardRef<TabScreenScrollViewRef, TabScreenS
       },
     }));
 
-    // Reset scroll position when tab gains focus to fix iOS content inset issues
-    useFocusEffect(
-      useCallback(() => {
-        if (Platform.OS === 'ios') {
-          // Small delay to ensure layout is complete
-          const timeout = setTimeout(() => {
-            scrollViewRef.current?.scrollTo({ y: 0, animated: false });
-          }, 0);
-          return () => clearTimeout(timeout);
-        }
-      }, [])
-    );
-
     return (
       <ScrollView
         ref={scrollViewRef}
         {...props}
         style={[{ backgroundColor }, props.style]}
         keyboardShouldPersistTaps="handled"
-        contentInsetAdjustmentBehavior={isNativeIOS ? 'scrollableAxes' : 'never'}
+        contentInsetAdjustmentBehavior="never"
         automaticallyAdjustContentInsets={false}
         scrollIndicatorInsets={{ top: topInset, bottom: totalBottomPadding }}
         contentContainerStyle={[

From f0955718b20c333f50f630cebd78a205ea5902bc Mon Sep 17 00:00:00 2001
From: James Haworth <james@jameshaworth.dev>
Date: Mon, 16 Mar 2026 22:56:03 +0000
Subject: [PATCH 2/3] Update app version to 1.2.8 in app.json

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index fca9a35..61ac1aa 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "CheckOut",
     "slug": "CheckOut",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "checkoutattendance",

From 864d7dd599d21bf1e444f269e80585f6725a16df Mon Sep 17 00:00:00 2001
From: James Haworth <james@jameshaworth.dev>
Date: Mon, 16 Mar 2026 23:03:52 +0000
Subject: [PATCH 3/3] Move BOTTOM_EXTRA_PADDING constant to module scope

---
 components/TabScreenScrollView.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/TabScreenScrollView.tsx b/components/TabScreenScrollView.tsx
index b2a65f3..c02816a 100644
--- a/components/TabScreenScrollView.tsx
+++ b/components/TabScreenScrollView.tsx
@@ -26,6 +26,8 @@ const TOP_BAR_HEIGHT = 60;
 const CONNECTION_BANNER_HEIGHT = 52;
 // VersionUpdateBanner height: padding (14*2) + content height (~24) ≈ 56px
 const VERSION_BANNER_HEIGHT = 56;
+// Extra breathing room so content doesn't sit flush against the tab bar
+const BOTTOM_EXTRA_PADDING = 16;
 
 export const TabScreenScrollView = forwardRef<TabScreenScrollViewRef, TabScreenScrollViewProps>(
   function TabScreenScrollView({ children, contentContainerStyle, ...props }, ref) {
@@ -48,9 +50,6 @@ export const TabScreenScrollView = forwardRef<TabScreenScrollViewRef, TabScreenS
     // Check if version update banner should be shown
     const shouldShowVersionBanner = isOutdated && !isForcedUpdate;
 
-    // Extra breathing room so content doesn't sit flush against the tab bar
-    const BOTTOM_EXTRA_PADDING = 16;
-
     const totalBottomPadding =
       bottomInset +
       BOTTOM_EXTRA_PADDING +