Improve refresh loading

src/components/Timeline/Refresh.tsx

@@ -61,7 +61,7 @@ const TimelineRefresh: React.FC<Props> = ({
   const prevStatusId = useRef<Mastodon.Status['id']>()
 
   const queryClient = useQueryClient()
-  const { refetch } = useTimelineQuery({ ...queryKey[1] })
+  const { refetch, isFetched } = useTimelineQuery({ ...queryKey[1] })
 
   const { t } = useTranslation('componentTimeline')
   const { colors } = useTheme()
@@ -118,10 +118,11 @@ const TimelineRefresh: React.FC<Props> = ({
       }
     },
     data => {
-      if (data) {
+      if (data && isFetched) {
         runOnJS(haptics)('Light')
       }
-    }
+    },
+    [isFetched]
   )
 
   const fetchAndScrolled = useSharedValue(false)
@@ -246,6 +247,8 @@ const TimelineRefresh: React.FC<Props> = ({
     []
   )
 
+  if (!isFetched) return null
+
   return (
     <Animated.View
       style={{

src/components/Timeline/index.tsx

@@ -228,11 +228,12 @@ const Timeline: React.FC<Props> = ({
           )
         }
         viewabilityConfigCallbackPairs={viewabilityConfigCallbackPairs.current}
-        {...(!isLoading && {
+        {...(!isLoading &&
-          maintainVisibleContentPosition: {
+          !isFetching && {
-            minIndexForVisible: 0
+            maintainVisibleContentPosition: {
-          }
+              minIndexForVisible: 0
-        })}
+            }
+          })}
         {...androidRefreshControl}
         {...customProps}
       />