From a76d9d9a31d4ccbb5eb2501575135aa2a604a81d Mon Sep 17 00:00:00 2001
From: Jason Hendee <jason@triumph.tech>
Date: Thu, 29 Feb 2024 21:42:21 -0700
Subject: [PATCH] + (Finance) Fixed an issue where the Transaction Matching
 block can present Transactions out of order. (Fixes #5676)

---
 RockWeb/Blocks/Finance/TransactionMatching.ascx    | 3 +--
 RockWeb/Blocks/Finance/TransactionMatching.ascx.cs | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/RockWeb/Blocks/Finance/TransactionMatching.ascx b/RockWeb/Blocks/Finance/TransactionMatching.ascx
index 14e59995ce0..45aa346ff26 100644
--- a/RockWeb/Blocks/Finance/TransactionMatching.ascx
+++ b/RockWeb/Blocks/Finance/TransactionMatching.ascx
@@ -498,8 +498,7 @@
                     });
                 }
                 else {
-                    // do the Postback (which will save the changes)
-                    window.location = successLocation;
+                    // Do the Postback wired up via the button's OnClick handler (which will save the changes).
                 }
             }
         </script>
diff --git a/RockWeb/Blocks/Finance/TransactionMatching.ascx.cs b/RockWeb/Blocks/Finance/TransactionMatching.ascx.cs
index ca4021f59bb..f28bf71d4ce 100644
--- a/RockWeb/Blocks/Finance/TransactionMatching.ascx.cs
+++ b/RockWeb/Blocks/Finance/TransactionMatching.ascx.cs
@@ -640,7 +640,14 @@ private void NavigateToTransaction( Direction direction )
                 var financialPersonBankAccountService = new FinancialPersonBankAccountService( rockContext );
                 var financialTransactionService = new FinancialTransactionService( rockContext );
                 var qryTransactionsToMatch = financialTransactionService.Queryable()
-                    .Where( a => a.AuthorizedPersonAliasId == null && a.ProcessedByPersonAliasId == null );
+                    .Where( a =>
+                        a.AuthorizedPersonAliasId == null
+                        &&
+                        (
+                            a.ProcessedByPersonAliasId == null
+                            || a.ProcessedByPersonAliasId == CurrentPersonAliasId
+                        )
+                    );
 
                 if ( batchId != 0 )
                 {