From e0874c64d55a1f9cc2fc608cc7d9b0a41c5c430e Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 09:31:54 +0700
Subject: [PATCH 1/6] style(ip): compact 510px ARSAS-native dialog with hidden
 expert options and subtle history

---
 IpConnectWizardWindow.xaml | 332 ++++++++++++++++++++++---------------
 1 file changed, 195 insertions(+), 137 deletions(-)

diff --git a/IpConnectWizardWindow.xaml b/IpConnectWizardWindow.xaml
index 01f524132..c4f67ef9b 100644
--- a/IpConnectWizardWindow.xaml
+++ b/IpConnectWizardWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="ArIED61850Tester.IpConnectWizardWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Add IEC 61850 IED" Width="700" MinWidth="640" MaxHeight="660"
+        Title="Add IEC 61850 IED" Width="510" MinWidth="480" MaxHeight="460"
         SizeToContent="Height" WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize" ShowInTaskbar="False"
         Background="{DynamicResource TaskDialogCanvas}"
@@ -11,19 +11,22 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles/IedTaskDialogStyles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+
+            <!-- Dialog-local sizing: same Inter family and colors as ARSAS,
+                 without changing shared styles or other task dialogs. -->
             <Style x:Key="SmartIpOctet" TargetType="{x:Type TextBox}">
-                <Setter Property="Width" Value="64"/>
+                <Setter Property="Width" Value="43"/>
+                <Setter Property="Height" Value="32"/>
                 <Setter Property="MaxLength" Value="3"/>
-                <Setter Property="Height" Value="36"/>
-                <Setter Property="Padding" Value="5,5"/>
-                <Setter Property="FontSize" Value="16"/>
-                <Setter Property="FontWeight" Value="Medium"/>
+                <Setter Property="Padding" Value="2,3"/>
+                <Setter Property="FontSize" Value="13"/>
+                <Setter Property="FontWeight" Value="Normal"/>
                 <Setter Property="TextAlignment" Value="Center"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
                 <Setter Property="BorderThickness" Value="0"/>
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="{StaticResource TaskDialogInk}"/>
-                <Setter Property="CaretBrush" Value="#2563EB"/>
+                <Setter Property="CaretBrush" Value="{DynamicResource Accent}"/>
                 <Setter Property="InputMethod.IsInputMethodEnabled" Value="False"/>
                 <EventSetter Event="PreviewTextInput" Handler="Octet_PreviewTextInput"/>
                 <EventSetter Event="PreviewKeyDown" Handler="Octet_PreviewKeyDown"/>
@@ -31,160 +34,215 @@
             </Style>
             <Style x:Key="SmartIpDot" TargetType="{x:Type TextBlock}">
                 <Setter Property="Foreground" Value="{StaticResource TaskDialogMuted}"/>
-                <Setter Property="FontSize" Value="18"/>
-                <Setter Property="FontWeight" Value="SemiBold"/>
+                <Setter Property="FontSize" Value="13"/>
+                <Setter Property="FontWeight" Value="Normal"/>
                 <Setter Property="VerticalAlignment" Value="Center"/>
-                <Setter Property="Margin" Value="2,0"/>
+                <Setter Property="Margin" Value="0"/>
+            </Style>
+            <Style x:Key="SmartIpHistoryButton" TargetType="{x:Type Button}">
+                <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="Focusable" Value="True"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border x:Name="HistoryChrome" Background="{TemplateBinding Background}"
+                                    CornerRadius="0,7,7,0">
+                                <Path Data="M 2,5 L 7,10 L 12,5" Width="14" Height="14"
+                                      Stretch="Uniform" Stroke="{StaticResource TaskDialogMuted}"
+                                      StrokeThickness="1.7" StrokeStartLineCap="Round"
+                                      StrokeEndLineCap="Round" StrokeLineJoin="Round"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#EAF2FF"/>
+                                </Trigger>
+                                <Trigger Property="IsKeyboardFocused" Value="True">
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#EAF2FF"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="True">
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#DCEAFF"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
             </Style>
         </ResourceDictionary>
     </Window.Resources>
