From e44633e557f602927b42cfc2e7ad7ef1427b00ed Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Tue, 5 Dec 2023 17:44:26 +0000
Subject: [PATCH] Revert "Pm mypackages - update package version (#14655)"

This reverts commit 3f564ec8b1664671555fff04ae80ee0e3a63ef30.
---
 .../Controls/InstalledPackagesControl.xaml    |  24 ++-
 .../Properties/Resources.Designer.cs          |   9 --
 .../Properties/Resources.en-US.resx           |   3 -
 src/DynamoCoreWpf/Properties/Resources.resx   |   5 +-
 .../UI/Themes/Modern/DynamoModern.xaml        |  19 +--
 .../PackageManagerSearchElementViewModel.cs   |  18 ---
 .../PackageManagerSearchViewModel.cs          |   7 +-
 .../PackageManager/PackageManagerViewModel.cs |  34 +---
 .../PackageManager/PublishPackageViewModel.cs |  21 +--
 .../Views/Core/DynamoView.xaml.cs             |   4 -
 .../PackageManagerPackagesControl.xaml        | 153 ++++++------------
 .../PackageManagerPublishControl.xaml.cs      |  30 +---
 .../PackageManager/PackageManagerView.xaml    |  10 +-
 .../Pages/PublishPackagePublishPage.xaml      |   2 +-
 .../Pages/PublishPackagePublishPage.xaml.cs   |  35 +---
 15 files changed, 75 insertions(+), 299 deletions(-)

diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
index 969911653eb..6bf51a5ad9e 100644
--- a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
@@ -52,12 +52,10 @@
                                  GroupName="PackageFilters"
                                  IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
                                  Style="{StaticResource {x:Type ToggleButton}}"
-                                 FontSize="11"
+                                 FontSize="10"
                                  FontFamily="Artifakt Element"
                                  FontWeight="Medium"
                                  HorizontalAlignment="Center"
-                                 VerticalAlignment="Center"
-                                 VerticalContentAlignment="Center"
                                  BorderThickness="1"
                                  BorderBrush="Transparent"
                                  UseLayoutRounding="True"
@@ -123,7 +121,7 @@
                                                 </TextBlock>
                                                 <TextBlock Text="{Binding Path=Model.VersionName}"
                                                                MinWidth="70"
-                                                               FontSize="12"
+                                                               FontSize="11"
                                                                VerticalAlignment="Center"
                                                                Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>
                                                
@@ -257,8 +255,7 @@
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="11"
-                                                                           FontWeight="Regular"
+                                                                           FontSize="9"
                                                                            TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
@@ -282,8 +279,7 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="11"
-                                                                           FontWeight="Regular"
+                                                                           FontSize="9"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -316,8 +312,7 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="11"
-                                                                           FontWeight="Regular"
+                                                                           FontSize="9"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -339,7 +334,7 @@
                                                         Margin="0,0,0,5">
 
                                                 <Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalFileLabel}"
-                                                           FontSize="12"
+                                                           FontSize="11"
                                                        Padding="0,5,5,5"
                                                            Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
                                                 <ItemsControl Name="AdditionalFiles"
