diff --git a/packages/desktop/src-tauri/Cargo.lock b/packages/desktop/src-tauri/Cargo.lock index 6c3e5b33..8344b205 100644 --- a/packages/desktop/src-tauri/Cargo.lock +++ b/packages/desktop/src-tauri/Cargo.lock @@ -2847,7 +2847,7 @@ dependencies = [ [[package]] name = "openchamber-desktop" -version = "1.2.4" +version = "1.2.5" dependencies = [ "anyhow", "axum", diff --git a/packages/ui/src/components/views/GitView.tsx b/packages/ui/src/components/views/GitView.tsx index 4eb1452a..035cdb3c 100644 --- a/packages/ui/src/components/views/GitView.tsx +++ b/packages/ui/src/components/views/GitView.tsx @@ -676,27 +676,31 @@ export const GitView: React.FC = () => { onRevertFile={handleRevertFile} /> ) : ( - handleSyncAction('pull')} - isPulling={syncAction === 'pull'} - /> +
+ handleSyncAction('pull')} + isPulling={syncAction === 'pull'} + /> +
)} - handleCommit({ pushAfter: false })} - onCommitAndPush={() => handleCommit({ pushAfter: true })} - commitAction={commitAction} - isBusy={isBusy} - /> + {changeEntries.length > 0 && ( + handleCommit({ pushAfter: false })} + onCommitAndPush={() => handleCommit({ pushAfter: true })} + commitAction={commitAction} + isBusy={isBusy} + /> + )} {/* History below, constrained width */}