Page MenuHomePhorge
Files F32185783

D15238.1765084099.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D15238.1765084099.diff
View Options

diff --git a/native/chat/message-list-container.react.js b/native/chat/message-list-container.react.js
--- a/native/chat/message-list-container.react.js
+++ b/native/chat/message-list-container.react.js
@@ -20,7 +20,10 @@
useSearchUsers,
} from 'lib/shared/search-utils.js';
import { useExistingThreadInfoFinder } from 'lib/shared/thread-utils.js';
-import { threadSpecs } from 'lib/shared/threads/thread-specs.js';
+import {
+ threadSpecs,
+ threadTypeIsPersonal,
+} from 'lib/shared/threads/thread-specs.js';
import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import type { AccountUserInfo, UserListItem } from 'lib/types/user-types.js';
import { pinnedMessageCountText } from 'lib/utils/message-pinning-utils.js';
@@ -37,6 +40,7 @@
import { MessageListContextProvider } from './message-list-types.js';
import MessageList from './message-list.react.js';
import ParentThreadHeader from './parent-thread-header.react.js';
+import RelationshipPrompt from './relationship-prompt.react.js';
import ContentLoading from '../components/content-loading.react.js';
import { InputStateContext } from '../input/input-state.js';
import {
@@ -76,6 +80,9 @@
height: 0,
opacity: 0,
},
+ bannersContainer: {
+ zIndex: 2,
+ },
};
type BaseProps = {
@@ -480,9 +487,24 @@
}
}, [farcasterRefreshConversation, threadInfo.id, threadInfo.type]);
+ let relationshipPrompt = null;
+ if (threadTypeIsPersonal(threadInfo.type)) {
+ relationshipPrompt = (
+ <RelationshipPrompt
+ pendingPersonalThreadUserInfo={
+ props.route.params.pendingPersonalThreadUserInfo
+ }
+ threadInfo={threadInfo}
+ />
+ );
+ }
+
return (
<MessageListContextProvider threadInfo={threadInfo}>
- {pinnedCountBanner}
+ <View style={styles.bannersContainer}>
+ {pinnedCountBanner}
+ {relationshipPrompt}
+ </View>
<MessageListContainer
{...props}
usernameInputText={usernameInputText}
diff --git a/native/chat/message-list.react.js b/native/chat/message-list.react.js
--- a/native/chat/message-list.react.js
+++ b/native/chat/message-list.react.js
@@ -8,14 +8,12 @@
import { chatMessageItemKey } from 'lib/shared/chat-message-item-utils.js';
import { useFetchMessages } from 'lib/shared/message-utils.js';
-import { threadTypeIsPersonal } from 'lib/shared/threads/thread-specs.js';
import { useWatchThread } from 'lib/shared/watch-thread-utils.js';
import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import ChatList from './chat-list.react.js';
import type { ChatNavigationProp } from './chat.react.js';
import Message from './message.react.js';
-import RelationshipPrompt from './relationship-prompt.react.js';
import ListLoadingIndicator from '../components/list-loading-indicator.react.js';
import {
KeyboardContext,
@@ -196,24 +194,13 @@
render(): React.Node {
const { messageListData, startReached } = this.props;
const footer = startReached ? this.ListFooterComponent : undefined;
- let relationshipPrompt = null;
- if (threadTypeIsPersonal(this.props.threadInfo.type)) {
- relationshipPrompt = (
- <RelationshipPrompt
- pendingPersonalThreadUserInfo={
- this.props.route.params.pendingPersonalThreadUserInfo
- }
- threadInfo={this.props.threadInfo}
- />
- );
- }
+
return (
<View
style={this.props.styles.container}
ref={this.flatListContainerRef}
onLayout={this.onFlatListContainerLayout}
>
- {relationshipPrompt}
<ChatList
navigation={this.props.navigation}
inverted={true}

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 5:08 AM (9 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5842549
Default Alt Text
D15238.1765084099.diff (3 KB)

Event Timeline