Skip to content

refactor: move branch display from sidebar to chat input #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
unknownzjc wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

refactor: move branch display from sidebar to chat input #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions packages/app-ai-native/src/pages/workspace/components/device-session-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,14 @@ export function DeviceSessionTab(props: { tabId: string }) {
hideAttachButton
hidePrompt={!!viewingSessionID()}
/>
<Show when={workspace.data.vcs?.branch}>
<div class="w-full px-3 pb-2 md:max-w-200 md:mx-auto 2xl:max-w-[1000px]">
<div class="flex items-center gap-1 text-11-regular text-text-weak">
<Icon name="branch" size="small" class="shrink-0" />
<span class="truncate">{workspace.data.vcs?.branch}</span>
</div>
</div>
</Show>
</Show>
<Show when={!workspace.agentAvailable()}>
<div class="shrink-0 w-full pb-3 flex justify-center items-center">
Expand Down
6 changes: 0 additions & 6 deletions packages/app-ai-native/src/pages/workspace/components/workspace-content-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,12 +621,6 @@ function ContentSidebar(props: { directory: string; autoExpandGroup?: () => { gr
</div>
}>
<div class="px-0 py-0.5">
<Show when={diff.state().branch}>
<div class="px-1.5 pb-1 text-11-regular text-text-weak flex items-center gap-1">
<Icon name="branch" size="small" class="shrink-0" />
<span class="truncate">{diff.state().branch}</span>
</div>
</Show>
<Show when={diff.state().stagedFiles.length > 0}>
<div
class="px-1.5 pt-1.5 pb-0.5 flex items-center gap-1 text-[11px] font-[600] text-native-muted tracking-wide uppercase cursor-pointer hover:text-native-foreground transition-colors"
Expand Down
Loading