diff --git a/src/App.native.tsx b/src/App.native.tsx index bfca341f42..ea018f1691 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -78,6 +78,8 @@ import {Splash} from '#/Splash' import {BottomSheetOutlet} from '../modules/bottom-sheet' import {BottomSheetProvider} from '../modules/bottom-sheet' import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider' +import {RequestListItem} from './screens/Messages/components/RequestListItem' +import {List} from './view/com/util/List' SplashScreen.preventAutoHideAsync() if (isIOS) { @@ -257,9 +259,9 @@ export default Sentry.wrap(App) function Testbed() { const control = Dialog.useDialogControl() + const [showItem, setShowItem] = useState(true) return ( - + + + ( + + )} + /> Close - toast after + diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx index f4e7863679..2fae651184 100644 --- a/src/screens/Messages/components/ChatListItem.tsx +++ b/src/screens/Messages/components/ChatListItem.tsx @@ -30,7 +30,7 @@ import { import {precacheProfile} from '#/state/queries/profile' import {useSession} from '#/state/session' import {TimeElapsed} from '#/view/com/util/TimeElapsed' -import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' +import {PreviewableUserAvatar, UserAvatar} from '#/view/com/util/UserAvatar' import {atoms as a, useBreakpoints, useTheme, web} from '#/alf' import * as tokens from '#/alf/tokens' import {useDialogControl} from '#/components/Dialog' @@ -47,6 +47,7 @@ import {Text} from '#/components/Typography' import {useSimpleVerificationState} from '#/components/verification' import {VerificationCheck} from '#/components/verification/VerificationCheck' import type * as bsky from '#/types/bsky' +import {Button} from '#/components/Button' export const ChatListItemPortal = createPortalGroup() @@ -349,15 +350,14 @@ function ChatListItemReady({ a.absolute, {top: tokens.space.md, left: tokens.space.lg}, ]}> - - )} - + - + {/* {showMenu && ( - )} - + />*/} diff --git a/src/screens/Messages/components/RequestButtons.tsx b/src/screens/Messages/components/RequestButtons.tsx index 4437a9a43f..306dca656e 100644 --- a/src/screens/Messages/components/RequestButtons.tsx +++ b/src/screens/Messages/components/RequestButtons.tsx @@ -50,11 +50,11 @@ export function RejectMenu({ }) { const {_} = useLingui() const shadowedProfile = useProfileShadow(profile) - const navigation = useNavigation() + // const navigation = useNavigation() const {mutate: leaveConvo} = useLeaveConvo(convo.id, { onMutate: () => { if (currentScreen === 'conversation') { - navigation.dispatch(StackActions.pop()) + // navigation.dispatch(StackActions.pop()) } }, onError: () => { @@ -192,7 +192,7 @@ export function AcceptChatButton({ }) { const {_} = useLingui() const queryClient = useQueryClient() - const navigation = useNavigation() + // const navigation = useNavigation() const {needsEmailVerification} = useEmail() const emailDialogControl = useEmailDialogControl() @@ -201,10 +201,10 @@ export function AcceptChatButton({ onAcceptConvo?.() if (currentScreen === 'list') { precacheConvoQuery(queryClient, {...convo, status: 'accepted'}) - navigation.navigate('MessagesConversation', { - conversation: convo.id, - accept: true, - }) + // navigation.navigate('MessagesConversation', { + // conversation: convo.id, + // accept: true, + // }) } }, onError: () => { @@ -272,12 +272,12 @@ export function DeleteChatButton({ currentScreen: 'list' | 'conversation' }) { const {_} = useLingui() - const navigation = useNavigation() + // const navigation = useNavigation() const {mutate: leaveConvo} = useLeaveConvo(convo.id, { onMutate: () => { if (currentScreen === 'conversation') { - navigation.dispatch(StackActions.pop()) + // navigation.dispatch(StackActions.pop()) } }, onError: () => { diff --git a/src/screens/Messages/components/RequestListItem.tsx b/src/screens/Messages/components/RequestListItem.tsx index 1f23b88823..86e5231d6d 100644 --- a/src/screens/Messages/components/RequestListItem.tsx +++ b/src/screens/Messages/components/RequestListItem.tsx @@ -27,14 +27,6 @@ export function RequestListItem({convo}: {convo: ChatBskyConvoDefs.ConvoView}) { return ( - - - {/* spacer, since you can't nest pressables */} {/* Placeholder text so that it responds to the font height */}