Merge pull request #382 from lightningrodlabs/fix/unsubscribe-from-assetstore

Fix unsubscribe from assetstore

Author: matthme

web/src/components/ExpandedViewMode/ExpandedViewMode.connector.tsx

@@ -59,7 +59,7 @@ function mapStateToProps(
 const ExpandedViewMode = connect(mapStateToProps)(ExpandedViewModeComponent)
 
 /*
-  We do this in order to 'connect' in the other 
+  We do this in order to 'connect' in the other
   redux connected sub-components
 */
 
@@ -113,11 +113,10 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
     // Run only once on mount when initial props are provided
   }, [initialProjectId, initialOutcomeActionHash, dispatch, projectId])
 
-  // Always call the hook, but only with valid data when outcome exists and projectId is determined
-  const { attachmentsInfo } = useAttachments({
+  const { attachmentsInfo } = outcome && projectId ? useAttachments({
     projectId: projectId, // Use the determined projectId
-    outcome: outcome || ({ actionHash: '' } as ComputedOutcome),
-  })
+    outcome: outcome,
+  }) : { attachmentsInfo: [] };
 
   // Function to add attachments
   const addAttachment = async () => {

web/src/hooks/useAttachments.ts

@@ -47,9 +47,10 @@ export function useAttachments({
       // Clean up any existing subscription before creating a new one
       if (
         subscriptionRef.current &&
-        typeof subscriptionRef.current.unsubscribe === 'function'
+        typeof subscriptionRef.current === 'function'
       ) {
-        subscriptionRef.current.unsubscribe()
+        const unsubscribe = subscriptionRef.current;
+        unsubscribe()
       }
       subscriptionRef.current = null
 
@@ -93,9 +94,10 @@ export function useAttachments({
     return () => {
       if (
         subscriptionRef.current &&
-        typeof subscriptionRef.current.unsubscribe === 'function'
+        typeof subscriptionRef.current === 'function'
       ) {
-        subscriptionRef.current.unsubscribe()
+        const unsubscribe = subscriptionRef.current;
+        unsubscribe()
       }
       subscriptionRef.current = null
     }

web/src/hooks/useProjectAttachments.ts

@@ -24,7 +24,7 @@ export function useProjectAttachments({
   projectId: string
   projectMeta: WithActionHash<ProjectMeta>
 }) {
-  // ✅ Call hooks unconditionally at the top level
+  // Call hooks unconditionally at the top level
   const [attachmentWALs, setAttachmentWALs] = useState<WAL[] | null>(null)
   const [attachmentsInfo, setAttachmentsInfo] = useState<ProjectAssetMeta[]>([])
   const [error, setError] = useState(null)
@@ -43,9 +43,10 @@ export function useProjectAttachments({
       // Ensure cleanup if subscription exists from a previous valid run
       if (
         subscriptionRef.current &&
-        typeof subscriptionRef.current.unsubscribe === 'function'
+        typeof subscriptionRef.current === 'function'
       ) {
-        subscriptionRef.current.unsubscribe()
+        const unsubscribe = subscriptionRef.current;
+        unsubscribe()
       }
       subscriptionRef.current = null
       return // Exit effect early
@@ -66,14 +67,15 @@ export function useProjectAttachments({
       // Clean up any existing subscription before creating a new one
       if (
         subscriptionRef.current &&
-        typeof subscriptionRef.current.unsubscribe === 'function'
+        typeof subscriptionRef.current === 'function'
       ) {
-        subscriptionRef.current.unsubscribe()
+        const unsubscribe = subscriptionRef.current;
+        unsubscribe()
       }
       subscriptionRef.current = null
 
       try {
-        const subscription = weaveClient.assets
+        const unsubscribe = weaveClient.assets
           .assetStore(wal)
           .subscribe(async (store) => {
             if (store.status === 'complete') {
@@ -102,7 +104,7 @@ export function useProjectAttachments({
           })
 
         // Store the subscription object properly
-        subscriptionRef.current = subscription
+        subscriptionRef.current = unsubscribe
       } catch (err) {
         setError(err)
       }
@@ -114,9 +116,10 @@ export function useProjectAttachments({
     return () => {
       if (
         subscriptionRef.current &&
-        typeof subscriptionRef.current.unsubscribe === 'function'
+        typeof subscriptionRef.current === 'function'
       ) {
-        subscriptionRef.current.unsubscribe()
+        const unsubscribe = subscriptionRef.current;
+        unsubscribe();
       }
       subscriptionRef.current = null
     }