+
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
                   Focusable="False">
-        <Grid Margin="24,22,24,22">
+        <Grid Margin="20,18,20,18">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <StackPanel>
-                <TextBlock Text="Add IEC 61850 IED" Style="{StaticResource TaskDialogHeading}"/>
-                <TextBlock Margin="0,5,0,0" Style="{StaticResource TaskDialogSubtitle}"
-                           Text="Enter a device address to discover its IEC 61850 data model."/>
+
+            <StackPanel Grid.Row="0">
+                <TextBlock Text="Add IEC 61850 IED" FontSize="17" FontWeight="SemiBold"
+                           Foreground="{StaticResource TaskDialogInk}"/>
+                <TextBlock Text="Enter the device IP address to connect."
+                           Margin="0,4,0,0" FontSize="11.5"
+                           Foreground="{StaticResource TaskDialogMuted}"/>
             </StackPanel>
-            <Border Grid.Row="1" Margin="0,18,0,0" Style="{StaticResource TaskDialogCardStyle}">
+
+            <Border Grid.Row="1" Margin="0,14,0,0" Padding="14,13"
+                    Background="{StaticResource TaskDialogCard}"
+                    BorderBrush="{StaticResource TaskDialogBorder}" BorderThickness="1"
+                    CornerRadius="11">
                 <StackPanel>
+                    <TextBlock Text="IP Address" FontSize="12" FontWeight="SemiBold"
+                               Foreground="{StaticResource TaskDialogInk}" Margin="0,0,0,7"/>
+
+                    <!-- One compact visual input; four keyboard-friendly octets
+                         deliberately share one surrounding field. -->
                     <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="14"/>
