Merge branch 'actualbudget:master' into budget-type-switch-bug-fix

packages/api/package.json

@@ -3,6 +3,9 @@
   "version": "6.2.1",
   "license": "MIT",
   "description": "An API for Actual",
+  "engines": {
+    "node": ">=18.12.0"
+  },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [

packages/desktop-client/src/browser-preload.browser.js

@@ -129,7 +129,9 @@ global.Actual = {
     return worker;
   },
 
-  setTheme: () => {},
+  setTheme: theme => {
+    window.__actionsForMenu.saveGlobalPrefs({ theme: theme });
+  },
 };
 
 document.addEventListener('keydown', e => {

packages/desktop-client/src/components/ManageRules.tsx

@@ -154,7 +154,9 @@ function ManageRulesContent({
       await dispatch(initiallyLoadPayees());
     }
 
-    undo.setUndoState('openModal', 'manage-rules');
+    if (payeeId) {
+      undo.setUndoState('openModal', 'manage-rules');
+    }
 
     loadData();
 

packages/desktop-client/src/components/Modals.tsx

@@ -139,7 +139,7 @@ export default function Modals() {
           return (
             <ManageRulesModal
               modalProps={modalProps}
-              payeeId={options.payeeId}
+              payeeId={options?.payeeId}
             />
           );
 

packages/desktop-client/src/components/accounts/MobileAccounts.js

@@ -21,11 +21,12 @@ function AccountHeader({ name, amount, style = {} }) {
   return (
     <View
       style={{
-        flex: '1 0 auto',
+        flex: 1,
         flexDirection: 'row',
         marginTop: 10,
         marginRight: 10,
         color: theme.pageTextLight,
+        width: '100%',
         ...style,
       }}
     >
@@ -54,13 +55,14 @@ function AccountCard({ account, updated, getBalanceQuery, onSelect }) {
   return (
     <View
       style={{
-        flex: '1 0 auto',
+        flex: 1,
         flexDirection: 'row',
         backgroundColor: theme.tableBackground,
         boxShadow: `0 1px 1px ${theme.mobileAccountShadow}`,
         borderRadius: 6,
         marginTop: 10,
         marginRight: 10,
+        width: '100%',
       }}
       data-testid="account"
     >
@@ -78,7 +80,7 @@ function AccountCard({ account, updated, getBalanceQuery, onSelect }) {
       >
         <View
           style={{
-            flex: '1 auto',
+            flex: 1,
             margin: '10px 0',
           }}
         >

packages/desktop-client/src/components/budget/index.tsx

@@ -97,6 +97,7 @@ type BudgetProps = {
   moveCategory: BoundActions['moveCategory'];
   moveCategoryGroup: BoundActions['moveCategoryGroup'];
   loadPrefs: BoundActions['loadPrefs'];
+  addNotification: BoundActions['addNotification'];
 };
 
 function Budget(props: BudgetProps) {
@@ -246,7 +247,28 @@ function Budget(props: BudgetProps) {
     setIsAddingGroup(false);
   };
 
+  const categoryNameAlreadyExistsNotification = name => {
+    props.addNotification({
+      type: 'error',
+      message: `Category ‘${name}’ already exists in group (May be Hidden)`,
+    });
+  };
+
   const onSaveCategory = async category => {
+    let exists =
+      (await props.getCategories()).grouped
+        .filter(g => g.id === category.cat_group)[0]
+        .categories.filter(
+          c => c.name.toUpperCase() === category.name.toUpperCase(),
+        )
+        .filter(c => (category.id === 'new' ? true : c.id !== category.id))
+        .length > 0;
+
+    if (exists) {
+      categoryNameAlreadyExistsNotification(category.name);
+      return;
+    }
+
     if (category.id === 'new') {
       let id = await props.createCategory(
         category.name,
@@ -355,6 +377,21 @@ function Budget(props: BudgetProps) {
   };
 
   const onReorderCategory = async sortInfo => {
+    let cats = await props.getCategories();
+    let moveCandidate = cats.list.filter(c => c.id === sortInfo.id)[0];
+    let exists =
+      cats.grouped
+        .filter(g => g.id === sortInfo.groupId)[0]
+        .categories.filter(
+          c => c.name.toUpperCase() === moveCandidate.name.toUpperCase(),
+        )
+        .filter(c => c.id !== moveCandidate.id).length > 0;
+
+    if (exists) {
+      categoryNameAlreadyExistsNotification(moveCandidate.name);
+      return;
+    }
+
     props.moveCategory(sortInfo.id, sortInfo.groupId, sortInfo.targetId);
     setCategoryGroups(state =>
       moveCategory(state, sortInfo.id, sortInfo.groupId, sortInfo.targetId),

packages/desktop-client/src/components/common/InputWithContent.tsx

@@ -6,8 +6,8 @@ import Input, { defaultInputStyle } from './Input';
 import View from './View';
 
 type InputWithContentProps = ComponentProps<typeof Input> & {
-  leftContent: ReactNode;
-  rightContent: ReactNode;
+  leftContent?: ReactNode;
+  rightContent?: ReactNode;
   inputStyle?: CSSProperties;
   focusStyle?: CSSProperties;
   style?: CSSProperties;

packages/desktop-client/src/components/mobile/MobileAmountInput.js

@@ -169,7 +169,7 @@ class AmountInput extends PureComponent {
           ...style,
         }}
       >
-        <View style={{ overflowY: 'auto' }}>{input}</View>
+        <View style={{ overflowY: 'auto', overflowX: 'hidden' }}>{input}</View>
 
         {/* <Animated.View
           style={{

packages/desktop-client/src/components/util/AmountInput.js → packages/desktop-client/src/components/util/AmountInput.tsx

@@ -1,17 +1,29 @@
-import React, { useRef, useState } from 'react';
+import React, { type MutableRefObject, useRef, useState } from 'react';
 
 import evalArithmetic from 'loot-core/src/shared/arithmetic';
 import { amountToInteger } from 'loot-core/src/shared/util';
 
 import { useMergedRefs } from '../../hooks/useMergedRefs';
 import Add from '../../icons/v1/Add';
 import Subtract from '../../icons/v1/Subtract';
-import { theme } from '../../style';
+import { type CSSProperties, theme } from '../../style';
 import Button from '../common/Button';
 import InputWithContent from '../common/InputWithContent';
 import View from '../common/View';
 import useFormat from '../spreadsheet/useFormat';
 
+type AmountInputProps = {
+  id?: string;
+  inputRef?: MutableRefObject<HTMLInputElement>;
+  initialValue: number;
+  zeroSign?: '-' | '+';
+  onChange?: (value: number) => void;
+  onBlur?: () => void;
+  style?: CSSProperties;
+  textStyle?: CSSProperties;
+  focused?: boolean;
+};
+
 export function AmountInput({
   id,
   inputRef,
@@ -22,7 +34,7 @@ export function AmountInput({
   style,
   textStyle,
   focused,
-}) {
+}: AmountInputProps) {
   let format = useFormat();
   let [negative, setNegative] = useState(
     (initialValue === 0 && zeroSign === '-') || initialValue < 0,
@@ -49,8 +61,8 @@ export function AmountInput({
     setValue(value ? value : '');
   }
 
-  let ref = useRef();
-  let mergedRef = useMergedRefs(inputRef, ref);
+  let ref = useRef<HTMLInputElement>();
+  let mergedRef = useMergedRefs<HTMLInputElement>(inputRef, ref);
 
   function onInputAmountBlur(e) {
     fireChange(value, negative);

packages/desktop-client/src/global-events.js

@@ -14,10 +14,6 @@ export function handleGlobalEvents(actions, store) {
     // to update.
   });
 
-  global.Actual.setTheme = theme => {
-    actions.saveGlobalPrefs({ theme });
-  };
-
   listen('server-error', info => {
     actions.addGenericErrorNotification();
   });

packages/desktop-electron/index.js

@@ -407,3 +407,11 @@ ipcMain.on('apply-update', () => {
 ipcMain.on('update-menu', (event, isBudgetOpen) => {
   updateMenu(isBudgetOpen);
 });
+
+ipcMain.on('set-theme', theme => {
+  let obj = { theme: theme };
+
+  clientWin.webContents.executeJavaScript(
+    `window.__actionsForMenu && window.__actionsForMenu.saveGlobalPrefs(${obj})`,
+  );
+});

packages/desktop-electron/preload.js

@@ -55,5 +55,7 @@ contextBridge.exposeInMainWorld('Actual', {
     return socketPromise;
   },
 
-  setTheme: () => {},
+  setTheme: theme => {
+    ipcRenderer.send('set-theme', theme);
+  },
 });

packages/loot-core/src/server/accounts/ofx2json.ts

@@ -44,48 +44,49 @@ function getStmtTrn(data) {
 }
 
 function getBankStmtTrn(ofx) {
-  const msg = ofx?.['BANKMSGSRSV1'];
-  const stmtTrnRs = msg?.['STMTTRNRS'];
-  const stmtRs = stmtTrnRs?.['STMTRS'];
-  const tranList = stmtRs?.['BANKTRANLIST'];
-  // Could be an array or a single object.
+  // Somes values could be an array or a single object.
   // xml2js serializes single item to an object and multiple to an array.
-  const stmtTrn = tranList?.['STMTTRN'];
-
-  if (!Array.isArray(stmtTrn)) {
-    return [stmtTrn];
-  }
-  return stmtTrn;
+  const msg = ofx?.['BANKMSGSRSV1'];
+  const stmtTrnRs = getAsArray(msg?.['STMTTRNRS']);
+  const result = stmtTrnRs.flatMap(s => {
+    const stmtRs = s?.['STMTRS'];
+    const tranList = stmtRs?.['BANKTRANLIST'];
+    const stmtTrn = tranList?.['STMTTRN'];
+    return getAsArray(stmtTrn);
+  });
+  return result;
 }
 
 function getCcStmtTrn(ofx) {
-  const msg = ofx?.['CREDITCARDMSGSRSV1'];
-  const stmtTrnRs = msg?.['CCSTMTTRNRS'];
-  const stmtRs = stmtTrnRs?.['CCSTMTRS'];
-  const tranList = stmtRs?.['BANKTRANLIST'];
-  // Could be an array or a single object.
+  // Some values could be an array or a single object.
   // xml2js serializes single item to an object and multiple to an array.
-  const stmtTrn = tranList?.['STMTTRN'];
-
-  if (!Array.isArray(stmtTrn)) {
-    return [stmtTrn];
-  }
-  return stmtTrn;
+  const msg = ofx?.['CREDITCARDMSGSRSV1'];
+  const stmtTrnRs = getAsArray(msg?.['CCSTMTTRNRS']);
+  const result = stmtTrnRs.flatMap(s => {
+    const stmtRs = s?.['CCSTMTRS'];
+    const tranList = stmtRs?.['BANKTRANLIST'];
+    const stmtTrn = tranList?.['STMTTRN'];
+    return getAsArray(stmtTrn);
+  });
+  return result;
 }
 
 function getInvStmtTrn(ofx) {
-  const msg = ofx?.['INVSTMTMSGSRSV1'];
-  const stmtTrnRs = msg?.['INVSTMTTRNRS'];
-  const stmtRs = stmtTrnRs?.['INVSTMTRS'];
-  const tranList = stmtRs?.['INVTRANLIST'];
-  // Could be an array or a single object.
+  // Somes values could be an array or a single object.
   // xml2js serializes single item to an object and multiple to an array.
-  const stmtTrn = tranList?.['INVBANKTRAN']?.flatMap(t => t?.['STMTTRN']);
+  const msg = ofx?.['INVSTMTMSGSRSV1'];
+  const stmtTrnRs = getAsArray(msg?.['INVSTMTTRNRS']);
+  const result = stmtTrnRs.flatMap(s => {
+    const stmtRs = s?.['INVSTMTRS'];
+    const tranList = stmtRs?.['INVTRANLIST'];
+    const stmtTrn = tranList?.['INVBANKTRAN']?.flatMap(t => t?.['STMTTRN']);
+    return getAsArray(stmtTrn);
+  });
+  return result;
+}
 
-  if (!Array.isArray(stmtTrn)) {
-    return [stmtTrn];
-  }
-  return stmtTrn;
+function getAsArray(value) {
+  return Array.isArray(value) ? value : [value];
 }
 
 function mapOfxTransaction(stmtTrn): OFXTransaction {

packages/loot-core/src/server/db/index.ts

@@ -346,6 +346,17 @@ export async function insertCategory(
 
   let id_;
   await batchMessages(async () => {
+    // Dont allow duplicated names in groups
+    const existingCatInGroup = await first(
+      `SELECT id FROM categories WHERE cat_group = ? and UPPER(name) = ? LIMIT 1`,
+      [category.cat_group, category.name.toUpperCase()],
+    );
+    if (existingCatInGroup) {
+      throw new Error(
+        `Category ‘${category.name}’ already exists in group ‘${category.cat_group}’`,
+      );
+    }
+
     if (atEnd) {
       const lastCat = await first(`
         SELECT sort_order FROM categories WHERE tombstone = 0 ORDER BY sort_order DESC, id DESC LIMIT 1

packages/loot-core/src/shared/util.ts

@@ -219,7 +219,7 @@ export function getNumberFormat({ format, hideFraction } = numberFormatConfig) {
 
   switch (format) {
     case 'space-comma':
-      locale = 'en-ZA';
+      locale = 'en-SE';
       regex = /[^-0-9,]/g;
       separator = ',';
       break;

upcoming-release-notes/1833.md

@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [Shazib]
+---
+
+Not allowed duplicated Category names in Category Groups

upcoming-release-notes/1885.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Fix crash when hitting undo after applying a rule to some transactions

upcoming-release-notes/1916.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+Fix mobile accounts page padding regression.

upcoming-release-notes/1921.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+Experimental ofx parser: Support multiple months in ofx file

upcoming-release-notes/1926.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [Shazib]
+---
+
+Fix issue with electron builds being stuck on a blank screen.

upcoming-release-notes/1929.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [miqh]
+---
+
+Fix flickering scroll bar that may appear when interacting with the new transaction input amount.