Fix balance column in transactino view.

Fix model based automation test.

Author: clovett

Source/WPF/MoneyPackage/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
-  <Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.56" />
+  <Identity Name="43906ChrisLovett.MyMoney.Net" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.1.0.57" />
   <Properties>
     <DisplayName>MyMoney.Net</DisplayName>
     <PublisherDisplayName>Chris Lovett</PublisherDisplayName>

Source/WPF/MyMoney/Controls/PasswordControl.xaml.cs

@@ -1,6 +1,6 @@
 using System.Windows;
+using System.Windows.Automation.Peers;
 using System.Windows.Controls;
-using System.Windows.Input;
 
 namespace Walkabout.Controls
 {
@@ -55,5 +55,24 @@ private void OnTextChanged(object sender, TextChangedEventArgs e)
         {
             this.PasswordField.Password = this.PasswordTextBox.Text;
         }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            // Make sure we can use ValuePattern on this control for automation.
+            var id = this.Name;
+            if (this.PasswordTextBox.Visibility == System.Windows.Visibility.Visible)
+            {
+                this.PasswordTextBox.SetValue(System.Windows.Automation.AutomationProperties.AutomationIdProperty, id);
+                return new TextBoxAutomationPeer(this.PasswordTextBox);
+            }
+            else
+            {
+                this.PasswordField.SetValue(System.Windows.Automation.AutomationProperties.AutomationIdProperty, id);
+                return new PasswordBoxAutomationPeer(this.PasswordField);
+            }
+        }
+
+
     }
+
 }

Source/WPF/MyMoney/Database/Money.cs