-                            <ColumnDefinition Width="120"/>
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0">
-                            <TextBlock Text="IED IP address" Style="{StaticResource TaskDialogFieldLabel}" Margin="0,0,0,7"/>
-                            <Border x:Name="IpEditorHost" Height="44" CornerRadius="10"
-                                    BorderThickness="1.5"
-                                    Background="{StaticResource TaskDialogCard}">
-                                <Border.Style>
-                                    <Style TargetType="Border">
-                                        <Setter Property="BorderBrush" Value="{StaticResource TaskDialogBorder}"/>
-                                        <Style.Triggers>
-                                            <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                                                <Setter Property="BorderBrush" Value="#3B82F6"/>
-                                            </Trigger>
-                                            <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter Property="BorderBrush" Value="#86AEEF"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Border.Style>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="44"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel x:Name="OctetEditor" Grid.Column="0" Orientation="Horizontal"
-                                                HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <TextBox x:Name="Octet1Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 1, 0 through 255"/>
-                                        <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
-                                        <TextBox x:Name="Octet2Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 2, 0 through 255"/>
-                                        <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
-                                        <TextBox x:Name="Octet3Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 3, 0 through 255"/>
-                                        <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
-                                        <TextBox x:Name="Octet4Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 4, 0 through 255"/>
-                                    </StackPanel>
-                                    <Button x:Name="HistoryButton" Grid.Column="1" Content="⌄"
-                                            FontSize="18" ToolTip="Search previously entered and connected IED addresses"
-                                            AutomationProperties.Name="Show address history"
-                                            Click="HistoryButton_Click"
-                                            Style="{StaticResource TaskDialogButtonBase}"
-                                            Padding="7,0" BorderThickness="0,0,0,0" Background="Transparent"/>
-                                </Grid>
-                            </Border>
-                            <Popup x:Name="HistoryPopup" PlacementTarget="{Binding ElementName=IpEditorHost}"
-                                   Placement="Bottom" VerticalOffset="4" AllowsTransparency="True"
-                                   StaysOpen="False" PopupAnimation="Fade">
-                                <Border Width="432" MaxHeight="270" CornerRadius="12" Background="White"
-                                        BorderThickness="1" BorderBrush="{StaticResource TaskDialogBorder}"
-                                        Padding="10" SnapsToDevicePixels="True">
-                                    <StackPanel>
-                                        <TextBox x:Name="HistorySearchBox" Height="34" Padding="9,5"
-                                                 VerticalContentAlignment="Center" Background="#F5F8FD"
-                                                 BorderBrush="{StaticResource TaskDialogBorder}"
-                                                 ToolTip="Filter by IP or saved IED name"
-                                                 AutomationProperties.Name="Search IED address history"
-                                                 TextChanged="HistorySearchBox_TextChanged"
-                                                 PreviewKeyDown="HistorySearchBox_PreviewKeyDown"/>
-                                        <ListBox x:Name="HistoryListBox" MaxHeight="202" Margin="0,6,0,0"
-                                                 BorderThickness="0" Background="Transparent"
-                                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                 MouseLeftButtonUp="HistoryListBox_MouseLeftButtonUp"
-                                                 PreviewKeyDown="HistoryListBox_PreviewKeyDown">
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <StackPanel Margin="5,4">
-                                                        <TextBlock Text="{Binding IpAddress}" FontSize="13"
-                                                                   FontWeight="SemiBold" Foreground="{StaticResource TaskDialogInk}"/>
-                                                        <TextBlock Text="{Binding Subtitle}" FontSize="11"
-                                                                   Foreground="{StaticResource TaskDialogMuted}"/>
-                                                    </StackPanel>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                        <TextBlock x:Name="HistoryEmptyText" Margin="8,8,0,5"
-                                                   Text="No matching saved addresses"
-                                                   Visibility="Collapsed" Style="{StaticResource TaskDialogSubtitle}"/>
-                                    </StackPanel>
-                                </Border>
-                            </Popup>
-                            <TextBox x:Name="RawIpBox" Height="44" Margin="0,0,0,0" Padding="12,7"
-                                     VerticalContentAlignment="Center" Visibility="Collapsed"
+                        <Border x:Name="IpEditorHost" Height="38" CornerRadius="8"
+                                BorderThickness="1" Background="White">
+                            <Border.Style>
+                                <Style TargetType="Border">
+                                    <Setter Property="BorderBrush" Value="{StaticResource TaskDialogBorder}"/>
+                                    <Style.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter Property="BorderBrush" Value="#9CB9E4"/>
+                                        </Trigger>
+                                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                                            <Setter Property="BorderBrush" Value="{DynamicResource Accent}"/>
+                                        </Trigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Border.Style>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="36"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel x:Name="OctetEditor" Grid.Column="0"
+                                            Orientation="Horizontal"
+                                            HorizontalAlignment="Left" Margin="10,0,0,0"
+                                            VerticalAlignment="Center">
+                                    <TextBox x:Name="Octet1Box" Style="{StaticResource SmartIpOctet}"
+                                             AutomationProperties.Name="IP address, group 1"/>
+                                    <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
+                                    <TextBox x:Name="Octet2Box" Style="{StaticResource SmartIpOctet}"
+                                             AutomationProperties.Name="IP address, group 2"/>
+                                    <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
+                                    <TextBox x:Name="Octet3Box" Style="{StaticResource SmartIpOctet}"
+                                             AutomationProperties.Name="IP address, group 3"/>
+                                    <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
+                                    <TextBox x:Name="Octet4Box" Style="{StaticResource SmartIpOctet}"
+                                             AutomationProperties.Name="IP address, group 4"/>
+                                </StackPanel>
+                                <Button x:Name="HistoryButton" Grid.Column="1"
+                                        Style="{StaticResource SmartIpHistoryButton}"
+                                        ToolTip="Choose a recently entered address"
+                                        AutomationProperties.Name="Recent IP addresses"
+                                        Click="HistoryButton_Click"/>
+                            </Grid>
+                        </Border>
+
+                        <TextBox x:Name="RawIpBox" Height="38" Padding="10,6"
+                                 VerticalContentAlignment="Center" Visibility="Collapsed"
+                                 Foreground="{StaticResource TaskDialogInk}"
+                                 Background="{StaticResource TaskDialogCard}"
+                                 BorderBrush="{StaticResource TaskDialogBorder}"
+                                 FontSize="12.5"
+                                 Text="{Binding RelayIpAddress, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=LostFocus}"
+                                 ToolTip="Enter an IP address manually"
+                                 AutomationProperties.Name="Manual IP address"/>
+                    </Grid>
+
+                    <Popup x:Name="HistoryPopup" PlacementTarget="{Binding ElementName=IpEditorHost}"
+                           Placement="Bottom" VerticalOffset="3" AllowsTransparency="True"
+                           StaysOpen="False" PopupAnimation="Fade">
+                        <Border Width="398" MaxHeight="230" CornerRadius="9" Background="White"
+                                FontFamily="{DynamicResource AppFontFamily}"
+                                BorderThickness="1" BorderBrush="{StaticResource TaskDialogBorder}"
+                                Padding="9" SnapsToDevicePixels="True">
+                            <StackPanel>
+                                <TextBlock Text="Recent addresses" Margin="5,0,0,6"
+                                           FontSize="11" FontWeight="SemiBold"
+                                           Foreground="{StaticResource TaskDialogMuted}"/>
+                                <TextBox x:Name="HistorySearchBox" Height="30" Padding="8,4"
+                                         VerticalContentAlignment="Center" FontSize="11.5"
+                                         Background="#F7FAFD"
+                                         BorderBrush="{StaticResource TaskDialogBorder}"
+                                         ToolTip="Type to search saved addresses"
+                                         AutomationProperties.Name="Search saved addresses"
+                                         TextChanged="HistorySearchBox_TextChanged"
+                                         PreviewKeyDown="HistorySearchBox_PreviewKeyDown"/>
+                                <ListBox x:Name="HistoryListBox" MaxHeight="154" Margin="0,4,0,0"
+                                         FontSize="11.5" BorderThickness="0" Background="Transparent"
+                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                         MouseLeftButtonUp="HistoryListBox_MouseLeftButtonUp"
+                                         PreviewKeyDown="HistoryListBox_PreviewKeyDown">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <StackPanel Margin="4,2">
+                                                <TextBlock Text="{Binding IpAddress}" FontSize="12"
+                                                           FontWeight="Medium"
+                                                           Foreground="{StaticResource TaskDialogInk}"/>
+                                                <TextBlock Text="{Binding Subtitle}" FontSize="10.5"
+                                                           Foreground="{StaticResource TaskDialogMuted}"/>
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                                <TextBlock x:Name="HistoryEmptyText" Margin="6,7,0,2"
+                                           Text="No matching addresses" Visibility="Collapsed"
+                                           Style="{StaticResource TaskDialogSubtitle}"/>
+                            </StackPanel>
+                        </Border>
+                    </Popup>
+
+                    <TextBlock x:Name="AddressHintText" Text="Example: 192.168.1.10"
+                               FontSize="11" Margin="1,6,0,0"
+                               Foreground="{StaticResource TaskDialogMuted}"/>
+
+                    <!-- Rare settings remain available, without introducing
+                         IEC 61850 jargon in the primary connection path. -->
+                    <Expander x:Name="MoreOptionsExpander" Margin="0,10,0,0"
+                              AutomationProperties.Name="More connection options">
+                        <Expander.Header>
+                            <TextBlock Text="More options" FontSize="11.5"
+                                       Foreground="{DynamicResource Accent}"/>
+                        </Expander.Header>
+                        <StackPanel Margin="17,7,0,1">
+                            <TextBlock Text="Port" FontSize="11"
+                                       Foreground="{StaticResource TaskDialogMuted}"
+                                       Margin="0,0,0,5"/>
+                            <TextBox x:Name="MmsPortBox" Width="92" Height="32"
+                                     HorizontalAlignment="Left" Padding="9,4"
+                                     FontSize="12" VerticalContentAlignment="Center"
                                      Foreground="{StaticResource TaskDialogInk}"
                                      BorderBrush="{StaticResource TaskDialogBorder}"
