From e3e7db2350e80a8876617fbb0efc3a706c9ddf61 Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Thu, 11 Jun 2026 08:45:37 -0700
Subject: [PATCH] Redirect to messages after leaving a chat (#10861)

---
 src/screens/Messages/components/ChatEnded.tsx  | 5 ++---
 src/screens/Messages/components/ChatLocked.tsx | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/screens/Messages/components/ChatEnded.tsx b/src/screens/Messages/components/ChatEnded.tsx
index 1ee13b68d3..ccc08f1d93 100644
--- a/src/screens/Messages/components/ChatEnded.tsx
+++ b/src/screens/Messages/components/ChatEnded.tsx
@@ -1,6 +1,6 @@
 import {Pressable} from 'react-native'
 import {Trans, useLingui} from '@lingui/react/macro'
-import {StackActions, useNavigation} from '@react-navigation/native'
+import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_10} from '#/lib/constants'
 import {type NavigationProp} from '#/lib/routes/types'
@@ -34,8 +34,7 @@ export function ChatEnded({
 
   const {mutate: leaveConvo} = useLeaveConvo(convo.view.id, {
     onSuccess: () => {
-      // Settings > Chat > Chat list
-      navigation.dispatch(StackActions.pop(2))
+      navigation.replace('Messages', {animation: 'pop'})
     },
     onError: e => {
       logger.error('Failed to leave group chat', {message: e})
diff --git a/src/screens/Messages/components/ChatLocked.tsx b/src/screens/Messages/components/ChatLocked.tsx
index bd67ac2574..8718667e9c 100644
--- a/src/screens/Messages/components/ChatLocked.tsx
+++ b/src/screens/Messages/components/ChatLocked.tsx
@@ -1,7 +1,7 @@
 import {Pressable} from 'react-native'
 import {ChatBskyConvoUnlockConvo} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
-import {StackActions, useNavigation} from '@react-navigation/native'
+import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_10} from '#/lib/constants'
 import {type NavigationProp} from '#/lib/routes/types'
@@ -54,8 +54,7 @@ export function ChatLocked({
 
   const {mutate: leaveConvo} = useLeaveConvo(convo.view.id, {
     onSuccess: () => {
-      // Settings > Chat > Chat list
-      navigation.dispatch(StackActions.pop(2))
+      navigation.replace('Messages', {animation: 'pop'})
     },
     onError: e => {
       logger.error('Failed to leave group chat', {message: e})