Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions backend/src/controllers/stream.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,6 @@ export const getUserStreamSummary = async (req: Request<{ address: string }>, re
claimableInTotal += BigInt(claimable.claimableAmount);
}

let claimableOutTotal = 0n;
for (const stream of outgoingStreams) {
// Outgoing streams also need to account for what the recipient can currently claim
const claimable = claimableAmountService.getClaimableAmount(stream as any, calculatedAt);
claimableOutTotal += BigInt(claimable.claimableAmount);
}

const totalStreamsCreated = outgoingStreams.length;
const totalStreamedOut = sumStringI128(outgoingStreams.map((stream: any) => stream.withdrawnAmount));
const totalStreamedIn = sumStringI128(incomingStreams.map((stream: any) => stream.withdrawnAmount));
Expand Down
23 changes: 16 additions & 7 deletions frontend/src/app/streams/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,31 +96,34 @@ export default function StreamDetailsPage() {
});

// Fetch stream data
const fetchStream = useCallback(async () => {
const fetchStream = useCallback(async (signal?: AbortSignal) => {
if (!streamId) return;
try {
const response = await fetch(`${API_BASE_URL}/streams/${streamId}`);
const response = await fetch(`${API_BASE_URL}/streams/${streamId}`, { signal });
if (!response.ok) throw new Error("Stream not found");
const data = await response.json();
setStream(data);
} catch (err) {
if (err instanceof Error && err.name === "AbortError") return;
setError(err instanceof Error ? err.message : "Failed to fetch stream");
}
}, [streamId]);

// Fetch events
const fetchEvents = useCallback(async (page: number) => {
const fetchEvents = useCallback(async (page: number, signal?: AbortSignal) => {
if (!streamId) return;
try {
const response = await fetch(
`${API_BASE_URL}/streams/${streamId}/events?page=${page}&limit=${EVENTS_PER_PAGE}`
`${API_BASE_URL}/streams/${streamId}/events?page=${page}&limit=${EVENTS_PER_PAGE}`,
{ signal }
);
if (response.ok) {
const data = await response.json();
setEvents(data.events || []);
setEventsTotal(data.total || 0);
}
} catch (err) {
if (err instanceof Error && err.name === "AbortError") return;
console.error("Failed to fetch events:", err);
}
}, [streamId]);
Expand All @@ -129,20 +132,26 @@ export default function StreamDetailsPage() {
useEffect(() => {
if (!isHydrated) return;

const controller = new AbortController();

const loadData = async () => {
setLoading(true);
await Promise.all([fetchStream(), fetchEvents(1)]);
await Promise.all([fetchStream(controller.signal), fetchEvents(1, controller.signal)]);
setLoading(false);
};

loadData();

return () => controller.abort();
}, [isHydrated, fetchStream, fetchEvents]);

// Handle SSE events
useEffect(() => {
if (streamEvents.length > 0) {
fetchStream();
fetchEvents(eventsPage);
const controller = new AbortController();
fetchStream(controller.signal);
fetchEvents(eventsPage, controller.signal);
return () => controller.abort();
}
}, [streamEvents, fetchStream, fetchEvents, eventsPage]);

Expand Down
1 change: 1 addition & 0 deletions frontend/src/utils/csvExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ export const downloadCSV = <T extends CsvRow>(data: T[], filename: string) => {
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
URL.revokeObjectURL(url);
}
};
247 changes: 0 additions & 247 deletions scripts/deploy.ts

This file was deleted.

Loading