fix: weather uplink loads origin, prefer zfw

Author: ninjomcs

src/instruments/src/EFB/apps/Aircraft/FuelPayload.tsx

@@ -81,9 +81,13 @@ export const FuelPayload: FC = () => {
     };
 
     const load = () => {
-        plannedPax && setPax(plannedPax);
-        plannedCargo && setCargo(metric ? plannedCargo * 2.205 : plannedCargo);
-        plannedZfw && setZfw(metric ? plannedZfw * 2.205 : plannedZfw);
+        if (!plannedZfw) {
+            plannedPax && setPax(plannedPax);
+            plannedCargo && setCargo(metric ? plannedCargo * 2.205 : plannedCargo);
+        } else {
+            setZfw(metric ? plannedZfw * 2.205 : plannedZfw);
+        }
+
         plannedFuel && setFuel(metric ? plannedFuel * 2.205 : plannedFuel);
     };
 

src/instruments/src/EFB/apps/FZPro/TopBar.tsx

@@ -32,7 +32,6 @@ export const TopBar: FC<TopBarProps> = ({ setFlightDisplayed, flightDisplayed, v
                 </TopBarSection>
                 <TopBarSection>
                     <Icons>
-                        <MdSatelliteAlt size={35} fill="white" />
                         <IoMdSettings size={40} onClick={() => navigate("/settings/general")} />
                     </Icons>
                 </TopBarSection>

src/instruments/src/EFB/apps/Settings/components/Toggle.tsx

@@ -3,10 +3,10 @@ import styled from "styled-components";
 
 import { ListItem } from "../../../components/ListItem";
 
-type ToggleProps = { label: string; enabled: boolean; onClick: (enabled: boolean) => void };
+type ToggleProps = { label: string; enabled: boolean; onClick: (enabled: boolean) => void; gray?: boolean };
 
-export const Toggle: FC<ToggleProps> = ({ label, enabled, onClick }) => (
-    <ListItem noMouseDownEffect>
+export const Toggle: FC<ToggleProps> = ({ label, enabled, onClick, gray = false }) => (
+    <ListItem noMouseDownEffect gray={gray}>
         <div className="side">{label}</div>
         <StyledToggle className="side" enabled={enabled} onClick={() => onClick(enabled)}>
             <StyledToggleCircle enabled={enabled} />

src/instruments/src/EFB/apps/Weather/index.tsx

@@ -56,7 +56,7 @@ export const Weather: FC = () => {
         try {
             const newOfp = await SimbriefClient.getOfp(await SimbriefClient.getSimbriefUserIDFromUsername(simbriefUsername as string));
             setOfp(newOfp);
-            handleSelectAirport(newOfp.destination.icao_code);
+            handleSelectAirport(newOfp.origin.icao_code);
         } catch (_) {
             setModal(<InfoModal title="Error" description="Failed to fetch SimBrief OFP" />);
         }