Merge remote-tracking branch 'origin/develop' into develop

Author: Weblate

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');
         }

res/img/feather-icons/gift.svg

@@ -26,7 +26,6 @@ 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 +66,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 +78,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();

src/components/views/context_menus/TopLeftMenu.js

@@ -1222,7 +1222,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>",