[PR #4715] [MERGED] 4571: Fix UI lockout when using In/Out mode with existing split columns #5551

Closed
opened 2026-02-28 21:14:16 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/4715
Author: @Gmanicus
Created: 3/31/2025
Status: Merged
Merged: 4/18/2025
Merged by: @matt-fidd

Base: masterHead: 4571-in-out-catch-22


📝 Commits (8)

  • 109b5e6 Fix catch 22 problem when using In/Out with split columns already enabled
  • d974072 Fix amount options triggering state resets
  • 0a4b70a Update VRT
  • dc8d875 Merge branch 'master' into 4571-in-out-catch-22
  • fd08c6a Revert "Update VRT"
  • 60799d6 Merge branch 'master' into 4571-in-out-catch-22
  • 3ced351 Update VRT
  • 97dda88 Merge branch 'master' into 4571-in-out-catch-22

📊 Changes

14 files changed (+122 additions, -95 deletions)

View changed files

📝 packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png (+0 -0)
📝 packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png (+0 -0)
📝 packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png (+0 -0)
📝 packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png (+0 -0)
📝 packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png (+0 -0)
📝 packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png (+0 -0)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.tsx (+1 -1)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx (+15 -21)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/InOutOption.tsx (+2 -2)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/MultiplierOption.tsx (+1 -1)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/SelectField.tsx (+14 -12)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx (+29 -31)
📝 packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.ts (+54 -27)
upcoming-release-notes/4715.md (+6 -0)

📄 Description

Fixes #4571

There was a bug in the Import Transactions modal that caused the In/Out and Split Amount options to become locked.

I believe this was due to either having used "Split Amount" in a previous import or already having Inflow and Outflow columns within the account.

This PR mainly changes the UI and utils.parseAmountFields method to allow using all of the amount options at the same time.

Notes:

  • Fixed UI disabling both In/Out and Split Columns when enabling In/Out after using Split Columns for previous transactions
  • Changed UI and transaction amount parsing behavior to accept all options combined
  • Repositioned some amount options
  • Adjusted the labels of a few options

image


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/4715 **Author:** [@Gmanicus](https://github.com/Gmanicus) **Created:** 3/31/2025 **Status:** ✅ Merged **Merged:** 4/18/2025 **Merged by:** [@matt-fidd](https://github.com/matt-fidd) **Base:** `master` ← **Head:** `4571-in-out-catch-22` --- ### 📝 Commits (8) - [`109b5e6`](https://github.com/actualbudget/actual/commit/109b5e63337a53b9dbab907778d41491c605e574) Fix catch 22 problem when using In/Out with split columns already enabled - [`d974072`](https://github.com/actualbudget/actual/commit/d974072836052c3b1e0a54e1608b62ccefec40f5) Fix amount options triggering state resets - [`0a4b70a`](https://github.com/actualbudget/actual/commit/0a4b70afad8abdd531846fad7e13e680b797b896) Update VRT - [`dc8d875`](https://github.com/actualbudget/actual/commit/dc8d875a054d3cf4b0ca1b1546ae97116c6edd44) Merge branch 'master' into 4571-in-out-catch-22 - [`fd08c6a`](https://github.com/actualbudget/actual/commit/fd08c6ac302caa6c942a234941ea46cd7f4dcad7) Revert "Update VRT" - [`60799d6`](https://github.com/actualbudget/actual/commit/60799d6cca3fe54a2bfd8998b4a98212ceb2c36e) Merge branch 'master' into 4571-in-out-catch-22 - [`3ced351`](https://github.com/actualbudget/actual/commit/3ced35127c65de0062726e0e4adfb96d41cace1c) Update VRT - [`97dda88`](https://github.com/actualbudget/actual/commit/97dda884dab1bcb6199cc6279bc92f9b962b8e0e) Merge branch 'master' into 4571-in-out-catch-22 ### 📊 Changes **14 files changed** (+122 additions, -95 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png` (+0 -0) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/FieldMappings.tsx` (+1 -1) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx` (+15 -21) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/InOutOption.tsx` (+2 -2) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/MultiplierOption.tsx` (+1 -1) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/SelectField.tsx` (+14 -12) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx` (+29 -31) 📝 `packages/desktop-client/src/components/modals/ImportTransactionsModal/utils.ts` (+54 -27) ➕ `upcoming-release-notes/4715.md` (+6 -0) </details> ### 📄 Description Fixes #4571 There was a bug in the Import Transactions modal that caused the In/Out and Split Amount options to become locked. I believe this was due to either having used "Split Amount" in a previous import or already having Inflow and Outflow columns within the account. This PR mainly changes the UI and `utils.parseAmountFields` method to allow using all of the amount options at the same time. Notes: - Fixed UI disabling both In/Out and Split Columns when enabling In/Out after using Split Columns for previous transactions - Changed UI and transaction amount parsing behavior to accept all options combined - Repositioned some amount options - Adjusted the labels of a few options ![image](https://github.com/user-attachments/assets/9e3901f1-352a-4245-92ac-986213258ecc) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-02-28 21:14:16 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#5551