From 56b871bbb6d284a71fbc11e651ba3354dc994cab Mon Sep 17 00:00:00 2001
From: Vivek <c_vivek.patel@harness.io>
Date: Thu, 16 Jan 2025 18:32:38 +0530
Subject: [PATCH 1/4] Fixed pull request compare route in branch info bar

---
 packages/ui/src/views/repo/components/branch-info-bar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/views/repo/components/branch-info-bar.tsx b/packages/ui/src/views/repo/components/branch-info-bar.tsx
index 947d13b44..b3eae3b96 100644
--- a/packages/ui/src/views/repo/components/branch-info-bar.tsx
+++ b/packages/ui/src/views/repo/components/branch-info-bar.tsx
@@ -30,14 +30,14 @@ export const BranchInfoBar: FC<BranchInfoBarProps> = ({
           This branch is{' '}
           {hasAhead && (
             <>
-              <StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pull-requests/compare/`}>
+              <StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pulls/compare/`}>
                 <span className="text-foreground-accent">{ahead} commits ahead of</span>
               </StyledLink>
               {hasBehind && ', '}
             </>
           )}
           {hasBehind && (
-            <StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pull-requests/compare/`}>
+            <StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pulls/compare/`}>
               <span className="text-foreground-accent">{behind} commits behind</span>
             </StyledLink>
           )}

From 3ce5418505e3673b0e857acdc95889c838a0d543 Mon Sep 17 00:00:00 2001
From: Vivek <c_vivek.patel@harness.io>
Date: Thu, 16 Jan 2025 18:53:52 +0530
Subject: [PATCH 2/4] Fixed view all branches button click issue in branch
 selector

---
 .../branch-selector/branch-selector-dropdown.tsx          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/views/repo/components/branch-selector/branch-selector-dropdown.tsx b/packages/ui/src/views/repo/components/branch-selector/branch-selector-dropdown.tsx
index 50b21ed6a..7eba02c68 100644
--- a/packages/ui/src/views/repo/components/branch-selector/branch-selector-dropdown.tsx
+++ b/packages/ui/src/views/repo/components/branch-selector/branch-selector-dropdown.tsx
@@ -165,8 +165,8 @@ export const BranchSelectorDropdown: FC<BranchSelectorDropdownProps> = ({
         </div>
 
         <DropdownMenu.Item className="p-0" asChild>
-          <div className="mt-1 border-t border-borders-1 px-3 py-2">
-            <Link to={viewAllUrl}>
+          <Link to={viewAllUrl}>
+            <div className="w-full border-t border-borders-1 px-3 py-2">
               <span className="text-14 font-medium leading-none transition-colors duration-200 hover:text-foreground-1">
                 {t('views:repos.viewAll', `View all ${activeTab}`, {
                   type:
@@ -175,8 +175,8 @@ export const BranchSelectorDropdown: FC<BranchSelectorDropdownProps> = ({
                       : t('views:repos.tagsLowercase', 'tags')
                 })}
               </span>
-            </Link>
-          </div>
+            </div>
+          </Link>
         </DropdownMenu.Item>
       </div>
     </DropdownMenu.Content>

From 848b701df4275cd4116126a2549bc247b6c1b7dd Mon Sep 17 00:00:00 2001
From: Vivek <c_vivek.patel@harness.io>
Date: Thu, 16 Jan 2025 19:28:54 +0530
Subject: [PATCH 3/4] Fixed open PR count font color in light theme

---
 .../repo/pull-request/components/pull-request-list-header.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/views/repo/pull-request/components/pull-request-list-header.tsx b/packages/ui/src/views/repo/pull-request/components/pull-request-list-header.tsx
index 38f91e945..cf355136a 100644
--- a/packages/ui/src/views/repo/pull-request/components/pull-request-list-header.tsx
+++ b/packages/ui/src/views/repo/pull-request/components/pull-request-list-header.tsx
@@ -34,7 +34,7 @@ export const PullRequestListHeader: FC<PullRequestListHeaderProps> = ({
           className={cn(
             'text-14 leading-tight',
             headerFilter === PULL_REQUEST_LIST_HEADER_FILTER_STATES.OPEN
-              ? 'text-white font-medium'
+              ? 'text-foreground-4 font-medium'
               : 'text-foreground-4'
           )}
         >
@@ -53,7 +53,7 @@ export const PullRequestListHeader: FC<PullRequestListHeaderProps> = ({
           className={cn(
             'text-14 leading-tight',
             headerFilter === PULL_REQUEST_LIST_HEADER_FILTER_STATES.CLOSED
-              ? 'text-white font-medium'
+              ? 'text-foreground-4 font-medium'
               : 'text-foreground-4'
           )}
         >

From 7947a9cbe2d767b8d4f07f8a88f86c34d1c266c7 Mon Sep 17 00:00:00 2001
From: Vivek <c_vivek.patel@harness.io>
Date: Thu, 16 Jan 2025 20:35:59 +0530
Subject: [PATCH 4/4] Changed diff viewer colors to work with light theme

---
 packages/ui/src/shared-style-variables.css | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/ui/src/shared-style-variables.css b/packages/ui/src/shared-style-variables.css
index f168a14eb..b4517aa6d 100644
--- a/packages/ui/src/shared-style-variables.css
+++ b/packages/ui/src/shared-style-variables.css
@@ -315,23 +315,23 @@
     --canary-ai-button-stop-2: var(--canary-ai-pink);
     --canary-ai-button-stop-3: var(--canary-ai-purple);
     --canary-ai-button-stop-4: var(--canary-ai-cyan);
-    --diff-grey: hsl(0 0% 33%);
-    --diff-add-content--: hsl(156 28% 10%);
-    --diff-del-content--: hsl(356 28% 11%);
-    --diff-add-lineNumber--: hsl(153 40% 14%);
-    --diff-del-lineNumber--: hsl(358 39% 17%);
+    --diff-grey: hsl(0 0% 20%);
+    --diff-add-content--: hsl(156 100% 95%);
+    --diff-del-content--: hsl(356 100% 95%);
+    --diff-add-lineNumber--: hsl(153 100% 90%);
+    --diff-del-lineNumber--: hsl(358 100% 90%);
     --diff-plain-content--: var(--canary-background);
     --diff-expand-content--: var(--canary-background);
     --diff-plain-lineNumber--: var(--canary-background);
-    --diff-plain-lineNumber-color--: hsl(0 0% 100%);
-    --diff-hunk-content--: hsl(218 26% 12%);
-    --diff-hunk-lineNumber--: hsl(218 26% 12%);
-    --diff-add-content-highlight--: hsl(152 37% 24%);
-    --diff-del-content-highlight--: hsl(0 38% 26%);
-    --diff-add-widget--: hsl(216 80% 65%);
-    --diff-add-widget-color--: hsl(0 0% 100%);
+    --diff-plain-lineNumber-color--: hsl(0 0% 0%);
+    --diff-hunk-content--: hsl(218 26% 95%);
+    --diff-hunk-lineNumber--: hsl(218 26% 95%);
+    --diff-add-content-highlight--: hsl(152 37% 90%);
+    --diff-del-content-highlight--: hsl(0 38% 90%);
+    --diff-add-widget--: hsl(216 80% 95%);
+    --diff-add-widget-color--: hsl(0 0% 0%);
     --diff-empty-content--: var(--canary-background);
-    --diff-hunk-content-color--: hsl(0 0% 100%);
+    --diff-hunk-content-color--: hsl(0 0% 0%);
     /* New colors design variables */
     /* Text */
     --canary-foreground-01: var(--canary-harness-grey-900);