@@ -349,10 +344,9 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=RelativePath}"
-                                                                       Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                       FontSize="12"
-                                                                       FontWeight="Regular"
-                                                                       TextTrimming="CharacterEllipsis" />
+                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                           FontSize="9"
+                                                                           TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
 
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 61b0f44e341..e63e6df6817 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -5744,15 +5744,6 @@ public static string PackageManagerMyPackagesControlName {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Publish Version.
-        /// </summary>
-        public static string PackageManagerMyPackagesPublishVersion {
-            get {
-                return ResourceManager.GetString("PackageManagerMyPackagesPublishVersion", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to My Packages.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 1d4540cf9a1..f6c0fe0f6ab 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3612,9 +3612,6 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
-  <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
-    <value>Publish Version</value>
-  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 4fc62fdc39a..7565ef61128 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3599,9 +3599,6 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
- <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
-    <value>Publish Version</value>
-  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
@@ -3845,4 +3842,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
     <value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index c3cc6e2c43e..26ca6add1dd 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -53,7 +53,6 @@
     <Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
     <Color x:Key="GenericMouseOverBackgroundColor">#808080</Color>
 
-    <SolidColorBrush x:Key="BorderPressedColorBrush" Color="{DynamicResource BorderPressedColor}"/>
     <SolidColorBrush x:Key="GenericBorderBackgroundColorBrush" Color="#3c3c3c"/>    
     <SolidColorBrush x:Key="GenericMouseOverBackgroundColorBrush" Color="{DynamicResource GenericMouseOverBackgroundColor}"/>    
 
@@ -1023,7 +1022,7 @@
         <Setter Property="CaretBrush" Value="{StaticResource PrimaryCharcoal200Brush}" />
         <Setter Property="Padding" Value="10,12,10,8"/>
         <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}"/>
-        <Setter Property="FontSize" Value="14px" />
+        <Setter Property="FontSize" Value="12px" />
         <Setter Property="Foreground" Value="{StaticResource PrimaryCharcoal200Brush}"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
 
@@ -3422,19 +3421,11 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Grid>
-                        <Border Width="16" Height="16" Background="Transparent" BorderThickness="0">
-                            <Path Name="menuIcon"
-                                  Width="16"
-                                  Height="16"
-                                  HorizontalAlignment="Center"
-                                  VerticalAlignment="Center"
-                                  Fill="{DynamicResource MidGreyBrush}"
-                                  Data="M7.5 3C8.32843 3 9 2.32843 9 1.5C9 0.671573 8.32843 0 7.5 0C6.67157 0 6 0.671573 6 1.5C6 2.32843 6.67157 3 7.5 3ZM7.5 9C8.32843 9 9 8.32843 9 7.5C9 6.67157 8.32843 6 7.5 6C6.67157 6 6 6.67157 6 7.5C6 8.32843 6.67157 9 7.5 9ZM9 13.5C9 14.3284 8.32843 15 7.5 15C6.67157 15 6 14.3284 6 13.5C6 12.6716 6.67157 12 7.5 12C8.32843 12 9 12.6716 9 13.5Z"/>
-                        </Border>
+                        <Image Name="menuIcon"  Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu_16_16.png"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="menuIcon" Property="Fill" Value="{DynamicResource BorderPressedColorBrush}" />
+                            <Setter TargetName="menuIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu-hover-16px.png" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value=".5" />
@@ -3443,7 +3434,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </Style>    
+    </Style>
 
     <Style x:Key="CtaButtonStyle" TargetType="Button">
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -4251,7 +4242,7 @@
 
     <Style x:Key="PackageManagerTab" TargetType="{x:Type TabItem}">
         <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontSize" Value="15" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
index f04c2d5692f..783035dfe4b 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
@@ -113,24 +113,6 @@ public PackageManagerSearchElementViewModel(PackageManagerSearchElement element,
         public PackageManagerSearchElementViewModel(PackageManagerSearchElement element, bool canLogin) : this(element, canLogin, true)
         {}
 
-        /// <summary>
-        /// A property showing if the currently logged-in user owns the package
-        /// </summary>
-        private bool isOwner = false;
-        public bool IsOnwer
-        {
-            get
-            {
-                return isOwner;
-            }
-
-            internal set
-            {   
-                isOwner = value;
-                RaisePropertyChanged(nameof(IsOnwer));
-            }
-        }
-
         private bool canInstall;
         /// <summary>
         /// A Boolean flag reporting whether or not the user can install this SearchElement's package.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index fd57ae6fd81..36cb8d1bd11 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -651,12 +651,8 @@ private void PopulateMyPackages()
             var pkgs = PackageManagerClientViewModel.CachedPackageList.Where(x => x.Maintainers != null && x.Maintainers.Contains(name)).ToList();
             foreach(var pkg in pkgs)
             {
-                var p = new PackageManagerSearchElementViewModel(pkg,
-                                                                 PackageManagerClientViewModel.AuthenticationManager.HasAuthProvider,
-                                                                 CanInstallPackage(pkg.Name));
+                var p = new PackageManagerSearchElementViewModel(pkg, false);
                 p.RequestDownload += this.PackageOnExecuted;
-                p.RequestShowFileDialog += this.OnRequestShowFileDialog;
-                p.IsOnwer = true;
 
                 myPackages.Add(p);
             }
@@ -670,7 +666,6 @@ private void ClearMySearchResults()
             foreach (var ele in this.SearchMyResults)
             {
                 ele.RequestDownload -= PackageOnExecuted;
-                ele.RequestShowFileDialog -= OnRequestShowFileDialog;
             }
 
             this.SearchMyResults = null;
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
index 84897abc499..8474cf4e3ce 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Linq;
-using Dynamo.PackageManager.ViewModels;
-using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using NotificationObject = Dynamo.Core.NotificationObject;
 
@@ -28,20 +25,7 @@ public class PackageManagerViewModel : NotificationObject, IDisposable
         /// <summary>
         /// PublishPackageViewModel containing information about all the published packages
         /// </summary>
-        ///
-        private PublishPackageViewModel publishPackageViewModel;
-        public PublishPackageViewModel PublishPackageViewModel
-        {
-            get { return publishPackageViewModel; }
-            set
-            {
-                if (publishPackageViewModel != value)
-                {
-                    publishPackageViewModel = value;
-                    RaisePropertyChanged(nameof(PublishPackageViewModel));
-                }
-            }
-        }
+        public PublishPackageViewModel PublishPackageViewModel { get; set; }
 
         /// <summary>
         /// Returns all installed packages
@@ -53,7 +37,6 @@ public PublishPackageViewModel PublishPackageViewModel
         /// </summary>
         public ObservableCollection<PackageFilter> Filters => installedPackagesViewModel.Filters;
 
-        public DelegateCommand PublishNewVersionCommand { get; set; }
 
         //Width of the PackageManagerView the default value is 1076
         public double Width
@@ -107,21 +90,6 @@ public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSe
             {
                 PreferencesViewModel.SelectedPackagePathForInstall = dynamoViewModel.PreferenceSettings.SelectedPackagePathForInstall;
             }
-
-            PublishNewVersionCommand = new DelegateCommand(PublishNewPackageVersionRelayCommand);
-        }
-
-
-        private void PublishNewPackageVersionRelayCommand(object obj)
-        {
-            var searchElement = obj as PackageManagerSearchElementViewModel;
-            if(searchElement != null)
-            {
-                var localPackage = LocalPackages.First(x => x.Model.Name.Equals(searchElement.Name));
-
-                if (localPackage == null) { return; }
-                localPackage.PublishNewPackageVersionCommand.Execute();
-            }
         }
 
         private void LocalPackages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
index b6b78271acf..f1aeab43e50 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -93,7 +92,7 @@ public DynamoViewModel DynamoViewModel
         /// <summary>
         /// Package Publish entry, binded to the host multi-selection option
         /// </summary>
-        public class HostComboboxEntry : NotificationObject 
+        public class HostComboboxEntry
         {
             /// <summary>
             /// Name of the host
@@ -103,19 +102,7 @@ public class HostComboboxEntry : NotificationObject
             /// <summary>
             /// Boolean indicates if the host entry is selected
             /// </summary>
-            private bool _isSelected;
-            public bool IsSelected
-            {
-                get { return _isSelected; }
-                set
-                {
-                    if (_isSelected != value)
-                    {
-                        _isSelected = value;
-                        RaisePropertyChanged(nameof(IsSelected));
-                    }
-                }
-            }
+            public bool IsSelected { get; set; }
 
             /// <summary>
             /// Constructor
@@ -203,7 +190,6 @@ public bool IsNewVersion
                 {
                     _isNewVersion = value;
                     RaisePropertyChanged("IsNewVersion");
-                    RaisePropertyChanged("CanEditName");
                 }
             }
         }
@@ -1122,9 +1108,8 @@ private void ClearAllEntries()
             this.AdditionalFiles = new ObservableCollection<string>();
             this.Dependencies = new ObservableCollection<PackageDependency>();
             this.Assemblies = new List<PackageAssembly>();
-            this.KnownHosts.ForEach(host => { host.IsSelected = false; });
-            this.SelectedHostsString = string.Empty;
             this.SelectedHosts = new List<String>();
+            this.SelectedHostsString = string.Empty;
             this.copyrightHolder = string.Empty;
             this.copyrightYear = string.Empty;
             this.RootFolder = string.Empty;
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 7e792419834..58be0f74b2d 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1493,10 +1493,6 @@ private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)
 
                 if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;
             }
