From a89129fcf678195f84b0497573c77614f7def9e6 Mon Sep 17 00:00:00 2001 From: Logan Rosen Date: Tue, 30 May 2023 14:55:06 -0400 Subject: [PATCH] Fix button to find people to follow (#806) --- package.json | 2 +- src/view/com/posts/CustomFeedEmptyState.tsx | 9 +++++++-- src/view/com/posts/FollowingEmptyState.tsx | 9 +++++++-- yarn.lock | 12 ++++++------ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 253c3b78..35138d56 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "react-avatar-editor": "^13.0.0", "react-circular-progressbar": "^2.1.0", "react-dom": "^18.2.0", - "react-native": "0.71.7", + "react-native": "0.71.8", "react-native-appstate-hook": "^1.0.6", "react-native-background-fetch": "^4.1.8", "react-native-draggable-flatlist": "^4.0.1", diff --git a/src/view/com/posts/CustomFeedEmptyState.tsx b/src/view/com/posts/CustomFeedEmptyState.tsx index e51794e7..e83a94f0 100644 --- a/src/view/com/posts/CustomFeedEmptyState.tsx +++ b/src/view/com/posts/CustomFeedEmptyState.tsx @@ -11,6 +11,7 @@ import {MagnifyingGlassIcon} from 'lib/icons' import {NavigationProp} from 'lib/routes/types' import {usePalette} from 'lib/hooks/usePalette' import {s} from 'lib/styles' +import {isWeb} from 'platform/detection' export function CustomFeedEmptyState() { const pal = usePalette('default') @@ -18,8 +19,12 @@ export function CustomFeedEmptyState() { const navigation = useNavigation() const onPressFindAccounts = React.useCallback(() => { - navigation.navigate('SearchTab') - navigation.popToTop() + if (isWeb) { + navigation.navigate('Search', {}) + } else { + navigation.navigate('SearchTab') + navigation.popToTop() + } }, [navigation]) return ( diff --git a/src/view/com/posts/FollowingEmptyState.tsx b/src/view/com/posts/FollowingEmptyState.tsx index b3729817..d1843900 100644 --- a/src/view/com/posts/FollowingEmptyState.tsx +++ b/src/view/com/posts/FollowingEmptyState.tsx @@ -11,6 +11,7 @@ import {MagnifyingGlassIcon} from 'lib/icons' import {NavigationProp} from 'lib/routes/types' import {usePalette} from 'lib/hooks/usePalette' import {s} from 'lib/styles' +import {isWeb} from 'platform/detection' export function FollowingEmptyState() { const pal = usePalette('default') @@ -18,8 +19,12 @@ export function FollowingEmptyState() { const navigation = useNavigation() const onPressFindAccounts = React.useCallback(() => { - navigation.navigate('SearchTab') - navigation.popToTop() + if (isWeb) { + navigation.navigate('Search', {}) + } else { + navigation.navigate('SearchTab') + navigation.popToTop() + } }, [navigation]) return ( diff --git a/yarn.lock b/yarn.lock index f20c29dc..bcc4b141 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15227,7 +15227,7 @@ react-native-get-random-values@^1.8.0: dependencies: fast-base64-decode "^1.0.0" -react-native-gradle-plugin@^0.71.17: +react-native-gradle-plugin@^0.71.18: version "0.71.18" resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.18.tgz#20ef199bc85be32e45bb6cc069ec2e7dcb1a74a6" integrity sha512-7F6bD7B8Xsn3JllxcwHhFcsl9aHIig47+3eN4IHFNqfLhZr++3ElDrcqfMzugM+niWbaMi7bJ0kAkAL8eCpdWg== @@ -15345,10 +15345,10 @@ react-native-web@^0.18.11: postcss-value-parser "^4.2.0" styleq "^0.1.2" -react-native@0.71.7: - version "0.71.7" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.7.tgz#d0ae409f6ee4fc7e7a876b4ca9d8d28934133228" - integrity sha512-Id6iRLS581fJMFGbBl1jP5uSmjExtGOvw5Gvh7694zISXjsRAsFMmU+izs0pyCLqDBoHK7y4BT7WGPGw693nYw== +react-native@0.71.8: + version "0.71.8" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.8.tgz#4314145341c49448cf7465b93ced52a433a5e191" + integrity sha512-ftMAuhpgTkbHU9brrqsEyxcNrpYvXKeATY+if22Nfhhg1zW+6wn95w9otwTnA3xHkljPCbng8mUhmmERjGEl7g== dependencies: "@jest/create-cache-key-function" "^29.2.1" "@react-native-community/cli" "10.2.2" @@ -15375,7 +15375,7 @@ react-native@0.71.7: promise "^8.3.0" react-devtools-core "^4.26.1" react-native-codegen "^0.71.5" - react-native-gradle-plugin "^0.71.17" + react-native-gradle-plugin "^0.71.18" react-refresh "^0.4.0" react-shallow-renderer "^16.15.0" regenerator-runtime "^0.13.2"