diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 996cb233..d38f5d75 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,6 +1,8 @@ PODS: - boost (1.76.0) - DoubleConversion (1.1.6) + - EXApplication (4.0.2): + - ExpoModulesCore - EXAV (10.2.1): - ExpoModulesCore - ReactCommon/turbomodule/core @@ -21,6 +23,8 @@ PODS: - EXFirebaseCore (4.1.1): - ExpoModulesCore - Firebase/Core (= 7.7.0) + - EXFont (10.0.5): + - ExpoModulesCore - EXImageLoader (3.1.1): - ExpoModulesCore - React-Core @@ -30,6 +34,8 @@ PODS: - EXImagePicker (12.0.2): - ExpoModulesCore - EXJSONUtils (0.2.1) + - EXKeepAwake (10.0.2): + - ExpoModulesCore - EXManifests (0.2.4): - EXJSONUtils - EXNotifications (0.14.1): @@ -373,7 +379,7 @@ PODS: - React-Core - react-native-netinfo (8.2.0): - React-Core - - react-native-pager-view (5.4.15): + - react-native-pager-view (5.4.11): - React-Core - react-native-safe-area-context (4.2.4): - RCT-Folly @@ -508,6 +514,7 @@ PODS: DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - EXApplication (from `../node_modules/expo-application/ios`) - EXAV (from `../node_modules/expo-av/ios`) - EXConstants (from `../node_modules/expo-constants/ios`) - EXCrypto (from `../node_modules/expo-crypto/ios`) @@ -516,10 +523,12 @@ DEPENDENCIES: - EXFileSystem (from `../node_modules/expo-file-system/ios`) - EXFirebaseAnalytics (from `../node_modules/expo-firebase-analytics/ios`) - EXFirebaseCore (from `../node_modules/expo-firebase-core/ios`) + - EXFont (from `../node_modules/expo-font/ios`) - EXImageLoader (from `../node_modules/expo-image-loader/ios`) - EXImageManipulator (from `../node_modules/expo-image-manipulator/ios`) - EXImagePicker (from `../node_modules/expo-image-picker/ios`) - EXJSONUtils (from `../node_modules/expo-json-utils/ios`) + - EXKeepAwake (from `../node_modules/expo-keep-awake/ios`) - EXManifests (from `../node_modules/expo-manifests/ios`) - EXNotifications (from `../node_modules/expo-notifications/ios`) - Expo (from `../node_modules/expo/ios`) @@ -610,6 +619,8 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" DoubleConversion: :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + EXApplication: + :path: "../node_modules/expo-application/ios" EXAV: :path: "../node_modules/expo-av/ios" EXConstants: @@ -626,6 +637,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-firebase-analytics/ios" EXFirebaseCore: :path: "../node_modules/expo-firebase-core/ios" + EXFont: + :path: "../node_modules/expo-font/ios" EXImageLoader: :path: "../node_modules/expo-image-loader/ios" EXImageManipulator: @@ -634,6 +647,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-image-picker/ios" EXJSONUtils: :path: "../node_modules/expo-json-utils/ios" + EXKeepAwake: + :path: "../node_modules/expo-keep-awake/ios" EXManifests: :path: "../node_modules/expo-manifests/ios" EXNotifications: @@ -758,6 +773,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 + EXApplication: 54fe5bd6268d697771645e8f1aef8b806a65247a EXAV: b9ed0c201092244c46aa78f907f5c66176bed236 EXConstants: 88bf79622fbd9b476c96d8ec57fe97ca44fe8e3c EXCrypto: ab2ba0df3136a5f2407b8c7e70eb498ac20d704f @@ -766,10 +782,12 @@ SPEC CHECKSUMS: EXFileSystem: 7bcd3c1428698150d5c8ca140c8183f2ee204048 EXFirebaseAnalytics: a7ec2dd1394ad0de5c0c63fac0deee496f798284 EXFirebaseCore: 52151d0b008b99983e6a120cea94466ee760a4e9 + EXFont: 2597c10ac85a69d348d44d7873eccf5a7576ef5e EXImageLoader: 347b72c2ec2df65120ccec40ea65a4c4f24317ff EXImageManipulator: 60d1bf3f1d7709453b1feb38adf8594b7f58710f EXImagePicker: bf4d62532cc2bf217edbe4abbb0014e73e079eac EXJSONUtils: 5ee0d5cf76da70ad86f0be1a41cc70f47d69e06f + EXKeepAwake: bf48d7f740a5cd2befed6cf9a49911d385c6c47d EXManifests: d3464cd2278f4a19cd80c1aa673231570b534c11 EXNotifications: a7d582fa800d77f4a75bd22d52e84e2fbcee26df Expo: 534e51e607aba8229293297da5585f4b26f50fa1 @@ -820,7 +838,7 @@ SPEC CHECKSUMS: react-native-blurhash: 80ed027224075ef708c3cac6ab116e6f8ee3272f react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866 react-native-netinfo: e922cb2e3eaf9ccdf16b8d4744a89657377aa4a1 - react-native-pager-view: b1914469643f40042e65d78cbf3d3dfebd6fb0d9 + react-native-pager-view: 7f00d63688f7df9fad86dfb0154814419cc5eb8d react-native-safe-area-context: f98b0b16d1546d208fc293b4661e3f81a895afd9 react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097 React-perflogger: 0afaf2f01a47fd0fc368a93bfbb5bd3b26db6e7f diff --git a/package.json b/package.json index f77c29e7..60604cc3 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "react-native-flash-message": "0.2.1", "react-native-gesture-handler": "2.3.2", "react-native-htmlview": "0.16.0", - "react-native-pager-view": "5.4.15", + "react-native-pager-view": "5.4.11", "react-native-reanimated": "2.5.0", "react-native-safe-area-context": "4.2.4", "react-native-screens": "3.13.1", diff --git a/src/screens/Tabs/Public.tsx b/src/screens/Tabs/Public.tsx index 4495a46a..c8b77940 100644 --- a/src/screens/Tabs/Public.tsx +++ b/src/screens/Tabs/Public.tsx @@ -9,13 +9,11 @@ import { TabPublicStackParamList } from '@utils/navigation/navigators' import { QueryKeyTimeline } from '@utils/queryHooks/timeline' -import { getInstanceTimelinesLookback } from '@utils/slices/instancesSlice' import { useTheme } from '@utils/styles/ThemeManager' import React, { useCallback, useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Dimensions, StyleSheet } from 'react-native' +import { Dimensions, StyleSheet, View } from 'react-native' import { TabView } from 'react-native-tab-view' -import { useSelector } from 'react-redux' import TabSharedRoot from './Shared/Root' const Stack = createNativeStackNavigator() @@ -72,10 +70,6 @@ const TabPublic = React.memo( const routes = pages.map(p => ({ key: p.key })) - const timelinesLookback = useSelector( - getInstanceTimelinesLookback, - () => true - ) const renderScene = useCallback( ({ route: { key: page } @@ -101,7 +95,6 @@ const TabPublic = React.memo( ) const children = useCallback( () => ( - // @ts-ignore