Page MenuHomePhorge
Files F32164771

D15424.1765048505.diff
No OneTemporary
Actions

Size
7 KB
Referenced Files
None
Subscribers
None

D15424.1765048505.diff
View Options

diff --git a/lib/shared/search-utils.js b/lib/shared/search-utils.js
--- a/lib/shared/search-utils.js
+++ b/lib/shared/search-utils.js
@@ -254,10 +254,7 @@
]);
const viewerID = useSelector(state => state.currentUserInfo?.id);
- const [sortedMembers, setSortedMembers] = React.useState<
- Omit<UserListItem, 'supportedProtocols'>[],
- >([]);
- React.useEffect(() => {
+ const sortedMembers = React.useMemo(() => {
const nonFriends = [];
const blockedUsers = [];
const friends = [];
@@ -288,7 +285,7 @@
.concat(nonFriends)
.concat(blockedUsers);
- const mappedResult = sortedResults.map(
+ return sortedResults.map(
({
isMemberOfContainingThread,
isMemberOfParentThread,
@@ -351,15 +348,13 @@
return result;
},
);
- setSortedMembers(mappedResult);
}, [
containingThreadInfo,
filteredUserResults,
+ isFarcasterDCsIntegrationEnabled,
parentThreadInfo,
threadType,
viewerID,
- auxUserInfos,
- isFarcasterDCsIntegrationEnabled,
]);
const usersSupportFarcasterDCs = useUsersSupportFarcasterDCs();
diff --git a/native/chat/chat.react.js b/native/chat/chat.react.js
--- a/native/chat/chat.react.js
+++ b/native/chat/chat.react.js
@@ -75,7 +75,6 @@
NUXTipsContext,
} from '../components/nux-tips-context.react.js';
import ProtocolIcon from '../components/protocol-icon.react.js';
-import { ProtocolSelectionProvider } from '../components/protocol-selection-provider.react.js';
import { InputStateContext } from '../input/input-state.js';
import CommunityDrawerButton from '../navigation/community-drawer-button.react.js';
import HeaderBackButton from '../navigation/header-back-button.react.js';
@@ -523,70 +522,68 @@
const activeThreadID = activeThreadSelector(navContext);
return (
- <ProtocolSelectionProvider>
- <View style={styles.view}>
- <Chat.Navigator screenOptions={screenOptions}>
- <Chat.Screen
- name={ChatThreadListRouteName}
- component={ChatThreadsComponent}
- options={chatThreadListOptions}
- />
- <Chat.Screen
- name={MessageListRouteName}
- component={MessageListContainer}
- options={messageListOptions}
- />
- <Chat.Screen
- name={ComposeSubchannelRouteName}
- component={ComposeSubchannel}
- options={composeThreadOptions}
- />
- <Chat.Screen
- name={ThreadSettingsRouteName}
- component={ThreadSettings}
- options={threadSettingsOptions}
- />
- <Chat.Screen
- name={EmojiThreadAvatarCreationRouteName}
- component={EmojiThreadAvatarCreation}
- options={emojiAvatarCreationOptions}
- />
- <Chat.Screen
- name={FullScreenThreadMediaGalleryRouteName}
- component={FullScreenThreadMediaGallery}
- options={fullScreenThreadMediaGalleryOptions}
- />
- <Chat.Screen
- name={DeleteThreadRouteName}
- component={DeleteThread}
- options={deleteThreadOptions}
- />
- <Chat.Screen
- name={PinnedMessagesScreenRouteName}
- component={PinnedMessagesScreen}
- options={pinnedMessagesScreenOptions}
- />
- <Chat.Screen
- name={MessageSearchRouteName}
- component={MessageSearch}
- options={messageSearchOptions}
- />
- <Chat.Screen
- name={ChangeRolesScreenRouteName}
- component={ChangeRolesScreen}
- options={changeRolesScreenOptions}
- />
- <Chat.Screen
- name={ThreadSettingsNotificationsRouteName}
- component={ThreadSettingsNotifications}
- options={threadSettingsNotificationsOptions}
- />
- </Chat.Navigator>
- <MessageStorePruner frozen={frozen} activeThreadID={activeThreadID} />
- <ThreadScreenPruner />
- <NUXHandler />
- {draftUpdater}
- </View>
- </ProtocolSelectionProvider>
+ <View style={styles.view}>
+ <Chat.Navigator screenOptions={screenOptions}>
+ <Chat.Screen
+ name={ChatThreadListRouteName}
+ component={ChatThreadsComponent}
+ options={chatThreadListOptions}
+ />
+ <Chat.Screen
+ name={MessageListRouteName}
+ component={MessageListContainer}
+ options={messageListOptions}
+ />
+ <Chat.Screen
+ name={ComposeSubchannelRouteName}
+ component={ComposeSubchannel}
+ options={composeThreadOptions}
+ />
+ <Chat.Screen
+ name={ThreadSettingsRouteName}
+ component={ThreadSettings}
+ options={threadSettingsOptions}
+ />
+ <Chat.Screen
+ name={EmojiThreadAvatarCreationRouteName}
+ component={EmojiThreadAvatarCreation}
+ options={emojiAvatarCreationOptions}
+ />
+ <Chat.Screen
+ name={FullScreenThreadMediaGalleryRouteName}
+ component={FullScreenThreadMediaGallery}
+ options={fullScreenThreadMediaGalleryOptions}
+ />
+ <Chat.Screen
+ name={DeleteThreadRouteName}
+ component={DeleteThread}
+ options={deleteThreadOptions}
+ />
+ <Chat.Screen
+ name={PinnedMessagesScreenRouteName}
+ component={PinnedMessagesScreen}
+ options={pinnedMessagesScreenOptions}
+ />
+ <Chat.Screen
+ name={MessageSearchRouteName}
+ component={MessageSearch}
+ options={messageSearchOptions}
+ />
+ <Chat.Screen
+ name={ChangeRolesScreenRouteName}
+ component={ChangeRolesScreen}
+ options={changeRolesScreenOptions}
+ />
+ <Chat.Screen
+ name={ThreadSettingsNotificationsRouteName}
+ component={ThreadSettingsNotifications}
+ options={threadSettingsNotificationsOptions}
+ />
+ </Chat.Navigator>
+ <MessageStorePruner frozen={frozen} activeThreadID={activeThreadID} />
+ <ThreadScreenPruner />
+ <NUXHandler />
+ {draftUpdater}
+ </View>
);
}
diff --git a/native/chat/settings/add-users-modal.react.js b/native/chat/settings/add-users-modal.react.js
--- a/native/chat/settings/add-users-modal.react.js
+++ b/native/chat/settings/add-users-modal.react.js
@@ -77,7 +77,10 @@
}, [goBackOnce]);
const callChangeThreadSettings = useChangeThreadSettings();
- const userInfoInputIDs = userInfoInputArray.map(userInfo => userInfo.id);
+ const userInfoInputIDs = React.useMemo(
+ () => userInfoInputArray.map(userInfo => userInfo.id),
+ [userInfoInputArray],
+ );
const { route } = props;
const { threadInfo } = route.params;
diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -73,6 +73,7 @@
import NonKeyserverActivityHandler from './components/non-keyserver-activity-handler.react.js';
import { NUXTipsContextProvider } from './components/nux-tips-context.react.js';
import PersistedStateGate from './components/persisted-state-gate.js';
+import { ProtocolSelectionProvider } from './components/protocol-selection-provider.react.js';
import ReportHandler from './components/report-handler.react.js';
import VersionSupportedChecker from './components/version-supported.react.js';
import ConnectedStatusBar from './connected-status-bar.react.js';
@@ -341,7 +342,9 @@
<NUXTipsContextProvider>
<BackupHandlerContextProvider>
<FarcasterMessageFetchingProvider>
- <RootNavigator />
+ <ProtocolSelectionProvider>
+ <RootNavigator />
+ </ProtocolSelectionProvider>
</FarcasterMessageFetchingProvider>
</BackupHandlerContextProvider>
</NUXTipsContextProvider>

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 7:15 PM (5 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5840327
Default Alt Text
D15424.1765048505.diff (7 KB)

Event Timeline