Page MenuHomePhorge
Files F32223274

D5518.1765208179.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D5518.1765208179.diff
View Options

diff --git a/native/components/user-list-user.react.js b/native/components/user-list-user.react.js
--- a/native/components/user-list-user.react.js
+++ b/native/components/user-list-user.react.js
@@ -58,7 +58,7 @@
this.props.onSelect(userInfo.id);
return;
}
- Alert.alert(userInfo.alert.title, userInfo.alert.text, [{ text: 'OK' }], {
+ Alert.alert(userInfo.alert?.title, userInfo.alert?.text, [{ text: 'OK' }], {
cancelable: true,
});
};
diff --git a/web/chat/chat-thread-composer.react.js b/web/chat/chat-thread-composer.react.js
--- a/web/chat/chat-thread-composer.react.js
+++ b/web/chat/chat-thread-composer.react.js
@@ -129,6 +129,36 @@
const onSelectUserFromSearch = React.useCallback(
(userItem: UserListItem) => {
setUsernameInputText('');
+ if (!userItem.alert) {
+ setUserInfoInputArray(previousUserInfoInputArray => [
+ ...previousUserInfoInputArray,
+ { id: userItem.id, username: userItem.username },
+ ]);
+ } else if (
+ userItem.notice === notFriendNotice &&
+ userInfoInputArray.length === 0
+ ) {
+ const newUserInfoInputArray = [
+ { id: userItem.id, username: userItem.username },
+ ];
+ setUserInfoInputArray(newUserInfoInputArray);
+ const threadInfo = existingThreadInfoFinderForCreatingThread({
+ searching: true,
+ userInfoInputArray: newUserInfoInputArray,
+ });
+ dispatch({
+ type: updateNavInfoActionType,
+ payload: {
+ chatMode: 'view',
+ activeChatThreadID: threadInfo?.id,
+ pendingThread: threadInfo,
+ },
+ });
+ } else {
+ pushModal(
+ <Alert title={userItem.alert?.title}>{userItem.alert?.text}</Alert>,
+ );
+ }
if (!userItem.alert) {
setUserInfoInputArray(previousUserInfoInputArray => [
...previousUserInfoInputArray,

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 8, 3:36 PM (6 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5848873
Default Alt Text
D5518.1765208179.diff (1 KB)

Event Timeline