diff --git a/frontend/src/components/settings/git/ChangeTable.jsx b/frontend/src/components/settings/git/ChangeTable.jsx index 76fa996..5af2e21 100644 --- a/frontend/src/components/settings/git/ChangeTable.jsx +++ b/frontend/src/components/settings/git/ChangeTable.jsx @@ -71,7 +71,7 @@ const ChangeTable = ({ Name - + Actions diff --git a/frontend/src/components/settings/git/StatusContainer.jsx b/frontend/src/components/settings/git/StatusContainer.jsx index 4739c13..515c038 100644 --- a/frontend/src/components/settings/git/StatusContainer.jsx +++ b/frontend/src/components/settings/git/StatusContainer.jsx @@ -34,6 +34,9 @@ const StatusContainer = ({ const handleSelectChange = (filePath, isIncoming) => { if (isIncoming) { + if (selectedOutgoingChanges.length > 0) { + setSelectedOutgoingChanges([]); + } setSelectedIncomingChanges(prevSelected => { if (prevSelected.includes(filePath)) { return prevSelected.filter(path => path !== filePath); @@ -42,6 +45,9 @@ const StatusContainer = ({ } }); } else { + if (selectedIncomingChanges.length > 0) { + setSelectedIncomingChanges([]); + } const change = status.outgoing_changes.find( c => c.file_path === filePath );