nostr/nostros
1
0
Fork 0
mirror of https://github.com/KoalaSat/nostros.git synced 2024-09-29 06:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dm

Browse Source
This commit is contained in:
KoalaSat 2023-01-28 22:08:20 +01:00
parent d904bf14a7
commit cfe48205f8
No known key found for this signature in database
GPG Key ID: 2F7F61C6146AB157
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/Pages/ConversationPage/index.tsx
View File

@ -10,7 +10,7 @@ import {
} from '../../Functions/DatabaseFunctions/DirectMessages'
import { getUser, User } from '../../Functions/DatabaseFunctions/Users'
import { useTranslation } from 'react-i18next'
import { username, usersToTags } from '../../Functions/RelayFunctions/Users'
import { username, usernamePubKey, usersToTags } from '../../Functions/RelayFunctions/Users'
import { getUnixTime, formatDistance, fromUnixTime } from 'date-fns'
import TextContent from '../../Components/TextContent'
import { encrypt, decrypt } from '../../lib/nostr/Nip04'
@ -38,7 +38,7 @@ export const ConversationPage: React.FC<ConversationPageProps> = ({ route }) =>
const scrollViewRef = useRef<ScrollView>()
const { database } = useContext(AppContext)
const { relayPool, lastEventId } = useContext(RelayPoolContext)
const { publicKey, privateKey, user } = useContext(UserContext)
const { publicKey, privateKey, name } = useContext(UserContext)
const otherPubKey = useMemo(() => route.params.pubKey, [])
const [directMessages, setDirectMessages] = useState<DirectMessage[]>([])
const [sendingMessages, setSendingMessages] = useState<DirectMessage[]>([])
@ -147,9 +147,9 @@ export const ConversationPage: React.FC<ConversationPageProps> = ({ route }) =>
item: DirectMessage,
pending: boolean,
) => JSX.Element = (index, item, pending) => {
if (!publicKey || !privateKey || !otherUser || !user) return <></>
if (!publicKey || !privateKey || !otherUser) return <></>
const displayName = item.pubkey === publicKey ? username(user) : username(otherUser)
const displayName = item.pubkey === publicKey ? usernamePubKey(name, publicKey) : username(otherUser)
const lastIndex = directMessages.length - 1 === index
const nextItemHasdifferentPubKey =
!lastIndex && directMessages[index + 1]?.pubkey !== item.pubkey