-            if (_pkgVM != null)
-            {
-                _pkgVM.PublishPackageViewModel = model;
-            }
 
             packageManagerWindow.Focus();
             packageManagerWindow.Navigate(Wpf.Properties.Resources.PackageManagerPublishTab);
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
index 6fa2e9d1291..998499ef4d2 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
@@ -259,7 +259,6 @@
                                     IsEnabled="{Binding IsEnabledForInstall}">
                                 <Button.Style>
                                     <Style TargetType="Button">
-                                        <Setter Property="Visibility" Value="Visible"/>
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type Button}">
@@ -330,9 +329,12 @@
                                                                                 </DataTrigger>
                                                                                 <MultiDataTrigger>
                                                                                     <MultiDataTrigger.Conditions>
-                                                                                        <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
-                                                                                        <Condition Binding="{Binding Path=CanInstall}" Value="True" />
-                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsDeprecated}"
+                                                                                                   Value="False" />
+                                                                                        <Condition Binding="{Binding Path=CanInstall}"
+                                                                                                   Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}"
+                                                                                                   Value="True" />
                                                                                     </MultiDataTrigger.Conditions>
                                                                                     <Setter Property="Fill">
                                                                                         <Setter.Value>
@@ -348,117 +350,54 @@
                                                         </Grid>
                                                     </Border>
                                                     <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
