feildmaster
diff --git a/‎src/base/vanilla/quest.highlight.js‎
Lines changed: 6 additions & 3 deletions b/‎src/base/vanilla/quest.highlight.js‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎src/utils/elementHelper.js‎
Lines changed: 5 additions & 0 deletions b/‎src/utils/elementHelper.js‎
Lines changed: 5 additions & 0 deletions
@@ -5,6 +5,9 @@ settings.register({
 
 (() => {
   if (settings.value('underscript.disable.questHighlight')) return;
+  const questSelector = 'input[type="submit"][value="Claim"]:not(:disabled)';
+
+  eventManager.on('jQuery', () => $el.removeClass(document.querySelectorAll('.yellowLink'), 'yellowLink'));
   style.add('a.highlightQuest {color: gold !important;}');
 
   function highlightQuest() {
@@ -21,12 +24,12 @@ settings.register({
     function checkHighlight() {
       axios.get('/Quests').then(function (response) {
         const data = $(response.data);
-        const quests = data.find('input[name="dailyQuest"]:not(:disabled)');
+        const quests = data.find(questSelector);
         if (quests.length) {
           localStorage.setItem('underscript.quest.clear', true);
           if (onPage('Game')) {
             let questsCleared = '';
-            quests.each((i, e) => questsCleared += `- ${$(e).parent().text().trim()}\n`);
+            quests.each((i, e) => questsCleared += `- ${$(e).parentsUntil('tbody', 'tr').find('span.descEN').text()}\n`);
             fn.toast({
               title: 'Quest Completed!',
               text: `${questsCleared}Click to go to Quests page`,
@@ -63,7 +66,7 @@ settings.register({
       }
     }
 
-    if (onPage('Quests') && !$('input[name="dailyQuest"]:not(:disabled)').length) {
+    if (onPage('Quests') && !$(questSelector).length) {
       clearHighlight();
     }
 
 
@@ -1,4 +1,8 @@
 const $el = (() => {
+  function removeClass(el, className) {
+    el.forEach((e) => e.classList.remove(className))
+  }
+
   function containsText(el, text, {mutex, single} = {}) {
     if (el.forEach) {
       const ret = [];
@@ -41,6 +45,7 @@ const $el = (() => {
     return el.innerHTML;
   }
   return {
+    removeClass,
     text: {
       contains: containsText,
       set: setText,