fix: conditionally set scroll

valora-inc · Mar 19, 2024 · fc03d3e · fc03d3e
1 parent ce2177b
commit fc03d3e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/dappsExplorer/DAppsExplorerScreenSearchFilter.tsx b/src/dappsExplorer/DAppsExplorerScreenSearchFilter.tsx
@@ -75,7 +75,6 @@ export function DAppsExplorerScreenSearchFilter({ navigation, route }: Props) {
   const horizontalScrollView = useRef<ScrollView>(null)
   const dappRankingsBottomSheetRef = useRef<BottomSheetRefType>(null)
 
-  const onScroll = Animated.event([{ nativeEvent: { contentOffset: { y: scrollPositionValue } } }])
   const dispatch = useDispatch()
   const loading = useSelector(dappsListLoadingSelector)
   const error = useSelector(dappsListErrorSelector)
@@ -154,8 +153,11 @@ export function DAppsExplorerScreenSearchFilter({ navigation, route }: Props) {
   }
 
   const handleScroll = useAnimatedScrollHandler((event) => {
-    onScroll()
-    scrollPosition.value = event.contentOffset.y
+    if (isTabNavigator) {
+      scrollPosition.value = event.contentOffset.y
+    } else {
+      Animated.event([{ nativeEvent: { contentOffset: { y: scrollPositionValue } } }])
+    }
   })
 
   useScrollAwareHeader({
@@ -288,7 +290,7 @@ export function DAppsExplorerScreenSearchFilter({ navigation, route }: Props) {
             // Workaround iOS setting an incorrect automatic inset at the top
             scrollIndicatorInsets={{ top: 0.01 }}
             scrollEventThrottle={16}
-            onScroll={isTabNavigator ? handleScroll : onScroll}
+            onScroll={handleScroll}
             sections={sections}
             renderItem={({ item: dapp, index, section }) => {
               return (

diff --git a/src/home/WalletHome.tsx b/src/home/WalletHome.tsx
@@ -70,7 +70,6 @@ function WalletHome({ navigation, route }: Props) {
 
   const insets = useSafeAreaInsets()
   const scrollPositionValue = useRef(new Animated.Value(0)).current
-  const onScroll = Animated.event([{ nativeEvent: { contentOffset: { y: scrollPositionValue } } }])
 
   const dispatch = useDispatch()
 
@@ -107,8 +106,11 @@ function WalletHome({ navigation, route }: Props) {
   }
 
   const handleScroll = useAnimatedScrollHandler((event) => {
-    onScroll()
-    scrollPosition.value = event.contentOffset.y
+    if (isTabNavigator) {
+      scrollPosition.value = event.contentOffset.y
+    } else {
+      Animated.event([{ nativeEvent: { contentOffset: { y: scrollPositionValue } } }])
+    }
   })
 
   useScrollAwareHeader({
@@ -237,7 +239,7 @@ function WalletHome({ navigation, route }: Props) {
         // Workaround iOS setting an incorrect automatic inset at the top
         scrollIndicatorInsets={{ top: 0.01 }}
         scrollEventThrottle={16}
-        onScroll={isTabNavigator ? handleScroll : onScroll}
+        onScroll={handleScroll}
         refreshControl={refresh}
         onRefresh={onRefresh}
         refreshing={isLoading}