From 93ad24f6e1da8740a1b15968ce5f7a797ec5157a Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Fri, 23 Sep 2022 13:02:45 +1000 Subject: [PATCH] Force tls when seved over https --- src/components/PageComponents/Connect/HTTP.tsx | 5 +++-- src/components/form/Toggle.tsx | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/PageComponents/Connect/HTTP.tsx b/src/components/PageComponents/Connect/HTTP.tsx index cd1d0874..6f35ebca 100644 --- a/src/components/PageComponents/Connect/HTTP.tsx +++ b/src/components/PageComponents/Connect/HTTP.tsx @@ -21,14 +21,14 @@ export const HTTP = (): JSX.Element => { }>({ defaultValues: { ip: "meshtastic.local", - tls: false, + tls: location.protocol === "https:", }, }); const TLSEnabled = useWatch({ control, name: "tls", - defaultValue: false, + defaultValue: location.protocol === "https:", }); const onSubmit = handleSubmit((data) => { @@ -63,6 +63,7 @@ export const HTTP = (): JSX.Element => { diff --git a/src/components/form/Toggle.tsx b/src/components/form/Toggle.tsx index 1127313f..d8ea4c69 100644 --- a/src/components/form/Toggle.tsx +++ b/src/components/form/Toggle.tsx @@ -6,6 +6,7 @@ export interface ToggleProps { label: string; description: string; checked: boolean; + disabled?: boolean; onChange?: (checked: boolean) => void; } @@ -13,6 +14,7 @@ export const Toggle = ({ label, description, checked, + disabled, onChange, }: ToggleProps): JSX.Element => { return ( @@ -31,6 +33,7 @@ export const Toggle = ({