ai/at
1
0

fix social-app menubar chat

This commit is contained in:
2026-01-10 14:39:29 +09:00
parent 16e11575f6
commit 0607650425

View File

@@ -1,70 +1,75 @@
diff --git a/src/state/messages/events/index.tsx b/src/state/messages/events/index.tsx --- a/src/view/shell/bottom-bar/BottomBar.tsx
index 2ff0784ae..dc314ecc5 100644 +++ b/src/view/shell/bottom-bar/BottomBar.tsx
--- a/src/state/messages/events/index.tsx @@ -198,38 +198,40 @@
+++ b/src/state/messages/events/index.tsx accessibilityLabel={_(msg`Search`)}
@@ -10,13 +10,7 @@ const MessagesEventBusContext = React.createContext<MessagesEventBus | null>( accessibilityHint=""
MessagesEventBusContext.displayName = 'MessagesEventBusContext' />
- <Btn
export function useMessagesEventBus() { - testID="bottomBarMessagesBtn"
- const ctx = React.useContext(MessagesEventBusContext) - icon={
- if (!ctx) { - isAtMessages ? (
- throw new Error( - <MessageFilled
- 'useMessagesEventBus must be used within a MessagesEventBusProvider', - width={iconWidth - 1}
- style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
- />
- ) : (
- <Message
- width={iconWidth - 1}
- style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
- />
- ) - )
- } - }
- return ctx - onPress={onPressMessages}
+ return React.useContext(MessagesEventBusContext) - notificationCount={numUnreadMessages.numUnread}
} - hasNew={numUnreadMessages.hasNew}
- accessible={true}
export function MessagesEventBusProvider({ - accessibilityRole="tab"
@@ -24,18 +18,11 @@ export function MessagesEventBusProvider({ - accessibilityLabel={_(msg`Chat`)}
}: { - accessibilityHint={
children: React.ReactNode - numUnreadMessages.count > 0
}) { - ? _(
- const {currentAccount} = useSession() - msg`${plural(numUnreadMessages.numUnread ?? 0, {
- - one: '# unread item',
- if (!currentAccount) { - other: '# unread items',
- return ( - })}` || '',
- <MessagesEventBusContext.Provider value={null}>
- {children}
- </MessagesEventBusContext.Provider>
- ) - )
- : ''
- } - }
- - />
+ // DM functionality is disabled for syu.is + {!currentAccount?.isSelfHosted && (
return ( + <Btn
- <MessagesEventBusProviderInner>{children}</MessagesEventBusProviderInner> + testID="bottomBarMessagesBtn"
+ <MessagesEventBusContext.Provider value={null}> + icon={
+ {children} + isAtMessages ? (
+ </MessagesEventBusContext.Provider> + <MessageFilled
) + width={iconWidth - 1}
} + style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
+ />
diff --git a/src/state/queries/messages/list-conversations.tsx b/src/state/queries/messages/list-conversations.tsx + ) : (
index c5457d1cb..5bc37bdce 100644 + <Message
--- a/src/state/queries/messages/list-conversations.tsx + width={iconWidth - 1}
+++ b/src/state/queries/messages/list-conversations.tsx + style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
@@ -74,17 +74,12 @@ export function useListConvos() { + />
const empty = {accepted: [], request: []}
export function ListConvosProvider({children}: {children: React.ReactNode}) {
- const {hasSession} = useSession()
-
- if (!hasSession) {
- return (
- <ListConvosContext.Provider value={empty}>
- {children}
- </ListConvosContext.Provider>
- )
- }
-
- return <ListConvosProviderInner>{children}</ListConvosProviderInner>
+ // DM functionality is disabled for syu.is - always return empty
+ return (
+ <ListConvosContext.Provider value={empty}>
+ {children}
+ </ListConvosContext.Provider>
+ ) + )
} + }
+ onPress={onPressMessages}
export function ListConvosProviderInner({ + notificationCount={numUnreadMessages.numUnread}
+ hasNew={numUnreadMessages.hasNew}
+ accessible={true}
+ accessibilityRole="tab"
+ accessibilityLabel={_(msg`Chat`)}
+ accessibilityHint={
+ numUnreadMessages.count > 0
+ ? _(
+ msg`${plural(numUnreadMessages.numUnread ?? 0, {
+ one: '# unread item',
+ other: '# unread items',
+ })}` || '',
+ )
+ : ''
+ }
+ />
+ )}
<Btn
testID="bottomBarNotificationsBtn"
icon={