Merge upstream develop

Author: github-actions[bot]

apps/polycentric/src/features/post/hooks/usePostActions.ts

@@ -3,9 +3,10 @@ import {
   PostData,
   usePolycentric,
 } from '@/src/common/lib/polycentric-hooks';
+import { getKeyFingerprint } from '@/src/common/lib/polycentric-hooks/helpers';
 import { invalidateQuery } from '@/src/common/query/hooks/useQuery';
 import { COLLECTION, v2, SyncStrategy } from '@polycentric/react-native';
-import { router, useSegments } from 'expo-router';
+import { router, useLocalSearchParams, useSegments } from 'expo-router';
 import { feedQueryKeys } from '../../feed/hooks/feedCache';
 import { threadQueryKey } from './useThread';
 
@@ -29,6 +30,12 @@ export default function usePostActions(post: PostData): PostActions {
   const client = usePolycentric();
   const segments = useSegments();
 
+  const { identityId, keyFingerprint, sequence } = useLocalSearchParams<{
+    identityId?: string;
+    keyFingerprint?: string;
+    sequence?: string;
+  }>();
+
   // Tombstone the event identified by `hexEventKey` (a FEED-collection
   // Delete referencing it).
   const deleteEventAtKey = async (hexEventKey: string) => {
@@ -74,9 +81,23 @@ export default function usePostActions(post: PostData): PostActions {
       invalidateFeeds(post.identity);
       invalidateThreads(post.reply);
 
-      if (segments[0] === '[identityId]' && segments[1] === 'post') {
-        // Redirect to profile
-        router.navigate('../../');
+      // We want to change the active page if we are currently viewing the post
+      // that just got deleted:
+
+      const onPostScreen =
+        segments[0] === '[identityId]' && segments[1] === 'post';
+
+      const isSubject =
+        post.identity === identityId &&
+        getKeyFingerprint(post.signedBy) === keyFingerprint &&
+        post.sequence === sequence;
+
+      if (onPostScreen && isSubject) {
+        if (router.canGoBack()) {
+          router.back();
+        } else {
+          router.replace('../../');
+        }
         return;
       }
     },