A local-first personal finance app
🐛 (imports) ability to toggle on/off OFX import fallback payee (#1631)
Matiss Janis Aboltinsdd7a7fa796e4
diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.js b/packages/desktop-client/src/components/modals/ImportTransactions.jsindex 760650c100..e301c4503c 100644--- a/packages/desktop-client/src/components/modals/ImportTransactions.js+++ b/packages/desktop-client/src/components/modals/ImportTransactions.js@@ -577,6 +577,9 @@ export default function ImportTransactions({ modalProps, options }) {let [hasHeaderRow, setHasHeaderRow] = useState(prefs[`csv-has-header-${accountId}`] ?? true,);+ let [fallbackMissingPayeeToMemo, setFallbackMissingPayeeToMemo] = useState(+ prefs[`ofx-fallback-missing-payee-${accountId}`] ?? true,+ );let [parseDateFormat, setParseDateFormat] = useState(null);@@ -645,10 +648,14 @@ export default function ImportTransactions({ modalProps, options }) {}useEffect(() => {+ const fileType = getFileType(options.filename);+parse(options.filename,- getFileType(options.filename) === 'csv'+ fileType === 'csv'? { delimiter: csvDelimiter, hasHeaderRow }+ : fileType === 'ofx'+ ? { fallbackMissingPayeeToMemo }: null,);}, [parseTransactions, options.filename]);@@ -693,9 +700,15 @@ export default function ImportTransactions({ modalProps, options }) {],});+ const fileType = getFileType(res[0]);+parse(res[0],- getFileType(res[0]) === 'csv' ? { delimiter: csvDelimiter } : null,+ fileType === 'csv'+ ? { delimiter: csvDelimiter }+ : fileType === 'ofx'+ ? { fallbackMissingPayeeToMemo }+ : null,);}@@ -754,6 +767,12 @@ export default function ImportTransactions({ modalProps, options }) {savePrefs({ [key]: parseDateFormat });}+ if (filetype === 'ofx') {+ savePrefs({+ [`ofx-fallback-missing-payee-${accountId}`]: fallbackMissingPayeeToMemo,+ });+ }+if (filetype === 'csv') {savePrefs({[`csv-mappings-${accountId}`]: JSON.stringify(fieldMappings),@@ -881,6 +900,21 @@ export default function ImportTransactions({ modalProps, options }) {</View>)}+ {filetype === 'ofx' && (+ <CheckboxOption+ id="form_fallback_missing_payee"+ checked={fallbackMissingPayeeToMemo}+ onChange={() => {+ setFallbackMissingPayeeToMemo(state => !state);+ parse(filename, {+ fallbackMissingPayeeToMemo: !fallbackMissingPayeeToMemo,+ });+ }}+ >+ Use Memo as a fallback for empty Payees+ </CheckboxOption>+ )}+{/*Import Options */}{(filetype === 'qif' || filetype === 'csv') && (<View style={{ marginTop: 25 }}>diff --git a/packages/loot-core/src/server/accounts/parse-file.ts b/packages/loot-core/src/server/accounts/parse-file.tsindex 16434a8a20..4a3a2d1bc2 100644--- a/packages/loot-core/src/server/accounts/parse-file.ts+++ b/packages/loot-core/src/server/accounts/parse-file.ts@@ -14,7 +14,11 @@ export type ParseFileResult = {export async function parseFile(filepath,- options?: { delimiter?: string; hasHeaderRow: boolean },+ options?: {+ delimiter?: string;+ hasHeaderRow: boolean;+ fallbackMissingPayeeToMemo?: boolean;+ },): Promise<ParseFileResult> {let errors = Array<ParseError>();let m = filepath.match(/\.[^.]*$/);@@ -30,7 +34,7 @@ export async function parseFile(return parseCSV(filepath, options);case '.ofx':case '.qfx':- return parseOFX(filepath);+ return parseOFX(filepath, options);default:}}@@ -101,7 +105,12 @@ async function parseQIF(filepath): Promise<ParseFileResult> {};}-async function parseOFX(filepath): Promise<ParseFileResult> {+async function parseOFX(+ filepath,+ options: { fallbackMissingPayeeToMemo?: boolean } = {+ fallbackMissingPayeeToMemo: true,+ },+): Promise<ParseFileResult> {let { getOFXTransactions, initModule } = await import(/* webpackChunkName: 'xfo' */ 'node-libofx');@@ -123,7 +132,7 @@ async function parseOFX(filepath): Promise<ParseFileResult> {// Banks don't always implement the OFX standard properly// If no payee is available try and fallback to memo- let useName = data.some(trans => trans.name != null && trans.name !== '');+ let useMemoFallback = options.fallbackMissingPayeeToMemo;return {errors,@@ -131,9 +140,9 @@ async function parseOFX(filepath): Promise<ParseFileResult> {amount: trans.amount,imported_id: trans.fi_id,date: trans.date ? dayFromDate(new Date(trans.date * 1000)) : null,- payee_name: useName ? trans.name : trans.memo,- imported_payee: useName ? trans.name : trans.memo,- notes: useName ? trans.memo || null : null, //memo used for payee+ payee_name: trans.name || (useMemoFallback ? trans.memo : null),+ imported_payee: trans.name || (useMemoFallback ? trans.memo : null),+ notes: !!trans.name || !useMemoFallback ? trans.memo || null : null, //memo used for payee})),};}diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.tsindex ece2505332..18c8f52d1b 100644--- a/packages/loot-core/src/types/prefs.d.ts+++ b/packages/loot-core/src/types/prefs.d.ts@@ -34,6 +34,7 @@ export type LocalPrefs = Partial<[key: `csv-mappings-${string}`]: string;[key: `csv-delimiter-${string}`]: ',' | ';' | '\t';[key: `csv-has-header-${string}`]: boolean;+ [key: `ofx-fallback-missing-payee-${string}`]: boolean;[key: `flip-amount-${string}-${'csv' | 'qif'}`]: boolean;'flags.updateNotificationShownForVersion': string;id: string;diff --git a/upcoming-release-notes/1631.md b/upcoming-release-notes/1631.mdnew file mode 100644index 0000000000..3de4609c95--- /dev/null+++ b/upcoming-release-notes/1631.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [MatissJanis]+---++Imports: ability to toggle on/off the fallback logic for payee field (OFX imports)