A local-first personal finance app
4571: Fix UI lockout when using In/Out mode with existing split columns (#4715)
Grant83f7a79c761d
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.pngindex 2ba32e6c6a..68a6bede49 100644Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.pngindex 510e4feda5..a7fe8d18ac 100644Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.pngindex 60489e0a7e..aa88c91bdc 100644Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.pngindex 0062aeaf77..c9481d1b68 100644Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.pngindex 38f07cdb0e..a682f1dd66 100644Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.pngindex 7d0c378fab..df6e555559 100644Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.tsxindex dc92a26bfd..2185027b55 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.tsx+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.tsx@@ -95,7 +95,7 @@ export function FieldMappings({firstTransaction={transactions[0]}/></View>- {splitMode ? (+ {splitMode && !inOutMode ? (<><View style={{ flex: 0.5 }}><SubLabel title="Outflow" />diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsxindex 4904a50ad9..00b264c13f 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx@@ -207,6 +207,7 @@ export function ImportTransactionsModal({multiplierAmount,) => {const previewTransactions = [];+ const inOutModeEnabled = isOfxFile(filetype) ? false : inOutMode;for (let trans of transactions) {if (trans.isMatchedTransaction) {@@ -237,7 +238,7 @@ export function ImportTransactionsModal({const { amount } = parseAmountFields(trans,splitMode,- isOfxFile(filetype) ? false : inOutMode,+ inOutModeEnabled,outValue,flipAmount,multiplierAmount,@@ -412,7 +413,9 @@ export function ImportTransactionsModal({setTransactions(transactionPreview);}},- [accountId, getImportPreview, inOutMode, multiplierAmount, outValue, prefs],+ // We use some state variables from the component, but do not want to re-parse when they change+ // eslint-disable-next-line react-hooks/exhaustive-deps+ [accountId, getImportPreview, prefs],);function onMultiplierChange(e) {@@ -449,14 +452,8 @@ export function ImportTransactionsModal({return;}- if (flipAmount === true) {- setFlipAmount(!flipAmount);- }-const isSplit = !splitMode;setSplitMode(isSplit);- setInOutMode(false);- setFlipAmount(false);// Run auto-detection on the fields to try to detect the fields// automatically@@ -1026,7 +1023,6 @@ export function ImportTransactionsModal({<CheckboxOptionid="form_flip"checked={flipAmount}- disabled={splitMode || inOutMode}onChange={() => {setFlipAmount(!flipAmount);runImportPreview();@@ -1034,12 +1030,21 @@ export function ImportTransactionsModal({>{t('Flip amount')}</CheckboxOption>+ <MultiplierOption+ multiplierEnabled={multiplierEnabled}+ multiplierAmount={multiplierAmount}+ onToggle={() => {+ setMultiplierEnabled(!multiplierEnabled);+ setMultiplierAmount('');+ runImportPreview();+ }}+ onChangeAmount={onMultiplierChange}+ />{filetype === 'csv' && (<><CheckboxOptionid="form_split"checked={splitMode}- disabled={inOutMode || flipAmount}onChange={() => {onSplitMode();runImportPreview();@@ -1050,7 +1055,6 @@ export function ImportTransactionsModal({<InOutOptioninOutMode={inOutMode}outValue={outValue}- disabled={splitMode || flipAmount}onToggle={() => {setInOutMode(!inOutMode);runImportPreview();@@ -1059,16 +1063,6 @@ export function ImportTransactionsModal({/></>)}- <MultiplierOption- multiplierEnabled={multiplierEnabled}- multiplierAmount={multiplierAmount}- onToggle={() => {- setMultiplierEnabled(!multiplierEnabled);- setMultiplierAmount('');- runImportPreview();- }}- onChangeAmount={onMultiplierChange}- /></View></Stack></View>diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/InOutOption.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/InOutOption.tsxindex 4bb40b6d9b..7c777ae31d 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/InOutOption.tsx+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/InOutOption.tsx@@ -29,7 +29,7 @@ export function InOutOption({onChange={onToggle}>{inOutMode- ? 'in/out identifier'+ ? 'In/Out outflow value': 'Select column to specify if amount goes in/out'}</CheckboxOption>{inOutMode && (@@ -37,7 +37,7 @@ export function InOutOption({type="text"value={outValue}onChangeValue={onChangeText}- placeholder="Value for out rows, i.e. Credit"+ placeholder="Value for out rows, e.g: ‘Credit’"/>)}</View>diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/MultiplierOption.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/MultiplierOption.tsxindex 1601ec8366..de6b74b02d 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/MultiplierOption.tsx+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/MultiplierOption.tsx@@ -25,7 +25,7 @@ export function MultiplierOption({checked={multiplierEnabled}onChange={onToggle}>- Add multiplier+ Multiply amount</CheckboxOption><Inputtype="text"diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/SelectField.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/SelectField.tsxindex 7061f8150a..1c7fb5defb 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/SelectField.tsx+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/SelectField.tsx@@ -19,20 +19,22 @@ export function SelectField({hasHeaderRow,firstTransaction,}: SelectFieldProps) {+ const columns = options.map(+ option =>+ [+ option,+ hasHeaderRow+ ? option+ : `Column ${parseInt(option) + 1} (${firstTransaction[option]})`,+ ] as const,+ );++ // If selected column does not exist in transaction sheet, ignore+ if (!columns.find(col => col[0] === value)) value = null;+return (<Select- options={[- ['choose-field', 'Choose field...'],- ...options.map(- option =>- [- option,- hasHeaderRow- ? option- : `Column ${parseInt(option) + 1} (${firstTransaction[option]})`,- ] as const,- ),- ]}+ options={[['choose-field', 'Choose field...'], ...columns]}value={value === null ? 'choose-field' : value}onChange={onChange}style={style}diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsxindex 8d872b3cdc..9f2ba870b1 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx@@ -30,7 +30,7 @@ type TransactionProps = {dateFormat: ComponentProps<typeof ParsedDate>['dateFormat'];splitMode: boolean;inOutMode: boolean;- outValue: number;+ outValue: string;flipAmount: boolean;multiplierAmount: string;categories: CategoryEntity[];@@ -208,6 +208,19 @@ export function Transaction({>{categoryList.includes(transaction.category) && transaction.category}</Field>+ {inOutMode && (+ <Field+ width={90}+ contentStyle={{ textAlign: 'left', ...styles.tnum }}+ title={+ transaction.inOut === undefined+ ? undefined+ : String(transaction.inOut)+ }+ >+ {transaction.inOut}+ </Field>+ )}{splitMode ? (<><Field@@ -246,36 +259,21 @@ export function Transaction({</Field></>) : (- <>- {inOutMode && (- <Field- width={90}- contentStyle={{ textAlign: 'left', ...styles.tnum }}- title={- transaction.inOut === undefined- ? undefined- : String(transaction.inOut)- }- >- {transaction.inOut}- </Field>- )}- <Field- width={90}- contentStyle={{- textAlign: 'right',- ...styles.tnum,- ...(amount === null ? { color: theme.errorText } : {}),- }}- title={- amount === null- ? `Invalid: unable to parse the value (${transaction.amount})`- : amountToCurrency(amount)- }- >- {amountToCurrency(amount || 0)}- </Field>- </>+ <Field+ width={90}+ contentStyle={{+ textAlign: 'right',+ ...styles.tnum,+ ...(amount === null ? { color: theme.errorText } : {}),+ }}+ title={+ amount === null+ ? `Invalid: unable to parse the value (${transaction.amount})`+ : amountToCurrency(amount)+ }+ >+ {amountToCurrency(amount || 0)}+ </Field>)}</Row>);diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.ts b/packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.tsindex d938c03733..a7ce81390b 100644--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.ts+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.ts@@ -126,7 +126,7 @@ export type ImportTransaction = {amount: number;inflow: number;outflow: number;- inOut: number;+ inOut: string;} & Record<string, string>;export type FieldMapping = {@@ -161,7 +161,6 @@ export function applyFieldMappings(function parseAmount(amount: number | string | undefined | null,mapper: (parsed: number) => number,- multiplier: number,) {if (amount == null) {return null;@@ -174,54 +173,82 @@ function parseAmount(return null;}- return mapper(parsed) * multiplier;+ return mapper(parsed);}export function parseAmountFields(trans: Partial<ImportTransaction>,splitMode: boolean,inOutMode: boolean,- outValue: number,+ outValue: string,flipAmount: boolean,multiplierAmount: string,) {const multiplier = parseFloat(multiplierAmount) || 1.0;- if (splitMode) {+ /** Keep track of the transaction amount as inflow and outflow.+ *+ * Inflow/outflow is taken from a positive/negative transaction amount+ * respectively, or the inflow/outflow fields if split mode is enabled.+ */+ const value = {+ outflow: 0,+ inflow: 0,+ };++ // Determine the base value of the transaction from the amount or inflow/outflow fields+ if (splitMode && !inOutMode) {// Split mode is a little weird; first we look for an outflow and// if that has a value, we never want to show a number in the// inflow. Same for `amount`; we choose outflow first and then inflow- const outflow = parseAmount(trans.outflow, n => -Math.abs(n), multiplier);- const inflow = outflow+ value.outflow = parseAmount(trans.outflow, n => -Math.abs(n)) || 0;+ value.inflow = value.outflow? 0- : parseAmount(trans.inflow, n => Math.abs(n), multiplier);+ : parseAmount(trans.inflow, n => Math.abs(n)) || 0;+ } else {+ const amount = parseAmount(trans.amount, n => n) || 0;+ if (amount >= 0) value.inflow = amount;+ else value.outflow = amount;+ }++ // Apply in/out+ if (inOutMode) {+ // The 'In/Out' field of a transaction will tell us+ // whether the transaction value is inflow or outflow.+ const transactionValue = value.outflow || value.inflow;+ if (trans.inOut === outValue) {+ value.outflow = -Math.abs(transactionValue);+ value.inflow = 0;+ } else {+ value.inflow = Math.abs(transactionValue);+ value.outflow = 0;+ }+ }+ // Apply flip+ if (flipAmount) {+ const oldInflow = value.inflow;+ value.inflow = Math.abs(value.outflow);+ value.outflow = -Math.abs(oldInflow);+ }++ // Apply multiplier+ value.inflow *= multiplier;+ value.outflow *= multiplier;++ if (splitMode) {return {- amount: outflow || inflow,- outflow,- inflow,+ amount: value.outflow || value.inflow,+ outflow: value.outflow,+ inflow: value.inflow,};- }- if (inOutMode) {+ } else {return {- amount: parseAmount(- trans.amount,- n => (trans.inOut === outValue ? Math.abs(n) * -1 : Math.abs(n)),- multiplier,- ),+ amount: value.outflow || value.inflow,outflow: null,inflow: null,};}- return {- amount: parseAmount(- trans.amount,- n => (flipAmount ? n * -1 : n),- multiplier,- ),- outflow: null,- inflow: null,- };}export function stripCsvImportTransaction(transaction: ImportTransaction) {diff --git a/upcoming-release-notes/4715.md b/upcoming-release-notes/4715.mdnew file mode 100644index 0000000000..64e3f53b4b--- /dev/null+++ b/upcoming-release-notes/4715.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [Gmanicus]+---++Reworked import to accept all amount options at the same time to fix UI lockout when using In/Out mode with existing split columns.