From 55ccaf33cd8dc0e60bf2bd7b6f1b67fe99d42d17 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 29 Sep 2016 23:25:22 +0900
Subject: [PATCH 1/4] Fix the app window pops up second to foreground when a
 new message is received

---
 CHANGELOG.md          | 11 +++++++++++
 src/browser/index.jsx |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ecf682a..68f0cfad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Mattermost Desktop Application Changelog
 
+## Release v3.4.1
+
+Release date: TBD
+
+### Bug Fixes
+
+#### macOS
+ - Fixed an issue where the app window pops up second to foreground when a new message is received
+
+----
+
 ## Release v3.4.0
 
 Release date: September 22, 2016
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 11f45396..b12f9437 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -113,8 +113,10 @@ var MainPage = React.createClass({
       }
     });
   },
-  componentDidUpdate: function() {
-    this.refs[`mattermostView${this.state.key}`].focusOnWebView();
+  componentDidUpdate: function(prevProps, prevState) {
+    if (prevState.key !== this.state.key) { // i.e. When tab has been changed
+      this.refs[`mattermostView${this.state.key}`].focusOnWebView();
+    }
   },
   handleSelect: function(key) {
     const newKey = (this.props.teams.length + key) % this.props.teams.length;

From 73583b9675511ebad65f8f4b241b5c743c1c6ceb Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Sat, 1 Oct 2016 01:10:01 +0900
Subject: [PATCH 2/4] Use naming "OS X" to be consistent with v3.4.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68f0cfad..7644bec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ Release date: TBD
 
 ### Bug Fixes
 
-#### macOS
+#### OS X
  - Fixed an issue where the app window pops up second to foreground when a new message is received
 
 ----

From 84c8c7e2d6279a31588a9b52541e10c0df83fce0 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Fri, 30 Sep 2016 23:33:13 +0900
Subject: [PATCH 3/4] Update version to 3.4.1

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

diff --git a/package.json b/package.json
index b20ac4b4..75d0ee83 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mattermost",
   "productName": "Mattermost",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {
diff --git a/src/package.json b/src/package.json
index 07eea3f5..1fccbefa 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "mattermost",
   "productName": "Mattermost",
   "desktopName": "Mattermost.desktop",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {

From 60aacd872519293f156b30851e53dd42325fc751 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Sat, 1 Oct 2016 01:15:34 +0900
Subject: [PATCH 4/4] Set release date for v3.4.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7644bec0..db602724 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Release v3.4.1
 
-Release date: TBD
+Release date: September 30, 2016
 
 ### Bug Fixes