From 14c176a83213552d6cdc0e74961f0e30f9ebf3fd Mon Sep 17 00:00:00 2001
From: Simon Detheridge <gh2k@users.noreply.github.com>
Date: Tue, 25 Jun 2019 12:07:39 +0100
Subject: [PATCH] Merge pull request #1896 from
 overleaf/as-remove-v1-return-message-flag

Remove unused v1-return-message feature flag

GitOrigin-RevId: c8ffe88fc3294ec207ad8888254ee8d4b95cde05
---
 .../app/src/infrastructure/ExpressLocals.js   |  4 ----
 .../web/app/src/infrastructure/Features.js    |  6 -----
 services/web/app/views/project/list.pug       | 23 -------------------
 3 files changed, 33 deletions(-)

diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index e9e147b29e..9ab0a49283 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -134,10 +134,6 @@ module.exports = function(app, webRouter, privateApiRouter, publicApiRouter) {
     res.locals.externalAuthenticationSystemUsed =
       Features.externalAuthenticationSystemUsed
     req.hasFeature = res.locals.hasFeature = Features.hasFeature
-    res.locals.userIsFromOLv1 = user =>
-      (user.overleaf != null ? user.overleaf.id : undefined) != null
-    res.locals.userIsFromSL = user =>
-      (user.overleaf != null ? user.overleaf.id : undefined) == null
     return next()
   })
 
diff --git a/services/web/app/src/infrastructure/Features.js b/services/web/app/src/infrastructure/Features.js
index 940194bd05..2c8eb95339 100644
--- a/services/web/app/src/infrastructure/Features.js
+++ b/services/web/app/src/infrastructure/Features.js
@@ -35,12 +35,6 @@ module.exports = Features = {
         return Settings.enableGithubSync
       case 'git-bridge':
         return Settings.enableGitBridge
-      case 'v1-return-message':
-        return (
-          Settings.accountMerge != null &&
-          Settings.overleaf != null &&
-          !Settings.forceImportToV2
-        )
       case 'custom-togglers':
         return Settings.overleaf != null
       case 'oauth':
diff --git a/services/web/app/views/project/list.pug b/services/web/app/views/project/list.pug
index bf04422188..9e4f22c51d 100644
--- a/services/web/app/views/project/list.pug
+++ b/services/web/app/views/project/list.pug
@@ -84,29 +84,6 @@ block content
 						aside.project-list-sidebar
 							include ./list/side-bar
 
-						if hasFeature('v1-return-message')
-							.project-list-sidebar-v2-pane(ng-controller="OverleafV1NotificationController")
-								div
-									button.btn-link.pull-right.project-list-sidebar-v2-pane-toggle(
-										ng-click="toggle()"
-									)
-										i.fa.fa-fw(ng-class="{ 'fa-chevron-up': !visible, 'fa-close': visible }" aria-hidden="true")
-										span.sr-only(ng-non-bindable) Toggle welcome to #{settings.appName} message
-									| Welcome to Overleaf v2!
-								div(ng-show="visible") #[a(href="https://www.overleaf.com/help/342-overleaf-v2-faq") Find out more].
-								if userIsFromOLv1(user)
-									div(ng-show="visible")
-										| To tag or rename your v1 projects, please go back to Overleaf v1.
-									div(ng-show="visible")
-										a.project-list-sidebar-v1-link(
-											href='/sign_in_to_v1?return_to=/dash%3Fprefer-v1-dash%3D1'
-										) Go back to v1
-								if userIsFromSL(user)
-									div(ng-show="visible")
-										a.project-list-sidebar-v1-link(
-											href=settings.accountMerge.sharelatexHost
-										) Go back to ShareLaTeX
-
 					.project-list-main.col-md-10.col-xs-9
 						include ./list/notifications
 						include ./list/project-list