From a3089602bbe9ba11b07fd88c8ff9179bc1606a3d Mon Sep 17 00:00:00 2001 From: Hailey Date: Fri, 7 Jun 2024 15:36:16 -0700 Subject: [PATCH] move newskie to handle (cherry picked from commit 150f2635b278a92ed67dcec748333b428aacb670) (cherry picked from commit 1efaaf835380f4e76d2e4b7fe8b727a92731a794) --- src/components/StarterPack/NewskieDialog.tsx | 2 +- src/components/icons/Newskie.tsx | 2 +- src/screens/Profile/Header/DisplayName.tsx | 6 +----- src/screens/Profile/Header/Handle.tsx | 9 ++++++++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/StarterPack/NewskieDialog.tsx b/src/components/StarterPack/NewskieDialog.tsx index 92919111a7..8aac16ea39 100644 --- a/src/components/StarterPack/NewskieDialog.tsx +++ b/src/components/StarterPack/NewskieDialog.tsx @@ -33,7 +33,7 @@ export function NewskieDialog({ )} hitSlop={HITSLOP_10} onPress={control.open}> - + diff --git a/src/components/icons/Newskie.tsx b/src/components/icons/Newskie.tsx index ba4943f1be..881255736c 100644 --- a/src/components/icons/Newskie.tsx +++ b/src/components/icons/Newskie.tsx @@ -3,7 +3,7 @@ import {View} from 'react-native' import Svg, {Path} from 'react-native-svg' export function Newskie({size}: {size: number}) { return ( - + + @@ -27,9 +26,6 @@ export function ProfileHeaderDisplayName({ moderation.ui('displayName'), )} - - - ) } diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx index 9ab24fbbed..7a4485e1c4 100644 --- a/src/screens/Profile/Header/Handle.tsx +++ b/src/screens/Profile/Header/Handle.tsx @@ -5,7 +5,9 @@ import {Trans} from '@lingui/macro' import {Shadow} from '#/state/cache/types' import {isInvalidHandle} from 'lib/strings/handles' +import {isAndroid} from 'platform/detection' import {atoms as a, useTheme, web} from '#/alf' +import {NewskieDialog} from '#/components/StarterPack/NewskieDialog' import {Text} from '#/components/Typography' export function ProfileHeaderHandle({ @@ -17,7 +19,12 @@ export function ProfileHeaderHandle({ const invalidHandle = isInvalidHandle(profile.handle) const blockHide = profile.viewer?.blocking || profile.viewer?.blockedBy return ( - + + + + {profile.viewer?.followedBy && !blockHide ? (