Merge branch 'main' into candidate

ios/Podfile.lock

@@ -348,8 +348,6 @@ PODS:
     - React-Core
   - react-native-language-detection (0.2.2):
     - React
-  - react-native-menu (0.7.3):
-    - React
   - react-native-mmkv (2.7.0):
     - MMKV (>= 1.2.13)
     - React-Core
@@ -561,7 +559,6 @@ DEPENDENCIES:
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-ios-context-menu (from `../node_modules/react-native-ios-context-menu`)
   - react-native-language-detection (from `../node_modules/react-native-language-detection`)
-  - "react-native-menu (from `../node_modules/@react-native-menu/menu`)"
   - react-native-mmkv (from `../node_modules/react-native-mmkv`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
@@ -702,8 +699,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-ios-context-menu"
   react-native-language-detection:
     :path: "../node_modules/react-native-language-detection"
-  react-native-menu:
-    :path: "../node_modules/@react-native-menu/menu"
   react-native-mmkv:
     :path: "../node_modules/react-native-mmkv"
   react-native-netinfo:
@@ -818,7 +813,6 @@ SPEC CHECKSUMS:
   react-native-image-picker: a5dddebb4d2955ac4712a4ed66b00a85f62a63ac
   react-native-ios-context-menu: e529171ba760a1af7f2ef0729f5a7f4d226171c5
   react-native-language-detection: f414937fa715108ab50a6269a3de0bcb95e4ceb0
-  react-native-menu: 9d7d6f819cc7fa14a15cf86888c53f3240d86f1b
   react-native-mmkv: a2a40a0458bdbc9d43c4e7752ecfc5e3a87b66dd
   react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
   react-native-pager-view: b58cb9e9f42f64e50cab3040815772c1d119a2e2

package.json

@@ -88,7 +88,6 @@
     "react-native-svg": "^13.8.0",
     "react-native-swipe-list-view": "^3.2.9",
     "react-native-tab-view": "^3.4.0",
-    "react-redux": "^8.0.5",
     "rn-placeholder": "^3.0.3",
     "url-parse": "^1.5.10",
     "zeego": "^1.0.2"

react-native.config.js

@@ -4,6 +4,16 @@ module.exports = {
       platforms: {
         ios: null
       }
+    },
+    '@react-native-menu/menu': {
+      platforms: {
+        ios: null
+      }
+    },
+    'react-native-ios-context-menu': {
+      platforms: {
+        android: null
+      }
     }
   }
 }

src/components/Emojis/List.tsx

@@ -249,7 +249,6 @@ const EmojisList = () => {
           </CustomText>
         )}
         renderItem={listItem}
-        windowSize={4}
         contentContainerStyle={{
           paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
           minHeight: 32 * 2 + StyleConstants.Spacing.M * 3

src/components/Timeline/index.tsx

@@ -251,13 +251,12 @@ const Timeline: React.FC<Props> = ({
         ref={customFLRef || flRef}
         scrollEventThrottle={16}
         onScroll={onScroll}
-        windowSize={5}
         data={flattenPages(data)}
         {...(customProps?.renderItem
           ? { renderItem: customProps.renderItem }
           : { renderItem: ({ item }) => <TimelineDefault item={item} queryKey={queryKey} /> })}
         initialNumToRender={3}
-        maxToRenderPerBatch={3}
+        maxToRenderPerBatch={2}
         onEndReached={() => !disableInfinity && !isFetchingNextPage && fetchNextPage()}
         onEndReachedThreshold={0.75}
         ListFooterComponent={

src/i18n/index.ts

@@ -96,7 +96,7 @@ import '@formatjs/intl-relativetimeformat/locale-data/zh-Hant'
 
 i18n.use(initReactI18next).init({
   lng: 'en',
-  fallbackLng: 'en',
+  fallbackLng: { nb: ['no'], nn: ['no'], default: ['en'] },
 
   ns: ['common'],
   defaultNS: 'common',

src/screens/Tabs/Shared/Toot.tsx

@@ -284,7 +284,6 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
   return (
     <FlatList
       ref={flRef}
-      windowSize={5}
       data={query.data?.pages?.[0].body}
       extraData={query.dataUpdatedAt}
       renderItem={({ item, index }) => {

src/screens/Tabs/Shared/Users.tsx

@@ -36,7 +36,6 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
 
   return (
     <FlatList
-      windowSize={7}
       data={flattenPages(data)}
       style={{
         minHeight: '100%',

yarn.lock

@@ -1445,7 +1445,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.8.4":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.8.4":
   version: 7.20.13
   resolution: "@babel/runtime@npm:7.20.13"
   dependencies:
@@ -3656,13 +3656,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/use-sync-external-store@npm:^0.0.3":
-  version: 0.0.3
-  resolution: "@types/use-sync-external-store@npm:0.0.3"
-  checksum: 161ddb8eec5dbe7279ac971531217e9af6b99f7783213566d2b502e2e2378ea19cf5e5ea4595039d730aa79d3d35c6567d48599f69773a02ffcff1776ec2a44e
-  languageName: node
-  linkType: hard
-
 "@types/yargs-parser@npm:*":
   version: 21.0.0
   resolution: "@types/yargs-parser@npm:21.0.0"
@@ -10084,38 +10077,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-redux@npm:^8.0.5":
-  version: 8.0.5
-  resolution: "react-redux@npm:8.0.5"
-  dependencies:
-    "@babel/runtime": ^7.12.1
-    "@types/hoist-non-react-statics": ^3.3.1
-    "@types/use-sync-external-store": ^0.0.3
-    hoist-non-react-statics: ^3.3.2
-    react-is: ^18.0.0
-    use-sync-external-store: ^1.0.0
-  peerDependencies:
-    "@types/react": ^16.8 || ^17.0 || ^18.0
-    "@types/react-dom": ^16.8 || ^17.0 || ^18.0
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-    react-native: ">=0.59"
-    redux: ^4
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-    react-dom:
-      optional: true
-    react-native:
-      optional: true
-    redux:
-      optional: true
-  checksum: a108f4f7ead6ac005e656d46051474a2bbdb31ede481bbbb3d8d779c1a35e1940b8655577cc5021313411864d305f67fc719aa48d6e5ed8288cf9cbe8b7042e4
-  languageName: node
-  linkType: hard
-
 "react-refresh@npm:^0.4.0":
   version: 0.4.3
   resolution: "react-refresh@npm:0.4.3"
@@ -11642,7 +11603,6 @@ __metadata:
     react-native-svg: ^13.8.0
     react-native-swipe-list-view: ^3.2.9
     react-native-tab-view: ^3.4.0
-    react-redux: ^8.0.5
     rn-placeholder: ^3.0.3
     typescript: ^4.9.5
     url-parse: ^1.5.10