Merge branch 'master' into errorColor

actualbudget · Oct 10, 2023 · d0cec7a · d0cec7a
2 parents 8aae84d + 3dfe633
commit d0cec7a
Show file tree

Hide file tree

Showing 129 changed files with 957 additions and 1,098 deletions.
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/web",
-  "version": "23.9.0",
+  "version": "23.10.0",
   "license": "MIT",
   "files": [
     "build"

diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsx
@@ -108,7 +108,7 @@ function Notification({
       style={{
         marginTop: 10,
         color: positive
-          ? theme.alt4NoticeText
+          ? theme.noticeText
           : error
           ? theme.errorTextDark
           : theme.alt4WarningText,
@@ -121,13 +121,13 @@ function Notification({
           padding: '14px 14px',
           fontSize: 14,
           backgroundColor: positive
-            ? theme.alt2NoticeBackground
+            ? theme.noticeBackgroundLight
             : error
             ? theme.errorBackground
             : theme.alt2WarningBackground,
           borderTop: `3px solid ${
             positive
-              ? theme.altNoticeAccent
+              ? theme.noticeBorder
               : error
               ? theme.errorBorder
               : theme.altWarningAccent
@@ -173,7 +173,7 @@ function Notification({
                 backgroundColor: 'transparent',
                 border: `1px solid ${
                   positive
-                    ? theme.altNoticeAccent
+                    ? theme.noticeBorder
                     : error
                     ? theme.errorBorder
                     : theme.altWarningAccent

diff --git a/packages/desktop-client/src/components/accounts/Balance.js b/packages/desktop-client/src/components/accounts/Balance.js
@@ -159,7 +159,7 @@ export function Balances({
               value < 0
                 ? theme.errorText
                 : value > 0
-                ? theme.noticeText
+                ? theme.noticeTextLight
                 : theme.pageTextSubdued,
           })}
           privacyFilter={{

diff --git a/packages/desktop-client/src/components/accounts/MobileAccounts.js b/packages/desktop-client/src/components/accounts/MobileAccounts.js
@@ -100,7 +100,7 @@ function AccountCard({ account, updated, getBalanceQuery, onSelect }) {
             {account.bankId && (
               <View
                 style={{
-                  backgroundColor: theme.noticeText,
+                  backgroundColor: theme.noticeBackgroundDark,
                   marginLeft: '-23px',
                   width: 8,
                   height: 8,

diff --git a/packages/desktop-client/src/components/accounts/Reconcile.js b/packages/desktop-client/src/components/accounts/Reconcile.js
@@ -45,7 +45,7 @@ export function ReconcilingMessage({
         {targetDiff === 0 ? (
           <View
             style={{
-              color: theme.noticeText,
+              color: theme.noticeTextLight,
               flex: 1,
               flexDirection: 'row',
               alignItems: 'center',

diff --git a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
@@ -164,7 +164,7 @@ type SingleAutocompleteProps = {
   openOnFocus?: boolean;
   getHighlightedIndex?: (suggestions) => number | null;
   highlightFirst?: boolean;
-  onUpdate: (id: unknown, value: string) => void;
+  onUpdate?: (id: unknown, value: string) => void;
   strict?: boolean;
   onSelect: (id: unknown, value: string) => void;
   tableBehavior?: boolean;
@@ -398,7 +398,7 @@ function SingleAutocomplete({
               },
               onBlur: e => {
                 // Should this be e.nativeEvent
-                e.preventDownshiftDefault = true;
+                e['preventDownshiftDefault'] = true;
                 inputProps.onBlur?.(e);
 
                 if (!closeOnBlur) return;

diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -93,7 +93,7 @@ function CategoryList({
                   alignItems: 'center',
                   fontSize: 11,
                   fontWeight: 500,
-                  color: theme.noticeAccent,
+                  color: theme.noticeTextMenu,
                   padding: '6px 8px',
                   ':active': {
                     backgroundColor: 'rgba(100, 100, 100, .25)',

diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js
@@ -99,7 +99,7 @@ function PayeeList({
             <View
               style={{
                 display: 'block',
-                color: theme.noticeAccent,
+                color: theme.noticeTextMenu,
                 borderRadius: 4,
                 fontSize: isNarrowWidth ? 'inherit' : 11,
                 fontWeight: 500,

diff --git a/...ient/src/components/budget/IncomeGroup.js → ...ent/src/components/budget/IncomeGroup.tsx b/...ient/src/components/budget/IncomeGroup.js → ...ent/src/components/budget/IncomeGroup.tsx
@@ -6,6 +6,25 @@ import { Row } from '../table';
 import RenderMonths from './RenderMonths';
 import SidebarGroup from './SidebarGroup';
 
+type IncomeGroupProps = {
+  group: {
+    id: string;
+    hidden: number;
+    categories: object[];
+    is_income: number;
+    name: string;
+    sort_order: number;
+    tombstone: number;
+  };
+  editingCell: { id: string; cell: string } | null;
+  collapsed: boolean;
+  MonthComponent: () => JSX.Element;
+  onEditName: (id: string) => void;
+  onSave: (group: object) => Promise<void>;
+  onToggleCollapse: (id: string) => void;
+  onShowNewCategory: (groupId: string) => void;
+};
+
 function IncomeGroup({
   group,
   editingCell,
@@ -15,7 +34,7 @@ function IncomeGroup({
   onSave,
   onToggleCollapse,
   onShowNewCategory,
-}) {
+}: IncomeGroupProps) {
   return (
     <Row
       collapsed={true}

diff --git a/packages/desktop-client/src/components/budget/IncomeHeader.tsx b/packages/desktop-client/src/components/budget/IncomeHeader.tsx
@@ -1,12 +1,12 @@
-import React, { type ReactNode } from 'react';
+import React from 'react';
 
 import Button from '../common/Button';
 import View from '../common/View';
 
 import RenderMonths from './RenderMonths';
 
 type IncomeHeaderProps = {
-  MonthComponent?: ReactNode;
+  MonthComponent?: () => JSX.Element;
   onShowNewGroup: () => void;
 };
 
@@ -27,8 +27,6 @@ function IncomeHeader({ MonthComponent, onShowNewGroup }: IncomeHeaderProps) {
       <RenderMonths
         component={MonthComponent}
         style={{ border: 0, justifyContent: 'flex-end' }}
-        editingIndex={undefined}
-        args={undefined}
       />
     </View>
   );