-                                     Text="{Binding RelayIpAddress, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=LostFocus}"
-                                     ToolTip="Advanced input: IPv4 or IPv6 literal"
-                                     AutomationProperties.Name="Advanced IPv4 or IPv6 address"/>
-                            <CheckBox x:Name="ManualAddressCheck" Margin="1,10,0,0"
-                                      Content="Advanced: IPv6 / manual address" FontSize="11.5"
+                                     ToolTip="Default MMS TCP port: 102"
+                                     Text="{Binding MmsPortText, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=PropertyChanged}"/>
+                            <CheckBox x:Name="ManualAddressCheck" Margin="0,10,0,0"
+                                      Content="Enter address manually" FontSize="11"
                                       Foreground="{StaticResource TaskDialogMuted}"
                                       Click="ManualAddressCheck_Click"/>
                         </StackPanel>
-                        <StackPanel Grid.Column="2">
-                            <TextBlock Text="MMS port" Style="{StaticResource TaskDialogFieldLabel}" Margin="0,0,0,7"/>
-                            <TextBox Height="44" VerticalContentAlignment="Center" Padding="9,5"
-                                     Foreground="{StaticResource TaskDialogInk}" Background="{StaticResource TaskDialogCard}"
-                                     BorderBrush="{StaticResource TaskDialogBorder}"
-                                     ToolTip="IEC 61850 MMS normally uses TCP port 102"
-                                     Text="{Binding MmsPortText, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=PropertyChanged}"/>
-                        </StackPanel>
-                    </Grid>
-                    <TextBlock x:Name="AddressHintText" Margin="2,8,0,0"
-                               Style="{StaticResource TaskDialogSubtitle}"
-                               Text="Enter four IPv4 numbers (0–255). Use dot, arrows, Tab or paste a complete address."/>
-                    <Border Margin="0,14,0,0" Background="{StaticResource TaskDialogHintSurface}"
-                            BorderBrush="{StaticResource TaskDialogHintBorder}"
-                            BorderThickness="1" CornerRadius="10" Padding="12,10">
-                        <StackPanel>
-                            <TextBlock Text="Smart discovery" FontSize="12.5" FontWeight="SemiBold"
-                                       Foreground="{StaticResource TaskDialogInk}"/>
-                            <TextBlock Margin="0,3,0,0" Style="{StaticResource TaskDialogSubtitle}"
-                                       Text="Reads the live DataSets and RCBs, and restores saved signal choices."/>
-                        </StackPanel>
-                    </Border>
-                    <TextBlock x:Name="WizardStatusText" Margin="0,12,0,0"
+                    </Expander>
+
+                    <TextBlock x:Name="WizardStatusText" Margin="0,9,0,0"
                                Style="{StaticResource TaskDialogError}"
                                AutomationProperties.LiveSetting="Assertive"/>
                 </StackPanel>
             </Border>
