Merge remote-tracking branch 'origin/main' into release/2.10 (#1853)

# Conflicts: # DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
specklesystems · Nov 14, 2022 · c1a998f · c1a998f
1 parent 663142e
commit c1a998f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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<string, object>() { { "name", "Share Open" } });
+    }
+
     public void EditSavedStreamCommand()
     {
       MainViewModel.RouterInstance.Navigate.Execute(this);
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,10 +107,6 @@ public void CancelSendOrReceiveCommand() @@
         }
-        public void CloseNotificationCommand()
-        {
-        }
         public void OpenReportCommand()
         {
@@ Expand Down @@