Remove useless badly typed tryParse

LedgerHQ · Oct 6, 2022 · 60ae08a · 60ae08a
1 parent 33af91a
commit 60ae08a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/...src/renderer/screens/settings/sections/Developer/FeatureFlagsSettings/FeatureFlagEdit.tsx b/...src/renderer/screens/settings/sections/Developer/FeatureFlagsSettings/FeatureFlagEdit.tsx
@@ -11,14 +11,6 @@ import Alert from "~/renderer/components/Alert";
 
 const Switch = withV2StyleProvider(SwitchV2);
 
-const tryParse = (jsonString: string, fallback: any) => {
-  try {
-    return JSON.parse(jsonString);
-  } catch (e) {
-    return fallback;
-  }
-};
-
 const FeatureFlagEdit: React.FC<{ flagName: FeatureId; flagValue: Feature }> = props => {
   const { flagName, flagValue } = props;
   const [error, setError] = useState<Error | unknown | undefined>();
@@ -58,12 +50,15 @@ const FeatureFlagEdit: React.FC<{ flagName: FeatureId; flagValue: Feature }> = p
     }
   }, [inputValue, flagName, featureFlagsProvider]);
 
-  const parsedInput = useMemo(() => {
-    return inputValueDefaulted ? tryParse(inputValueDefaulted, false) : {};
+  const isChecked = useMemo(() => {
+    if (!inputValueDefaulted) return false;
+    try {
+      return JSON.parse(inputValueDefaulted)?.enabled;
+    } catch (e) {
+      return false;
+    }
   }, [inputValueDefaulted]);
 
-  const isChecked = parsedInput.enabled;
-
   const handleSwitchChange = useCallback(
     enabled => {
       featureFlagsProvider.overrideFeature(flagName, { ...flagValue, enabled });

diff --git a/apps/ledger-live-mobile/src/screens/FeatureFlagsSettings/FeatureFlagEdit.tsx b/apps/ledger-live-mobile/src/screens/FeatureFlagsSettings/FeatureFlagEdit.tsx
@@ -8,14 +8,6 @@ import { BaseInput, Text, Flex, Button, Switch } from "@ledgerhq/native-ui";
 import { InputRenderRightContainer } from "@ledgerhq/native-ui/components/Form/Input/BaseInput";
 import Alert from "../../components/Alert";
 
-const tryParse = (jsonString: string, fallback: any) => {
-  try {
-    return JSON.parse(jsonString);
-  } catch (e) {
-    return fallback;
-  }
-};
-
 const FeatureFlagEdit: React.FC<{
   flagName: FeatureId;
   flagValue: Feature;
@@ -63,12 +55,15 @@ const FeatureFlagEdit: React.FC<{
     }
   }, [inputValue, flagName, featureFlagsProvider]);
 
-  const parsedInput = useMemo(() => {
-    return inputValueDefaulted ? tryParse(inputValueDefaulted, false) : {};
+  const isChecked = useMemo(() => {
+    if (!inputValueDefaulted) return false;
+    try {
+      return JSON.parse(inputValueDefaulted)?.enabled;
+    } catch (e) {
+      return false;
+    }
   }, [inputValueDefaulted]);
 
-  const isChecked = parsedInput.enabled;
-
   const handleSwitchChange = useCallback(
     enabled => {
       featureFlagsProvider.overrideFeature(flagName, { ...flagValue, enabled });