Merge pull request #1896 from overleaf/as-remove-v1-return-message-flag

Remove unused v1-return-message feature flag

GitOrigin-RevId: c8ffe88fc3294ec207ad8888254ee8d4b95cde05

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()
   })
 

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':

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