diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6d6f9853..9d512fde 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -236,4 +236,4 @@ lane :build do end expo_release rocket -end \ No newline at end of file +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f004d4df..db563438 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,8 +1,6 @@ PODS: - boost (1.76.0) - DoubleConversion (1.1.6) - - EXApplication (4.0.1): - - ExpoModulesCore - EXAV (10.2.1): - ExpoModulesCore - ReactCommon/turbomodule/core @@ -23,8 +21,6 @@ PODS: - EXFirebaseCore (4.1.0): - ExpoModulesCore - Firebase/Core (= 7.7.0) - - EXFont (10.0.5): - - ExpoModulesCore - EXImageLoader (3.1.0): - ExpoModulesCore - React-Core @@ -34,8 +30,6 @@ PODS: - EXImagePicker (12.0.2): - ExpoModulesCore - EXJSONUtils (0.2.0) - - EXKeepAwake (10.0.2): - - ExpoModulesCore - EXManifests (0.2.2): - EXJSONUtils - EXNotifications (0.14.1): @@ -510,7 +504,6 @@ 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`) @@ -519,12 +512,10 @@ 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`) @@ -615,8 +606,6 @@ 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: @@ -633,8 +622,6 @@ 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: @@ -643,8 +630,6 @@ 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: @@ -769,7 +754,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - EXApplication: bdc8dc27713235565da1029a34385229f31b8e08 EXAV: b9ed0c201092244c46aa78f907f5c66176bed236 EXConstants: 88bf79622fbd9b476c96d8ec57fe97ca44fe8e3c EXCrypto: ab2ba0df3136a5f2407b8c7e70eb498ac20d704f @@ -778,12 +762,10 @@ SPEC CHECKSUMS: EXFileSystem: 7bcd3c1428698150d5c8ca140c8183f2ee204048 EXFirebaseAnalytics: a7ec2dd1394ad0de5c0c63fac0deee496f798284 EXFirebaseCore: 16f39b0ea94ce985a8f2e16cc796bf79bdcfa297 - EXFont: 2597c10ac85a69d348d44d7873eccf5a7576ef5e EXImageLoader: df83442d32bcfb57b7cfc5690096b6caf8203f8d EXImageManipulator: 60d1bf3f1d7709453b1feb38adf8594b7f58710f EXImagePicker: bf4d62532cc2bf217edbe4abbb0014e73e079eac EXJSONUtils: f515cf71710855d7ba5bfc6752af3b9a6f6aad01 - EXKeepAwake: bf48d7f740a5cd2befed6cf9a49911d385c6c47d EXManifests: 50e42e01335df4e54109dee7be5a91bfd37347db EXNotifications: a7d582fa800d77f4a75bd22d52e84e2fbcee26df Expo: 534e51e607aba8229293297da5585f4b26f50fa1 diff --git a/package.json b/package.json index 194d3228..f98d2ac2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "native": "220214", "major": 3, "minor": 5, - "patch": 1, + "patch": 2, "expo": "44.0.0" }, "description": "tooot app for Mastodon", @@ -115,5 +115,26 @@ "postinstall-postinstall": "2.1.0", "react-native-clean-project": "4.0.0", "typescript": "4.5.5" + }, + "expo": { + "autolinking": { + "ios": { + "exclude": [ + "expo-application", + "expo-font", + "expo-keep-awake" + ] + }, + "android": { + "exclude": [ + "expo-application", + "expo-firebase-analytics", + "expo-firebase-core", + "expo-font", + "expo-keep-awake", + "expo-store-review" + ] + } + } } -} +} \ No newline at end of file diff --git a/src/i18n/vi/components/emojis.json b/src/i18n/vi/components/emojis.json index 9e26dfee..1d42a8c1 100644 --- a/src/i18n/vi/components/emojis.json +++ b/src/i18n/vi/components/emojis.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "frequentUsed": "Sử dụng gần đây" +} \ No newline at end of file diff --git a/src/i18n/vi/screens/tabs.json b/src/i18n/vi/screens/tabs.json index 892f3cce..ebbe9806 100644 --- a/src/i18n/vi/screens/tabs.json +++ b/src/i18n/vi/screens/tabs.json @@ -249,7 +249,7 @@ } }, "feedback": { - "heading": "Yêu cầu tính năng" + "heading": "Đề xuất tính năng" }, "support": { "heading": "Ủng hộ tooot" @@ -290,7 +290,7 @@ } }, "attachments": { - "name": "Bộ sưu tập của <1>" + "name": "<0 /><1>'s media" }, "search": { "header": { diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index b659b9b2..d8e20a15 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -44,7 +44,7 @@ const TabSharedToot: React.FC> = ({ if (!scrolled.current) { scrolled.current = true const pointer = flattenData.findIndex(({ id }) => id === toot.id) - if (pointer === -1) return + if (pointer < 1) return Sentry.Native.setContext('Scroll to Index', { type: 'original', index: pointer, diff --git a/yarn.lock b/yarn.lock index cda8a540..f465d7bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8014,4 +8014,4 @@ yargs@^16.2.0: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file