From dc1634308f428aa32f1618a21bb489e397063f0b Mon Sep 17 00:00:00 2001
From: Chen Asraf <chenasrafil@gmail.com>
Date: Sun, 26 Mar 2023 23:40:59 +0300
Subject: [PATCH] fix: options/popup loading/saving

---
 CHANGELOG.md          | 6 ++++++
 manifest.json         | 2 +-
 src/content_script.ts | 5 +++++
 src/options.tsx       | 5 +++++
 src/popup.tsx         | 9 +++++++--
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd6f1db..560bb83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v0.2.1
+
+### Fixes
+
+- Options & popup behavior
+
 ## v0.2.0
 
 ### Features
diff --git a/manifest.json b/manifest.json
index 2b5ed94..0b85f0e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "FP Max",
   "description": "Enhance your Floatplane experience",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "manifest_version": 3,
   "permissions": ["storage"],
   "action": {
diff --git a/src/content_script.ts b/src/content_script.ts
index 11dad03..ba77d14 100644
--- a/src/content_script.ts
+++ b/src/content_script.ts
@@ -7,6 +7,11 @@ export default function main() {
     ['saveInterval', 'lastPlayed', 'useTimestamps', 'returnToLastTime'],
     ({ useTimestamps, returnToLastTime }: Settings) => {
       // mutation observer to detect when the video is loaded
+      console.debug(
+        '🚀 | file: content_script.ts:36 | main | useTimestamps, returnToLastTime:',
+        useTimestamps,
+        returnToLastTime,
+      )
       const observer = new MutationObserver((mutations) => {
         mutations.forEach((mutation) => {
           if (returnToLastTime) {
diff --git a/src/options.tsx b/src/options.tsx
index 69da8f2..dd9172b 100644
--- a/src/options.tsx
+++ b/src/options.tsx
@@ -11,10 +11,12 @@ function OptionsApp() {
       {
         returnToLastTime: false,
         saveInterval: 5,
+        useTimestamps: true,
       },
       (items) => {
         setReturnToLastTime(items.returnToLastTime)
         setSaveInterval(items.saveInterval)
+        setUseTimestamps(items.useTimestamps)
       },
     )
   }, [])
@@ -25,6 +27,9 @@ function OptionsApp() {
   useEffect(() => {
     chrome.storage.sync.set({ saveInterval })
   }, [saveInterval])
+  useEffect(() => {
+    chrome.storage.sync.set({ useTimestamps })
+  }, [useTimestamps])
 
   return (
     <>
diff --git a/src/popup.tsx b/src/popup.tsx
index 19c844c..9f4abfa 100644
--- a/src/popup.tsx
+++ b/src/popup.tsx
@@ -10,11 +10,13 @@ function PopupApp() {
     chrome.storage.sync.get(
       {
         returnToLastTime: false,
-        saveInterval: 5,
+        saveInterval: 5000,
+        useTimestamps: true,
       },
       (items) => {
         setReturnToLastTime(items.returnToLastTime)
         setSaveInterval(items.saveInterval)
+        setUseTimestamps(items.useTimestamps)
       },
     )
   }, [])
@@ -25,10 +27,13 @@ function PopupApp() {
   useEffect(() => {
     chrome.storage.sync.set({ saveInterval })
   }, [saveInterval])
+  useEffect(() => {
+    chrome.storage.sync.set({ useTimestamps })
+  }, [useTimestamps])
 
   return (
     <>
-      <div>
+      <div style={{ width: 200 }}>
         <label>
           <input
             type="checkbox"