From 202fcd13e97cda86ef6ebd02e8fdc4114f2be6ef Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Tue, 19 Nov 2024 11:33:57 +0000
Subject: [PATCH] Drop RemoteBranch in favor of RemoteBranchData

- redundant data structure and api removed
- served same purpose as `find_git_branches`
---
 .../src/lib/branch/BranchPreviewHeader.svelte |  6 +-
 apps/desktop/src/lib/branches/gitBranch.ts    | 11 +--
 .../src/lib/components/BranchPreview.svelte   | 39 ++-------
 .../desktop/src/lib/pr/PullRequestCard.svelte | 21 ++++-
 apps/desktop/src/lib/vbranches/types.ts       | 22 ++---
 .../[projectId]/branch/[...name]/+page.svelte |  6 +-
 .../gitbutler-branch-actions/src/actions.rs   |  9 +-
 crates/gitbutler-branch-actions/src/lib.rs    | 11 ++-
 crates/gitbutler-branch-actions/src/remote.rs | 87 ++++---------------
 .../gitbutler-branch-actions/src/virtual.rs   |  8 +-
 crates/gitbutler-tauri/src/main.rs            |  1 -
 .../gitbutler-tauri/src/virtual_branches.rs   | 19 +---
 12 files changed, 66 insertions(+), 174 deletions(-)

diff --git a/apps/desktop/src/lib/branch/BranchPreviewHeader.svelte b/apps/desktop/src/lib/branch/BranchPreviewHeader.svelte
index 55c9eae307..36ea69dc62 100644
--- a/apps/desktop/src/lib/branch/BranchPreviewHeader.svelte
+++ b/apps/desktop/src/lib/branch/BranchPreviewHeader.svelte
@@ -12,11 +12,11 @@
 	import Modal from '@gitbutler/ui/Modal.svelte';
 	import Tooltip from '@gitbutler/ui/Tooltip.svelte';
 	import type { PullRequest } from '$lib/forge/interface/types';
-	import type { Branch } from '$lib/vbranches/types';
+	import type { BranchData } from '$lib/vbranches/types';
 	import { goto } from '$app/navigation';
 
-	export let localBranch: Branch | undefined;
-	export let remoteBranch: Branch | undefined;
+	export let localBranch: BranchData | undefined;
+	export let remoteBranch: BranchData | undefined;
 	export let pr: PullRequest | undefined;
 
 	$: branch = remoteBranch || localBranch!;
diff --git a/apps/desktop/src/lib/branches/gitBranch.ts b/apps/desktop/src/lib/branches/gitBranch.ts
index 68a98c2ff2..036ef08279 100644
--- a/apps/desktop/src/lib/branches/gitBranch.ts
+++ b/apps/desktop/src/lib/branches/gitBranch.ts
@@ -1,21 +1,14 @@
 import { invoke } from '$lib/backend/ipc';
-import { Branch, BranchData } from '$lib/vbranches/types';
+import { BranchData } from '$lib/vbranches/types';
 import { plainToInstance } from 'class-transformer';
 
 export class GitBranchService {
 	constructor(private projectId: string) {}
 
 	async findBranches(name: string) {
-		return plainToInstance(
-			Branch,
-			await invoke<any[]>('find_git_branches', { projectId: this.projectId, branchName: name })
-		);
-	}
-
-	async getRemoteBranchData(refname: string): Promise<BranchData> {
 		return plainToInstance(
 			BranchData,
-			await invoke<any>('get_remote_branch_data', { projectId: this.projectId, refname })
+			await invoke<any[]>('find_git_branches', { projectId: this.projectId, branchName: name })
 		);
 	}
 }
diff --git a/apps/desktop/src/lib/components/BranchPreview.svelte b/apps/desktop/src/lib/components/BranchPreview.svelte
index 018386c614..1c10375ecb 100644
--- a/apps/desktop/src/lib/components/BranchPreview.svelte
+++ b/apps/desktop/src/lib/components/BranchPreview.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import BranchPreviewHeader from '../branch/BranchPreviewHeader.svelte';
 	import Resizer from '../shared/Resizer.svelte';
-	import { GitBranchService } from '$lib/branches/gitBranch';
 	import CommitCard from '$lib/commit/CommitCard.svelte';
 	import { transformAnyCommit } from '$lib/commitLines/transformers';
 	import Markdown from '$lib/components/Markdown.svelte';
