Merge branch 'master' into api-hidden

actualbudget · Dec 15, 2023 · 7653727 · 7653727
2 parents ec6962a + a5557ca
commit 7653727
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/packages/desktop-client/src/components/FinancesApp.tsx b/packages/desktop-client/src/components/FinancesApp.tsx
@@ -121,7 +121,13 @@ function FinancesApp() {
       <View style={{ height: '100%' }}>
         <GlobalKeys />
 
-        <View style={{ flexDirection: 'row', flex: 1 }}>
+        <View
+          style={{
+            flexDirection: 'row',
+            backgroundColor: theme.pageBackground,
+            flex: 1,
+          }}
+        >
           <FloatableSidebar />
 
           <View

diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
@@ -188,6 +188,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
               paddingLeft: 3,
               justifyContent: 'center',
               borderTopWidth: 1,
+              borderBottomWidth: 1,
               borderColor: theme.tableBorder,
             }}
           >

diff --git a/upcoming-release-notes/2092.md b/upcoming-release-notes/2092.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [HansiWursti]
+---
+
+Fix background color when pinning sidebar (Issue [#2089](https://github.com/actualbudget/actual/issues/2089))
diff --git a/upcoming-release-notes/2093.md b/upcoming-release-notes/2093.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [HansiWursti]
+---
+
+Fix missing divider bar issue [#1878](https://github.com/actualbudget/actual/issues/1878)