Fixes

typefully · Oct 23, 2023 · ae1d7ec · ae1d7ec
1 parent 78fd0d0
commit ae1d7ec
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/bundle/chrome.zip b/bundle/chrome.zip
diff --git a/bundle/firefox.zip b/bundle/firefox.zip
diff --git a/popup/components/sections/NavigationSection.js b/popup/components/sections/NavigationSection.js
@@ -20,6 +20,7 @@ import {
   KeyUnreadCountBadge,
   KeyVerifiedOrgsButton,
   KeyXPremiumButton,
+  defaultPreferences,
 } from "../../../storage-keys";
 import SectionLabel from "../ui/SectionLabel";
 
@@ -171,12 +172,12 @@ const TypefullyGrow = () => (
 );
 
 const NavigationSection = () => {
-  const showLabels = useStorageValue(KeyNavigationButtonsLabels);
-  const [labelsShown, setLabelsShown] = useState(false);
+  const initialShowLabels = useStorageValue(KeyNavigationButtonsLabels);
+  const [labelsShown, setLabelsShown] = useState(defaultPreferences[KeyNavigationButtonsLabels] === "on");
 
   useEffect(() => {
-    setLabelsShown(showLabels);
-  }, [showLabels]);
+    setLabelsShown(initialShowLabels === "on");
+  }, [initialShowLabels]);
 
   return (
     <section className="flex flex-col gap-y-2">

diff --git a/popup/components/ui/SwitchControl.js b/popup/components/ui/SwitchControl.js
@@ -1,13 +1,12 @@
 import * as SwitchPrimitive from "@radix-ui/react-switch";
 import { styled } from "@stitches/react";
-
 import useStorageKeyState from "../../utilities/useStorageKeyState";
 
 export default function SwitchControl({ label, disabled, storageKey, onChange }) {
   const [checked, setChecked, loaded] = useStorageKeyState(storageKey);
 
   return (
-    <div className={"flex items-center justify-between w-full" + (disabled ? " opacity-50 pointer-events-none" : "")}>
+    <div className={"flex items-center justify-between w-full" + (disabled ? " opacity-40 pointer-events-none" : "")}>
       <label htmlFor={storageKey} className="text-[15px] font-medium">
         {label}
       </label>

diff --git a/popup/utilities/useStorageKeyState.js b/popup/utilities/useStorageKeyState.js
@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState } from "react";
+import { defaultPreferences } from "../../storage-keys";
 import { getStorage, setStorage } from "./chromeStorage";
 
 export default function useStorageKeyState(storageKey) {
@@ -44,7 +45,7 @@ export default function useStorageKeyState(storageKey) {
 }
 
 export function useStorageValue(storageKey) {
-  const [value, setValue] = useState(null);
+  const [value, setValue] = useState(defaultPreferences[storageKey]);
 
   useEffect(() => {
     const getInitialState = async () => {