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
10 changes: 8 additions & 2 deletions components/agent/AgentActivity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ export function AgentActivity(props: Props) {
return <ActivityForAddress key={`${deployment.chainId}:${address}`} {...props} address={address} chainId={deployment.chainId} tokenAddress={deployment.address} />;
}

// 確定後の再取得。実測 (2026-09-22・本番): 支払い tx は確定の 54 秒後にはまだ API に出ず、89 秒後に出た
// (索引側の遅れ + CDN の stale-while-revalidate で 1 回ぶん古い応答が返る)。60 秒で打ち切ると、
// 開き直すまで新しい行が出ない。120 秒まで追う。上流の呼び出しは CDN (s-maxage=30) が吸収する。
const REFRESH_INTERVAL_MS = 20_000;
const REFRESH_ATTEMPTS = 6;

function ActivityForAddress({ address, locale, c, refreshKey, chainId, tokenAddress }: Props & { chainId: number; tokenAddress: string }) {
const [filter, setFilter] = useState<'all' | 'in' | 'out'>('all');
const [visibleCount, setVisibleCount] = useState(10);
Expand Down Expand Up @@ -55,11 +61,11 @@ function ActivityForAddress({ address, locale, c, refreshKey, chainId, tokenAddr
const timer = window.setInterval(() => {
void refetch();
attempts += 1;
if (attempts === 3) {
if (attempts === REFRESH_ATTEMPTS) {
window.clearInterval(timer);
setRefreshing(false);
}
}, 20_000);
}, REFRESH_INTERVAL_MS);
return () => window.clearInterval(timer);
}, [refreshKey, refetch, supported]);

Expand Down
19 changes: 13 additions & 6 deletions tests/components/agent/AgentActivity.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ describe('AgentActivity', () => {
expect(screen.getByText(c.unsupported, { exact: false })).toBeVisible();
expectExplorer('https://amoy.polygonscan.com');
update({ refreshKey: 1 });
await act(async () => { await vi.advanceTimersByTimeAsync(80_000); });
await act(async () => { await vi.advanceTimersByTimeAsync(200_000); });
expect(mockFetch).not.toHaveBeenCalled();
expect(screen.queryByText(c.loading)).toBeNull();
expect(screen.queryByText(c.refreshing)).toBeNull();
Expand Down Expand Up @@ -291,7 +291,7 @@ describe('AgentActivity', () => {
expect(screen.getAllByText('0 JPYC')).toHaveLength(2);
});

it('refetches at 20-second intervals exactly three times after confirmation', async () => {
it('refetches at 20-second intervals exactly six times (120 s) after confirmation', async () => {
const { update } = mount();
await screen.findByRole('table');
vi.useFakeTimers();
Expand All @@ -306,9 +306,16 @@ describe('AgentActivity', () => {
expect(mockFetch).toHaveBeenCalledTimes(3);
await act(async () => { await vi.advanceTimersByTimeAsync(20_000); });
expect(mockFetch).toHaveBeenCalledTimes(4);
// 60 秒では打ち切らない (本番実測: 確定の 54 秒後にまだ出ず 89 秒後に出た)。
expect(screen.getByText(c.refreshing)).toBeVisible();
await act(async () => { await vi.advanceTimersByTimeAsync(59_999); });
expect(mockFetch).toHaveBeenCalledTimes(6);
expect(screen.getByText(c.refreshing)).toBeVisible();
await act(async () => { await vi.advanceTimersByTimeAsync(1); });
expect(mockFetch).toHaveBeenCalledTimes(7);
expect(screen.queryByText(c.refreshing)).toBeNull();
await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
expect(mockFetch).toHaveBeenCalledTimes(4);
await act(async () => { await vi.advanceTimersByTimeAsync(120_000); });
expect(mockFetch).toHaveBeenCalledTimes(7);
expect(mockFetch.mock.calls.every(([url]) => url === `/api/agent/activity?address=${address.toLowerCase()}`)).toBe(true);
});

Expand All @@ -323,8 +330,8 @@ describe('AgentActivity', () => {
else update({ refreshKey: 2 });
await act(async () => { await vi.advanceTimersByTimeAsync(10_000); });
expect(mockFetch).toHaveBeenCalledTimes(change === 'address' ? 2 : 1);
await act(async () => { await vi.advanceTimersByTimeAsync(100_000); });
expect(mockFetch).toHaveBeenCalledTimes(change === 'address' ? 2 : change === 'confirmation' ? 4 : 1);
await act(async () => { await vi.advanceTimersByTimeAsync(200_000); });
expect(mockFetch).toHaveBeenCalledTimes(change === 'address' ? 2 : change === 'confirmation' ? 7 : 1);
expect(screen.queryByText(c.refreshing)).toBeNull();
});

Expand Down
Loading