+                                                        <Trigger Property="IsMouseOver"
+                                                                 Value="True">
+                                                            <Setter TargetName="ButtonBorder"
+                                                                    Property="BorderBrush"
+                                                                    Value="#4A4A4A" />
                                                         </Trigger>
-                                                        <Trigger Property="IsPressed" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
+                                                        <Trigger Property="IsPressed"
+                                                                 Value="True">
+                                                            <Setter TargetName="ButtonBorder"
+                                                                    Property="BorderBrush"
+                                                                    Value="#5F5F5F" />
                                                         </Trigger>
-                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
-                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
+                                                        <DataTrigger Binding="{Binding IsDeprecated}"
+                                                                     Value="True">
+                                                            <Setter Property="TextBlock.Opacity"
+                                                                    Value="0.5" />
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#84D7CE" />
+                                                            <Setter Property="ToolTip"
+                                                                    Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding CanInstall}" Value="False">
-                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
-                                                            <Setter Property="Opacity" Value="1" />
+                                                        <DataTrigger Binding="{Binding CanInstall}"
+                                                                     Value="False">
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#999999" />
+                                                            <Setter Property="Opacity"
+                                                                    Value="1" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}" Value="False">
-                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
-                                                            <Setter Property="TextBlock.Opacity" Value="1" />
-                                                        </DataTrigger>
-                                                        <MultiDataTrigger>
-                                                            <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
-                                                                <Condition Binding="{Binding Path=CanInstall}" Value="True" />
-                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
-                                                            </MultiDataTrigger.Conditions>
-                                                            <Setter Property="TextBlock.Opacity" Value="1" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                        </MultiDataTrigger>
-                                                        <MultiDataTrigger>
-                                                            <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
-                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
-                                                            </MultiDataTrigger.Conditions>
-                                                            <Setter Property="Visibility" Value="Collapsed"/>
-                                                        </MultiDataTrigger>
-                                                    </ControlTemplate.Triggers>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </Button.Style>
-                            </Button>
-
-
-                            <!--  Publish Version Button  -->
-                            <Button Name="publishButton"
-                                    Content="{x:Static p:Resources.PackageManagerMyPackagesPublishVersion}"
-                                    Command="{Binding Path=PackageManagerViewModel.PublishNewVersionCommand,
-                                                      RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                                    CommandParameter="{Binding}"
-                                    DockPanel.Dock="Right"
-                                    ToolTipService.ShowOnDisabled="True"
-                                    IsEnabled="{Binding IsEnabledForInstall}">
-                                <Button.Style>
-                                    <Style TargetType="Button">
-                                        <Setter Property="Visibility" Value="Collapsed"/>
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate TargetType="{x:Type Button}">
-                                                    <Border Name="ButtonBorder"
-                                                            Height="25"
-                                                            Padding="5,0"
-                                                            BorderThickness="2"
-                                                            CornerRadius="2">
-                                                        <Grid x:Name="publishPackageGrid">
-
-                                                            <DockPanel LastChildFill="False">
-                                                                <TextBlock Name="textBlock"
-                                                                           Padding="4,4,4,3"
-                                                                           VerticalAlignment="Center"
-                                                                           Cursor="Hand"
-                                                                           DockPanel.Dock="Right"
-                                                                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                                                                           FontSize="11"
-                                                                           Text="{TemplateBinding Content}" />
-                                                                <Rectangle Width="10"
-                                                                           Height="10"
-                                                                           VerticalAlignment="Center"
-                                                                           DockPanel.Dock="Left">
-                                                                    <Rectangle.Fill>
-                                                                        <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - default.png" />
-                                                                    </Rectangle.Fill>
-                                                                </Rectangle>
-                                                            </DockPanel>
-                                                        </Grid>
-                                                    </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
-                                                        </Trigger>
-                                                        <Trigger Property="IsPressed" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
-                                                        </Trigger>
-                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
-                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
+                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}"
+                                                                     Value="False">
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#999999" />
+                                                            <Setter Property="TextBlock.Opacity"
+                                                                    Value="1" />
                                                         </DataTrigger>
                                                         <MultiDataTrigger>
                                                             <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
