Fix stash tabs being appended to the list instead of replacing the list

Author: zemoto

EnhancePoE/Model/ApiAdapter.cs

@@ -19,9 +19,7 @@ public static class ApiAdapter
       public static bool FetchError { get; set; }
       public static bool FetchingDone { get; set; }
 
-      public static List<StashTab> StashTabList { get; private set; }
-
-      public static async Task<bool> GenerateUri()
+      public static async Task<List<StashTab>> FetchStashTabs()
       {
          FetchError = false;
          FetchingDone = false;
@@ -34,30 +32,21 @@ public static async Task<bool> GenerateUri()
 
             if ( await GetProps( accName, league ) && !FetchError )
             {
-               StashTabList = PropsList.tabs.ConvertAll( x => new StashTab( x.n, x.i ) );
-               GenerateStashtabUris( accName, league );
-               return true;
+               var stashTabs = PropsList.tabs.ConvertAll( x => new StashTab( x.n, x.i ) );
+               for ( int i = 0; i < stashTabs.Count; i++ )
+               {
+                  stashTabs[i].StashTabUri = new Uri( $"https://www.pathofexile.com/character-window/get-stash-items?accountName={accName}&tabIndex={i}&league={league}" );
+               }
+
+               return stashTabs;
             }
          }
          else
          {
             _ = MessageBox.Show( "Missing Settings!" + Environment.NewLine + "Please set Accountname, Stash Tab and League." );
          }
          IsFetching = false;
-         return false;
-      }
-
-      private static void GenerateStashtabUris( string accName, string league )
-      {
-         if ( StashTabList is null )
-         {
-            return;
-         }
-
-         for ( int i = 0; i < StashTabList.Count; i++ )
-         {
-            StashTabList[i].StashTabUri = new Uri( $"https://www.pathofexile.com/character-window/get-stash-items?accountName={accName}&tabIndex={i}&league={league}" );
-         }
+         return null;
       }
 
       private static async Task<bool> GetProps( string accName, string league )

EnhancePoE/View/MainWindow.xaml.cs

@@ -305,31 +305,37 @@ private async Task LoadStashTabsAsync()
          StashTabComboBox.IsEnabled = false;
 
          SelectedStashTab = null;
-         if ( await ApiAdapter.GenerateUri() )
+         var stashTabs = await ApiAdapter.FetchStashTabs();
+         if ( stashTabs is not null )
          {
-            foreach ( var stashTab in ApiAdapter.StashTabList )
+            StashTabList.Clear();
+            foreach ( var tab in stashTabs )
             {
-               StashTabList.Add( stashTab );
+               StashTabList.Add( tab );
             }
-         }
 
-         if ( StashTabList.Count > 0 )
-         {
-            var selectedStashTabName = Properties.Settings.Default.SelectedStashTabName;
-            if ( !string.IsNullOrEmpty( selectedStashTabName ) )
+            if ( stashTabs.Count > 0 )
             {
-               var previouslySelectedStashTab = StashTabList.FirstOrDefault( x => x.TabName == selectedStashTabName );
-               if ( previouslySelectedStashTab is not null )
+               var selectedStashTabName = Properties.Settings.Default.SelectedStashTabName;
+               if ( !string.IsNullOrEmpty( selectedStashTabName ) )
                {
-                  SelectedStashTab = previouslySelectedStashTab;
+                  var previouslySelectedStashTab = StashTabList.FirstOrDefault( x => x.TabName == selectedStashTabName );
+                  if ( previouslySelectedStashTab is not null )
+                  {
+                     SelectedStashTab = previouslySelectedStashTab;
+                  }
                }
-            }
 
-            if ( SelectedStashTab is null )
-            {
-               SelectedStashTab = StashTabList[0];
+               if ( SelectedStashTab is null )
+               {
+                  SelectedStashTab = StashTabList[0];
+               }
             }
          }
+         else
+         {
+            _ = MessageBox.Show( "Failed to fetch stash tabs", "Request Failed", MessageBoxButton.OK, MessageBoxImage.Error );
+         }
 
          FetchStashTabsButton.IsEnabled = true;
          StashTabComboBox.IsEnabled = true;