From acb4a3c148c103f2adbbdc15f42398c378b6cd3d Mon Sep 17 00:00:00 2001
From: arunbhardwaj <arun.b.95@gmail.com>
Date: Thu, 18 Apr 2024 15:40:30 -0400
Subject: [PATCH] fixes issue with new site layout breaking functionality

---
 scripts/leetcode.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/scripts/leetcode.js b/scripts/leetcode.js
index 82273ffc..2764b8c6 100644
--- a/scripts/leetcode.js
+++ b/scripts/leetcode.js
@@ -658,9 +658,9 @@ LeetCodeV2.prototype.init = async function () {
   async function getSubmissionId() {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
-        const submissionId = document.URL.match(/\/(\d+)\/?$/)[1]; // '/problems/two-sum/post-solution?submissionId=999594717'
-        resolve(submissionId);
-      }, 100);
+        const submissionId = document.URL.match(/\/(\d+)\/?$/)[1]; // '/problems/two-sum/submissions/1180327225/'
+        resolve(submissionId); 
+      }, 300);
     });
   }
   const submissionId = await getSubmissionId();
@@ -871,11 +871,11 @@ LeetCodeV2.prototype.insertToAnchorElement = function (elem) {
     //   }
     return;
   }
-
-  if (checkElem(document.getElementsByClassName('ml-auto flex items-center space-x-4'))) {
-    const target = document.getElementsByClassName('ml-auto flex items-center space-x-4')[0];
+  // TODO: target within the Run and Submit div regardless of UI position of submit button
+  let target = document.querySelector('[data-e2e-locator="console-submit-button"]').parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.childNodes
+  if (checkElem(target)) {
     elem.className = 'runcode-wrapper__8rXm';
-    if (target.childNodes.length > 0) target.childNodes[0].prepend(elem);
+    target[0].appendChild(elem);
   }
 };
 LeetCodeV2.prototype.markUploaded = function () {
@@ -1046,12 +1046,15 @@ const observer = new MutationObserver(function (_mutations, observer) {
     observer.disconnect();
 
     const leetCode = new LeetCodeV2();
-    v2SubmitBtn.addEventListener('click', () => loader(leetCode));
-    textarea.addEventListener('keydown', e => submitByShortcuts(e, leetCode));
+    if (!!!v2SubmitBtn.onclick) {
+      v2SubmitBtn.onclick = () => loader(leetCode);
+      textarea.addEventListener('keydown', e => submitByShortcuts(e, leetCode));
+    }
   }
 });
 
+// Submission location
 observer.observe(document.body, {
   childList: true,
   subtree: true,
-});
\ No newline at end of file
+});