-            <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right"
-                        Margin="0,18,0,0">
+
+            <StackPanel Grid.Row="2" Orientation="Horizontal"
+                        HorizontalAlignment="Right" Margin="0,14,0,0">
                 <Button Content="Cancel" Style="{StaticResource TaskDialogFooterButton}"
-                        Click="Cancel_Click" IsCancel="True" Margin="0,0,10,0"/>
-                <Button Content="Connect &amp; Discover" Style="{StaticResource TaskDialogSubmitAction}"
-                        MinWidth="174" MinHeight="38" IsDefault="True" Click="Connect_Click"/>
+                        MinHeight="34" MinWidth="84" Padding="12,6"
+                        Click="Cancel_Click" IsCancel="True" Margin="0,0,8,0"/>
+                <Button Content="Connect" Style="{StaticResource TaskDialogSubmitAction}"
+                        MinWidth="112" MinHeight="34" Padding="14,6"
+                        IsDefault="True" Click="Connect_Click"/>
             </StackPanel>
         </Grid>
     </ScrollViewer>

From d5114f57b90d437fda9ec73473fd1426c798fda7 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 09:32:20 +0700
Subject: [PATCH 2/6] ux(ip): keep alternate address support but remove
 technical guidance from default flow

---
 IpConnectWizardWindow.xaml.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/IpConnectWizardWindow.xaml.cs b/IpConnectWizardWindow.xaml.cs
