Merge branch 'master' into dev

actualbudget · Oct 10, 2023 · 296d59a · 296d59a
2 parents e2b3f2a + 3dfe633
commit 296d59a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 18 deletions.
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;

diff --git a/packages/desktop-client/src/components/common/InlineField.tsx b/packages/desktop-client/src/components/common/InlineField.tsx
@@ -8,7 +8,7 @@ type InlineFieldProps = {
   label: ReactNode;
   labelWidth?: number;
   children?: ReactNode;
-  width: number;
+  width: number | string;
   style?: CSSProperties;
 };
 

diff --git a/...nt/src/components/modals/BudgetSummary.js → ...t/src/components/modals/BudgetSummary.tsx b/...nt/src/components/modals/BudgetSummary.js → ...t/src/components/modals/BudgetSummary.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 
 import { rolloverBudget } from 'loot-core/src/client/queries';
-import * as monthUtils from 'loot-core/src/shared/months';
+import { format, sheetForMonth, prevMonth } from 'loot-core/src/shared/months';
 
 import { theme, styles } from '../../style';
+import { type CommonModalProps } from '../../types/modals';
 import Button from '../common/Button';
 import Modal from '../common/Modal';
 import Text from '../common/Text';
@@ -35,13 +36,18 @@ function ToBudget({ toBudget }) {
   );
 }
 
-function BudgetSummary({ month, modalProps }) {
-  const prevMonthName = monthUtils.format(monthUtils.prevMonth(month), 'MMM');
+type BudgetSummaryProps = {
+  modalProps: CommonModalProps;
+  month: string;
+};
+
+function BudgetSummary({ month, modalProps }: BudgetSummaryProps) {
+  const prevMonthName = format(prevMonth(month), 'MMM');
 
   return (
-    <Modal title="Budget Details" {...modalProps} animate>
+    <Modal title="Budget Details" {...modalProps}>
       {() => (
-        <NamespaceContext.Provider value={monthUtils.sheetForMonth(month)}>
+        <NamespaceContext.Provider value={sheetForMonth(month)}>
           <View
             style={{
               flexDirection: 'row',

diff --git a/...c/components/modals/CreateLocalAccount.js → .../components/modals/CreateLocalAccount.tsx b/...c/components/modals/CreateLocalAccount.js → .../components/modals/CreateLocalAccount.tsx
@@ -3,7 +3,9 @@ import { useNavigate } from 'react-router-dom';
 
 import { toRelaxedNumber } from 'loot-core/src/shared/util';
 
+import { type BoundActions } from '../../hooks/useActions';
 import { theme } from '../../style';
+import { type CommonModalProps } from '../../types/modals';
 import Button from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import FormError from '../common/FormError';
@@ -14,7 +16,12 @@ import Modal, { ModalButtons } from '../common/Modal';
 import Text from '../common/Text';
 import View from '../common/View';
 
-function CreateLocalAccount({ modalProps, actions }) {
+type CreateLocalAccountProps = {
+  modalProps: CommonModalProps;
+  actions: BoundActions;
+};
+
+function CreateLocalAccount({ modalProps, actions }: CreateLocalAccountProps) {
   let navigate = useNavigate();
   let [name, setName] = useState('');
   let [offbudget, setOffbudget] = useState(false);
@@ -26,7 +33,7 @@ function CreateLocalAccount({ modalProps, actions }) {
   let validateBalance = balance => !isNaN(parseFloat(balance));
 
   return (
-    <Modal title="Create Local Account" {...modalProps} showBack={false}>
+    <Modal title="Create Local Account" {...modalProps}>
       {() => (
         <View>
           <form

diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.js b/packages/desktop-client/src/components/modals/ImportTransactions.js
@@ -578,7 +578,7 @@ export default function ImportTransactions({ modalProps, options }) {
   // options which are simple post-processing. That means if you
   // parsed different files without closing the modal, it wouldn't
   // re-read this.
-  let [csvDelimiter, setCsvDelimiter] = useState(
+  let [delimiter, setDelimiter] = useState(
     prefs[`csv-delimiter-${accountId}`] ||
       (filename.endsWith('.tsv') ? '\t' : ','),
   );
@@ -666,7 +666,7 @@ export default function ImportTransactions({ modalProps, options }) {
     const fileType = getFileType(options.filename);
     const parseOptions = getParseOptions(
       fileType,
-      { csvDelimiter, hasHeaderRow },
+      { delimiter, hasHeaderRow },
       { fallbackMissingPayeeToMemo },
     );
 
@@ -716,7 +716,7 @@ export default function ImportTransactions({ modalProps, options }) {
     const fileType = getFileType(res[0]);
     const parseOptions = getParseOptions(
       fileType,
-      { csvDelimiter, hasHeaderRow },
+      { delimiter, hasHeaderRow },
       { fallbackMissingPayeeToMemo },
     );
 
@@ -787,7 +787,7 @@ export default function ImportTransactions({ modalProps, options }) {
       savePrefs({
         [`csv-mappings-${accountId}`]: JSON.stringify(fieldMappings),
       });
-      savePrefs({ [`csv-delimiter-${accountId}`]: csvDelimiter });
+      savePrefs({ [`csv-delimiter-${accountId}`]: delimiter });
     }
 
     if (filetype === 'csv' || filetype === 'qif') {
@@ -966,11 +966,12 @@ export default function ImportTransactions({ modalProps, options }) {
                     options={[
                       [',', ','],
                       [';', ';'],
+                      ['|', '|'],
                       ['\t', 'tab'],
                     ]}
-                    value={csvDelimiter}
+                    value={delimiter}
                     onChange={value => {
-                      setCsvDelimiter(value);
+                      setDelimiter(value);
                       parse(
                         filename,
                         getParseOptions('csv', {
@@ -990,7 +991,7 @@ export default function ImportTransactions({ modalProps, options }) {
                     parse(
                       filename,
                       getParseOptions('csv', {
-                        delimiter: csvDelimiter,
+                        delimiter,
                         hasHeaderRow: !hasHeaderRow,
                       }),
                     );
@@ -1070,8 +1071,8 @@ export default function ImportTransactions({ modalProps, options }) {
 
 function getParseOptions(fileType, csvOptions, ofxOptions) {
   if (fileType === 'csv') {
-    const { csvDelimiter, hasHeaderRow } = csvOptions;
-    return { csvDelimiter, hasHeaderRow };
+    const { delimiter, hasHeaderRow } = csvOptions;
+    return { delimiter, hasHeaderRow };
   } else if (isOfxFile(fileType)) {
     const { fallbackMissingPayeeToMemo } = ofxOptions;
     return { fallbackMissingPayeeToMemo };

diff --git a/upcoming-release-notes/1768.md b/upcoming-release-notes/1768.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Convert BudgetSummary modal(mobile) and CreateLocalAccounts components to TypeScript.
diff --git a/upcoming-release-notes/1774.md b/upcoming-release-notes/1774.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [KaiBelmo]
+---
+
+Fix selecting delimiters in CSV options when uploading a CSV; it will apply to parsing. Also added a new delimiter '|'.