@@ -10,7 +9,7 @@
 	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
 	import { SETTINGS, type Settings } from '$lib/settings/userSettings';
 	import { FileIdSelection } from '$lib/vbranches/fileIdSelection';
-	import { BranchData, type Branch } from '$lib/vbranches/types';
+	import { BranchData } from '$lib/vbranches/types';
 	import { getContext, getContextStoreBySymbol } from '@gitbutler/shared/context';
 	import Line from '@gitbutler/ui/commitLines/Line.svelte';
 	import { LineManagerFactory } from '@gitbutler/ui/commitLines/lineManager';
@@ -18,11 +17,10 @@
 	import { onMount, setContext } from 'svelte';
 	import type { PullRequest } from '$lib/forge/interface/types';
 
-	export let localBranch: Branch | undefined = undefined;
-	export let remoteBranch: Branch | undefined = undefined;
+	export let localBranch: BranchData | undefined = undefined;
+	export let remoteBranch: BranchData | undefined = undefined;
 	export let pr: PullRequest | undefined;
 
-	const gitBranchService = getContext(GitBranchService);
 	const forge = getForge();
 
 	const fileIdSelection = new FileIdSelection();
@@ -37,42 +35,19 @@
 	const userSettings = getContextStoreBySymbol<Settings>(SETTINGS);
 	const lineManagerFactory = getContext(LineManagerFactory);
 
-	let localBranchData: BranchData | undefined;
-	let remoteBranchData: BranchData | undefined;
-
-	// The remote branch service (which needs to be renamed) is responsible for
-	// fetching local and remote branches.
-	// We must manually set the branch data to undefined as the component
-	// doesn't get completely re-rendered on a page change.
-	$: if (localBranch) {
-		gitBranchService
-			.getRemoteBranchData(localBranch.name)
-			.then((branchData) => (localBranchData = branchData));
-	} else {
-		localBranchData = undefined;
-	}
-
-	$: if (remoteBranch) {
-		gitBranchService
-			.getRemoteBranchData(remoteBranch.name)
-			.then((branchData) => (remoteBranchData = branchData));
-	} else {
-		remoteBranchData = undefined;
-	}
-
-	$: remoteCommitShas = new Set(remoteBranchData?.commits.map((commit) => commit.id) || []);
+	$: remoteCommitShas = new Set(remoteBranch?.commits.map((commit) => commit.id) || []);
 
 	// Find commits common in the local and remote
 	$: localAndRemoteCommits =
-		localBranchData?.commits.filter((commit) => remoteCommitShas.has(commit.id)) || [];
+		localBranch?.commits.filter((commit) => remoteCommitShas.has(commit.id)) || [];
 
 	$: localAndRemoteCommitShas = new Set(localAndRemoteCommits.map((commit) => commit.id));
 
 	// Find the local and remote commits that are not shared
 	$: localCommits =
-		localBranchData?.commits.filter((commit) => !localAndRemoteCommitShas.has(commit.id)) || [];
+		localBranch?.commits.filter((commit) => !localAndRemoteCommitShas.has(commit.id)) || [];
 	$: remoteCommits =
