diff --git a/app/components/chat-message/chat-message.tsx b/app/components/chat-message/chat-message.tsx
index ad9e198b0..f2ed8df34 100644
--- a/app/components/chat-message/chat-message.tsx
+++ b/app/components/chat-message/chat-message.tsx
@@ -4,11 +4,10 @@ import "react-native-get-random-values"
import React, { useEffect, useRef } from "react"
import { View, Text } from "react-native"
import { makeStyles } from "@rneui/themed"
-import { MessageType } from "@flyerhq/react-native-chat-ui"
type Props = {
recipientId: `npub1${string}`
- message: MessageType.Text
+ message: { id: string; author: { id: string }; text: string }
nextMessage: number
prevMessage: boolean
}
diff --git a/app/navigation/root-navigator.tsx b/app/navigation/root-navigator.tsx
index 27fd4238f..7f395624b 100644
--- a/app/navigation/root-navigator.tsx
+++ b/app/navigation/root-navigator.tsx
@@ -1,5 +1,6 @@
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"
import { CardStyleInterpolators, createStackNavigator } from "@react-navigation/stack"
+import { getFocusedRouteNameFromRoute } from "@react-navigation/native"
import * as React from "react"
import {
@@ -596,7 +597,7 @@ export const RootStack = () => {
)
@@ -720,16 +721,20 @@ export const PrimaryNavigator = () => {
({
headerShown: false,
title: LL.ChatScreen.title(),
+ tabBarStyle:
+ getFocusedRouteNameFromRoute(route) === "messages"
+ ? { display: "none" }
+ : styles.bottomNavigatorStyle,
tabBarIcon: ({ color }) => (
),
- }}
+ })}
/>
) : null}
- /**
- * Send a plain text message to the group
- */
- sendMessage: (text: string) => Promise
- /**
- * Request to join the group (NIP-29 join event)
- */
+ sendMessage: (text: string, replyToId?: string) => Promise
requestJoin: () => Promise
+ removeMessage: (messageId: string) => Promise
+ removeMember: (pubkey: string) => Promise
}
const NostrGroupChatContext = createContext(undefined)
// ===== Helpers =====
-const makeSystemText = (text: string): MessageType.Text => ({
+const makeSystemMessage = (text: string): GroupMessage => ({
id: `sys-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
- author: { id: "system" },
+ authorId: "system",
createdAt: Date.now(),
- type: "text",
text,
+ isSystem: true,
})
export const NostrGroupChatProvider: React.FC = ({
@@ -60,24 +63,25 @@ export const NostrGroupChatProvider: React.FC = ({
}) => {
const { userPublicKey } = useChatContext()
- // Internal message map ensures dedupe by id
- const [messagesMap, setMessagesMap] = useState>(new Map())
+ const [messagesMap, setMessagesMap] = useState>(new Map())
+ const [deletedIds, setDeletedIds] = useState>(new Set())
const [isMember, setIsMember] = useState(false)
+ const [isAdmin, setIsAdmin] = useState(false)
+ const [adminList, setAdminList] = useState([])
const [knownMembers, setKnownMembers] = useState>(new Set())
const [metadata, setMetadata] = useState<{
name?: string
about?: string
picture?: string
}>({})
- // Track last known membership set to detect new joins for system messages
const prevMembersRef = useRef>(new Set())
- // Sorted messages array for the UI (newest first)
const messages = useMemo(() => {
- return Array.from(messagesMap.values()).sort((a, b) => b.createdAt! - a.createdAt!)
- }, [messagesMap])
+ return Array.from(messagesMap.values())
+ .filter((m) => !deletedIds.has(m.id))
+ .sort((a, b) => b.createdAt - a.createdAt)
+ }, [messagesMap, deletedIds])
- // Sync isMember when userPublicKey becomes available after membership data was already received
useEffect(() => {
if (userPublicKey && knownMembers.size > 0) {
setIsMember(knownMembers.has(userPublicKey))
@@ -88,18 +92,17 @@ export const NostrGroupChatProvider: React.FC = ({
useEffect(() => {
nostrRuntime.ensureSubscription(
`nip29:messages`,
-
- {
- "#h": [groupId],
- "kinds": [9],
- },
+ { "#h": [groupId], "kinds": [9] },
(event: Event) => {
- const msg: MessageType.Text = {
+ const replyTag = event.tags.find(
+ (t: string[]) => t[0] === "e" && t[3] === "reply",
+ )
+ const msg: GroupMessage = {
id: event.id,
- author: { id: event.pubkey },
+ authorId: event.pubkey,
createdAt: event.created_at * 1000,
- type: "text",
text: event.content,
+ replyToId: replyTag?.[1],
}
setMessagesMap((prev) => {
if (prev.has(msg.id)) return prev
@@ -113,99 +116,66 @@ export const NostrGroupChatProvider: React.FC = ({
)
}, [relayUrls.join("|"), groupId])
- //metadata
+ // ----- Sub: group metadata (kind 39000) -----
useEffect(() => {
- function parseGroupTags(tags: string[][]) {
- const result: { name?: string; about?: string; picture?: string } = {}
- for (const tag of tags) {
- const [key, value] = tag
- if (key === "name") result.name = value
- else if (key === "about") result.about = value
- else if (key === "picture") result.picture = value
- }
- return result
- }
- const unsub = nostrRuntime.ensureSubscription(
+ nostrRuntime.ensureSubscription(
`nip29:group_metadata`,
{ "kinds": [39000], "#d": [groupId] },
- (event) => {
- console.log("==============GOT METADATA EVENT=============")
- const parsed = parseGroupTags(event.tags)
- setMetadata(parsed)
- },
- () => {
- console.log("EOSE TRIGGERED FOR ", 39000)
+ (event: Event) => {
+ const result: { name?: string; about?: string; picture?: string } = {}
+ for (const [key, value] of event.tags) {
+ if (key === "name") result.name = value
+ else if (key === "about") result.about = value
+ else if (key === "picture") result.picture = value
+ }
+ setMetadata(result)
},
+ () => {},
relayUrls,
)
}, [groupId])
// ----- Sub: membership roster (kind 39002) -----
useEffect(() => {
- const filters: any = {
- "kinds": [39002],
- "#d": [groupId],
- }
+ const filters: any = { "kinds": [39002], "#d": [groupId] }
if (adminPubkeys?.length) filters.authors = adminPubkeys
- const unsub = nostrRuntime.ensureSubscription(
+ nostrRuntime.ensureSubscription(
`nip29:membership`,
filters,
(event: any) => {
- // Extract all `p` tags as pubkeys
- console.log("==============GOT MEMBERSHIP EVENT=============")
const currentMembers: string[] = event.tags
.filter((tag: string[]) => tag?.[0] === "p" && tag[1])
.map((tag: string[]) => tag[1])
- // Convert to Set for easy diff
const currentSet = new Set(currentMembers)
- // Notify self if just joined (transition only – for the system message)
if (
userPublicKey &&
!prevMembersRef.current.has(userPublicKey) &&
currentSet.has(userPublicKey)
) {
- setMessagesMap((prevMap) => {
- const next = new Map(prevMap)
- next.set(
- `sys-joined-self-${Date.now()}`,
- makeSystemText("You joined the group"),
- )
+ setMessagesMap((prev) => {
+ const next = new Map(prev)
+ next.set(`sys-joined-self-${Date.now()}`, makeSystemMessage("You joined the group"))
return next
})
}
- // Always sync isMember with the current roster
- if (userPublicKey) {
- setIsMember(currentSet.has(userPublicKey))
- }
+ if (userPublicKey) setIsMember(currentSet.has(userPublicKey))
- // Notify other new members
- // Track new members
currentMembers.forEach((pk) => {
- if (
- pk !== userPublicKey &&
- !prevMembersRef.current.has(pk) &&
- prevMembersRef.current.size !== 0
- ) {
+ if (pk !== userPublicKey && !prevMembersRef.current.has(pk) && prevMembersRef.current.size !== 0) {
const short = pk.slice(0, 6) + "…" + pk.slice(-4)
- setMessagesMap((prevMap) => {
- const next = new Map(prevMap)
- next.set(
- `sys-joined-${pk}-${Date.now()}`,
- makeSystemText(`${short} joined the group`),
- )
+ setMessagesMap((prev) => {
+ const next = new Map(prev)
+ next.set(`sys-joined-${pk}-${Date.now()}`, makeSystemMessage(`${short} joined the group`))
return next
})
}
})
- // Update prevMembersRef to exactly the current members
prevMembersRef.current = currentSet
-
- // Update knownMembers state
setKnownMembers(currentSet)
},
() => {},
@@ -213,22 +183,90 @@ export const NostrGroupChatProvider: React.FC = ({
)
}, [relayUrls.join("|"), groupId, userPublicKey, adminPubkeys?.join("|")])
+ // ----- Sub: admin list (kind 39001) -----
+ useEffect(() => {
+ nostrRuntime.ensureSubscription(
+ `nip29:admins`,
+ { "kinds": [39001], "#d": [groupId] },
+ (event: Event) => {
+ const adminPubkeyList = event.tags
+ .filter((t: string[]) => t[0] === "p")
+ .map((t: string[]) => t[1])
+ setAdminList(adminPubkeyList)
+ if (userPublicKey) setIsAdmin(adminPubkeyList.includes(userPublicKey))
+ },
+ () => {},
+ relayUrls,
+ )
+ }, [groupId, relayUrls.join("|"), userPublicKey])
+
+ // ----- Sub: deleted messages (kind 9005) -----
+ useEffect(() => {
+ nostrRuntime.ensureSubscription(
+ `nip29:deletions`,
+ { "#h": [groupId], "kinds": [9005] },
+ (event: Event) => {
+ const deletedId = event.tags.find((t: string[]) => t[0] === "e")?.[1]
+ if (deletedId) {
+ setDeletedIds((prev) => {
+ if (prev.has(deletedId)) return prev
+ return new Set([...prev, deletedId])
+ })
+ }
+ },
+ () => {},
+ relayUrls,
+ )
+ }, [groupId, relayUrls.join("|")])
+
// ----- Actions -----
const sendMessage = useCallback(
- async (text: string) => {
+ async (text: string, replyToId?: string) => {
if (!userPublicKey) throw Error("No user pubkey present")
-
const signer = await getSigner()
-
- const nostrEvent = {
+ const tags: string[][] = [["h", groupId, relayUrls[0]]]
+ if (replyToId) tags.push(["e", replyToId, relayUrls[0], "reply"])
+ const signedEvent = await signer.signEvent({
kind: 9,
created_at: Math.floor(Date.now() / 1000),
- tags: [["h", groupId, relayUrls[0]]], // include relay hint
+ tags,
content: text,
pubkey: userPublicKey,
- }
+ } as any)
+ pool.publish(relayUrls, signedEvent)
+ },
+ [userPublicKey, groupId, relayUrls],
+ )
- const signedEvent = await signer.signEvent(nostrEvent as any)
+ const removeMessage = useCallback(
+ async (messageId: string) => {
+ if (!userPublicKey) return
+ const signer = await getSigner()
+ const signedEvent = await signer.signEvent({
+ kind: 9005,
+ created_at: Math.floor(Date.now() / 1000),
+ tags: [["h", groupId], ["e", messageId]],
+ content: "",
+ pubkey: userPublicKey,
+ } as any)
+ pool.publish(relayUrls, signedEvent)
+ // Optimistically remove locally
+ setDeletedIds((prev) => new Set([...prev, messageId]))
+ },
+ [userPublicKey, groupId, relayUrls],
+ )
+
+ const removeMember = useCallback(
+ async (pubkey: string) => {
+ if (!userPublicKey) return
+ const signer = await getSigner()
+ const signedEvent = await signer.signEvent({
+ kind: 9001,
+ created_at: Math.floor(Date.now() / 1000),
+ tags: [["h", groupId], ["p", pubkey]],
+ content: "",
+ pubkey: userPublicKey,
+ } as any)
pool.publish(relayUrls, signedEvent)
},
[userPublicKey, groupId, relayUrls],
@@ -236,24 +274,19 @@ export const NostrGroupChatProvider: React.FC = ({
const requestJoin = useCallback(async () => {
if (!userPublicKey) throw Error("No user pubkey present")
-
const signer = await getSigner()
-
- const joinEvent = {
+ const signedEvent = await signer.signEvent({
kind: 9021,
created_at: Math.floor(Date.now() / 1000),
tags: [["h", groupId]],
content: "I'd like to join this group.",
pubkey: userPublicKey,
- }
-
- const signedJoinEvent = await signer.signEvent(joinEvent as any)
- pool.publish(relayUrls, signedJoinEvent)
+ } as any)
+ pool.publish(relayUrls, signedEvent)
- // Optimistic system note
setMessagesMap((prev) => {
const next = new Map(prev)
- next.set(`sys-join-req-${Date.now()}`, makeSystemText("Join request sent"))
+ next.set(`sys-join-req-${Date.now()}`, makeSystemMessage("Join request sent"))
return next
})
}, [userPublicKey, groupId, relayUrls])
@@ -262,24 +295,25 @@ export const NostrGroupChatProvider: React.FC = ({
() => ({
messages,
isMember,
+ isAdmin,
+ adminList,
knownMembers,
sendMessage,
requestJoin,
+ removeMessage,
+ removeMember,
groupMetadata: metadata,
}),
- [messages, isMember, knownMembers, sendMessage, requestJoin],
+ [messages, isMember, isAdmin, adminList, knownMembers, sendMessage, requestJoin, removeMessage, removeMember, metadata],
)
return (
-
- {children}
-
+ {children}
)
}
export const useNostrGroupChat = () => {
const ctx = useContext(NostrGroupChatContext)
- if (!ctx)
- throw new Error("useNostrGroupChat must be used inside NostrGroupChatProvider")
+ if (!ctx) throw new Error("useNostrGroupChat must be used inside NostrGroupChatProvider")
return ctx
}
diff --git a/app/screens/chat/GroupChat/GroupInfoModal.tsx b/app/screens/chat/GroupChat/GroupInfoModal.tsx
new file mode 100644
index 000000000..e6ea25211
--- /dev/null
+++ b/app/screens/chat/GroupChat/GroupInfoModal.tsx
@@ -0,0 +1,255 @@
+import React from "react"
+import {
+ Modal,
+ View,
+ Image,
+ ScrollView,
+ TouchableOpacity,
+ TouchableWithoutFeedback,
+} from "react-native"
+import { Text, makeStyles, useTheme } from "@rneui/themed"
+import Icon from "react-native-vector-icons/Ionicons"
+import { nip19 } from "nostr-tools"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+
+const DEFAULT_AVATAR =
+ "https://pfp.nostr.build/520649f789e06c2a3912765c0081584951e91e3b5f3366d2ae08501162a5083b.jpg"
+
+type Props = {
+ visible: boolean
+ onClose: () => void
+ groupMetadata: { name?: string; about?: string; picture?: string }
+ adminList: string[]
+ memberCount: number
+ profileMap: Map
+ isAdmin: boolean
+}
+
+export const GroupInfoModal: React.FC = ({
+ visible,
+ onClose,
+ groupMetadata,
+ adminList,
+ memberCount,
+ profileMap,
+ isAdmin,
+}) => {
+ const styles = useStyles()
+ const { theme: { colors } } = useTheme()
+ const insets = useSafeAreaInsets()
+
+ const getDisplayName = (pubkey: string) => {
+ const p = profileMap.get(pubkey)
+ return p?.name || p?.username || nip19.npubEncode(pubkey).slice(0, 10) + "…"
+ }
+
+ return (
+
+
+
+
+
+
+ {/* Handle bar */}
+
+
+ {/* Close button */}
+
+
+
+
+
+ {/* Group avatar + name */}
+
+
+ {groupMetadata.name || "Support Group"}
+ {groupMetadata.about ? (
+ {groupMetadata.about}
+ ) : null}
+
+
+
+ {memberCount} {memberCount === 1 ? "member" : "members"}
+
+
+ {isAdmin && (
+
+
+ You are an admin
+
+ )}
+
+
+ {/* Admins section */}
+ {adminList.length > 0 && (
+
+ Admins
+ {adminList.map((pubkey) => {
+ const profile = profileMap.get(pubkey)
+ return (
+
+
+
+ {getDisplayName(pubkey)}
+ {profile?.nip05 && (
+ {profile.nip05}
+ )}
+
+
+
+ Admin
+
+
+ )
+ })}
+
+ )}
+
+
+
+ )
+}
+
+const useStyles = makeStyles(({ colors }) => ({
+ backdrop: {
+ flex: 1,
+ backgroundColor: "rgba(0,0,0,0.4)",
+ },
+ sheet: {
+ backgroundColor: colors.grey5,
+ borderTopLeftRadius: 20,
+ borderTopRightRadius: 20,
+ paddingTop: 12,
+ paddingHorizontal: 20,
+ maxHeight: "75%",
+ },
+ handle: {
+ width: 40,
+ height: 4,
+ borderRadius: 2,
+ backgroundColor: colors.grey4,
+ alignSelf: "center",
+ marginBottom: 12,
+ },
+ closeBtn: {
+ position: "absolute",
+ top: 16,
+ right: 20,
+ zIndex: 1,
+ },
+ hero: {
+ alignItems: "center",
+ paddingTop: 8,
+ paddingBottom: 20,
+ borderBottomWidth: 0.5,
+ borderBottomColor: colors.grey4,
+ marginBottom: 16,
+ },
+ avatar: {
+ width: 80,
+ height: 80,
+ borderRadius: 40,
+ borderWidth: 2,
+ marginBottom: 12,
+ },
+ groupName: {
+ fontSize: 20,
+ fontWeight: "700",
+ color: colors.primary3,
+ textAlign: "center",
+ },
+ groupAbout: {
+ fontSize: 14,
+ color: colors.grey2,
+ textAlign: "center",
+ marginTop: 6,
+ lineHeight: 20,
+ },
+ memberBadge: {
+ flexDirection: "row",
+ alignItems: "center",
+ gap: 4,
+ marginTop: 10,
+ },
+ memberCount: {
+ fontSize: 13,
+ fontWeight: "500",
+ },
+ adminBadge: {
+ flexDirection: "row",
+ alignItems: "center",
+ gap: 4,
+ marginTop: 8,
+ paddingHorizontal: 10,
+ paddingVertical: 4,
+ borderRadius: 12,
+ },
+ adminBadgeText: {
+ fontSize: 12,
+ fontWeight: "600",
+ },
+ section: {
+ marginBottom: 24,
+ },
+ sectionTitle: {
+ fontSize: 12,
+ fontWeight: "600",
+ color: colors.grey2,
+ textTransform: "uppercase",
+ letterSpacing: 0.8,
+ marginBottom: 10,
+ },
+ memberRow: {
+ flexDirection: "row",
+ alignItems: "center",
+ paddingVertical: 8,
+ borderBottomWidth: 0.5,
+ borderBottomColor: colors.grey4,
+ },
+ memberAvatar: {
+ width: 40,
+ height: 40,
+ borderRadius: 20,
+ marginRight: 12,
+ },
+ memberInfo: {
+ flex: 1,
+ },
+ memberName: {
+ fontSize: 15,
+ fontWeight: "500",
+ color: colors.primary3,
+ },
+ memberNip05: {
+ fontSize: 12,
+ color: colors.grey2,
+ marginTop: 1,
+ },
+ adminTag: {
+ flexDirection: "row",
+ alignItems: "center",
+ gap: 3,
+ paddingHorizontal: 8,
+ paddingVertical: 3,
+ borderRadius: 10,
+ },
+ adminTagText: {
+ fontSize: 11,
+ fontWeight: "600",
+ },
+}))
diff --git a/app/screens/chat/GroupChat/SupportGroupChat.tsx b/app/screens/chat/GroupChat/SupportGroupChat.tsx
index cab847784..f81c59830 100644
--- a/app/screens/chat/GroupChat/SupportGroupChat.tsx
+++ b/app/screens/chat/GroupChat/SupportGroupChat.tsx
@@ -1,126 +1,304 @@
-import React from "react"
-import { View, Platform } from "react-native"
-import { useTheme, makeStyles, Button, Text } from "@rneui/themed"
+import React, { useEffect, useRef, useState } from "react"
+import { Alert, View, Image, TouchableOpacity, Platform } from "react-native"
+import { makeStyles, useTheme, Text, Button } from "@rneui/themed"
import { Screen } from "../../../components/screen"
-import { Chat, MessageType, defaultTheme } from "@flyerhq/react-native-chat-ui"
-import { SafeAreaProvider } from "react-native-safe-area-context"
-import { ChatMessage } from "../chatMessage"
+import { FlatList } from "react-native-gesture-handler"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+import { useNavigation } from "@react-navigation/native"
+import { StackNavigationProp } from "@react-navigation/stack"
+import Icon from "react-native-vector-icons/Ionicons"
import type { StackScreenProps } from "@react-navigation/stack"
import type { RootStackParamList } from "../../../navigation/stack-param-lists"
-import { useNostrGroupChat } from "./GroupChatProvider"
+import { useNostrGroupChat, GroupMessage } from "./GroupChatProvider"
import { useChatContext } from "../chatContext"
+import { nostrRuntime } from "@app/nostr/runtime/NostrRuntime"
+import { MessageInput } from "../components/MessageInput"
+import { MessageBubble } from "../components/MessageBubble"
+import { GroupInfoModal } from "./GroupInfoModal"
+import { Rumor } from "@app/utils/nostr"
type SupportGroupChatScreenProps = StackScreenProps
+const DEFAULT_AVATAR =
+ "https://pfp.nostr.build/520649f789e06c2a3912765c0081584951e91e3b5f3366d2ae08501162a5083b.jpg"
+
+function readProfilesFromStore(pubkeys: string[]): Map {
+ const map = new Map()
+ for (const pubkey of pubkeys) {
+ const event = nostrRuntime.getEventStore().getLatest(`0:${pubkey}`)
+ if (event) {
+ try {
+ map.set(pubkey, JSON.parse(event.content))
+ } catch {}
+ }
+ }
+ return map
+}
+
+// Convert a GroupMessage to a Rumor-compatible shape for MessageBubble
+function toRumor(msg: GroupMessage): Rumor {
+ const tags: string[][] = []
+ if (msg.replyToId) tags.push(["e", msg.replyToId, "", "reply"])
+ return {
+ id: msg.id,
+ pubkey: msg.authorId,
+ content: msg.text,
+ created_at: Math.floor(msg.createdAt / 1000),
+ kind: 9,
+ tags,
+ }
+}
+
const InnerGroupChat: React.FC = () => {
const styles = useStyles()
- const {
- theme: { colors },
- } = useTheme()
-
- const { messages, isMember, sendMessage, requestJoin } = useNostrGroupChat()
+ const { theme: { colors, mode } } = useTheme()
+ const insets = useSafeAreaInsets()
+ const navigation = useNavigation>()
+ const { messages, isMember, isAdmin, adminList, knownMembers, sendMessage, requestJoin, removeMessage, removeMember, groupMetadata } = useNostrGroupChat()
const { userPublicKey } = useChatContext()
+ const [replyTo, setReplyTo] = useState(null)
+ const [infoVisible, setInfoVisible] = useState(false)
- const renderTextMessage = (
- message: MessageType.Text,
- showName: number,
- nextMessage: boolean,
- ) => {
- if (message.author.id === "system") {
- return (
-
-
-
- {message.text}
-
-
-
- )
- }
+ // Profile loading via EventStore (same pattern as messages.tsx)
+ const subscribedPubkeys = useRef>(new Set())
+ const [profileMap, setProfileMap] = useState>(new Map())
- return (
-
+ useEffect(() => {
+ const unsubStore = nostrRuntime.getEventStore().subscribe(() => {
+ const pubkeys = Array.from(subscribedPubkeys.current)
+ setProfileMap(readProfilesFromStore(pubkeys))
+ })
+ return unsubStore
+ }, [])
+
+ // Subscribe to profiles for any new authors we haven't seen yet
+ useEffect(() => {
+ const newPubkeys = messages
+ .filter((m) => !m.isSystem && !subscribedPubkeys.current.has(m.authorId))
+ .map((m) => m.authorId)
+ .filter((id, i, arr) => arr.indexOf(id) === i)
+
+ if (newPubkeys.length === 0) return
+
+ newPubkeys.forEach((pk) => subscribedPubkeys.current.add(pk))
+
+ nostrRuntime.ensureSubscription(
+ `groupProfiles:${[...subscribedPubkeys.current].sort().join(",")}`,
+ { kinds: [0], authors: [...subscribedPubkeys.current] },
)
+
+ setProfileMap(readProfilesFromStore([...subscribedPubkeys.current]))
+ }, [messages])
+
+ const chatBg = mode === "dark" ? "#0e1a16" : "#eef5f2"
+
+ const handleAdminPress = (msg: GroupMessage) => {
+ const isOwnMessage = msg.authorId === userPublicKey
+ const options: { text: string; onPress: () => void; style?: "destructive" | "cancel" }[] = []
+
+ options.push({
+ text: "Delete Message",
+ style: "destructive",
+ onPress: () => removeMessage(msg.id),
+ })
+
+ if (!isOwnMessage) {
+ options.push({
+ text: "Remove User",
+ style: "destructive",
+ onPress: () => {
+ Alert.alert("Remove User", "Remove this user from the group?", [
+ { text: "Cancel", style: "cancel" },
+ { text: "Remove", style: "destructive", onPress: () => removeMember(msg.authorId) },
+ ])
+ },
+ })
+ }
+
+ options.push({ text: "Cancel", style: "cancel", onPress: () => {} })
+
+ Alert.alert("Admin Actions", undefined, options)
+ }
+
+ // Build a map of rumor-shaped messages for parent lookup
+ const rumorMap = new Map(messages.filter((m) => !m.isSystem).map((m) => [m.id, toRumor(m)]))
+
+ const getParentRumor = (rumor: Rumor): Rumor | null => {
+ const replyTag = rumor.tags.find((t) => t[0] === "e" && t[3] === "reply")
+ if (!replyTag) return null
+ return rumorMap.get(replyTag[1]) || null
}
return (
-
-
- sendMessage(partial.text)}
- user={{ id: userPublicKey || "me" }}
- renderTextMessage={(message, showName, nextMessage) =>
- renderTextMessage(message, showName, nextMessage)
- }
- customBottomComponent={
- !isMember
- ? () => (
-
-
-
- )
- : undefined
+ {/* Header */}
+
+
+
+
+ setInfoVisible(true)}>
+ (
-
- {child}
+ style={[styles.headerAvatar, { borderColor: colors.primary }]}
+ />
+
+
+ {groupMetadata.name || "Support Group"}
+
+
+ {knownMembers.size} members · tap for info
+
+
+
+
+
+
+ {/* Message list */}
+ m.id}
+ style={{ backgroundColor: chatBg }}
+ contentContainerStyle={styles.listContent}
+ renderItem={({ item: msg }) => {
+ if (msg.isSystem) {
+ return (
+
+
+ {msg.text}
+
- )}
- l10nOverride={{ emptyChatPlaceholder: "No messages yet..." }}
- flatListProps={{
- contentContainerStyle: {
- paddingTop: messages.length ? (Platform.OS === "ios" ? 50 : 0) : 100,
- },
- }}
- theme={{
- ...defaultTheme,
- colors: {
- ...defaultTheme.colors,
- inputBackground: colors._black,
- background: colors._lightGrey,
- },
- fonts: {
- ...defaultTheme.fonts,
- sentMessageBodyTextStyle: {
- ...defaultTheme.fonts.sentMessageBodyTextStyle,
- fontSize: 12,
- },
- },
- }}
+ )
+ }
+ const rumor = toRumor(msg)
+ return (
+ {}}
+ isGroupChat
+ onAdminPress={isAdmin ? () => handleAdminPress(msg) : undefined}
+ />
+ )
+ }}
+ ListEmptyComponent={
+
+ No messages yet
+
+ }
+ />
+
+ {/* Input or Join button */}
+
+ {isMember ? (
+ setReplyTo(null)}
+ onSend={(text) => sendMessage(text, replyTo?.id)}
/>
-
-
+ ) : (
+
+
+
+ )}
+
+
+ setInfoVisible(false)}
+ groupMetadata={groupMetadata}
+ adminList={adminList}
+ memberCount={knownMembers.size}
+ profileMap={profileMap}
+ isAdmin={isAdmin}
+ />
)
}
-export const SupportGroupChatScreen: React.FC = ({
- route,
-}) => {
+export const SupportGroupChatScreen: React.FC = () => {
return
}
const useStyles = makeStyles(({ colors }) => ({
- chatView: {
+ header: {
+ flexDirection: "row",
+ alignItems: "center",
+ paddingHorizontal: 12,
+ paddingBottom: 10,
+ borderBottomWidth: 0.5,
+ borderBottomColor: colors.grey4,
+ backgroundColor: colors.grey5,
+ },
+ backBtn: {
+ padding: 4,
+ marginRight: 4,
+ },
+ headerCenter: {
flex: 1,
- marginHorizontal: 30,
- borderRadius: 24,
+ flexDirection: "row",
+ alignItems: "center",
overflow: "hidden",
},
+ headerAvatar: {
+ width: 38,
+ height: 38,
+ borderRadius: 19,
+ borderWidth: 1.5,
+ marginRight: 10,
+ },
+ headerNameCol: {
+ flex: 1,
+ },
+ headerName: {
+ fontSize: 16,
+ fontWeight: "600",
+ color: colors.primary3,
+ },
+ headerSubtitle: {
+ fontSize: 12,
+ color: colors.grey2,
+ marginTop: 1,
+ },
+ listContent: {
+ paddingVertical: 8,
+ },
+ emptyContainer: {
+ flex: 1,
+ alignItems: "center",
+ justifyContent: "center",
+ paddingTop: 60,
+ },
+ systemRow: {
+ alignItems: "center",
+ marginVertical: 6,
+ paddingHorizontal: 16,
+ },
+ systemPill: {
+ backgroundColor: colors.grey4,
+ borderRadius: 12,
+ paddingHorizontal: 12,
+ paddingVertical: 4,
+ },
+ systemText: {
+ fontSize: 12,
+ color: colors.grey1,
+ textAlign: "center",
+ },
+ joinContainer: {
+ padding: 16,
+ alignItems: "center",
+ backgroundColor: colors.grey5,
+ borderTopWidth: 0.5,
+ borderTopColor: colors.grey4,
+ },
}))
diff --git a/app/screens/chat/NIP17Chat.tsx b/app/screens/chat/NIP17Chat.tsx
index 81612997b..864bfa3bd 100644
--- a/app/screens/chat/NIP17Chat.tsx
+++ b/app/screens/chat/NIP17Chat.tsx
@@ -58,7 +58,6 @@ export const NIP17Chat: React.FC = () => {
rumors,
profileMap,
resetChat,
- initializeChat,
userProfileEvent,
userPublicKey,
contactsEvent,
@@ -81,10 +80,8 @@ export const NIP17Chat: React.FC = () => {
// ------------------------
React.useEffect(() => {
async function initialize() {
- console.log("Initializing nip17 screen use effect")
const secretKeyString = await fetchSecretFromLocalStorage()
if (!secretKeyString) {
- console.log("Couldn't find secret key in local storage")
setShowImportModal(true)
return
}
@@ -93,19 +90,15 @@ export const NIP17Chat: React.FC = () => {
if (userPublicKey) {
const storedNpub = nip19.npubEncode(userPublicKey)
if (!skipMismatchCheck && accountNpub && storedNpub !== accountNpub) {
- console.log("Account Info mismatch", accountNpub, storedNpub)
setShowImportModal(true)
}
}
- if (!initialized) {
- await initializeChat()
- setInitialized(true)
- }
+ setInitialized(true)
}
initialize()
- }, [dataAuthed, initialized, skipMismatchCheck])
+ }, [dataAuthed, userPublicKey, skipMismatchCheck])
// ------------------------
// Focus effect for secret key / import modal check
@@ -240,7 +233,7 @@ export const NIP17Chat: React.FC = () => {
groupId: "support-group-id",
})
}
- style={{ marginRight: 20, marginLeft: 20, marginBottom: 4 }}
+ style={styles.item}
>
diff --git a/app/screens/chat/UserSearchBar.tsx b/app/screens/chat/UserSearchBar.tsx
index 5f834df03..65bba9b00 100644
--- a/app/screens/chat/UserSearchBar.tsx
+++ b/app/screens/chat/UserSearchBar.tsx
@@ -44,7 +44,6 @@ export const UserSearchBar: React.FC = ({ setSearchedUsers }
if (newSearchText === "") reset()
const nip05Matching = async (alias: string) => {
let nostrUser = await nip05.queryProfile(alias.toLocaleLowerCase())
- console.log("nostr user for", alias, nostrUser)
if (nostrUser) {
let nostrProfile = profileMap?.get(nostrUser.pubkey)
let participants = [nostrUser.pubkey, userPublicKey!].filter(Boolean)
@@ -82,7 +81,6 @@ export const UserSearchBar: React.FC = ({ setSearchedUsers }
} else if (!newSearchText.includes("@")) {
let modifiedSearchText =
newSearchText + "@" + appConfig.galoyInstance.lnAddressHostname
- console.log("Searching for", modifiedSearchText)
if (await nip05Matching(modifiedSearchText)) {
setRefreshing(false)
return
diff --git a/app/screens/chat/chatContext.tsx b/app/screens/chat/chatContext.tsx
index e2f4d1e29..e9fe075f3 100644
--- a/app/screens/chat/chatContext.tsx
+++ b/app/screens/chat/chatContext.tsx
@@ -8,6 +8,10 @@ import {
getRumorFromWrap,
loadGiftwrapsFromStorage,
saveGiftwrapsToStorage,
+ loadRumorsFromStorage,
+ saveRumorsToStorage,
+ loadReactionsFromStorage,
+ saveReactionsToStorage,
fetchSecretFromLocalStorage,
} from "@app/utils/nostr"
import { nostrRuntime } from "@app/nostr/runtime/NostrRuntime"
@@ -17,11 +21,15 @@ import { loadJson, saveJson } from "@app/utils/storage"
const contactsEventCacheKey = (pubkey: string) => `contacts_event:${pubkey}`
const profileEventCacheKey = (pubkey: string) => `user_profile_event:${pubkey}`
+export type ReactionEntry = { emoji: string; reactor: string; pending?: boolean }
+
type ChatContextType = {
giftwraps: Event[]
rumors: Rumor[]
setGiftWraps: React.Dispatch>
setRumors: React.Dispatch>
+ reactions: Map
+ addOptimisticReaction: (messageId: string, emoji: string, reactor: string) => void
profileMap: Map
addEventToProfiles: (event: Event) => void
resetChat: () => Promise
@@ -39,6 +47,8 @@ const ChatContext = createContext({
setGiftWraps: () => {},
rumors: [],
setRumors: () => {},
+ reactions: new Map(),
+ addOptimisticReaction: () => {},
profileMap: new Map(),
addEventToProfiles: () => {},
resetChat: async () => {},
@@ -56,11 +66,13 @@ export const useChatContext = () => useContext(ChatContext)
export const ChatContextProvider: React.FC = ({ children }) => {
const [giftwraps, setGiftWraps] = useState([])
const [rumors, setRumors] = useState([])
+ const [reactions, setReactions] = useState>(new Map())
const [userProfileEvent, setUserProfileEvent] = useState(null)
const [userPublicKey, setUserPublicKey] = useState(null)
const [contactsEvent, setContactsEvent] = useState()
const profileMap = useRef>(new Map())
const processedEventIds = useRef>(new Set())
+ const rumorWrapIds = useRef>(new Set())
const {
appConfig: {
@@ -84,14 +96,41 @@ export const ChatContextProvider: React.FC = ({ children }) =
try {
const signer = await getSigner()
const rumor = await getRumorFromWrap(event, signer)
- setRumors((prev) => {
- if (!prev.map((r) => r.id).includes(rumor.id)) {
- return [...prev, rumor]
+ if (rumor.kind === 7) {
+ // NIP-25 reaction
+ const originalId = rumor.tags.find((t) => t[0] === "e")?.[1]
+ if (originalId) {
+ setReactions((prev) => {
+ const existing = prev.get(originalId) || []
+ const idx = existing.findIndex(
+ (r) => r.reactor === rumor.pubkey && r.emoji === rumor.content,
+ )
+ if (idx >= 0) {
+ // Confirm an optimistic entry, or skip if already confirmed
+ if (!existing[idx].pending) return prev
+ const next = new Map(prev)
+ const updated = [...existing]
+ updated[idx] = { emoji: rumor.content, reactor: rumor.pubkey }
+ next.set(originalId, updated)
+ saveReactionsToStorage(next)
+ return next
+ }
+ const next = new Map(prev)
+ next.set(originalId, [...existing, { emoji: rumor.content, reactor: rumor.pubkey }])
+ saveReactionsToStorage(next)
+ return next
+ })
}
- return prev
- })
- } catch (e) {
- console.log("Failed to decrypt giftwrap", e)
+ } else {
+ setRumors((prev) => {
+ if (prev.some((r) => r.id === rumor.id)) return prev
+ const next = [...prev, rumor]
+ saveRumorsToStorage(next)
+ return next
+ })
+ }
+ } catch {
+ // giftwrap not decryptable by this key
}
}
@@ -118,21 +157,55 @@ export const ChatContextProvider: React.FC = ({ children }) =
const publicKey = await signer.getPublicKey()
setUserPublicKey(publicKey)
- // Load cached giftwraps
const cachedGiftwraps = await loadGiftwrapsFromStorage()
+ cachedGiftwraps.forEach((wrap) => processedEventIds.current.add(wrap.id))
setGiftWraps(cachedGiftwraps)
- const decryptedRumors = (
- await Promise.all(
- cachedGiftwraps.map(async (wrap) => {
- try {
- return await getRumorFromWrap(wrap, signer)
- } catch {
- return null
- }
- }),
- )
- ).filter((r): r is Rumor => r !== null)
- setRumors(decryptedRumors)
+
+ // Load pre-decrypted rumors from cache — avoids re-decrypting all giftwraps on every startup
+ const cachedRumors = await loadRumorsFromStorage()
+ const cachedRumorIds = new Set(cachedRumors.map((r) => r.id))
+
+ // Only decrypt giftwraps that aren't already in the rumors cache
+ const uncachedWraps = cachedGiftwraps.filter((wrap) => {
+ // A giftwrap can produce a rumor we haven't cached yet; we can't know the rumor id
+ // without decrypting, so decrypt wraps whose id isn't tracked yet via a separate set.
+ return !rumorWrapIds.current.has(wrap.id)
+ })
+
+ let newRumors: Rumor[] = []
+ if (uncachedWraps.length > 0) {
+ const decrypted = (
+ await Promise.all(
+ uncachedWraps.map(async (wrap) => {
+ try {
+ const r = await getRumorFromWrap(wrap, signer)
+ rumorWrapIds.current.add(wrap.id)
+ return r
+ } catch {
+ return null
+ }
+ }),
+ )
+ ).filter((r): r is Rumor => r !== null)
+
+ const seenIds = new Set(cachedRumorIds)
+ newRumors = decrypted.filter((r) => {
+ if (seenIds.has(r.id)) return false
+ seenIds.add(r.id)
+ return true
+ })
+ }
+
+ const allRumors = [...cachedRumors, ...newRumors]
+ setRumors(allRumors)
+ if (newRumors.length > 0) saveRumorsToStorage(allRumors)
+
+ // Restore cached reactions
+ const cachedReactions = await loadReactionsFromStorage()
+ const reactionsMap = new Map(
+ Object.entries(cachedReactions).map(([k, v]) => [k, v]),
+ )
+ if (reactionsMap.size > 0) setReactions(reactionsMap)
// ------------------------
// Subscribe to giftwraps via NostrRuntime
@@ -220,6 +293,16 @@ export const ChatContextProvider: React.FC = ({ children }) =
})
}
+ const addOptimisticReaction = (messageId: string, emoji: string, reactor: string) => {
+ setReactions((prev) => {
+ const existing = prev.get(messageId) || []
+ if (existing.some((r) => r.reactor === reactor && r.emoji === emoji)) return prev
+ const next = new Map(prev)
+ next.set(messageId, [...existing, { emoji, reactor, pending: true }])
+ return next
+ })
+ }
+
const getContactPubkeys = () => {
if (!contactsEvent) return null
return contactsEvent.tags.filter((t) => t[0] === "p").map((t) => t[1])
@@ -233,9 +316,13 @@ export const ChatContextProvider: React.FC = ({ children }) =
setGiftWraps([])
setRumors([])
setContactsEvent(undefined)
+ setReactions(new Map())
setUserProfileEvent(null)
setUserPublicKey(null)
processedEventIds.current.clear()
+ rumorWrapIds.current.clear()
+ saveRumorsToStorage([])
+ saveReactionsToStorage(new Map())
nostrRuntime.getEventStore().clear()
await initializeChat()
}
@@ -252,6 +339,8 @@ export const ChatContextProvider: React.FC = ({ children }) =
setGiftWraps,
rumors,
setRumors,
+ reactions,
+ addOptimisticReaction,
profileMap: profileMap.current,
addEventToProfiles: (event: Event) => {
try {
diff --git a/app/screens/chat/chatMessage.tsx b/app/screens/chat/chatMessage.tsx
index 5c3577673..c4b8014be 100644
--- a/app/screens/chat/chatMessage.tsx
+++ b/app/screens/chat/chatMessage.tsx
@@ -4,7 +4,6 @@ import "react-native-get-random-values"
import React, { useEffect, useRef } from "react"
import { View, Text } from "react-native"
import { makeStyles } from "@rneui/themed"
-import { MessageType } from "@flyerhq/react-native-chat-ui"
import { GaloyIcon } from "@app/components/atomic/galoy-icon"
import { useChatContext } from "./chatContext"
import { Event, nip19 } from "nostr-tools"
@@ -12,7 +11,7 @@ import { SUPPORT_AGENTS } from "@app/config/supportAgents"
import { nostrRuntime } from "@app/nostr/runtime/NostrRuntime"
type Props = {
- message: MessageType.Text
+ message: { id: string; author: { id: string }; text: string; metadata?: { errors?: boolean } }
nextMessage: number
prevMessage: boolean
showSender?: boolean
diff --git a/app/screens/chat/components/MessageBubble.tsx b/app/screens/chat/components/MessageBubble.tsx
new file mode 100644
index 000000000..a7ce6f542
--- /dev/null
+++ b/app/screens/chat/components/MessageBubble.tsx
@@ -0,0 +1,471 @@
+import React, { useRef, useState } from "react"
+import {
+ View,
+ Text,
+ Image,
+ TouchableOpacity,
+ GestureResponderEvent,
+ Modal,
+ ScrollView,
+} from "react-native"
+import { Swipeable } from "react-native-gesture-handler"
+import Icon from "react-native-vector-icons/Ionicons"
+import { nip19 } from "nostr-tools"
+import { Rumor } from "@app/utils/nostr"
+import { ReactionPicker } from "./ReactionPicker"
+import type { ReactionEntry } from "../chatContext"
+import { makeStyles, useTheme } from "@rneui/themed"
+import { GaloyIcon } from "@app/components/atomic/galoy-icon"
+import type { DeliveryInfo } from "@app/screens/chat/messages"
+
+type Props = {
+ rumor: Rumor
+ isMe: boolean
+ profileMap: Map
+ reactions: ReactionEntry[]
+ parentRumor: Rumor | null
+ onReply: (rumor: Rumor) => void
+ onReact: (emoji: string) => void
+ isGroupChat?: boolean
+ onAdminPress?: () => void
+ deliveryInfo?: DeliveryInfo
+}
+
+const formatTime = (created_at: number) =>
+ new Date(created_at * 1000).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })
+
+const MAX_AVATARS = 3
+
+function groupReactions(
+ reactions: ReactionEntry[],
+): { emoji: string; count: number; reactors: string[]; pending: boolean }[] {
+ const map = new Map()
+ for (const r of reactions) {
+ const entry = map.get(r.emoji) || { reactors: [], allPending: true }
+ if (!entry.reactors.includes(r.reactor)) entry.reactors.push(r.reactor)
+ if (!r.pending) entry.allPending = false
+ map.set(r.emoji, entry)
+ }
+ return Array.from(map.entries()).map(([emoji, { reactors, allPending }]) => ({
+ emoji,
+ count: reactors.length,
+ reactors,
+ pending: allPending,
+ }))
+}
+
+export const MessageBubble: React.FC = ({
+ rumor,
+ isMe,
+ profileMap,
+ reactions,
+ parentRumor,
+ onReply,
+ onReact,
+ isGroupChat = false,
+ onAdminPress,
+ deliveryInfo,
+}) => {
+ const { theme: { colors } } = useTheme()
+ const styles = useStyles()
+ const [pickerVisible, setPickerVisible] = useState(false)
+ const [pickerPosition, setPickerPosition] = useState({ x: 0, y: 0 })
+ const [deliveryModalVisible, setDeliveryModalVisible] = useState(false)
+ const swipeableRef = useRef(null)
+
+ const senderProfile = profileMap.get(rumor.pubkey)
+ const senderName =
+ senderProfile?.name ||
+ senderProfile?.username ||
+ senderProfile?.nip05 ||
+ nip19.npubEncode(rumor.pubkey).slice(0, 10)
+
+ const replyTag = rumor.tags.find((t) => t[0] === "e" && t[3] === "reply")
+ const groupedReactions = groupReactions(reactions)
+
+ const handleLongPress = (e: GestureResponderEvent) => {
+ if (onAdminPress) {
+ onAdminPress()
+ } else {
+ setPickerPosition({ x: e.nativeEvent.pageX, y: e.nativeEvent.pageY })
+ setPickerVisible(true)
+ }
+ }
+
+ const renderRightActions = () => (
+
+
+
+ )
+
+ const renderLeftActions = () => (
+
+
+
+ )
+
+ return (
+ <>
+ {
+ onReply(rumor)
+ swipeableRef.current?.close()
+ }}
+ friction={2}
+ rightThreshold={40}
+ leftThreshold={40}
+ >
+
+ {/* Avatar for received messages in group chats */}
+ {!isMe && isGroupChat && (
+
+ )}
+
+
+ {/* Sender name in group chats */}
+ {!isMe && isGroupChat && (
+ {senderName}
+ )}
+
+ {/* Quoted reply preview */}
+ {replyTag && parentRumor && (
+
+
+ {profileMap.get(parentRumor.pubkey)?.name ||
+ nip19.npubEncode(parentRumor.pubkey).slice(0, 10)}
+
+
+ {parentRumor.content}
+
+
+ )}
+
+
+
+
+ {(rumor as any).metadata?.errors && (
+
+ )}
+
+ {rumor.content}
+
+
+
+
+ {formatTime(rumor.created_at)}
+
+ {isMe && deliveryInfo && (
+ setDeliveryModalVisible(true)}
+ hitSlop={8}
+ style={styles.deliveryIcon}
+ >
+ {deliveryInfo.pending ? (
+
+ ) : deliveryInfo.results.some((r) => r.status === "accepted") ? (
+
+ ) : (
+
+ )}
+
+ )}
+
+
+
+
+ {/* Reaction pills */}
+ {groupedReactions.length > 0 && (
+
+ {groupedReactions.map(({ emoji, count, reactors, pending }) => (
+
+ {emoji}
+ {/* Reactor avatars (up to MAX_AVATARS) */}
+
+ {reactors.slice(0, MAX_AVATARS).map((pubkey, i) => (
+
+ ))}
+
+ {count > MAX_AVATARS && (
+ +{count - MAX_AVATARS}
+ )}
+
+ ))}
+
+ )}
+
+
+
+
+ setPickerVisible(false)}
+ position={pickerPosition}
+ />
+
+ {isMe && deliveryInfo && (
+ setDeliveryModalVisible(false)}
+ >
+ setDeliveryModalVisible(false)}
+ >
+
+ Delivery Status
+ {deliveryInfo.pending ? (
+ Sending…
+ ) : deliveryInfo.results.length === 0 ? (
+ No relay info available
+ ) : (
+
+ {deliveryInfo.results.map((r) => (
+
+
+
+
+ {r.url.replace("wss://", "")}
+
+ {r.error && r.status !== "accepted" && (
+
+ {r.error}
+
+ )}
+
+
+ ))}
+
+ )}
+
+
+
+ )}
+
+ )
+}
+
+const useStyles = makeStyles(({ colors }) => ({
+ row: {
+ flexDirection: "row",
+ marginVertical: 2,
+ paddingHorizontal: 12,
+ },
+ rowSent: {
+ justifyContent: "flex-end",
+ },
+ rowReceived: {
+ justifyContent: "flex-start",
+ },
+ avatar: {
+ width: 32,
+ height: 32,
+ borderRadius: 16,
+ marginRight: 8,
+ alignSelf: "flex-end",
+ marginBottom: 4,
+ },
+ bubbleWrapper: {
+ maxWidth: "75%",
+ },
+ bubblePending: {
+ opacity: 0.5,
+ },
+ senderName: {
+ fontSize: 11,
+ fontWeight: "600",
+ color: colors.grey2,
+ marginBottom: 2,
+ marginLeft: 4,
+ },
+ replyPreview: {
+ backgroundColor: colors.grey4,
+ borderLeftWidth: 3,
+ borderLeftColor: colors.grey2,
+ borderRadius: 6,
+ paddingHorizontal: 8,
+ paddingVertical: 4,
+ marginBottom: 4,
+ },
+ replyPreviewAuthor: {
+ fontSize: 11,
+ fontWeight: "600",
+ color: colors.primary3,
+ },
+ replyPreviewText: {
+ fontSize: 12,
+ color: colors.grey1,
+ },
+ bubble: {
+ borderRadius: 16,
+ paddingHorizontal: 12,
+ paddingVertical: 8,
+ },
+ bubbleRow: {
+ flexDirection: "row",
+ alignItems: "flex-start",
+ },
+ messageText: {
+ fontSize: 15,
+ color: colors.primary3,
+ flexShrink: 1,
+ },
+ messageTextSent: {
+ color: "#FFFFFF",
+ },
+ timestamp: {
+ fontSize: 10,
+ color: colors.grey2,
+ alignSelf: "flex-end",
+ },
+ timestampSent: {
+ color: "rgba(255,255,255,0.7)",
+ },
+ errorIcon: {
+ marginRight: 6,
+ marginTop: 2,
+ },
+ reactionsRow: {
+ flexDirection: "row",
+ flexWrap: "wrap",
+ marginTop: 3,
+ gap: 4,
+ },
+ reactionsRight: {
+ justifyContent: "flex-end",
+ },
+ reactionsLeft: {
+ justifyContent: "flex-start",
+ },
+ reactionPill: {
+ flexDirection: "row",
+ alignItems: "center",
+ backgroundColor: colors.grey4,
+ borderRadius: 12,
+ paddingHorizontal: 6,
+ paddingVertical: 2,
+ },
+ reactionPillPending: {
+ opacity: 0.45,
+ },
+ reactionEmoji: {
+ fontSize: 14,
+ },
+ reactorAvatars: {
+ flexDirection: "row",
+ alignItems: "center",
+ },
+ reactorAvatar: {
+ width: 16,
+ height: 16,
+ borderRadius: 8,
+ borderWidth: 1,
+ borderColor: colors.grey5,
+ },
+ reactionCount: {
+ fontSize: 11,
+ color: colors.grey1,
+ marginLeft: 4,
+ },
+ swipeAction: {
+ justifyContent: "center",
+ alignItems: "center",
+ width: 60,
+ paddingHorizontal: 12,
+ },
+ timestampRow: {
+ flexDirection: "row",
+ alignItems: "center",
+ justifyContent: "flex-end",
+ marginTop: 2,
+ },
+ deliveryIcon: {
+ marginLeft: 3,
+ },
+ modalOverlay: {
+ flex: 1,
+ backgroundColor: "rgba(0,0,0,0.45)",
+ justifyContent: "center",
+ alignItems: "center",
+ padding: 24,
+ },
+ modalCard: {
+ backgroundColor: colors.white,
+ borderRadius: 14,
+ padding: 16,
+ width: "100%",
+ maxHeight: 320,
+ },
+ modalTitle: {
+ fontSize: 15,
+ fontWeight: "700",
+ color: colors.black,
+ marginBottom: 12,
+ },
+ modalPending: {
+ fontSize: 13,
+ color: colors.grey2,
+ textAlign: "center",
+ paddingVertical: 8,
+ },
+ relayRow: {
+ flexDirection: "row",
+ alignItems: "flex-start",
+ paddingVertical: 6,
+ borderBottomWidth: 0.5,
+ borderBottomColor: colors.grey4,
+ },
+ relayUrl: {
+ fontSize: 13,
+ color: colors.black,
+ fontWeight: "500",
+ },
+ relayError: {
+ fontSize: 11,
+ color: colors.grey2,
+ marginTop: 2,
+ },
+}))
diff --git a/app/screens/chat/components/MessageInput.tsx b/app/screens/chat/components/MessageInput.tsx
new file mode 100644
index 000000000..c8b9c66dd
--- /dev/null
+++ b/app/screens/chat/components/MessageInput.tsx
@@ -0,0 +1,148 @@
+import React, { useState } from "react"
+import {
+ View,
+ TextInput,
+ TouchableOpacity,
+ Text,
+} from "react-native"
+import Icon from "react-native-vector-icons/Ionicons"
+import ReactNativeHapticFeedback from "react-native-haptic-feedback"
+import { nip19 } from "nostr-tools"
+import { Rumor } from "@app/utils/nostr"
+import { makeStyles, useTheme } from "@rneui/themed"
+
+type Props = {
+ onSend: (text: string, replyToId?: string) => void
+ replyTo: Rumor | null
+ onCancelReply: () => void
+ profileMap: Map
+}
+
+const MIN_HEIGHT = 40
+const MAX_HEIGHT = 120
+
+export const MessageInput: React.FC = ({
+ onSend,
+ replyTo,
+ onCancelReply,
+ profileMap,
+}) => {
+ const [text, setText] = useState("")
+ const [inputHeight, setInputHeight] = useState(MIN_HEIGHT)
+ const { theme: { colors } } = useTheme()
+ const styles = useStyles()
+
+ const handleSend = () => {
+ const trimmed = text.trim()
+ if (!trimmed) return
+ ReactNativeHapticFeedback.trigger("impactMedium", { enableVibrateFallback: true })
+ onSend(trimmed, replyTo?.id)
+ setText("")
+ setInputHeight(MIN_HEIGHT)
+ onCancelReply()
+ }
+
+ const replyAuthorProfile = replyTo ? profileMap.get(replyTo.pubkey) : null
+ const replyAuthorName = replyTo
+ ? replyAuthorProfile?.name ||
+ replyAuthorProfile?.username ||
+ nip19.npubEncode(replyTo.pubkey).slice(0, 10)
+ : null
+
+ return (
+
+ {replyTo && (
+
+
+ Replying to {replyAuthorName}
+
+ {replyTo.content}
+
+
+
+
+
+
+ )}
+
+
+ {
+ const h = e.nativeEvent.contentSize.height
+ setInputHeight(Math.min(Math.max(h, MIN_HEIGHT), MAX_HEIGHT))
+ }}
+ placeholder="Message"
+ placeholderTextColor={colors.grey3}
+ multiline
+ scrollEnabled={inputHeight >= MAX_HEIGHT}
+ maxLength={2000}
+ />
+
+
+
+
+
+ )
+}
+
+const useStyles = makeStyles(({ colors }) => ({
+ container: {
+ borderTopWidth: 0.5,
+ borderTopColor: colors.grey4,
+ },
+ replyBar: {
+ flexDirection: "row",
+ alignItems: "center",
+ backgroundColor: colors.grey4,
+ borderLeftWidth: 3,
+ borderLeftColor: colors.grey2,
+ paddingHorizontal: 12,
+ paddingVertical: 6,
+ },
+ replyContent: {
+ flex: 1,
+ },
+ replyLabel: {
+ fontSize: 12,
+ fontWeight: "600",
+ color: colors.primary3,
+ },
+ replyText: {
+ fontSize: 12,
+ color: colors.grey1,
+ },
+ replyClose: {
+ padding: 4,
+ },
+ inputRow: {
+ flexDirection: "row",
+ alignItems: "flex-end",
+ backgroundColor: colors.grey5,
+ paddingHorizontal: 12,
+ paddingVertical: 8,
+ },
+ textInput: {
+ flex: 1,
+ fontSize: 15,
+ color: colors.primary3,
+ paddingHorizontal: 12,
+ paddingVertical: 8,
+ borderRadius: 20,
+ backgroundColor: colors.grey4,
+ marginRight: 8,
+ },
+ sendButton: {
+ width: 36,
+ height: 36,
+ borderRadius: 18,
+ justifyContent: "center",
+ alignItems: "center",
+ },
+}))
diff --git a/app/screens/chat/components/ReactionPicker.tsx b/app/screens/chat/components/ReactionPicker.tsx
new file mode 100644
index 000000000..35820eb3c
--- /dev/null
+++ b/app/screens/chat/components/ReactionPicker.tsx
@@ -0,0 +1,83 @@
+import React, { useState } from "react"
+import { Dimensions, Modal, View, TouchableOpacity, Text, TouchableWithoutFeedback } from "react-native"
+import { makeStyles } from "@rneui/themed"
+
+const EMOJIS = ["❤️", "👍", "😂", "😮", "😢", "🔥", "➕", "💯"]
+const MARGIN = 10
+
+type Props = {
+ visible: boolean
+ onSelect: (emoji: string) => void
+ onClose: () => void
+ position: { x: number; y: number }
+}
+
+export const ReactionPicker: React.FC = ({ visible, onSelect, onClose, position }) => {
+ const styles = useStyles()
+ const screenWidth = Dimensions.get("window").width
+ const [pickerWidth, setPickerWidth] = useState(0)
+
+ const left = Math.min(
+ Math.max(position.x - pickerWidth / 2, MARGIN),
+ screenWidth - pickerWidth - MARGIN,
+ )
+
+ return (
+
+
+
+ setPickerWidth(e.nativeEvent.layout.width)}
+ style={[
+ styles.picker,
+ {
+ top: Math.max(position.y - 60, MARGIN),
+ left,
+ opacity: pickerWidth > 0 ? 1 : 0,
+ },
+ ]}
+ >
+ {EMOJIS.map((emoji) => (
+ {
+ onSelect(emoji)
+ onClose()
+ }}
+ >
+ {emoji}
+
+ ))}
+
+
+
+
+ )
+}
+
+const useStyles = makeStyles(({ colors }) => ({
+ overlay: {
+ flex: 1,
+ },
+ picker: {
+ position: "absolute",
+ flexDirection: "row",
+ backgroundColor: colors.grey5,
+ borderRadius: 24,
+ paddingHorizontal: 8,
+ paddingVertical: 6,
+ shadowColor: colors.black,
+ shadowOffset: { width: 0, height: 2 },
+ shadowOpacity: 0.3,
+ shadowRadius: 6,
+ elevation: 8,
+ },
+ emojiButton: {
+ paddingHorizontal: 6,
+ paddingVertical: 2,
+ },
+ emoji: {
+ fontSize: 24,
+ },
+}))
diff --git a/app/screens/chat/historyListItem.tsx b/app/screens/chat/historyListItem.tsx
index edecb1b68..28104566f 100644
--- a/app/screens/chat/historyListItem.tsx
+++ b/app/screens/chat/historyListItem.tsx
@@ -5,7 +5,7 @@ import { nip19, Event } from "nostr-tools"
import { useFocusEffect, useNavigation } from "@react-navigation/native"
import { StackNavigationProp } from "@react-navigation/stack"
import { ChatStackParamList } from "@app/navigation/stack-param-lists"
-import { useEffect, useState } from "react"
+import { useCallback, useEffect, useState } from "react"
import { useChatContext } from "./chatContext"
import { Rumor } from "@app/utils/nostr"
import { getLastSeen } from "./utils"
@@ -17,6 +17,17 @@ interface HistoryListItemProps {
groups: Map
}
+function formatRelativeTime(created_at: number): string {
+ const now = Math.floor(Date.now() / 1000)
+ const diff = now - created_at
+ if (diff < 60) return "now"
+ if (diff < 3600) return `${Math.floor(diff / 60)}m ago`
+ if (diff < 86400) return `${Math.floor(diff / 3600)}h ago`
+ if (diff < 172800) return "Yesterday"
+ if (diff < 604800) return `${Math.floor(diff / 86400)}d ago`
+ return new Date(created_at * 1000).toLocaleDateString([], { month: "short", day: "numeric" })
+}
+
export const HistoryListItem: React.FC = ({
item,
groups,
@@ -31,12 +42,10 @@ export const HistoryListItem: React.FC = ({
const navigation = useNavigation>()
const styles = useStyles()
- // Last message in this conversation
const lastRumor = (groups.get(item) || []).sort(
(a, b) => b.created_at - a.created_at,
)[0]
- // Subscribe to profiles using nostrRuntime
useEffect(() => {
const pubkeys = item
.split(",")
@@ -46,7 +55,7 @@ export const HistoryListItem: React.FC = ({
pubkeys.forEach((pubkey) => subscribedPubkeys.add(pubkey))
setSubscribedPubkeys(new Set(subscribedPubkeys))
- const unsub = nostrRuntime.ensureSubscription(
+ nostrRuntime.ensureSubscription(
`historyProfile:${pubkeys.join(",")}`,
{ kinds: [0], authors: pubkeys },
(event: Event) => {
@@ -55,18 +64,19 @@ export const HistoryListItem: React.FC = ({
)
}, [profileMap, subscribedPubkeys, item])
- // Check unread messages
- useFocusEffect(() => {
- const checkUnreadStatus = async () => {
- const lastSeen = await getLastSeen(item)
- if (lastRumor && (!lastSeen || lastSeen < lastRumor.created_at)) {
- setHasUnread(true)
- } else {
- setHasUnread(false)
+ useFocusEffect(
+ useCallback(() => {
+ const checkUnreadStatus = async () => {
+ const lastSeen = await getLastSeen(item)
+ if (lastRumor && (!lastSeen || lastSeen < lastRumor.created_at)) {
+ setHasUnread(true)
+ } else {
+ setHasUnread(false)
+ }
}
- }
- checkUnreadStatus()
- })
+ checkUnreadStatus()
+ }, [item, lastRumor?.id]),
+ )
return (
= ({
/>
))}
- {/* Self note indicator */}
{selfNote && (
= ({
)}
{/* Names and last message */}
-
-
-
- {item
- .split(",")
- .filter((p) => p !== userPublicKeyVal)
- .map((pubkey) => {
- const profile = profileMap?.get(pubkey)
- return (
- profile?.nip05 ||
- profile?.name ||
- profile?.username ||
- nip19.npubEncode(pubkey).slice(0, 9) + ".."
- )
- })
- .join(", ")}
- {selfNote && (
-
-
- Note to Self
-
-
-
- )}
-
-
+
+
+
+
+ {item
+ .split(",")
+ .filter((p) => p !== userPublicKeyVal)
+ .map((pubkey) => {
+ const profile = profileMap?.get(pubkey)
+ return (
+ profile?.nip05 ||
+ profile?.name ||
+ profile?.username ||
+ nip19.npubEncode(pubkey).slice(0, 9) + ".."
+ )
+ })
+ .join(", ")}
+ {selfNote && (
+
+
+ Note to Self
+
+
+
+ )}
+
+
+ {lastRumor && (
+ {formatRelativeTime(lastRumor.created_at)}
+ )}
+
{lastRumor && (
-
+
{(profileMap?.get(lastRumor.pubkey)?.name ||
profileMap?.get(lastRumor.pubkey)?.nip05 ||
profileMap?.get(lastRumor.pubkey)?.username ||
diff --git a/app/screens/chat/messages.tsx b/app/screens/chat/messages.tsx
index 77a1a0be7..4f64fa68f 100644
--- a/app/screens/chat/messages.tsx
+++ b/app/screens/chat/messages.tsx
@@ -1,7 +1,6 @@
import "react-native-get-random-values"
import * as React from "react"
-import { ActivityIndicator, Image, Platform, View } from "react-native"
-import { useI18nContext } from "@app/i18n/i18n-react"
+import { Image, View, TouchableOpacity, Platform } from "react-native"
import { RouteProp, useNavigation } from "@react-navigation/native"
import { StackNavigationProp } from "@react-navigation/stack"
import { Screen } from "../../components/screen"
@@ -9,59 +8,35 @@ import type {
ChatStackParamList,
RootStackParamList,
} from "../../navigation/stack-param-lists"
-import { makeStyles, Text, useTheme } from "@rneui/themed"
-import { GaloyIconButton } from "@app/components/atomic/galoy-icon-button"
-import { isIos } from "@app/utils/helper"
-import { Chat, MessageType, defaultTheme } from "@flyerhq/react-native-chat-ui"
-import { ChatMessage } from "./chatMessage"
+import { Text, makeStyles, useTheme } from "@rneui/themed"
import Icon from "react-native-vector-icons/Ionicons"
-import { nip19, Event } from "nostr-tools"
-import { Rumor, convertRumorsToGroups, sendNip17Message } from "@app/utils/nostr"
-import { useEffect, useState } from "react"
+import { nip19 } from "nostr-tools"
+import { Rumor, RelayDeliveryResult, getGroupId, sendNip17Message, sendReaction } from "@app/utils/nostr"
+import { useEffect, useMemo, useState } from "react"
import { useChatContext } from "./chatContext"
-import { SafeAreaProvider } from "react-native-safe-area-context"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
import { updateLastSeen } from "./utils"
import { nostrRuntime } from "@app/nostr/runtime/NostrRuntime"
import { getSigner } from "@app/nostr/signer"
+import { FlatList } from "react-native-gesture-handler"
+import { MessageBubble } from "./components/MessageBubble"
+import { MessageInput } from "./components/MessageInput"
+
+export type DeliveryInfo = {
+ pending: boolean
+ results: RelayDeliveryResult[]
+}
type MessagesProps = {
route: RouteProp
}
export const Messages: React.FC = ({ route }) => {
- const groupId = route.params.groupId
const { userPublicKey } = useChatContext()
- const [profileMap, setProfileMap] = useState>(new Map())
- const [preferredRelaysMap, setPreferredRelaysMap] = useState>(
- new Map(),
- )
-
- // Helper for handling profile events
- const handleProfileEvent = (event: Event) => {
- try {
- const profile = JSON.parse(event.content)
- setProfileMap((prev) => new Map(prev).set(event.pubkey, profile))
- } catch (e) {
- console.error("Failed to parse profile event", e)
- }
- }
-
- // Subscribe to profiles using nostrRuntime
- useEffect(() => {
- const pubkeys = groupId.split(",")
- nostrRuntime.ensureSubscription(
- `messagesProfiles:${pubkeys.join(",")}`,
- { kinds: [0], authors: pubkeys },
- handleProfileEvent,
- )
- }, [groupId])
-
return (
)
}
@@ -69,209 +44,275 @@ export const Messages: React.FC = ({ route }) => {
type MessagesScreenProps = {
groupId: string
userPubkey: string
- profileMap: Map
- preferredRelaysMap: Map
}
-export const MessagesScreen: React.FC = ({
- userPubkey,
- groupId,
- profileMap,
- preferredRelaysMap,
-}) => {
- const {
- theme: { colors },
- } = useTheme()
- const { rumors } = useChatContext()
+function readProfilesFromStore(pubkeys: string[]): Map {
+ const map = new Map()
+ for (const pubkey of pubkeys) {
+ const event = nostrRuntime.getEventStore().getLatest(`0:${pubkey}`)
+ if (event) {
+ try {
+ map.set(pubkey, JSON.parse(event.content))
+ } catch {}
+ }
+ }
+ return map
+}
+
+export const MessagesScreen: React.FC = ({ userPubkey, groupId }) => {
+ const { theme: { colors, mode } } = useTheme()
const styles = useStyles()
+ const { rumors, setRumors, reactions, addOptimisticReaction } = useChatContext()
const navigation = useNavigation>()
- const { LL } = useI18nContext()
- const [initialized, setInitialized] = useState(false)
- const [messages, setMessages] = useState>(new Map())
- const user = { id: userPubkey }
+ const insets = useSafeAreaInsets()
- const convertRumorsToMessages = (rumors: Rumor[]) => {
- const chatMap = new Map()
- rumors.forEach((r) => {
- chatMap.set(r.id, {
- author: { id: r.pubkey },
- createdAt: r.created_at * 1000,
- id: r.id,
- type: "text",
- text: r.content,
- })
- })
- return chatMap
- }
+ const [replyTo, setReplyTo] = useState(null)
+ const [deliveryStatus, setDeliveryStatus] = useState>(new Map())
+
+ const pubkeys = groupId.split(",")
+ const isGroupChat = pubkeys.length > 2
+ const recipientPubkeys = pubkeys.filter((p) => p !== userPubkey)
+
+ // Seed profiles immediately from EventStore, then subscribe for live updates
+ const [profileMap, setProfileMap] = useState>(() =>
+ readProfilesFromStore(pubkeys),
+ )
- // Initialize messages map & last-seen tracking
useEffect(() => {
- setInitialized(true)
- const chatRumors = convertRumorsToGroups(rumors).get(groupId) || []
- const lastRumor = chatRumors.sort((a, b) => b.created_at - a.created_at)[0]
- if (lastRumor) updateLastSeen(groupId, lastRumor.created_at)
- setMessages((prev) => new Map([...prev, ...convertRumorsToMessages(chatRumors)]))
- }, [rumors])
+ // Re-read from EventStore whenever it emits (covers profiles fetched by any screen)
+ const unsubStore = nostrRuntime.getEventStore().subscribe(() => {
+ setProfileMap(readProfilesFromStore(pubkeys))
+ })
- const handleSendPress = async (message: MessageType.PartialText) => {
- const textMessage: MessageType.Text = {
- author: user,
- createdAt: Date.now(),
- text: message.text,
- type: "text",
- id: message.text,
- }
+ // Ensure relay subscription for profiles not yet in store
+ nostrRuntime.ensureSubscription(
+ `messagesProfiles:${pubkeys.join(",")}`,
+ { kinds: [0], authors: pubkeys },
+ )
- let sent = false
- const onSent = (rumor: Rumor) => {
- if (!sent) {
- textMessage.id = rumor.id
- setMessages((prev) => new Map(prev).set(textMessage.id, textMessage))
- sent = true
- }
- }
+ return unsubStore
+ }, [groupId])
+ // Build deduplicated chat rumor list synchronously (no extra render cycle)
+ const chatRumors = useMemo(() => {
+ const seen = new Set()
+ return rumors
+ .filter((r) => {
+ if (r.kind !== 14) return false
+ const participants = r.tags.filter((t) => t[0] === "p").map((t) => t[1])
+ return getGroupId([...participants, r.pubkey]) === groupId
+ })
+ .filter((r) => {
+ if (seen.has(r.id)) return false
+ seen.add(r.id)
+ return true
+ })
+ .sort((a, b) => a.created_at - b.created_at)
+ }, [rumors, groupId])
+
+ useEffect(() => {
+ const last = chatRumors[chatRumors.length - 1]
+ if (last) updateLastSeen(groupId, last.created_at)
+ }, [chatRumors, groupId])
+
+ const getParentRumor = (rumor: Rumor): Rumor | null => {
+ const replyTag = rumor.tags.find((t) => t[0] === "e" && t[3] === "reply")
+ if (!replyTag) return null
+ return rumors.find((r) => r.id === replyTag[1]) || null
+ }
+
+ const handleSend = async (text: string, replyToId?: string) => {
const signer = await getSigner()
+ let sendSettled = false
const result = await sendNip17Message(
- groupId.split(","),
- message.text,
- preferredRelaysMap,
+ pubkeys,
+ text,
+ new Map(),
signer,
- onSent,
+ (rumor) => {
+ setRumors((prev) => {
+ if (prev.some((r) => r.id === rumor.id)) return prev
+ return [...prev, rumor]
+ })
+ // Guard against late callbacks firing after sendNip17Message has returned
+ if (!sendSettled) {
+ setDeliveryStatus((prev) => new Map(prev).set(rumor.id, { pending: true, results: [] }))
+ }
+ },
+ replyToId,
+ )
+
+ sendSettled = true
+ setDeliveryStatus((prev) =>
+ new Map(prev).set(result.rumor.id, { pending: false, results: result.relayDetails }),
)
- // Mark failed messages
if (result.outputs.filter((o) => o.acceptedRelays.length > 0).length === 0) {
- textMessage.metadata = { errors: true }
- textMessage.id = result.rumor.id
- setMessages((prev) => new Map(prev).set(textMessage.id, textMessage))
+ const failed = { ...result.rumor, metadata: { errors: true } } as any
+ setRumors((prev) => {
+ if (prev.some((r) => r.id === failed.id)) return prev
+ return [...prev, failed]
+ })
}
}
+ const handleReaction = (rumor: Rumor, emoji: string) => {
+ if (userPubkey) addOptimisticReaction(rumor.id, emoji, userPubkey)
+ getSigner().then((signer) => sendReaction(rumor.id, rumor.pubkey, emoji, pubkeys, new Map(), signer))
+ }
+
+ const recipientProfile = profileMap.get(recipientPubkeys[0])
+ const headerTitle = recipientPubkeys
+ .map(
+ (p) =>
+ profileMap.get(p)?.name ||
+ profileMap.get(p)?.username ||
+ profileMap.get(p)?.lud16 ||
+ nip19.npubEncode(p).slice(0, 9) + "..",
+ )
+ .join(", ")
+
+ const chatBg = mode === "dark" ? "#0e1a16" : "#eef5f2"
+
return (
-
-
-
- {groupId
- .split(",")
- .filter((p) => p !== userPubkey)
- .map(
- (p) =>
- profileMap.get(p)?.name ||
- profileMap.get(p)?.username ||
- profileMap.get(p)?.lud16 ||
- nip19.npubEncode(p).slice(0, 9) + "..",
- )
- .join(", ")}
-
-
- {
- const recipientId = groupId.split(",").filter((id) => id !== userPubkey)[0]
- navigation.navigate("sendBitcoinDestination", {
- username: profileMap.get(recipientId)?.lud16,
- })
+ {/* Header */}
+
+
+
+
+
+ {/* Avatar + name */}
+
+
- {groupId
- .split(",")
- .filter((p) => p !== userPubkey)
- .map((pubkey) => (
-
- ))}
-
+
+
+ {headerTitle}
+
+ {recipientProfile?.nip05 && (
+
+ {recipientProfile.nip05}
+
+ )}
+
+
+
+ {/* Lightning button */}
+ {
+ navigation.navigate("sendBitcoinDestination", {
+ username: recipientProfile?.lud16,
+ })
+ }}
+ hitSlop={8}
+ >
+
+
- {!initialized && }
+ {/* Message list */}
+ r.id}
+ style={{ backgroundColor: chatBg }}
+ contentContainerStyle={styles.listContent}
+ renderItem={({ item }) => (
+ setReplyTo(r)}
+ onReact={(emoji) => handleReaction(item, emoji)}
+ isGroupChat={isGroupChat}
+ deliveryInfo={deliveryStatus.get(item.id)}
+ />
+ )}
+ ListEmptyComponent={
+
+ No messages yet
+
+ }
+ />
-
-
-
- b.createdAt! - a.createdAt!,
- )}
- user={user}
- onSendPress={handleSendPress}
- renderTextMessage={(msg, next, prev) => (
-
- )}
- theme={{
- ...defaultTheme,
- colors: {
- ...defaultTheme.colors,
- inputBackground: colors._black,
- background: colors._lightGrey,
- },
- fonts: {
- ...defaultTheme.fonts,
- sentMessageBodyTextStyle: {
- ...defaultTheme.fonts.sentMessageBodyTextStyle,
- fontSize: 12,
- },
- },
- }}
- l10nOverride={{
- emptyChatPlaceholder: initialized
- ? isIos
- ? "No messages here yet"
- : "..."
- : isIos
- ? "Fetching Messages..."
- : "...",
- }}
- flatListProps={{
- contentContainerStyle: {
- paddingTop: messages.size ? (Platform.OS === "ios" ? 50 : 0) : 100,
- },
- }}
- />
-
-
+ {/* Input */}
+
+ setReplyTo(null)}
+ onSend={handleSend}
+ />
)
}
const useStyles = makeStyles(({ colors }) => ({
- aliasView: {
+ header: {
+ flexDirection: "row",
+ alignItems: "center",
+ paddingHorizontal: 12,
+ paddingBottom: 10,
+ borderBottomWidth: 0.5,
+ borderBottomColor: colors.grey4,
+ backgroundColor: colors.grey5,
+ },
+ backBtn: {
+ padding: 4,
+ marginRight: 4,
+ },
+ headerCenter: {
+ flex: 1,
flexDirection: "row",
alignItems: "center",
- justifyContent: "space-between",
- paddingRight: 10,
- paddingLeft: 10,
- paddingBottom: 6,
- paddingTop: isIos ? 40 : 10,
+ marginRight: 8,
+ overflow: "hidden",
},
- chatBodyContainer: { flex: 1 },
- chatView: { flex: 1, marginHorizontal: 30, borderRadius: 24, overflow: "hidden" },
- userPic: {
- borderRadius: 50,
- height: 50,
- width: 50,
- borderWidth: 1,
- borderColor: colors.green,
+ headerAvatar: {
+ width: 38,
+ height: 38,
+ borderRadius: 19,
+ borderWidth: 1.5,
+ marginRight: 10,
+ },
+ headerNameCol: {
+ flex: 1,
+ },
+ headerName: {
+ fontSize: 16,
+ fontWeight: "600",
+ color: colors.primary3,
+ },
+ headerSubtitle: {
+ fontSize: 12,
+ color: colors.grey2,
+ marginTop: 1,
+ },
+ lightningBtn: {
+ width: 36,
+ height: 36,
+ borderRadius: 18,
+ justifyContent: "center",
+ alignItems: "center",
+ },
+ listContent: {
+ paddingVertical: 8,
+ },
+ emptyContainer: {
+ flex: 1,
+ alignItems: "center",
+ justifyContent: "center",
+ paddingTop: 60,
},
- backButton: { fontSize: 26, color: colors.primary3 },
}))
diff --git a/app/screens/chat/style.ts b/app/screens/chat/style.ts
index fe8aa5546..742b5bb83 100644
--- a/app/screens/chat/style.ts
+++ b/app/screens/chat/style.ts
@@ -46,7 +46,21 @@ export const useStyles = makeStyles(({ colors }) => ({
item: {
marginHorizontal: 20,
- marginVertical: 4,
+ marginVertical: 3,
+ },
+
+ listItemHeader: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ alignItems: "center",
+ marginBottom: 2,
+ },
+
+ timestamp: {
+ fontSize: 11,
+ color: "#888",
+ flexShrink: 0,
+ marginLeft: 8,
},
unreadItem: {
@@ -64,17 +78,17 @@ export const useStyles = makeStyles(({ colors }) => ({
},
itemContainer: {
- borderRadius: 8,
+ borderRadius: 12,
backgroundColor: colors.grey5,
- // borderColor: colors.grey2,
- // borderWidth: 0.5,
- minHeight: 50,
- margin: 5,
+ minHeight: 60,
+ paddingHorizontal: 12,
+ paddingVertical: 10,
+ marginVertical: 3,
shadowColor: colors.black,
- shadowOffset: { width: 0, height: 2 },
- shadowOpacity: 0.2,
- shadowRadius: 3,
- elevation: 4,
+ shadowOffset: { width: 0, height: 1 },
+ shadowOpacity: 0.1,
+ shadowRadius: 2,
+ elevation: 2,
},
listContainer: { flexGrow: 1 },
@@ -83,7 +97,7 @@ export const useStyles = makeStyles(({ colors }) => ({
backgroundColor: colors.grey5,
borderBottomColor: colors.grey5,
borderTopColor: colors.grey5,
- marginHorizontal: 12,
+ marginHorizontal: 20,
marginVertical: 8,
},
diff --git a/app/screens/settings-screen/nostr-settings/nostr-settings-screen.tsx b/app/screens/settings-screen/nostr-settings/nostr-settings-screen.tsx
index 18b97c757..a8137abac 100644
--- a/app/screens/settings-screen/nostr-settings/nostr-settings-screen.tsx
+++ b/app/screens/settings-screen/nostr-settings/nostr-settings-screen.tsx
@@ -370,55 +370,55 @@ export const NostrSettingsScreen = () => {
{LL.Nostr.noProfileDescription()}
- {
- if (isGenerating) return
- setIsGenerating(true)
- setProgressMessage("Creating profile...")
- try {
- const signer = await getSigner()
- await setPreferredRelay(signer)
- await generateProfileImages(
- {
- name: dataAuthed?.me?.username,
- username: dataAuthed?.me?.username,
- lud16: `${dataAuthed?.me?.username}@${lnDomain}`,
- nip05: `${dataAuthed?.me?.username}@${lnDomain}`,
- },
- (msg) => setProgressMessage(msg),
- )
- } finally {
- setIsGenerating(false)
- setProgressMessage("")
- await resetChat()
- await initialize()
- }
- }}
- disabled={isGenerating}
- >
-
-
- {isGenerating
- ? progressMessage || LL.Nostr.creatingProfile()
- : LL.Nostr.generateProfile()}
-
-
+ {isGenerating ? (
+
+ ) : (
+ {
+ setIsGenerating(true)
+ setProgressMessage("Creating profile...")
+ try {
+ const signer = await getSigner()
+ await setPreferredRelay(signer)
+ await generateProfileImages(
+ {
+ name: dataAuthed?.me?.username,
+ username: dataAuthed?.me?.username,
+ lud16: `${dataAuthed?.me?.username}@${lnDomain}`,
+ nip05: `${dataAuthed?.me?.username}@${lnDomain}`,
+ },
+ (msg) => setProgressMessage(msg),
+ )
+ } finally {
+ setIsGenerating(false)
+ setProgressMessage("")
+ await resetChat()
+ await initialize()
+ }
+ }}
+ >
+
+
+ {LL.Nostr.generateProfile()}
+
+
+ )}
{nostrPubKey && !isGenerating && (
{
closer.close()
- console.log("Re-establishing connection")
closer = fetchGiftWrapsForPublicKey(pubkey, eventHandler, pool)
},
},
@@ -123,6 +128,8 @@ export const fetchGiftWrapsForPublicKey = (
export const convertRumorsToGroups = (rumors: Rumor[]) => {
let groups: Map = new Map()
rumors.forEach((rumor) => {
+ // Filter out kind 7 reactions — only kind 14 messages belong in conversation groups
+ if (rumor.kind !== 14) return
let participants = rumor.tags.filter((t) => t[0] === "p").map((p) => p[1])
let id = getGroupId([...participants, rumor.pubkey])
groups.set(id, [...(groups.get(id) || []), rumor])
@@ -206,12 +213,8 @@ export const fetchContactList = async (
filter,
{
onevent: onEvent,
- onclose: () => {
- console.log("Closing Subscription for Contacts")
- },
- oneose: () => {
- console.log("EOSE RECEIVED, DID SUBSCRIPTION CLOSE?")
- },
+ onclose: () => {},
+ oneose: () => {},
},
)
}
@@ -230,8 +233,7 @@ export const setPreferredRelay = async (signer: NostrSigner) => {
content: "",
}
const finalEvent = await signer.signEvent(relayEvent)
- let messages = await Promise.allSettled(pool.publish(publicRelays, finalEvent))
- console.log("Message from relays", messages)
+ await Promise.allSettled(pool.publish(publicRelays, finalEvent))
setTimeout(() => {
pool.close(publicRelays)
}, 5000)
@@ -248,16 +250,12 @@ export const addToContactList = async (
const tags = contactsEvent?.tags || []
if (existingContacts.some((p: NostrProfile) => p.pubkey === hexPubKeyToAdd)) {
- console.log("Contact already in list.")
return
}
if (!contactsEvent) {
const confirmed = await confirmOverwrite()
- if (!confirmed) {
- console.log("User declined to create a new contact list.")
- return
- }
+ if (!confirmed) return
}
tags.push(["p", hexPubKeyToAdd])
@@ -270,14 +268,12 @@ export const addToContactList = async (
}
const finalNewEvent = await signer.signEvent(newEvent)
- const messages = await Promise.allSettled(
+ await Promise.allSettled(
pool.publish(
["wss://relay.damus.io", "wss://relay.primal.net", "wss://nos.lol"],
finalNewEvent,
),
)
-
- console.log("Contact Publish: Relay replies", messages)
}
export async function sendNip17Message(
@@ -286,14 +282,17 @@ export async function sendNip17Message(
preferredRelaysMap: Map,
signer: NostrSigner,
onSent?: (rumor: Rumor) => void,
-) {
+ replyToId?: string,
+): Promise<{ outputs: { acceptedRelays: string[]; rejectedRelays: string[] }[]; rumor: Rumor; relayDetails: RelayDeliveryResult[] }> {
let p_tags = recipients.map((recipientId: string) => ["p", recipientId])
+ if (replyToId) {
+ p_tags = [...p_tags, ["e", replyToId, "", "reply"]]
+ }
let rumor = await createRumor({ content: message, kind: 14, tags: p_tags }, signer)
let outputs: { acceptedRelays: string[]; rejectedRelays: string[] }[] = []
- console.log("total recipients", recipients)
+ const allRelayResults = new Map()
await Promise.allSettled(
recipients.map(async (recipientId: string) => {
- console.log("sending rumor for recipient ", recipientId)
let recipientAcceptedRelays: string[] = []
let recipientRelays = preferredRelaysMap.get(recipientId)
recipientRelays = [
@@ -305,30 +304,86 @@ export async function sendNip17Message(
]
let seal = await createSeal(rumor, signer, recipientId)
let wrap = createWrap(seal, recipientId)
- console.log("wrap created")
- try {
- let response = await Promise.allSettled(
- customPublish(
- recipientRelays,
- wrap,
- (url: string) => {
- console.log("Accepted relay callback triggered:", url)
- onSent?.(rumor)
- recipientAcceptedRelays.push(url)
- },
- (url: string) => {
- console.log("Rejected relay:", url)
- },
- ),
- )
- } catch (e) {
- console.log("error in publishing", e)
- }
+ const settled = await Promise.allSettled(
+ customPublish(
+ recipientRelays,
+ wrap,
+ (url: string) => {
+ onSent?.(rumor)
+ recipientAcceptedRelays.push(url)
+ },
+ ),
+ )
+
+ settled.forEach((result, i) => {
+ const url = normalizeURL(recipientRelays![i] ?? "")
+ if (!url) return
+ // customPublish immediately rejects duplicates — skip them
+ if (result.status === "rejected" && String(result.reason) === "duplicate url") return
+ // Don't overwrite a result we already have for this URL from another recipient
+ if (allRelayResults.has(url)) {
+ // Upgrade to accepted if this recipient got it accepted
+ if (recipientAcceptedRelays.includes(url)) {
+ allRelayResults.set(url, { url, status: "accepted" })
+ }
+ return
+ }
+
+ if (result.status === "rejected") {
+ const errMsg = String(result.reason).replace(/^Error: /, "")
+ const isTimeout = errMsg.toLowerCase().includes("timed out")
+ allRelayResults.set(url, {
+ url,
+ status: isTimeout ? "timeout" : "connection_error",
+ error: errMsg,
+ })
+ } else if (recipientAcceptedRelays.includes(url)) {
+ allRelayResults.set(url, { url, status: "accepted" })
+ } else {
+ const errVal = typeof result.value === "string" ? result.value : undefined
+ allRelayResults.set(url, {
+ url,
+ status: "relay_error",
+ error: errVal ?? "Rejected by relay",
+ })
+ }
+ })
+
outputs.push({ acceptedRelays: recipientAcceptedRelays, rejectedRelays: [] })
}),
)
- console.log("Final output is", outputs)
- return { outputs, rumor }
+ return { outputs, rumor, relayDetails: Array.from(allRelayResults.values()) }
+}
+
+export async function sendReaction(
+ originalRumorId: string,
+ originalAuthorPubkey: string,
+ emoji: string,
+ recipients: string[],
+ preferredRelaysMap: Map,
+ signer: NostrSigner,
+): Promise {
+ const p_tags = recipients.map((r) => ["p", r])
+ const rumor = await createRumor(
+ {
+ kind: 7,
+ content: emoji,
+ tags: [...p_tags, ["e", originalRumorId], ["p", originalAuthorPubkey]],
+ },
+ signer,
+ )
+ await Promise.allSettled(
+ recipients.map(async (recipientId) => {
+ const recipientRelays = preferredRelaysMap.get(recipientId) || [
+ "wss://relay.flashapp.me",
+ "wss://relay.damus.io",
+ "wss://nostr.oxtr.dev",
+ ]
+ const seal = await createSeal(rumor, signer, recipientId)
+ const wrap = createWrap(seal, recipientId)
+ await Promise.allSettled(customPublish(recipientRelays, wrap))
+ }),
+ )
}
export const ensureRelay = async (
@@ -350,14 +405,12 @@ export const customPublish = (
onAcceptedRelays?: (url: string) => void,
onRejectedRelays?: (url: string) => void,
): Promise[] => {
- console.log("Custom publish invoked ")
const timeoutPromise = (url: string): Promise =>
new Promise((_, reject) => {
- setTimeout(() => reject(new Error(`Publish to ${url} timed out`)), 2000)
+ setTimeout(() => reject(new Error(`Publish to ${url} timed out`)), 5000)
})
return relays.map(normalizeURL).map(async (url, i, arr) => {
- console.log("trying to publish to", url)
if (arr.indexOf(url) !== i) {
return Promise.reject("duplicate url")
}
@@ -366,12 +419,10 @@ export const customPublish = (
let r = await ensureRelay(url)
return r.publish(event).then(
(value) => {
- console.log("Accepted on", url)
onAcceptedRelays?.(url)
return value
},
(reason: string) => {
- console.log("Rejected on", url)
onRejectedRelays?.(url)
return reason
},
@@ -415,6 +466,47 @@ export const saveGiftwrapsToStorage = async (giftwraps: Event[]) => {
}
}
+export const loadRumorsFromStorage = async (): Promise => {
+ try {
+ const saved = await AsyncStorage.getItem("rumors_cache")
+ return saved ? (JSON.parse(saved) as Rumor[]) : []
+ } catch (e) {
+ console.error("Error loading rumors from storage:", e)
+ return []
+ }
+}
+
+export const saveRumorsToStorage = async (rumors: Rumor[]) => {
+ try {
+ await AsyncStorage.setItem("rumors_cache", JSON.stringify(rumors))
+ } catch (e) {
+ console.error("Error saving rumors to storage:", e)
+ }
+}
+
+export const loadReactionsFromStorage = async (): Promise<
+ Record
+> => {
+ try {
+ const saved = await AsyncStorage.getItem("reactions_cache")
+ return saved ? JSON.parse(saved) : {}
+ } catch (e) {
+ console.error("Error loading reactions from storage:", e)
+ return {}
+ }
+}
+
+export const saveReactionsToStorage = async (
+ reactions: Map,
+) => {
+ try {
+ const obj = Object.fromEntries(reactions)
+ await AsyncStorage.setItem("reactions_cache", JSON.stringify(obj))
+ } catch (e) {
+ console.error("Error saving reactions to storage:", e)
+ }
+}
+
export const createContactListEvent = async (signer: NostrSigner) => {
const selfPublicKey = await signer.getPublicKey()
const event: UnsignedEvent = {
@@ -425,11 +517,10 @@ export const createContactListEvent = async (signer: NostrSigner) => {
pubkey: selfPublicKey,
}
const signedEvent = await signer.signEvent(event)
- const messages = await Promise.allSettled(
+ await Promise.allSettled(
pool.publish(
["wss://relay.damus.io", "wss://relay.primal.net", "wss://nos.lol"],
signedEvent,
),
)
- console.log("Message from relays for contact list publish", messages)
}
diff --git a/package.json b/package.json
index 3f66d442d..aa1323cfd 100644
--- a/package.json
+++ b/package.json
@@ -62,8 +62,6 @@
"@breeztech/breez-sdk-spark-react-native": "^0.7.14",
"@breeztech/react-native-breez-sdk-liquid": "^0.11.13",
"@flash/client": "git+https://github.com/lnflash/flash-client.git",
- "@flyerhq/react-native-chat-ui": "^1.4.3",
- "@flyerhq/react-native-link-preview": "^1.6.0",
"@formatjs/intl-getcanonicallocales": "^2.3.0",
"@formatjs/intl-locale": "^3.4.3",
"@formatjs/intl-relativetimeformat": "^11.2.10",
diff --git a/yarn.lock b/yarn.lock
index 4fb492b96..c1f40be5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2227,29 +2227,6 @@
version "0.3.0"
resolved "git+https://github.com/lnflash/flash-client.git#5c96550fea9124eb7a7c6a0b716c3f1ada7586a9"
-"@flyerhq/react-native-chat-ui@^1.4.3":
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/@flyerhq/react-native-chat-ui/-/react-native-chat-ui-1.4.3.tgz#1a2cbf382080ab76099ba155ad7a4014e53eb31e"
- integrity sha512-qrk6qQbvLXQruIQcHBWbf7FEyz6Sq0E+1man740VydBcvx5DuUlCwQwS2c7FMVKsvpOwmtxxFlKXdwPbOpZtnA==
- dependencies:
- "@flyerhq/react-native-keyboard-accessory-view" "^2.3.3"
- "@flyerhq/react-native-link-preview" "^1.5.2"
- dayjs "^1.10.7"
- react-native-image-viewing "^0.2.1"
- react-native-parsed-text "^0.0.22"
-
-"@flyerhq/react-native-keyboard-accessory-view@^2.3.3":
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/@flyerhq/react-native-keyboard-accessory-view/-/react-native-keyboard-accessory-view-2.4.0.tgz#27fe52f77e2b0ee324bf74154eda79bfebba608f"
- integrity sha512-LF2WdkMk23bTTpsXPQIyVjWttfo+6DcG0HcgE4kp+ozbVRv2Z1S+K1IRd1CR1LAuvHPnVax3DjrJqsGFTavqvA==
-
-"@flyerhq/react-native-link-preview@^1.5.2", "@flyerhq/react-native-link-preview@^1.6.0":
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/@flyerhq/react-native-link-preview/-/react-native-link-preview-1.6.0.tgz#c7285ab93a133328edc5d69b011822581bb4414b"
- integrity sha512-MY2Kxlf3SzLVUAuGU2LXhDU0a2icNBWL7MDCA8BNpmKqsWI+tHjX3mHm5nGpsLweYG5wsajzBd5XS0KCXNPkJA==
- dependencies:
- html-entities "^2.3.2"
-
"@formatjs/ecma402-abstract@1.18.3":
version "1.18.3"
resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.18.3.tgz#274a563964ef5bfb76dc6a477329f52ce9d5b18d"
@@ -11217,7 +11194,7 @@ date-fns@^3.6.0:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf"
integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==
-dayjs@^1.10.7, dayjs@^1.8.15:
+dayjs@^1.8.15:
version "1.11.19"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.19.tgz#15dc98e854bb43917f12021806af897c58ae2938"
integrity sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==
@@ -14518,7 +14495,7 @@ hosted-git-info@^7.0.0:
dependencies:
lru-cache "^10.0.1"
-html-entities@^2.1.0, html-entities@^2.3.2:
+html-entities@^2.1.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8"
integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==
@@ -20369,7 +20346,7 @@ prop-types@15.7.2:
object-assign "^4.1.1"
react-is "^16.8.1"
-prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.7.x, prop-types@^15.8.0, prop-types@^15.8.1:
+prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.0, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -20974,11 +20951,6 @@ react-native-image-picker@^8.2.1:
resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-8.2.1.tgz#1ac7826563cbaa5d5298d9f2acc53c69805e5393"
integrity sha512-FBeGYJGFDjMdGCcyubDJgBAPCQ4L1D3hwLXyUU91jY9ahOZMTbluceVvRmrEKqnDPFJ0gF1NVhJ0nr1nROFLdg==
-react-native-image-viewing@^0.2.1:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/react-native-image-viewing/-/react-native-image-viewing-0.2.2.tgz#fb26e57d7d3d9ce4559a3af3d244387c0367242b"
- integrity sha512-osWieG+p/d2NPbAyonOMubttajtYEYiRGQaJA54slFxZ69j1V4/dCmcrVQry47ktVKy8/qpFwCpW1eT6MH5T2Q==
-
react-native-in-app-review@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/react-native-in-app-review/-/react-native-in-app-review-4.4.2.tgz#eaa908cdc7adee26158903a0e6f22ca6af415f7b"
@@ -21070,13 +21042,6 @@ react-native-pager-view@6.9.1:
resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.9.1.tgz#a9e6d9323935cc2ae1d46d7816b66f76dc3eff8e"
integrity sha512-uUT0MMMbNtoSbxe9pRvdJJKEi9snjuJ3fXlZhG8F2vVMOBJVt/AFtqMPUHu9yMflmqOr08PewKzj9EPl/Yj+Gw==
-react-native-parsed-text@^0.0.22:
- version "0.0.22"
- resolved "https://registry.yarnpkg.com/react-native-parsed-text/-/react-native-parsed-text-0.0.22.tgz#a23c756eaa5d6724296814755085127f9072e5f5"
- integrity sha512-hfD83RDXZf9Fvth3DowR7j65fMnlqM9PpxZBGWkzVcUTFtqe6/yPcIoIAgrJbKn6YmtzkivmhWE2MCE4JKBXrQ==
- dependencies:
- prop-types "^15.7.x"
-
react-native-qrcode-svg@^6.2.0:
version "6.3.21"
resolved "https://registry.yarnpkg.com/react-native-qrcode-svg/-/react-native-qrcode-svg-6.3.21.tgz#af873cf8e5b9fc68315a2c267ff6563d55c56abb"