diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index f8a87a68e..4ad84ac63 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -75,6 +75,10 @@ let ProfileHeaderStandard = ({
const [_queueBlock, queueUnblock] = useProfileBlockMutationQueue(profile)
const unblockPromptControl = Prompt.usePromptControl()
const requireAuth = useRequireAuth()
+ const isBlockedUser =
+ profile.viewer?.blocking ||
+ profile.viewer?.blockedBy ||
+ profile.viewer?.blockingByList
const onPressEditProfile = React.useCallback(() => {
track('ProfileHeader:EditProfileButtonClicked')
@@ -257,7 +261,7 @@ let ProfileHeaderStandard = ({
- {!isPlaceholderProfile && (
+ {!isPlaceholderProfile && !isBlockedUser && (
<>
{descriptionRT && !moderation.ui('profileView').blur ? (
@@ -274,6 +278,7 @@ let ProfileHeaderStandard = ({
) : undefined}
{!isMe &&
+ !isBlockedUser &&
shouldShowKnownFollowers(profile.viewer?.knownFollowers) && (
Date: Thu, 13 Jun 2024 15:58:56 +0100
Subject: [PATCH 2/2] Calculate correct keyboard offset in composer (#4500)
* calculate correct keyboard offset
* give viewHeight a default value
* much simpler approach
---
src/view/com/composer/Composer.tsx | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 9bb704012..80bce5351 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -415,12 +415,14 @@ export const ComposePost = observer(function ComposePost({
bottomBarAnimatedStyle,
} = useAnimatedBorders()
+ const keyboardVerticalOffset = useKeyboardVerticalOffset()
+
return (
+ keyboardVerticalOffset={keyboardVerticalOffset}
+ style={a.flex_1}>
@@ -741,6 +743,19 @@ function useAnimatedBorders() {
}
}
+function useKeyboardVerticalOffset() {
+ const {top} = useSafeAreaInsets()
+
+ // Android etc
+ if (!isIOS) return 0
+
+ // iPhone SE
+ if (top === 20) return 40
+
+ // all other iPhones
+ return top + 10
+}
+
const styles = StyleSheet.create({
topbarInner: {
flexDirection: 'row',