Merge branch 'master' into fix-2575

actualbudget · Apr 13, 2024 · 21ab924 · 21ab924
2 parents 64d9ac6 + e88ea69
commit 21ab924
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Account.jsx b/packages/desktop-client/src/components/accounts/Account.jsx
@@ -754,7 +754,11 @@ class AccountInternal extends PureComponent {
   };
 
   onReconcile = async balance => {
-    this.setState({ reconcileAmount: balance });
+    this.setState(({ showCleared }) => ({
+      reconcileAmount: balance,
+      showCleared: true,
+      prevShowCleared: showCleared,
+    }));
   };
 
   onDoneReconciling = async () => {
@@ -783,7 +787,10 @@ class AccountInternal extends PureComponent {
       await this.lockTransactions();
     }
 
-    this.setState({ reconcileAmount: null });
+    this.setState({
+      reconcileAmount: null,
+      showCleared: this.state.prevShowCleared,
+    });
   };
 
   onCreateReconciliationTransaction = async diff => {

diff --git a/upcoming-release-notes/2589.md b/upcoming-release-notes/2589.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Force transaction cleared checkboxes to show on reconcile view