Fetch logicals on free plan rescope

Author: Mindaugas Veblauskas

src/ProtonVPN.App/Windows/Popups/FreeRescope/FreeRescopePopupView.xaml src/ProtonVPN.App/Modals/FreeRescopeModalView.xaml

@@ -17,22 +17,20 @@ You should have received a copy of the GNU General Public License
 along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<resource:BasePopupWindow x:Class="ProtonVPN.Windows.Popups.FreeRescope.FreeRescopePopupView"
+<resource:BaseModalWindow x:Class="ProtonVPN.Modals.FreeRescopeModalView"
                           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                           xmlns:resource="clr-namespace:ProtonVPN.Resource;assembly=ProtonVPN.Resource"
-                          xmlns:rebranding="clr-namespace:ProtonVPN.Windows.Popups.Rebranding"
                           xmlns:translations="clr-namespace:ProtonVPN.Translations;assembly=ProtonVPN.Translations"
                           mc:Ignorable="d"
                           Title=" "
                           Width="657"
                           Height="Auto"
                           SizeToContent="Height"
-                          d:DataContext="{d:DesignInstance rebranding:RebrandingPopupViewModel}"
-                          Style="{StaticResource BasePopupWindowStyle}">
-    <resource:BasePopupWindow.Resources>
+                          Style="{StaticResource BaseWindowStyle}">
+    <resource:BaseModalWindow.Resources>
         <Style x:Key="ItemTitle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="16" />
             <Setter Property="Margin" Value="0,24,0,8" />
@@ -46,7 +44,7 @@ along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
             <Setter Property="Foreground" Value="{StaticResource TextWeakBrushColor}" />
             <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
-    </resource:BasePopupWindow.Resources>
+    </resource:BaseModalWindow.Resources>
     <StackPanel HorizontalAlignment="Center"
                 Margin="64">
         <Image Source="pack://application:,,,/ProtonVPN.Resource;component/Graphics/Images/brand-logo-box.png"
@@ -74,4 +72,4 @@ along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
                 Command="{Binding CloseCommand}"
                 Content="{translations:Loc Modals_Rescope_btn_GotIt}" />
     </StackPanel>
-</resource:BasePopupWindow>
+</resource:BaseModalWindow>

src/ProtonVPN.App/Windows/Popups/FreeRescope/FreeRescopePopupView.xaml.cs src/ProtonVPN.App/Modals/FreeRescopeModalView.xaml.cs

@@ -17,11 +17,11 @@
  * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace ProtonVPN.Windows.Popups.FreeRescope
+namespace ProtonVPN.Modals
 {
-    public partial class FreeRescopePopupView
+    public partial class FreeRescopeModalView
     {
-        public FreeRescopePopupView()
+        public FreeRescopeModalView()
         {
             InitializeComponent();
         }

src/ProtonVPN.App/Windows/Popups/FreeRescope/FreeRescopePopupViewModel.cs src/ProtonVPN.App/Modals/FreeRescopeModalViewModel.cs

@@ -17,12 +17,9 @@
  * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace ProtonVPN.Windows.Popups.FreeRescope
+namespace ProtonVPN.Modals
 {
-    public class FreeRescopePopupViewModel : BasePopupViewModel
+    public class FreeRescopeModalViewModel : BaseModalViewModel
     {
-        public FreeRescopePopupViewModel(AppWindow appWindow) : base(appWindow)
-        {
-        }
     }
 }

src/ProtonVPN.App/Modals/Welcome/WelcomeModalManager.cs

@@ -27,7 +27,6 @@
 using ProtonVPN.Core.Settings;
 using ProtonVPN.Core.Windows.Popups;
 using ProtonVPN.Modals.Upsell;
-using ProtonVPN.Windows.Popups.FreeRescope;
 using ProtonVPN.Windows.Popups.Offers;
 using ProtonVPN.Windows.Popups.Rebranding;
 
@@ -75,19 +74,19 @@ public void Load()
             }
             else if (IsToShowFreeRescopePopup)
             {
-                ShowFreeRescopePopup();
+                ShowFreeRescopeModal();
             }
             else if (!user.Paid() && !_userStorage.GetUser().IsDelinquent())
             {
                 ShowUpsellModal();
             }
         }
 
-        private void ShowFreeRescopePopup()
+        private async void ShowFreeRescopeModal()
         {
             if (_appSettings.WelcomeModalShown)
             {
-                _popupWindows.Show<FreeRescopePopupViewModel>();
+                await _modals.ShowAsync<FreeRescopeModalViewModel>();
                 _appSettings.IsFreeRescopeModalDisplayed = true;
             }
         }
@@ -157,7 +156,7 @@ public void OnAppSettingsChanged(PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(IAppSettings.FeatureFreeRescopeEnabled) && IsToShowFreeRescopePopup)
             {
-                ShowFreeRescopePopup();
+                ShowFreeRescopeModal();
             }
         }
     }

src/ProtonVPN.App/Sidebar/Countries.xaml

@@ -466,7 +466,9 @@ along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
                                             Height="20" />
                                 <TextBlock x:Name="CountryLabel"
                                            Text="{Binding Name}"
+                                           FontSize="16"
                                            Style="{StaticResource CountrySeparator}"
+                                           Foreground="{StaticResource TextNormBrushColor}"
                                            TextTrimming="CharacterEllipsis" />
                             </DockPanel>
                             <Button Style="{StaticResource SidebarCountryConnectButton}"

src/ProtonVPN.App/Views/Controls/UpsellBanner.xaml

@@ -42,6 +42,7 @@ along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
                 </Grid.ColumnDefinitions>
                 <Image Grid.Column="0"
                        Width="48"
+                       VerticalAlignment="Top"
                        Source="{Binding ImagePath, ElementName=UserControl, TargetNullValue={x:Null}}" />
                 <TextBlock Grid.Column="1"
                            Text="{Binding Title, ElementName=UserControl}"

src/ProtonVPN.Core/Servers/ServerUpdater.cs

@@ -25,7 +25,6 @@
 using ProtonVPN.Api.Contracts.Servers;
 using ProtonVPN.Common.Configuration;
 using ProtonVPN.Common.Extensions;
-using ProtonVPN.Common.Networking;
 using ProtonVPN.Common.Threading;
 using ProtonVPN.Core.Auth;
 using ProtonVPN.Core.Servers.FileStoraging;
@@ -42,7 +41,6 @@ public class ServerUpdater : IServerUpdater, ILoggedInAware, ILogoutAware, ISett
         private readonly SingleAction _updateAction;
         private readonly IAppSettings _appSettings;
 
-        private VpnProtocol _lastVpnProtocol;
         private bool _firstTime = true;
 
         public ServerUpdater(
@@ -72,7 +70,6 @@ public ServerUpdater(
         public void OnUserLoggedIn()
         {
             _timer.Start();
-            _lastVpnProtocol = _appSettings.GetProtocol();
         }
 
         public void OnUserLoggedOut()
@@ -141,12 +138,9 @@ private void InvokeServersUpdated()
 
         public void OnAppSettingsChanged(PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(IAppSettings.OvpnProtocol) &&
-                _lastVpnProtocol == VpnProtocol.WireGuard && _appSettings.GetProtocol() != VpnProtocol.WireGuard ||
-                _lastVpnProtocol != VpnProtocol.WireGuard && _appSettings.GetProtocol() == VpnProtocol.WireGuard)
+            if (e.PropertyName == nameof(IAppSettings.FeatureFreeRescopeEnabled))
             {
                 _updateAction.Run();
-                _lastVpnProtocol = _appSettings.GetProtocol();
             }
         }
     }