From c1a998fa1f026ea7727c34d585496c43111c5c14 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Mon, 14 Nov 2022 19:13:05 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/main' into release/2.10 (#1853) # Conflicts: # DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs --- .../DesignViewModels/DesignSavedStreamsViewModel.cs | 4 ---- DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs index 9ed2d37591..d3fe3b3f57 100644 --- a/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs +++ b/DesktopUI2/DesktopUI2/ViewModels/DesignViewModels/DesignSavedStreamsViewModel.cs @@ -107,10 +107,6 @@ public void CancelSendOrReceiveCommand() } - public void CloseNotificationCommand() - { - - } public void OpenReportCommand() { diff --git a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs index 52c738da7c..70f3c7151a 100644 --- a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs +++ b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs @@ -1082,6 +1082,13 @@ public void ClearSearchCommand() } + public void ShareCommand() + { + MainViewModel.RouterInstance.Navigate.Execute(new CollaboratorsViewModel(HostScreen, this)); + + Analytics.TrackEvent(Analytics.Events.DUIAction, new Dictionary() { { "name", "Share Open" } }); + } + public void EditSavedStreamCommand() { MainViewModel.RouterInstance.Navigate.Execute(this);