diff --git a/src/windows/GitLog/useGitHistoryLogic.ts b/src/windows/GitLog/useGitHistoryLogic.ts index 17c47b5d..c116a541 100644 --- a/src/windows/GitLog/useGitHistoryLogic.ts +++ b/src/windows/GitLog/useGitHistoryLogic.ts @@ -220,26 +220,26 @@ export function useCommitSelection({ // Don't set shouldSelectFirst - let the maintain selection logic handle it // The uncommitted changes will disappear and it will auto-select the new commit void window.service.native.log('debug', '[test-id-commit-success-handler]', {}); - // Manually trigger refresh as fallback when observable subscription doesn't work - triggerRefresh(); - }, [triggerRefresh]); + // No need to manually trigger refresh - gitStateChange$ observable already handles it + // triggerRefresh(); // Removed: causes race condition with observable-triggered refresh + }, []); const handleRevertSuccess = useCallback(() => { // After revert, select the new revert commit (first non-uncommitted) void window.service.native.log('debug', '[test-id-revert-success-handler]', {}); setLastChangeType('revert'); - // Manually trigger refresh as fallback when observable subscription doesn't work - triggerRefresh(); - }, [setLastChangeType, triggerRefresh]); + // No need to manually trigger refresh - gitStateChange$ observable already handles it + // triggerRefresh(); // Removed: causes race condition with observable-triggered refresh + }, [setLastChangeType]); const handleUndoSuccess = useCallback(() => { // After undo, we want to select uncommitted changes // Set a special flag that will be handled by the effect above // Using lastChangeType 'undo' will trigger the selection logic setLastChangeType('undo'); - // Manually trigger refresh as fallback when observable subscription doesn't work - triggerRefresh(); - }, [setLastChangeType, triggerRefresh]); + // No need to manually trigger refresh - gitStateChange$ observable already handles it + // triggerRefresh(); // Removed: causes race condition with observable-triggered refresh + }, [setLastChangeType]); const handleSearch = useCallback( (parameters: ISearchParameters) => {