index 41ec4a3ab..7bdef8331 100644
--- a/IpConnectWizardWindow.xaml.cs
+++ b/IpConnectWizardWindow.xaml.cs
@@ -159,9 +159,11 @@ private void SetAddressMode(bool manual)
         OctetEditor.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
         HistoryButton.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
         RawIpBox.Visibility = manual ? Visibility.Visible : Visibility.Collapsed;
+        if (manual)
+            MoreOptionsExpander.IsExpanded = true;
         AddressHintText.Text = manual
-            ? "Enter a numeric IPv6 or IPv4 address. Connection starts only when you confirm."
-            : "Enter four IPv4 numbers (0–255). Use dot, arrows, Tab or paste a complete address.";
+            ? "Enter the address exactly as provided."
+            : "Example: 192.168.1.10";
     }
 
     private void ManualAddressCheck_Click(object sender, RoutedEventArgs e)
@@ -186,7 +188,7 @@ private void ManualAddressCheck_Click(object sender, RoutedEventArgs e)
         {
             // Never silently truncate a valid IPv6 literal into four octets.
             ManualAddressCheck.IsChecked = true;
-            WizardStatusText.Text = "IPv6 requires Advanced / manual address mode.";
+            WizardStatusText.Text = "Keep manual entry enabled for this address format.";
             return;
         }
 
@@ -222,7 +224,7 @@ private void Octet_PreviewTextInput(object sender, TextCompositionEventArgs e)
         if (!IsValidPartialOctet(replacement))
         {
             e.Handled = true;
-            WizardStatusText.Text = "Each IPv4 octet must be a number from 0 to 255.";
+            WizardStatusText.Text = "Each number must be between 0 and 255.";
         }
     }
 
@@ -284,7 +286,7 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
                 FocusOctet(3, atEnd: true);
             }
             else
-                WizardStatusText.Text = "Paste a complete IPv4 address with four octets (0–255).";
+                WizardStatusText.Text = "Paste a full IP address, for example 192.168.1.10.";
             return;
         }
 
@@ -293,7 +295,7 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
         if (!IsValidPartialOctet(next))
         {
             e.CancelCommand();
-            WizardStatusText.Text = "Each IPv4 octet must be a number from 0 to 255.";
+            WizardStatusText.Text = "Each number must be between 0 and 255.";
         }
     }
 
@@ -376,7 +378,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
             submittedAddress = RawIpBox.Text.Trim();
             if (!IPAddress.TryParse(submittedAddress, out _))
             {
-                WizardStatusText.Text = "Enter a valid IPv4 or IPv6 address.";
+                WizardStatusText.Text = "Enter a valid IP address.";
                 RawIpBox.Focus();
                 return;
             }
@@ -385,7 +387,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
         {
             if (!TryNormalizeIpv4Octets(Octets.Select(b => b.Text).ToArray(), out submittedAddress))
             {
-                WizardStatusText.Text = "Complete all four IPv4 octets, each between 0 and 255.";
+                WizardStatusText.Text = "Enter all four parts of the IP address (0–255).";
                 return;
             }
         }
@@ -394,7 +396,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
                 out var port) || port is <= 0 or > 65535)
         {
             WizardStatusText.Text =
-                "MMS port must be between 1 and 65535. Standard IEC 61850 MMS uses TCP 102.";
+                "Port must be between 1 and 65535.";
             return;
         }
 

From c24eda24dd6eacc2e9acbd731bc4e5680437c0f0 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 09:32:42 +0700
Subject: [PATCH 3/6] ux(ip): simplify recent address labels while retaining
 verified endpoint truth

---
 Services/UserPreferenceStore.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Services/UserPreferenceStore.cs b/Services/UserPreferenceStore.cs