@@ -1241,13 +1241,16 @@ private async void ApplyPendingBalance()
         {
             bool changed = false;
             List<Account> copy = null;
-            lock (this.balancePending)
+            if (this.balancePending != null)
             {
-                if (this.balancePending != null && this.balancePending.Count > 0)
+                lock (this.balancePending)
                 {
-                    copy = new List<Account>(this.balancePending);
+                    if (this.balancePending != null && this.balancePending.Count > 0)
+                    {
+                        copy = new List<Account>(this.balancePending);
+                    }
+                    this.balancePending.Clear();
                 }
-                this.balancePending.Clear();
             }
             if (copy != null && copy.Count > 0) 
             { 
@@ -9948,7 +9951,7 @@ public async Task<bool> Rebalance(CostBasisCalculator calculator, StockQuoteCach
             this.BeginUpdate(true);
             try
             {
-                var result = await this.GetAccountBalance(calculator, cache, a);
+                var result = await this.GetBalance(calculator, cache, this.GetTransactionsFrom(a), a, false, false, true);
                 // Refresh the Account balance value
                 var balance = result.Balance + result.InvestmentValue;
                 if (a.Balance != balance)
@@ -9965,12 +9968,7 @@ public async Task<bool> Rebalance(CostBasisCalculator calculator, StockQuoteCach
             return changed;
         }
 
-        private async Task<AccountBalanceInfo> GetAccountBalance(CostBasisCalculator calculator, StockQuoteCache cache, Account a)
-        {
-            return await this.GetBalance(calculator, cache, this.GetTransactionsFrom(a), a, false, false);
-        }
-
-        public async Task<AccountBalanceInfo> GetBalance(CostBasisCalculator calculator, StockQuoteCache cache, System.Collections.IEnumerable data, Account account, bool normalize, bool withoutTax)
+        public async Task<AccountBalanceInfo> GetBalance(CostBasisCalculator calculator, StockQuoteCache cache, System.Collections.IEnumerable data, Account account, bool normalize, bool withoutTax, bool updateTransactionBalance = false)
         {
             MyMoney money = this.Parent as MyMoney;
             var result = new AccountBalanceInfo();
@@ -10027,6 +10025,10 @@ public async Task<AccountBalanceInfo> GetBalance(CostBasisCalculator calculator,
 
                     balance += amount;
                     result.SalesTax += tax;
+                    if (updateTransactionBalance)
+                    {
+                        t.Balance = balance;
+                    }
                 }
             }
 

Source/WPF/MyMoney/Dialogs/PasswordWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows;
+using System.Windows.Automation.Peers;
 using System.Windows.Controls;
 //using Kerr;
 using Walkabout.Controls;
@@ -42,8 +43,6 @@ private void PasswordWindow_SizeChanged(object sender, SizeChangedEventArgs e)
             this.TextBlockIntroMessage.Width = Math.Max(0, e.NewSize.Width - 20);
         }
 
-
-
         public void AddUserDefinedField(string id, string label)
         {
             //<TextBlock x:Name="TextBlockUserNamePrompt" Text="User Name: " VerticalAlignment="Center" Margin="0,10,0,2"/>

Source/WPF/MyMoney/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>56</ApplicationRevision>
-    <ApplicationVersion>2.1.0.56</ApplicationVersion>
+    <ApplicationRevision>57</ApplicationRevision>
+    <ApplicationVersion>2.1.0.57</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>

Source/WPF/MyMoney/Setup/changes.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <changes>
+	<change version="2.1.0.57" date="12/13/2025">
+		- Bug: Fix account balance column in Transaction View.
+	</change>
 	<change version="2.1.0.56" date="12/10/2025">
 		- Feature: Add account summary report with date picker.
 		- Feature: Switch to https://www.fastforex.io/ for exchange rate info.

Source/WPF/ScenarioTest/AutomationExtensions.cs

@@ -1,4 +1,5 @@
 using System.Windows.Automation;
+using Walkabout.Tests.Interop;
 using Walkabout.Tests.Wrappers;
 
 namespace Walkabout.Tests
@@ -122,8 +123,15 @@ public static AutomationElement SetTextBox(this AutomationElement parent, string
             {
                 throw new Exception("TextBox '" + name + "' is not enabled");
             }
-            ValuePattern p = (ValuePattern)box.GetCurrentPattern(ValuePattern.Pattern);
-            p.SetValue(value);
+
+            if (box.TryGetCurrentPattern(ValuePattern.Pattern, out object obj) && obj is ValuePattern p)
+            {
+                p.SetValue(value);
+            }
+            else
+            {
+                throw new Exception("TextBox '" + name + "' does not support ValuePattern");
+            }
             return box;
         }
 

Source/WPF/ScenarioTest/ScenarioTest.cs

@@ -557,8 +557,11 @@ internal void ConnectToBank()
         internal void SignOnToBank()
         {
             this.WriteLine("  - SignOnToBank");
-            this.ofxServerWindow.UserName = this.passwordDialog.UserName = "test";
-            this.ofxServerWindow.Password = this.passwordDialog.Password = "1234";
+            this.passwordDialog.UserName = "test";
+            this.passwordDialog.Password = "1234";
+            // this brings the ofx dialog to the front.
+            this.ofxServerWindow.UserName = "test";
+            this.ofxServerWindow.Password = "1234";
 
             bool mfa = false;
             if (this.random.Next(0, 2) == 0)
@@ -1070,6 +1073,8 @@ private void SelectAccount()
             }
             this.ClearTransactionViewState();
             this.dataChangedSinceExport = true;
+            this.selectedCurrency = null;
+            this.editedCurrency = null;
         }
         #endregion
 
@@ -1258,6 +1263,7 @@ private void EnsureSelectedTransaction()
                 {
                     throw new Exception("Cannot find any transaction to select!");
                 }
+                this.transactions.ScrollSelectionIntoView();
             }
         }
 
@@ -1632,12 +1638,15 @@ private bool HasSelectedTransaction
 
         private void SearchTransactionView()
         {
+            this.transactions = this.window.FindTransactionGrid();
             if (this.transactions != null && this.transactions.CountNoPlaceholder > 5)
             {
                 this.EnsureSelectedTransaction();
 
                 this.WriteLine("- SearchTransactionView");
-                var row1 = this.transactions.WaitForSelection();
+                var row1 = this.transactions.WaitForSelection();                
+                Assert.That(row1, Is.Not.Null, "Selection not found after trying to set a selection?");
+
                 var t = this.transactions.GetSelectedTransactionProxy();
                 var search = "\"" + t.Date.ToShortDateString() + "\" and " + t.Amount;
 
@@ -1648,35 +1657,30 @@ private void SearchTransactionView()
 
                 // Make sure selection is preserved on the matching transaction
                 var row2 = this.transactions.WaitForSelection();
-                Assert.That(row2, Is.Not.Null, "Selection not found after setting search filter");
+                if (row2 == null)
+                {
+                    // WTF?
+                    Assert.That(row2, Is.Not.Null, "Selection not found after setting search filter");
+                }
                 Assert.That(row2.Id, Is.EqualTo(row1.Id), $"Expected election automation id {row1.Id} doesn't match {row2.Id}");
 
                 var t2 = this.transactions.GetSelectedTransactionProxy();
-                Assert.Multiple(() =>
-                {
-                    Assert.That(t2.Date, Is.EqualTo(t.Date), "Dates don't match");
-                    Assert.That(t2.Amount, Is.EqualTo(t.Amount), "Amounts don't match");
-                });
-
+                Assert.That(t2.Date, Is.EqualTo(t.Date), "Dates don't match");
+                Assert.That(t2.Amount, Is.EqualTo(t.Amount), "Amounts don't match");
+                
                 // don't leave Money with active search filter as it makes the rest of the
                 // editing logic very complicated.
                 quickFilter.ClearSearch();
                 Thread.Sleep(500);
 
                 // Make sure selection is preserved after search is cleared.
                 var row3 = this.transactions.WaitForSelection();
-                Assert.Multiple(() =>
-                {
-                    Assert.That(row3, Is.Not.Null, "Selection not restored after clearing search filter");
-                    Assert.That(row3.Id, Is.EqualTo(row1.Id), $"Expected election automation id {row1.Id} doesn't match {row3.Id}");
-                });
-
+                Assert.That(row3, Is.Not.Null, "Selection not restored after clearing search filter");
+                Assert.That(row3.Id, Is.EqualTo(row1.Id), $"Expected election automation id {row1.Id} doesn't match {row3.Id}");
+                
                 var t3 = this.transactions.GetSelectedTransactionProxy();
-                Assert.Multiple(() =>
-                {
-                    Assert.That(t3.Date, Is.EqualTo(t.Date), "Dates don't match");
-                    Assert.That(t3.Amount, Is.EqualTo(t.Amount), "Amounts don't match");
-                });
+                Assert.That(t3.Date, Is.EqualTo(t.Date), "Dates don't match");
+                Assert.That(t3.Amount, Is.EqualTo(t.Amount), "Amounts don't match");                
             }
         }