From a278421887ef5e8cf72b99fb34a72ed6f017cbba Mon Sep 17 00:00:00 2001
From: Troy Coutu <Autre31415@gmail.com>
Date: Tue, 24 Apr 2018 20:35:58 -0400
Subject: [PATCH 1/3] pin electron-context-menu to version 0.9.0 (#707)

---
 src/package.json | 2 +-
 src/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/package.json b/src/package.json
index 44004f4a..5988205d 100644
--- a/src/package.json
+++ b/src/package.json
@@ -12,7 +12,7 @@
     "auto-launch": "^5.0.5",
     "bootstrap": "^3.3.7",
     "create-react-class": "^15.6.3",
-    "electron-context-menu": "^0.9.0",
+    "electron-context-menu": "0.9.0",
     "electron-devtools-installer": "^2.2.3",
     "electron-is-dev": "^0.3.0",
     "electron-squirrel-startup": "^1.0.0",
diff --git a/src/yarn.lock b/src/yarn.lock
index 0ce3a614..b96c8f0e 100644
--- a/src/yarn.lock
+++ b/src/yarn.lock
@@ -137,9 +137,9 @@ dom-helpers@^3.2.0, dom-helpers@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
 
-electron-context-menu@^0.9.0:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-0.9.1.tgz#ed4df20c080491c3c996abfcb363159946a38058"
+electron-context-menu@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-0.9.0.tgz#8a66bef502f0524255a1350a2b4704dbaacfd503"
   dependencies:
     electron-dl "^1.2.0"
     electron-is-dev "^0.1.1"

From d4bd8e588c0c8e5a2d1e77702e46abac22bb9345 Mon Sep 17 00:00:00 2001
From: Troy Coutu <Autre31415@gmail.com>
Date: Tue, 24 Apr 2018 21:02:47 -0400
Subject: [PATCH 2/3] fix linting

---
 src/browser/components/TabBar.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/TabBar.jsx b/src/browser/components/TabBar.jsx
index bb77d3c3..1b5f3c23 100644
--- a/src/browser/components/TabBar.jsx
+++ b/src/browser/components/TabBar.jsx
@@ -61,7 +61,12 @@ export default class TabBar extends React.Component { // need "this"
           ref={id}
           draggable={false}
         >
-          <span title={team.name} className={unreadCount === 0 ? '' : 'teamTabItem-unread'}>{team.name}</span>
+          <span
+            title={team.name}
+            className={unreadCount === 0 ? '' : 'teamTabItem-unread'}
+          >
+            {team.name}
+          </span>
           { ' ' }
           { badgeDiv }
           {permissionOverlay}

From 495acff82bf462b169d45da7480621359b67177e Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Mon, 30 Apr 2018 20:24:33 +0900
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1bd22dd..42844548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,8 @@ Release date: TBD
 [#708](https://github.com/mattermost/desktop/issues/708)
 - Fixed an issue where the main screen opens a blank page when a tab is dropped into the screen.
 [#667](https://github.com/mattermost/desktop/issues/667)
+- Fixed "Save Image" context menu not working.
+[#707](https://github.com/mattermost/desktop/issues/707)
 
 #### Windows
 - Fixed `file://` protocol not working. But localhost URL will not continue to work.