From 3007cddce92f68cbcb8ee0726bba4d23c62caba3 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Tue, 24 May 2022 10:04:56 +0200
Subject: [PATCH 1/3] add reset settings option

---
 public/_locales/en/messages.json |  9 +++++++++
 public/options/options.html      |  8 ++++++++
 src/config.ts                    |  8 +++++++-
 src/options.ts                   | 20 +++++++++++++++-----
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index c2782048..11a3d609 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -947,5 +947,14 @@
     },
     "openOptionsPage": {
         "message": "Open options page"
+    },
+    "resetToDefault": {
+        "message": "Reset to default"
+    },
+    "confirmResetToDefault": {
+        "message": "Are you sure you want to reset all settings to their default values? This cannot be undone."
+    },
+    "whatResetToDefault": {
+       "message": "This resets all settings to their default values." 
     }
 }
diff --git a/public/options/options.html b/public/options/options.html
index 4f2bd730..2d6885bb 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -368,6 +368,14 @@
 					</div>
 				</div>
 
+				<div data-type="button-press" data-sync="resetToDefault" data-confirm-message="confirmResetToDefault">
+					<div class="option-button trigger-button">
+						__MSG_resetToDefault__
+					</div>
+	
+					<div class="small-description">__MSG_whatResetToDefault__</div>
+				</div>
+
 			</div>
 
 			<div id="advanced" class="option-group hidden">
diff --git a/src/config.ts b/src/config.ts
index c1c6d17e..52c9f45a 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -113,6 +113,7 @@ export interface SBObject {
     local: SBStorage;
     forceSyncUpdate(prop: string): void;
     forceLocalUpdate(prop: string): void;
+    resetToDefault(): void;
 }
 
 const Config: SBObject = {
@@ -289,7 +290,8 @@ const Config: SBObject = {
     config: null,
     local: null,
     forceSyncUpdate,
-    forceLocalUpdate
+    forceLocalUpdate,
+    resetToDefault
 };
 
 // Function setup
@@ -522,6 +524,10 @@ function addDefaults() {
     }
 }
 
+function resetToDefault() {
+    chrome.storage.sync.set(Config.syncDefaults);
+}
+
 // Sync config
 setupConfig();
 
diff --git a/src/options.ts b/src/options.ts
index b0245c6b..a1ddc234 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -232,12 +232,22 @@ async function init() {
             }
             case "button-press": {
                 const actionButton = optionsElements[i].querySelector(".trigger-button");
+                const confirmMessage = optionsElements[i].getAttribute("data-confirm-message");
 
-                switch(optionsElements[i].getAttribute("data-sync")) {
-                    case "copyDebugInformation":
-                        actionButton.addEventListener("click", copyDebugOutputToClipboard);
-                        break;
-                }
+                actionButton.addEventListener("click", () => {
+                    if (confirmMessage !== null && !confirm(chrome.i18n.getMessage(confirmMessage))) {
+                        return;
+                    }
+                    switch (optionsElements[i].getAttribute("data-sync")) {
+                        case "copyDebugInformation":
+                            copyDebugOutputToClipboard();
+                            break;
+                        case "resetToDefault":
+                            Config.resetToDefault();
+                            window.location.reload();
+                            break;
+                    }
+                });
 
                 break;
             }

From f8fecf5174a6c9ee67a68fee07644a2c213a108d Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 24 May 2022 12:50:39 -0400
Subject: [PATCH 2/3] Remove redundant explanation

---
 public/_locales/en/messages.json | 5 +----
 public/options/options.html      | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index 11a3d609..52def784 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -949,12 +949,9 @@
         "message": "Open options page"
     },
     "resetToDefault": {
-        "message": "Reset to default"
+        "message": "Reset settings to default"
     },
     "confirmResetToDefault": {
         "message": "Are you sure you want to reset all settings to their default values? This cannot be undone."
-    },
-    "whatResetToDefault": {
-       "message": "This resets all settings to their default values." 
     }
 }
diff --git a/public/options/options.html b/public/options/options.html
index 2d6885bb..e23be2ab 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -372,8 +372,6 @@
 					<div class="option-button trigger-button">
 						__MSG_resetToDefault__
 					</div>
-	
-					<div class="small-description">__MSG_whatResetToDefault__</div>
 				</div>
 
 			</div>

From d992cc7a3c621f435ac01544697ed57f77eccc60 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 24 May 2022 12:55:17 -0400
Subject: [PATCH 3/3] Don't reset everything

---
 src/config.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/config.ts b/src/config.ts
index 52c9f45a..03ebbaf0 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -525,7 +525,13 @@ function addDefaults() {
 }
 
 function resetToDefault() {
-    chrome.storage.sync.set(Config.syncDefaults);
+    chrome.storage.sync.set({
+        ...Config.syncDefaults,
+        userID: Config.config.userID,
+        minutesSaved: Config.config.minutesSaved,
+        skipCount: Config.config.skipCount,
+        sponsorTimesContributed: Config.config.sponsorTimesContributed
+    });
 }
 
 // Sync config