index 42d7cb446..e7e5ed885 100644
--- a/Services/UserPreferenceStore.cs
+++ b/Services/UserPreferenceStore.cs
@@ -72,13 +72,11 @@ public sealed record RecentEndpointDetail(
         string IpAddress, int MmsPort, string IedName, bool ConfirmedSuccessful,
         bool WasLastSubmitted = false)
     {
-        public string Subtitle => WasLastSubmitted
-            ? (ConfirmedSuccessful
-                ? $"Last submitted · previously connected · MMS {MmsPort}"
-                : $"Last submitted · connection unverified · MMS {MmsPort}")
+        public string Subtitle => (WasLastSubmitted
+            ? (ConfirmedSuccessful ? "Last entered · Connected before" : "Last entered · Not yet connected")
             : ConfirmedSuccessful
-                ? $"Connected successfully · {(string.IsNullOrWhiteSpace(IedName) ? "IED" : IedName)} · MMS {MmsPort}"
-                : "Saved address · connection unverified";
+                ? (string.IsNullOrWhiteSpace(IedName) ? "Connected before" : $"Connected before · {IedName}")
+                : "Previously saved") + (MmsPort == 102 ? string.Empty : $" · Port {MmsPort}");
     }
 
     // A read-only projection of the EXISTING user preference document.

From a395e0d3d4d1843e0d94c090644615b5d3b803f2 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 09:33:24 +0700
Subject: [PATCH 4/6] test(ip): lock compact Inter styling, progressive
 disclosure and WPF focus contract

---
 .../ARSAS.Tests/PremiumSmartIpWizardTests.cs  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
index f0fa7125f..2626678d2 100644
--- a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
+++ b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
@@ -78,6 +78,44 @@ public void ExistingPreferences_SeparateSubmittedFromVerifiedHistory_WithNoMigra
         finally { if (File.Exists(path)) File.Delete(path); }
     }
 