-                                                            </MultiDataTrigger.Conditions>
-                                                            <Setter Property="TextBlock.Opacity" Value="1" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                        </MultiDataTrigger>
-                                                        <MultiDataTrigger>
-                                                            <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
-                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
+                                                                <Condition Binding="{Binding Path=IsDeprecated}"
+                                                                           Value="False" />
+                                                                <Condition Binding="{Binding Path=CanInstall}"
+                                                                           Value="True" />
+                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}"
+                                                                           Value="True" />
                                                             </MultiDataTrigger.Conditions>
-                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                            <Setter Property="TextBlock.Opacity"
+                                                                    Value="1" />
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#84D7CE" />
                                                         </MultiDataTrigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
index ce278dff7cb..54a82e58d1b 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
@@ -32,35 +32,9 @@ public PackageManagerPublishControl()
             InitializeComponent();
 
             this.Loaded += InitializeContext;
-            this.DataContextChanged += PackageManagerPublishControl_DataContextChanged;
-        }
-
-        private void PackageManagerPublishControl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (!(this.DataContext is PublishPackageViewModel)) return;
-
-            ResetDataContext();
-            SetDataContext();
         }
 
         private void InitializeContext(object sender, RoutedEventArgs e)
-        {
-            SetDataContext();
-
-            this.Loaded -= InitializeContext;
-        }
-
-        private void ResetDataContext()
-        {
-            if (PublishPackageViewModel != null)
-            {
-                PublishPackageViewModel.PublishSuccess -= PackageViewModelOnPublishSuccess;
-                PublishPackageViewModel.RequestShowFolderBrowserDialog -= OnRequestShowFolderBrowserDialog;
-            }
-
-            PublishPackageViewModel = null; 
-        }
-        private void SetDataContext()
         {
             // Set the owner of this user control
             this.Owner = Window.GetWindow(this);
@@ -68,7 +42,7 @@ private void SetDataContext()
             PublishPackageViewModel = this.DataContext as PublishPackageViewModel;
             PublishPackageViewModel.Owner = this.Owner;
 
-            if (PublishPackageViewModel != null)
+            if(PublishPackageViewModel != null )
             {
                 PublishPackageViewModel.PublishSuccess += PackageViewModelOnPublishSuccess;
                 PublishPackageViewModel.RequestShowFolderBrowserDialog += OnRequestShowFolderBrowserDialog;
@@ -104,8 +78,6 @@ public void Dispose()
             NavButtonStacks = null;
 
             Breadcrumbs?.Clear();
-            
-            this.DataContextChanged -= PackageManagerPublishControl_DataContextChanged;
         }
 
         private void InitializePages()
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
index 771ec05f97e..b8eb4d9aa1b 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
@@ -32,7 +32,7 @@
             <controls:ListHasMoreThanNItemsToVisibilityConverter x:Key="ListHasMoreThanNItemsToVisibilityConverter" />
             <controls:EmptyListToVisibilityConverter x:Key="EmptyListToVisibilityConverter" />
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            
+
             <Style x:Key="PkgMngTextBlockStyle" TargetType="TextBlock">
                 <Setter Property="Width" Value="Auto" />
                 <Setter Property="Margin" Value="0 5" />
@@ -111,7 +111,7 @@
                            Grid.Column="0"
                            Margin="14,16,0,0"
                            TextAlignment="Left"
-                           FontSize="20"
+                           FontSize="18"
                            FontFamily="Helvetica"
                            HorizontalAlignment="Left"
                            Width="459" />
@@ -509,7 +509,7 @@
                                                 HorizontalAlignment="Stretch">
                                         <TextBlock FontFamily="{StaticResource ArtifaktElementRegular}"
                                                    Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                   FontSize="14"
+                                                   FontSize="13"
                                                    Margin="0 5 0 20">
                                             <Run Text="{x:Static p:Resources.PackageManagerSettingsRunPrefix}" />
                                             <Hyperlink Click="OnPackageManagerSettingsHyperlinkClicked"
@@ -521,7 +521,7 @@
                                         </TextBlock>
                                         <Label Content="{x:Static p:Resources.PreferencesViewPackageDownloadDirectory}"
                                                Padding="5,5,5,5"
-                                               FontSize="14"
+                                               FontSize="13"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
@@ -541,7 +541,7 @@
 
                                         <Label Content="{x:Static p:Resources.PackagePathPreferencesTitle}"
                                                Padding="5,5,5,5"
-                                               FontSize="14"
+                                               FontSize="13"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
index e3f6cb36e8a..3fa2101b100 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
@@ -539,7 +539,7 @@
                                     <CheckBox Name="HostEntry"
                                               Checked="HostEntry_CheckStateChanged"
                                               Content="{Binding HostName}"
-                                              IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                              IsChecked="{Binding IsSelected, Mode=TwoWay}"
                                               Style="{StaticResource ComboBoxCheckBoxStyle}"
                                               Tag="{RelativeSource FindAncestor,
                                                             AncestorType={x:Type ComboBox}}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
