Merge pull request #209 from tooot-app/main

Correct iPad screenshots

package.json

@@ -39,7 +39,7 @@
     "@reduxjs/toolkit": "1.7.2",
     "@sentry/react-native": "3.2.13",
     "@sharcoux/slider": "5.6.4",
-    "axios": "0.25.0",
+    "axios": "0.24.0",
     "expo": "44.0.6",
     "expo-auth-session": "3.5.0",
     "expo-av": "10.2.1",

src/screens/Tabs/Local.tsx

@@ -8,11 +8,9 @@ import {
   TabLocalStackParamList
 } from '@utils/navigation/navigators'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { getInstanceTimelinesLookback } from '@utils/slices/instancesSlice'
 import React, { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
-import { useSelector } from 'react-redux'
 import TabSharedRoot from './Shared/Root'
 
 const Stack = createNativeStackNavigator<TabLocalStackParamList>()
@@ -45,17 +43,11 @@ const TabLocal = React.memo(
       [i18n.language]
     )
 
-    const timelinesLookback = useSelector(
-      getInstanceTimelinesLookback,
-      () => true
-    )
     const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Following' }]
-    const renderItem = useCallback(({ item }) => {
+    const renderItem = useCallback(
-      if (timelinesLookback?.['Following']?.ids?.[0] === item.id) {
+      ({ item }) => <TimelineDefault item={item} queryKey={queryKey} />,
-        return <TimelineDefault item={item} queryKey={queryKey} />
+      []
-      }
+    )
-      return <TimelineDefault item={item} queryKey={queryKey} />
-    }, [])
     const children = useCallback(
       () => (
         <Timeline

src/screens/Tabs/Public.tsx

@@ -85,17 +85,15 @@ const TabPublic = React.memo(
         }
       }) => {
         const queryKey: QueryKeyTimeline = ['Timeline', { page }]
-        const renderItem = ({ item }: any) => {
-          if (timelinesLookback?.[page]?.ids?.[0] === item.id) {
-            return <TimelineDefault item={item} queryKey={queryKey} />
-          }
-          return <TimelineDefault item={item} queryKey={queryKey} />
-        }
         return (
           <Timeline
             queryKey={queryKey}
             lookback={page}
-            customProps={{ renderItem }}
+            customProps={{
+              renderItem: ({ item }: any) => (
+                <TimelineDefault item={item} queryKey={queryKey} />
+              )
+            }}
           />
         )
       },

src/utils/queryHooks/timeline.ts

@@ -2,10 +2,7 @@ import apiInstance, { InstanceResponse } from '@api/instance'
 import haptics from '@components/haptics'
 import queryClient from '@helpers/queryClient'
 import { store } from '@root/store'
-import {
+import { getInstanceNotificationsFilter } from '@utils/slices/instancesSlice'
-  getInstanceNotificationsFilter,
-  updateInstanceTimelineLookback
-} from '@utils/slices/instancesSlice'
 import { AxiosError } from 'axios'
 import { uniqBy } from 'lodash'
 import {

yarn.lock

@@ -2676,12 +2676,12 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-axios@0.25.0:
+axios@0.24.0:
-  version "0.25.0"
+  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
   dependencies:
-    follow-redirects "^1.14.7"
+    follow-redirects "^1.14.4"
 
 babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
@@ -4170,7 +4170,7 @@ flow-parser@^0.121.0:
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f"
   integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==
 
-follow-redirects@^1.14.7:
+follow-redirects@^1.14.4:
   version "1.14.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
   integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==