From 7845a6350655bf4c1fc01676390968ab4206f3dd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 14 Feb 2019 15:53:52 +0000
Subject: [PATCH 1/2] Remove 'welcome' from top-left menu

Tjis is quite confusing as the welcome page is designed for when
you're not logged in, ie. has a sign-in button. There's also no way
to get back into the app so it really looks like it's logged you
out.

Reverts 116367fd69
---
 res/css/views/context_menus/_TopLeftMenu.scss     |  4 ----
 res/img/feather-icons/gift.svg                    |  1 -
 src/components/views/context_menus/TopLeftMenu.js | 10 ----------
 src/i18n/strings/en_EN.json                       |  1 -
 4 files changed, 16 deletions(-)
 delete mode 100644 res/img/feather-icons/gift.svg

diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss
index b3ef7031444..272a8820513 100644
--- a/res/css/views/context_menus/_TopLeftMenu.scss
+++ b/res/css/views/context_menus/_TopLeftMenu.scss
@@ -31,10 +31,6 @@ limitations under the License.
             mask-image: url('$(res)/img/feather-icons/home.svg');
         }
 
-        li.mx_TopLeftMenu_icon_welcome::after {
-            mask-image: url('$(res)/img/feather-icons/gift.svg');
-        }
-
         li.mx_TopLeftMenu_icon_settings::after {
             mask-image: url('$(res)/img/feather-icons/settings.svg');
         }
diff --git a/res/img/feather-icons/gift.svg b/res/img/feather-icons/gift.svg
deleted file mode 100644
index c225b50f9d2..00000000000
--- a/res/img/feather-icons/gift.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" class="feather feather-gift"><polyline points="20 12 20 22 4 22 4 12"></polyline><rect x="2" y="7" width="20" height="5"></rect><line x1="12" y1="22" x2="12" y2="7"></line><path d="M12 7H7.5a2.5 2.5 0 0 1 0-5C11 2 12 7 12 7z"></path><path d="M12 7h4.5a2.5 2.5 0 0 0 0-5C13 2 12 7 12 7z"></path></svg>
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 8583f631f2e..56f5ba5c6f1 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -25,8 +25,6 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 export class TopLeftMenu extends React.Component {
     constructor() {
         super();
-        this.viewHomePage = this.viewHomePage.bind(this);
-        this.viewWelcomePage = this.viewWelcomePage.bind(this);
         this.openSettings = this.openSettings.bind(this);
         this.signIn = this.signIn.bind(this);
         this.signOut = this.signOut.bind(this);
@@ -67,9 +65,6 @@ export class TopLeftMenu extends React.Component {
 
         return <div className="mx_TopLeftMenu">
             {homePageSection}
-            <ul className="mx_TopLeftMenu_section">
-                <li className="mx_TopLeftMenu_icon_welcome" onClick={this.viewWelcomePage}>{_t("Welcome")}</li>
-            </ul>
             <ul className="mx_TopLeftMenu_section">
                 <li className="mx_TopLeftMenu_icon_settings" onClick={this.openSettings}>{_t("Settings")}</li>
             </ul>
@@ -82,11 +77,6 @@ export class TopLeftMenu extends React.Component {
         this.closeMenu();
     }
 
-    viewWelcomePage() {
-        dis.dispatch({action: 'view_welcome_page'});
-        this.closeMenu();
-    }
-
     openSettings() {
         dis.dispatch({action: 'view_user_settings'});
         this.closeMenu();
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fe41beb7ae4..ef705dab784 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1221,7 +1221,6 @@
     "View Community": "View Community",
     "Hide": "Hide",
     "Sign in": "Sign in",
-    "Welcome": "Welcome",
     "Login": "Login",
     "powered by Matrix": "powered by Matrix",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",

From 93350c43a5610e3909f21eabceb492ae58b8e194 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 14 Feb 2019 16:07:44 +0000
Subject: [PATCH 2/2] Put back this bind - it's an unrelated fix

---
 src/components/views/context_menus/TopLeftMenu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 56f5ba5c6f1..e3d8ef8d917 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -25,6 +25,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 export class TopLeftMenu extends React.Component {
     constructor() {
         super();
+        this.viewHomePage = this.viewHomePage.bind(this);
         this.openSettings = this.openSettings.bind(this);
         this.signIn = this.signIn.bind(this);
         this.signOut = this.signOut.bind(this);