-		remoteBranchData?.commits.filter((commit) => !localAndRemoteCommitShas.has(commit.id)) || [];
+		remoteBranch?.commits.filter((commit) => !localAndRemoteCommitShas.has(commit.id)) || [];
 
 	$: lineManager = lineManagerFactory.build({
 		remoteCommits: remoteCommits.map(transformAnyCommit),
diff --git a/apps/desktop/src/lib/pr/PullRequestCard.svelte b/apps/desktop/src/lib/pr/PullRequestCard.svelte
index 40204b7844..93b0dfb9cd 100644
--- a/apps/desktop/src/lib/pr/PullRequestCard.svelte
+++ b/apps/desktop/src/lib/pr/PullRequestCard.svelte
@@ -15,6 +15,7 @@
 	import { getContext } from '@gitbutler/shared/context';
 	import Button from '@gitbutler/ui/Button.svelte';
 	import { type ComponentColor } from '@gitbutler/ui/utils/colorTypes';
+	import type { ForgeReview } from '$lib/forge/interface/forgeReviewService';
 	import type { DetailedPullRequest } from '$lib/forge/interface/types';
 	import type { MessageStyle } from '$lib/shared/InfoMessage.svelte';
 	import type iconsJson from '@gitbutler/ui/data/icons.json';
@@ -23,13 +24,21 @@
 		upstreamName: string;
 		pr: DetailedPullRequest;
 		checksMonitor?: ForgeChecksMonitor;
+		forgeReview?: ForgeReview;
 		reloadPR: () => void;
 		reopenPr: () => Promise<void>;
 		openPrDetailsModal: () => void;
 	}
 
-	const { upstreamName, pr, checksMonitor, reloadPR, reopenPr, openPrDetailsModal }: Props =
-		$props();
+	const {
+		upstreamName,
+		pr,
+		checksMonitor,
+		forgeReview,
+		reloadPR,
+		reopenPr,
+		openPrDetailsModal
+	}: Props = $props();
 
 	type StatusInfo = {
 		text: string;
@@ -55,6 +64,7 @@
 
 	const prService = getForgePrService();
 	const prMonitor = $derived(prNumber ? $prService?.prMonitor(prNumber) : undefined);
+	const reviewStatus = $derived(forgeReview?.status);
 
 	const checks = $derived(checksMonitor?.status);
 
@@ -212,7 +222,7 @@
 			>
 				{prStatusInfo.text}
 			</Button>
-			{#if !pr?.closedAt && checksTagInfo}
+			{#if !pr.closedAt && checksTagInfo}
 				<Button
 					size="tag"
 					clickable={false}
@@ -224,7 +234,10 @@
 					{checksTagInfo.text}
 				</Button>
 			{/if}
-			{#if pr?.htmlUrl}
+			{#if $reviewStatus?.approved}
+				<Button icon="success-small" size="tag" style="success" outline>Approved</Button>
+			{/if}
+			{#if pr.htmlUrl}
 				<Button
 					icon="open-link"
 					size="tag"
diff --git a/apps/desktop/src/lib/vbranches/types.ts b/apps/desktop/src/lib/vbranches/types.ts
index 8900f08ea3..b2e40e5b04 100644
--- a/apps/desktop/src/lib/vbranches/types.ts
+++ b/apps/desktop/src/lib/vbranches/types.ts
@@ -111,8 +111,8 @@ export class VirtualBranch {
 	description!: string;
 	head!: string;
 	order!: number;
-	@Type(() => Branch)
-	upstream?: Branch;
+	@Type(() => BranchData)
+	upstream?: BranchData;
 	upstreamData?: BranchData;
 	upstreamName?: string;
 	conflicted!: boolean;
@@ -370,20 +370,6 @@ export interface Author {
 	isBot?: boolean;
 }
 
-export class Branch {
-	sha!: string;
-	name!: string;
-	upstream?: string;
-	lastCommitTimestampMs?: number | undefined;
-	lastCommitAuthor?: string | undefined;
-	givenName!: string;
-	isRemote!: boolean;
-
-	get displayName(): string {
-		return this.name.replace('refs/remotes/', '').replace('refs/heads/', '');
-	}
-}
-
 export class BranchData {
 	sha!: string;
 	name!: string;
@@ -393,6 +379,8 @@ export class BranchData {
 	commits!: Commit[];
 	isMergeable!: boolean | undefined;
 	forkPoint?: string | undefined;
+	isRemote!: boolean;
+	givenName!: string;
 
 	get ahead(): number {
 		return this.commits.length;
@@ -415,7 +403,7 @@ export class BranchData {
 	}
 
 	get displayName(): string {
-		return this.name.replace('refs/remotes/', '').replace('origin/', '').replace('refs/heads/', '');
+		return this.name.replace('refs/remotes/', '').replace('refs/heads/', '');
 	}
 }
 
diff --git a/apps/desktop/src/routes/[projectId]/branch/[...name]/+page.svelte b/apps/desktop/src/routes/[projectId]/branch/[...name]/+page.svelte
index 905f2493f7..e5960c889c 100644
--- a/apps/desktop/src/routes/[projectId]/branch/[...name]/+page.svelte
+++ b/apps/desktop/src/routes/[projectId]/branch/[...name]/+page.svelte
@@ -2,7 +2,7 @@
 	import { GitBranchService } from '$lib/branches/gitBranch';
 	import BranchPreview from '$lib/components/BranchPreview.svelte';
 	import { getForgeListingService } from '$lib/forge/interface/forgeListingService';
-	import { Branch } from '$lib/vbranches/types';
+	import { BranchData } from '$lib/vbranches/types';
 	import { getContext } from '@gitbutler/shared/context';
 	import { page } from '$app/stores';
 
@@ -13,8 +13,8 @@
 	const prs = $derived($forgeListingService?.prs);
 	const pr = $derived($prs?.find((pr) => pr.sourceBranch === name));
 
-	let localBranch = $state<Branch>();
-	let remoteBranches = $state<Branch[]>([]);
+	let localBranch = $state<BranchData>();
+	let remoteBranches = $state<BranchData[]>([]);
 	let loading = $state(false);
 
 	$effect(() => {
diff --git a/crates/gitbutler-branch-actions/src/actions.rs b/crates/gitbutler-branch-actions/src/actions.rs
index 4782c46747..3e8fc08e8b 100644
--- a/crates/gitbutler-branch-actions/src/actions.rs
+++ b/crates/gitbutler-branch-actions/src/actions.rs
@@ -14,7 +14,7 @@ use crate::{
     branch_manager::BranchManagerExt,
     file::RemoteBranchFile,
     remote,
-    remote::{RemoteBranch, RemoteBranchData, RemoteCommit},
+    remote::{RemoteBranchData, RemoteCommit},
     VirtualBranchesExt,
 };
 use anyhow::{Context, Result};
@@ -427,16 +427,11 @@ pub fn push_virtual_branch(
     vbranch::push(&ctx, stack_id, with_force, askpass)
 }
 
-pub fn find_git_branches(project: Project, branch_name: &str) -> Result<Vec<RemoteBranch>> {
+pub fn find_git_branches(project: Project, branch_name: &str) -> Result<Vec<RemoteBranchData>> {
     let ctx = CommandContext::open(&project)?;
     remote::find_git_branches(&ctx, branch_name)
 }
 
-pub fn get_remote_branch_data(project: &Project, refname: &Refname) -> Result<RemoteBranchData> {
-    let ctx = CommandContext::open(project)?;
-    remote::get_branch_data(&ctx, refname)
-}
-
 pub fn squash(project: &Project, stack_id: StackId, commit_oid: git2::Oid) -> Result<()> {
     let ctx = open_with_verify(project)?;
     assure_open_workspace_mode(&ctx).context("Squashing a commit requires open workspace mode")?;
diff --git a/crates/gitbutler-branch-actions/src/lib.rs b/crates/gitbutler-branch-actions/src/lib.rs
index 8067e3adfa..624b30df04 100644
--- a/crates/gitbutler-branch-actions/src/lib.rs
+++ b/crates/gitbutler-branch-actions/src/lib.rs
@@ -4,11 +4,10 @@ mod actions;
 pub use actions::{
     amend, can_apply_remote_branch, create_commit, create_virtual_branch,
     create_virtual_branch_from_branch, delete_local_branch, fetch_from_remotes, find_commit,
-    find_git_branches, get_base_branch_data, get_remote_branch_data, get_uncommited_files,
-    get_uncommited_files_reusable, insert_blank_commit, integrate_upstream,
-    integrate_upstream_commits, list_commit_files, list_virtual_branches,
-    list_virtual_branches_cached, move_commit, move_commit_file, push_base_branch,
-    push_virtual_branch, reorder_stack, reset_files, reset_virtual_branch,
+    find_git_branches, get_base_branch_data, get_uncommited_files, get_uncommited_files_reusable,
+    insert_blank_commit, integrate_upstream, integrate_upstream_commits, list_commit_files,
+    list_virtual_branches, list_virtual_branches_cached, move_commit, move_commit_file,
+    push_base_branch, push_virtual_branch, reorder_stack, reset_files, reset_virtual_branch,
     resolve_upstream_integration, save_and_unapply_virutal_branch, set_base_branch,
     set_target_push_remote, squash, unapply_lines, unapply_ownership,
     unapply_without_saving_virtual_branch, undo_commit, update_branch_order, update_commit_message,
@@ -43,7 +42,7 @@ mod file;
 pub use file::{Get, RemoteBranchFile};
 
 mod remote;
-pub use remote::{RemoteBranch, RemoteBranchData, RemoteCommit};
+pub use remote::{RemoteBranchData, RemoteCommit};
 
 pub mod conflicts;
 
diff --git a/crates/gitbutler-branch-actions/src/remote.rs b/crates/gitbutler-branch-actions/src/remote.rs
index 50b8e2c384..8d2659628a 100644
--- a/crates/gitbutler-branch-actions/src/remote.rs
+++ b/crates/gitbutler-branch-actions/src/remote.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use crate::author::Author;
-use anyhow::{Context, Result};
+use anyhow::Result;
 use git2::BranchType;
 use gitbutler_branch::ReferenceExt;
 use gitbutler_command_context::CommandContext;
@@ -13,39 +13,19 @@ use gitbutler_serde::BStringForFrontend;
 use gitbutler_stack::{Target, VirtualBranchesHandle};
 use serde::Serialize;
 
-/// this struct is a mapping to the view `RemoteBranch` type in Typescript
-/// found in src-tauri/src/routes/repo/[project_id]/types.ts
-///
-/// it holds data calculated for presentation purposes of one Git branch
-/// with comparison data to the Target commit, determining if it is mergeable,
-/// and how far ahead or behind the Target it is.
-/// an array of them can be requested from the frontend to show in the sidebar
-/// Tray and should only contain branches that have not been converted into
-/// virtual branches yet (ie, we have no `Branch` struct persisted in our data.
-#[derive(Debug, Clone, Serialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct RemoteBranch {
-    #[serde(with = "gitbutler_serde::oid")]
-    pub sha: git2::Oid,
-    pub name: Refname,
-    pub upstream: Option<RemoteRefname>,
-    pub given_name: String,
-    pub last_commit_timestamp_ms: Option<u128>,
-    pub last_commit_author: Option<String>,
-    pub is_remote: bool,
-}
-
 #[derive(Debug, Clone, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct RemoteBranchData {
     #[serde(with = "gitbutler_serde::oid")]
     pub sha: git2::Oid,
     pub name: Refname,
+    pub given_name: String,
     pub upstream: Option<RemoteRefname>,
     pub behind: u32,
     pub commits: Vec<RemoteCommit>,
     #[serde(with = "gitbutler_serde::oid_opt", default)]
     pub fork_point: Option<git2::Oid>,
+    pub is_remote: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize)]
@@ -67,7 +47,7 @@ pub struct RemoteCommit {
 /// # Previous notes
 /// For legacy purposes, this is still named "remote" branches, but it's actually
 /// a list of all the normal (non-gitbutler) git branches.
-pub fn find_git_branches(ctx: &CommandContext, branch_name: &str) -> Result<Vec<RemoteBranch>> {
+pub fn find_git_branches(ctx: &CommandContext, branch_name: &str) -> Result<Vec<RemoteBranchData>> {
     let repo = ctx.repository();
     let remotes_raw = repo.remotes()?;
     let remotes: Vec<_> = remotes_raw.iter().flatten().collect();
@@ -75,14 +55,14 @@ pub fn find_git_branches(ctx: &CommandContext, branch_name: &str) -> Result<Vec<
     // We since we are testing for the presence of branches we swallow any errors
     // from both finding the branch, and looking up the branch commit data. The
     // latter can fail if/when a ref points to a object that doesn't exist.
-    let mut all_branches: Vec<RemoteBranch> = remotes
+    let mut all_branches: Vec<RemoteBranchData> = remotes
         .iter()
         .filter_map(|remote_name| {
             let branch_name = format!("{}/{}", remote_name, branch_name);
             let blah = repo
                 .find_branch(&branch_name, BranchType::Remote)
                 .ok()
-                .and_then(|branch| branch_to_remote_branch(&branch, &[remote_name]).ok());
+                .and_then(|branch| branch_to_remote_branch(ctx, &branch, &[remote_name]).ok());
             blah
         })
         .collect();
@@ -90,7 +70,7 @@ pub fn find_git_branches(ctx: &CommandContext, branch_name: &str) -> Result<Vec<
     if let Some(local_branch) = repo
         .find_branch(branch_name, BranchType::Local)
         .ok()
-        .and_then(|branch| branch_to_remote_branch(&branch, &remotes).ok())
+        .and_then(|branch| branch_to_remote_branch(ctx, &branch, &remotes).ok())
     {
         all_branches.push(local_branch);
     }
@@ -108,15 +88,6 @@ pub fn find_git_branches(ctx: &CommandContext, branch_name: &str) -> Result<Vec<
         .collect())
 }
 
-pub(crate) fn get_branch_data(ctx: &CommandContext, refname: &Refname) -> Result<RemoteBranchData> {
-    let branch = ctx
-        .repository()
-        .maybe_find_branch_by_refname(refname)?
-        .ok_or(anyhow::anyhow!("failed to find branch {}", refname))?;
-
-    branch_to_remote_branch_data(ctx, &branch)
-}
-
 pub(crate) fn get_commit_data(
     ctx: &CommandContext,
     sha: git2::Oid,
@@ -135,9 +106,10 @@ pub(crate) fn get_commit_data(
 }
 
 pub(crate) fn branch_to_remote_branch(
+    ctx: &CommandContext,
     branch: &git2::Branch<'_>,
     remotes: &[&str],
-) -> Result<RemoteBranch> {
+) -> Result<RemoteBranchData> {
     let reference = branch.get();
     let name = Refname::try_from(branch)?;
     let given_name = reference.given_name(remotes)?;
@@ -146,13 +118,10 @@ pub(crate) fn branch_to_remote_branch(
     let sha = commit.id();
     let is_remote = reference.is_remote();
 
-    let author = commit.author().name().map(String::from);
-    let last_commit_timestamp_ms = commit
-        .time()
-        .seconds()
-        .try_into()
-        .map(|t: u128| t * 1000)
-        .ok();
+    let base = default_target(&ctx.project().gb_dir())?.remote_head(ctx.repository())?;
+    let ahead = ctx.repository().log(sha, LogUntil::Commit(base), false)?;
+    let fork_point = ahead.last().and_then(|c| c.parent(0).ok()).map(|c| c.id());
+    let behind = ctx.distance(base, sha)?;
 
     let upstream = if let Refname::Local(local_name) = &name {
         local_name.remote().cloned()
@@ -160,39 +129,11 @@ pub(crate) fn branch_to_remote_branch(
         None
     };
 
-    Ok(RemoteBranch {
-        name,
-        given_name,
-        sha,
-        upstream,
-        is_remote,
-        last_commit_timestamp_ms,
-        last_commit_author: author,
-    })
-}
-
-pub(crate) fn branch_to_remote_branch_data(
-    ctx: &CommandContext,
-    branch: &git2::Branch,
-) -> Result<RemoteBranchData> {
-    let name = Refname::try_from(branch)?;
-    let base = default_target(&ctx.project().gb_dir())?.remote_head(ctx.repository())?;
-
-    let sha = branch.get().target().context("failed to get target")?;
-    let ahead = ctx.repository().log(sha, LogUntil::Commit(base), false)?;
-    let behind = ctx.distance(base, sha)?;
-    let fork_point = ahead.last().and_then(|c| c.parent(0).ok()).map(|c| c.id());
-
     let commits = ahead
         .into_iter()
         .map(|commit| commit_to_remote_commit(&commit))
         .collect::<Vec<_>>();
 
-    let upstream = match &name {
-        Refname::Local(local_name) => local_name.remote().cloned(),
-        _ => None,
-    };
-
     Ok(RemoteBranchData {
         name,
         sha,
@@ -200,6 +141,8 @@ pub(crate) fn branch_to_remote_branch_data(
         upstream,
         fork_point,
         commits,
+        is_remote,
+        given_name,
     })
 }
 
diff --git a/crates/gitbutler-branch-actions/src/virtual.rs b/crates/gitbutler-branch-actions/src/virtual.rs
index 9b0ab7faeb..fc667f80e7 100644
--- a/crates/gitbutler-branch-actions/src/virtual.rs
+++ b/crates/gitbutler-branch-actions/src/virtual.rs
@@ -5,10 +5,10 @@ use crate::{
     file::VirtualBranchFile,
     hunk::VirtualBranchHunk,
     integration::get_workspace_head,
-    remote::{branch_to_remote_branch, RemoteBranch},
+    remote::branch_to_remote_branch,
     stack::stack_series,
     status::{get_applied_status, get_applied_status_cached},
-    Get, VirtualBranchHunkRange, VirtualBranchHunkRangeMap, VirtualBranchesExt,
+    Get, RemoteBranchData, VirtualBranchHunkRange, VirtualBranchHunkRangeMap, VirtualBranchesExt,
 };
 use anyhow::{anyhow, bail, Context, Result};
 use bstr::{BString, ByteSlice};
@@ -58,7 +58,7 @@ pub struct VirtualBranch {
     pub requires_force: bool, // does this branch require a force push to the upstream?
     pub conflicted: bool, // is this branch currently in a conflicted state (only for the workspace)
     pub order: usize,     // the order in which this branch should be displayed in the UI
-    pub upstream: Option<RemoteBranch>, // the upstream branch where this branch pushes to, if any
+    pub upstream: Option<RemoteBranchData>, // the upstream branch where this branch pushes to, if any
     pub upstream_name: Option<String>, // the upstream branch where this branch will push to on next push
     pub base_current: bool, // is this vbranch based on the current base branch? if false, this needs to be manually merged with conflicts
     /// The hunks (as `[(file, [hunks])]`) which are uncommitted but assigned to this branch.
@@ -457,7 +457,7 @@ pub fn list_virtual_branches_cached(
         let raw_remotes = repo.remotes()?;
         let remotes: Vec<_> = raw_remotes.into_iter().flatten().collect();
         let upstream = upstream_branch
-            .map(|upstream_branch| branch_to_remote_branch(&upstream_branch, &remotes))
+            .map(|upstream_branch| branch_to_remote_branch(ctx, &upstream_branch, &remotes))
             .transpose()?;
 
         let path_claim_positions: HashMap<&PathBuf, usize> = branch
diff --git a/crates/gitbutler-tauri/src/main.rs b/crates/gitbutler-tauri/src/main.rs
index 588889fe87..3042b38098 100644
--- a/crates/gitbutler-tauri/src/main.rs
+++ b/crates/gitbutler-tauri/src/main.rs
@@ -190,7 +190,6 @@ fn main() {
                     virtual_branches::commands::find_git_branches,
                     virtual_branches::commands::list_branches,
                     virtual_branches::commands::get_branch_listing_details,
-                    virtual_branches::commands::get_remote_branch_data,
                     virtual_branches::commands::squash_branch_commit,
                     virtual_branches::commands::fetch_from_remotes,
                     virtual_branches::commands::move_commit,
diff --git a/crates/gitbutler-tauri/src/virtual_branches.rs b/crates/gitbutler-tauri/src/virtual_branches.rs
index 8d36a10fe7..f5fb6c46b8 100644
--- a/crates/gitbutler-tauri/src/virtual_branches.rs
+++ b/crates/gitbutler-tauri/src/virtual_branches.rs
@@ -7,9 +7,8 @@ pub mod commands {
         BaseBranchResolution, BaseBranchResolutionApproach, Resolution, StackStatuses,
     };
     use gitbutler_branch_actions::{
-        BaseBranch, BranchListing, BranchListingDetails, BranchListingFilter, RemoteBranch,
-        RemoteBranchData, RemoteBranchFile, RemoteCommit, StackOrder, VirtualBranchHunkRangeMap,
-        VirtualBranches,
+        BaseBranch, BranchListing, BranchListingDetails, BranchListingFilter, RemoteBranchData,
+        RemoteBranchFile, RemoteCommit, StackOrder, VirtualBranchHunkRangeMap, VirtualBranches,
     };
     use gitbutler_command_context::CommandContext;
     use gitbutler_project as projects;
@@ -443,7 +442,7 @@ pub mod commands {
         projects: State<'_, projects::Controller>,
         project_id: ProjectId,
         branch_name: &str,
-    ) -> Result<Vec<RemoteBranch>, Error> {
+    ) -> Result<Vec<RemoteBranchData>, Error> {
         let project = projects.get(project_id)?;
         let branches = gitbutler_branch_actions::find_git_branches(project, branch_name)?;
         Ok(branches)
@@ -473,18 +472,6 @@ pub mod commands {
         Ok(branches)
     }
 
-    #[tauri::command(async)]
-    #[instrument(skip(projects), err(Debug))]
-    pub fn get_remote_branch_data(
-        projects: State<'_, projects::Controller>,
-        project_id: ProjectId,
-        refname: Refname,
-    ) -> Result<RemoteBranchData, Error> {
-        let project = projects.get(project_id)?;
-        let branch_data = gitbutler_branch_actions::get_remote_branch_data(&project, &refname)?;
-        Ok(branch_data)
-    }
-
     #[tauri::command(async)]
     #[instrument(skip(projects, windows), err(Debug))]
     pub fn squash_branch_commit(