From 0f594db5a9925500262e65b99e26a694f6d3d6dd Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Thu, 23 Sep 2021 11:47:48 +0200
Subject: [PATCH] Merge pull request #5137 from
 overleaf/jpa-contact-form-selector

[web] contact-form: swap the element selector for the open form trigger

GitOrigin-RevId: f4d5c437fc2021d7559f5948350c13e5cb847e11
---
 .../web/app/views/general/account-merge-error.pug    |  4 ++--
 .../web/frontend/js/features/contact-form/index.js   | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/services/web/app/views/general/account-merge-error.pug b/services/web/app/views/general/account-merge-error.pug
index 44ee6b1511..795f69c2fa 100644
--- a/services/web/app/views/general/account-merge-error.pug
+++ b/services/web/app/views/general/account-merge-error.pug
@@ -1,4 +1,4 @@
-extends ../layout
+extends ../layout-marketing
 
 block content
 	main.content.content-alt#main-content
@@ -8,4 +8,4 @@ block content
 					.card
 						.page-header
 							h1 Account Access Error
-						p.text-danger Sorry, an error occurred accessing your account. Please #[a(href="" ng-controller="ContactModal" ng-click="contactUsModal()") contact support] and provide any email addresses that you have used to sign in to Overleaf and/or ShareLaTeX for assistance.
+						p.text-danger Sorry, an error occurred accessing your account. Please #[a(href="" data-ol-open-contact-form-modal="contact-us") contact support] and provide any email addresses that you have used to sign in to Overleaf and/or ShareLaTeX for assistance.
diff --git a/services/web/frontend/js/features/contact-form/index.js b/services/web/frontend/js/features/contact-form/index.js
index 55ab27a34d..df3b307ff5 100644
--- a/services/web/frontend/js/features/contact-form/index.js
+++ b/services/web/frontend/js/features/contact-form/index.js
@@ -4,12 +4,14 @@ document
   .querySelectorAll('[data-ol-contact-form-with-search]')
   .forEach(setupSearch)
 
-document.querySelectorAll('a[ng-click="contactUsModal()"]').forEach(el => {
-  el.addEventListener('click', function (e) {
-    e.preventDefault()
-    $('[data-ol-contact-form-modal="contact-us"]').modal()
+document
+  .querySelectorAll('[data-ol-open-contact-form-modal="contact-us"]')
+  .forEach(el => {
+    el.addEventListener('click', function (e) {
+      e.preventDefault()
+      $('[data-ol-contact-form-modal="contact-us"]').modal()
+    })
   })
-})
 
 document
   .querySelectorAll('[data-ol-open-contact-form-modal="general"]')