index 72004e438f8..84e1a796522 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Navigation;
 
@@ -12,7 +11,7 @@ public class PackageNameLengthValidationRule : ValidationRule
     {
         public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         {
-            if (IsValidName((string)value))
+            if (value is string name && name.TrimEnd().Length > 2)
             {
                 // Validation succeeded
                 return ValidationResult.ValidResult;
@@ -21,11 +20,6 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             // Validation failed
             return new ValidationResult(false, Wpf.Properties.Resources.NameNeedMoreCharacters);
         }
-        public static bool IsValidName(string value)
-        {
-            return (value is string name && name.TrimEnd().Length > 2);
-        }
-
     }
 
 
@@ -142,36 +136,11 @@ private void textBoxInput_PreviewKeyDown(object sender, System.Windows.Input.Key
         {
             var textBox = sender as TextBox;
             if (textBox == null) return;
-            if (e.Key == Key.System) return;
-
-            int caretIndex = textBox.CaretIndex; // Store the caret index
 
             // Prevents text starting with a space
             if (e.Key == System.Windows.Input.Key.Space && string.IsNullOrWhiteSpace(textBox.Text))
             {
-                e.Handled = true;
-                return;
-            }
-
-            if (string.IsNullOrEmpty(textBox.Text)) { return; }
-
-            // In case we are using the Backspace to remove characters, the validation error will stop the Name property from being updated 
-            if (textBox.Name.Equals("packageNameInput") && e.Key == Key.Back && !PackageNameLengthValidationRule.IsValidName(textBox.Text.Substring(0, textBox.Text.Length - 1)))
-            {
-                e.Handled = true;
-
-                if (!string.IsNullOrEmpty(PublishPackageViewModel.Name))
-                {
-                    // Manually remove the last character from the Name property, as the validation error will not update the Name property
-                    PublishPackageViewModel.Name = PublishPackageViewModel.Name.Substring(0, PublishPackageViewModel.Name.Length - 1);
-
-                    // Trigger re-validation explicitly
-                    var expression = textBox.GetBindingExpression(TextBox.TextProperty);
-                    expression?.UpdateSource();
-
-                    textBox.CaretIndex = caretIndex - 1 >= 0 ? caretIndex - 1 : 0;
-                    return;
-                }
+                e.Handled = true; 
             }
         }
     }