From e680099cecec7754029e1ede1d6eaa6328ff5989 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Tue, 11 May 2021 01:09:01 -0400
Subject: [PATCH] Scroll to category in options page

---
 src/background.ts                            | 3 ++-
 src/components/SkipNoticeComponent.tsx       | 4 ++--
 src/components/SponsorTimeEditComponent.tsx  | 2 +-
 src/components/SubmissionNoticeComponent.tsx | 3 ++-
 src/content.ts                               | 1 -
 src/render/SubmissionNotice.tsx              | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index e44dd28a..a5b548a5 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -32,7 +32,8 @@ chrome.tabs.onUpdated.addListener(function(tabId) {
 chrome.runtime.onMessage.addListener(function (request, sender, callback) {
 	switch(request.message) {
         case "openConfig":
-            chrome.runtime.openOptionsPage();
+            console.log(chrome.runtime.getURL('permissions/index.html' + (request.hash ?  '#' + request.hash : '')))
+            chrome.tabs.create({url: chrome.runtime.getURL('options/options.html' + (request.hash ? '#' + request.hash : ''))});
             return;
         case "openHelp":
             chrome.tabs.create({url: chrome.runtime.getURL('help/index_en.html')});
diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index 74114f9f..275a94d4 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -198,7 +198,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                         </td>
                     }
 
-                    {/* Unskip Button */}
+                    {/* Unskip/Skip Button */}
                     <td className="sponsorSkipNoticeUnskipSection">
                         <button id={"sponsorSkipUnskipButton" + this.idSuffix}
                             className="sponsorSkipObject sponsorSkipNoticeButton"
@@ -424,7 +424,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         // See if show more categories was pressed
         if (event.target.value === "moreCategories") {
             // Open options page
-            chrome.runtime.sendMessage({"message": "openConfig"});
+            chrome.runtime.sendMessage({message: "openConfig", hash: event.target.value + "OptionsName"});
 
             // Reset option to original
             event.target.value = this.segments[0].category;
diff --git a/src/components/SponsorTimeEditComponent.tsx b/src/components/SponsorTimeEditComponent.tsx
index 2679a50c..81aa6844 100644
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -253,7 +253,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
             if (confirm(chrome.i18n.getMessage("enableThisCategoryFirst")
                             .replace("{0}", chrome.i18n.getMessage("category_" + chosenCategory)))) {
                 // Open options page
-                chrome.runtime.sendMessage({"message": "openConfig"});
+                chrome.runtime.sendMessage({message: "openConfig", hash: chosenCategory + "OptionsName"});
             }
             
             return;
diff --git a/src/components/SubmissionNoticeComponent.tsx b/src/components/SubmissionNoticeComponent.tsx
index c6aae60a..ea94bb85 100644
--- a/src/components/SubmissionNoticeComponent.tsx
+++ b/src/components/SubmissionNoticeComponent.tsx
@@ -12,7 +12,8 @@ export interface SubmissionNoticeProps {
 
     callback: () => unknown;
 
-    closeListener: () => void
+    closeListener: () => void;
+    smaller: boolean;
 }
 
 export interface SubmissionNoticeeState {
diff --git a/src/content.ts b/src/content.ts
index ec4ff0ed..2c13e2d3 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -734,7 +734,6 @@ async function getVideoInfo(): Promise<void> {
 }
 
 async function videoInfoFetchFailed(errorMessage: string): Promise<void> {
-    console.log("failed\t" + errorMessage)
     if (utils.isFirefox()) {
         // Attempt to ask permission for youtube.com domain
         alert(chrome.i18n.getMessage("youtubePermissionRequest"));
diff --git a/src/render/SubmissionNotice.tsx b/src/render/SubmissionNotice.tsx
index 8c267854..7b06296f 100644
--- a/src/render/SubmissionNotice.tsx
+++ b/src/render/SubmissionNotice.tsx
@@ -47,7 +47,8 @@ class SubmissionNotice {
                 contentContainer={contentContainer}
                 callback={callback} 
                 ref={this.noticeRef}
-                closeListener={() => this.close()} />,
+                closeListener={() => this.close()}
+                smaller={true} />,
             this.noticeElement
         );
     }