+    [Fact]
+    public void DefaultDialog_IsCompactUsesAppTypography_AndKeepsExpertControlsCollapsed()
+    {
+        var doc = XDocument.Load(Find("IpConnectWizardWindow.xaml"));
+        XNamespace w = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+        XNamespace x = "http://schemas.microsoft.com/winfx/2006/xaml";
+        var root = Assert.IsType<XElement>(doc.Root);
+
+        Assert.InRange(int.Parse(root.Attribute("Width")!.Value), 460, 530);
+        Assert.True(int.Parse(root.Attribute("MaxHeight")!.Value) <= 480);
+        Assert.Contains("AppFontFamily", root.Attribute("FontFamily")!.Value);
+        Assert.Equal("Height", root.Attribute("SizeToContent")?.Value);
+
+        var octetStyle = doc.Descendants(w + "Style")
+            .Single(style => style.Attribute(x + "Key")?.Value == "SmartIpOctet");
+        var setters = octetStyle.Elements(w + "Setter")
+            .ToDictionary(e => e.Attribute("Property")!.Value, e => e.Attribute("Value")!.Value);
+        Assert.True(double.Parse(setters["Width"], System.Globalization.CultureInfo.InvariantCulture) <= 46);
+        Assert.True(double.Parse(setters["FontSize"], System.Globalization.CultureInfo.InvariantCulture) <= 13);
+        Assert.True(double.Parse(setters["Height"], System.Globalization.CultureInfo.InvariantCulture) <= 34);
+
+        var options = doc.Descendants(w + "Expander")
+            .Single(e => e.Attribute(x + "Name")?.Value == "MoreOptionsExpander");
+        Assert.NotEqual("True", options.Attribute("IsExpanded")?.Value);
+        Assert.Contains(options.Descendants(w + "TextBox"),
+            box => box.Attribute(x + "Name")?.Value == "MmsPortBox");
+        Assert.Contains(options.Descendants(w + "CheckBox"),
+            box => box.Attribute(x + "Name")?.Value == "ManualAddressCheck");
+
+        var xaml = File.ReadAllText(Find("IpConnectWizardWindow.xaml"));
+        Assert.DoesNotContain("Smart discovery", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("DataSets", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("RCBs", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("IPv6", xaml, StringComparison.Ordinal);
+        Assert.Contains("x:Name=\"HistoryPopup\"", xaml, StringComparison.Ordinal);
+        Assert.Contains("Content=\"Connect\"", xaml, StringComparison.Ordinal);
+    }
+
     [Fact]
     public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
     {
@@ -112,6 +150,8 @@ public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
                     FocusManager.SetFocusedElement(wizard, boxes[0]);
                     Assert.Same(boxes[0], FocusManager.GetFocusedElement(wizard));
 
+                    var options = Assert.IsType<Expander>(wizard.FindName("MoreOptionsExpander"));
+                    Assert.False(options.IsExpanded);
                     var advanced = Assert.IsType<CheckBox>(wizard.FindName("ManualAddressCheck"));
                     var raw = Assert.IsType<TextBox>(wizard.FindName("RawIpBox"));
                     var host = Assert.IsType<Border>(wizard.FindName("IpEditorHost"));
@@ -120,6 +160,7 @@ public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
                     Assert.NotNull(mode);
                     advanced.IsChecked = true;
                     mode.Invoke(wizard, [advanced, new RoutedEventArgs()]);
+                    Assert.True(options.IsExpanded);
                     Assert.Equal(Visibility.Visible, raw.Visibility);
                     Assert.Equal(Visibility.Collapsed, host.Visibility);
                     raw.Text = "2001:db8::2";

From 24f97f0cd1be81c58146f7eda6d5b9e569fcfddf Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 09:37:16 +0700
Subject: [PATCH 5/6] fix(ip): remove unsupported Border.FontFamily property in
 history popup

---
 IpConnectWizardWindow.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IpConnectWizardWindow.xaml b/IpConnectWizardWindow.xaml
index c4f67ef9b..a46ea975f 100644
--- a/IpConnectWizardWindow.xaml
+++ b/IpConnectWizardWindow.xaml
@@ -160,7 +160,6 @@
                            Placement="Bottom" VerticalOffset="3" AllowsTransparency="True"
                            StaysOpen="False" PopupAnimation="Fade">
                         <Border Width="398" MaxHeight="230" CornerRadius="9" Background="White"
-                                FontFamily="{DynamicResource AppFontFamily}"
                                 BorderThickness="1" BorderBrush="{StaticResource TaskDialogBorder}"
                                 Padding="9" SnapsToDevicePixels="True">
                             <StackPanel>

From 1962d5f3f4886b0bf682e0cd9c27f32cec01d117 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 09:37:31 +0700
Subject: [PATCH 6/6] style(ip): explicitly apply ARSAS Inter to popup text
 controls only

---
 IpConnectWizardWindow.xaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IpConnectWizardWindow.xaml b/IpConnectWizardWindow.xaml
index a46ea975f..ae70d0c49 100644
--- a/IpConnectWizardWindow.xaml
+++ b/IpConnectWizardWindow.xaml
@@ -164,9 +164,11 @@
                                 Padding="9" SnapsToDevicePixels="True">
                             <StackPanel>
                                 <TextBlock Text="Recent addresses" Margin="5,0,0,6"
+                                           FontFamily="{DynamicResource AppFontFamily}"
                                            FontSize="11" FontWeight="SemiBold"
                                            Foreground="{StaticResource TaskDialogMuted}"/>
                                 <TextBox x:Name="HistorySearchBox" Height="30" Padding="8,4"
+                                         FontFamily="{DynamicResource AppFontFamily}"
                                          VerticalContentAlignment="Center" FontSize="11.5"
                                          Background="#F7FAFD"
                                          BorderBrush="{StaticResource TaskDialogBorder}"
@@ -175,6 +177,7 @@
                                          TextChanged="HistorySearchBox_TextChanged"
                                          PreviewKeyDown="HistorySearchBox_PreviewKeyDown"/>
                                 <ListBox x:Name="HistoryListBox" MaxHeight="154" Margin="0,4,0,0"
+                                         FontFamily="{DynamicResource AppFontFamily}"
                                          FontSize="11.5" BorderThickness="0" Background="Transparent"
                                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                          MouseLeftButtonUp="HistoryListBox_MouseLeftButtonUp"
@@ -192,6 +195,7 @@
                                     </ListBox.ItemTemplate>
                                 </ListBox>
                                 <TextBlock x:Name="HistoryEmptyText" Margin="6,7,0,2"
+                                           FontFamily="{DynamicResource AppFontFamily}"
                                            Text="No matching addresses" Visibility="Collapsed"
                                            Style="{StaticResource TaskDialogSubtitle}"/>
                             </StackPanel>