Refactor: Make CloseAllDialogs async

src/Files.App/App.xaml.cs

@@ -234,7 +234,7 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 				!Process.GetProcessesByName("Files").Any(x => x.Id != Environment.ProcessId))
 			{
 				// Close open content dialogs
-				UIHelpers.CloseAllDialogs();
+				await UIHelpers.CloseAllDialogs();
 
 				// Close all notification banners except in progress
 				statusCenterViewModel.RemoveAllCompletedItems();

src/Files.App/Helpers/UI/UIHelpers.cs

@@ -90,16 +90,24 @@ private static ContentDialog SetContentDialogRoot(ContentDialog contentDialog)
 			return contentDialog;
 		}
 
-		public static void CloseAllDialogs()
+		public static async Task CloseAllDialogs()
 		{
 			if (MainWindow.Instance?.Content?.XamlRoot == null)
 				return;
 
 			var openedDialogs = VisualTreeHelper.GetOpenPopupsForXamlRoot(MainWindow.Instance.Content.XamlRoot);
-
+			var closingTasks = new List<Task>();
 			foreach (var item in openedDialogs)
+			{
 				if (item.Child is ContentDialog dialog)
+				{
+					var tcs = new TaskCompletionSource();
+					dialog.Closed += (s, e) => tcs.SetResult();
 					dialog.Hide();
+					closingTasks.Add(tcs.Task);
+				}
+			}
+			await Task.WhenAll(closingTasks);
 		}
 
 		private static IEnumerable<IconFileInfo> SidebarIconResources = LoadSidebarIconResources();

src/Files.App/Utils/Git/GitHelpers.cs

@@ -931,7 +931,7 @@ public static async Task CloneRepoAsync(string repoUrl, string repoName, string
 
 			if (!string.IsNullOrEmpty(errorMessage))
 			{
-				UIHelpers.CloseAllDialogs();
+				await UIHelpers.CloseAllDialogs();
 				await Task.Delay(500);
 				await DynamicDialogFactory.ShowFor_CannotCloneRepo(errorMessage);
 			}

src/Files.App/ViewModels/Settings/AboutViewModel.cs

@@ -108,7 +108,7 @@ private async Task<bool> OpenLogLocation()
 
 			// Close the settings dialog if Files is the deault file manager
 			if (!string.IsNullOrEmpty(command) && command.Contains("Files.App.Launcher.exe"))
-				UIHelpers.CloseAllDialogs();
+				await UIHelpers.CloseAllDialogs();
 
 			return true;
 		}

src/Files.App/ViewModels/Settings/AdvancedViewModel.cs

@@ -187,7 +187,7 @@ private async Task ImportSettingsAsync()
 			catch (Exception ex)
 			{
 				App.Logger.LogWarning(ex, "Error importing settings");
-				UIHelpers.CloseAllDialogs();
+				await UIHelpers.CloseAllDialogs();
 				await DialogDisplayHelper.ShowDialogAsync(Strings.SettingsImportErrorTitle.GetLocalizedResource(), Strings.SettingsImportErrorDescription.GetLocalizedResource());
 			}
 		}

src/Files.App/ViewModels/Settings/DevToolsViewModel.cs

@@ -130,7 +130,7 @@ public void DoRemoveCredentials()
 
 		public async void DoConnectToGitHubAsync()
 		{
-			UIHelpers.CloseAllDialogs();
+			await UIHelpers.CloseAllDialogs();
 
 			await Task.Delay(500);