fix: track description not showing

flybywiresim · Apr 27, 2024 · c767c81 · c767c81
1 parent 15442ca
commit c767c81
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 33 deletions.
diff --git a/src/renderer/components/AddonSection/Configure/index.tsx b/src/renderer/components/AddonSection/Configure/index.tsx
@@ -10,8 +10,8 @@ import './index.css';
 export interface ConfigureProps {
   routeAspectKey: string;
   selectedAddon: Addon;
-  selectedTrack: () => AddonTrack;
-  installedTrack: () => AddonTrack;
+  selectedTrack: AddonTrack;
+  installedTrack: AddonTrack;
   onTrackSelection: (track: AddonTrack) => void;
 }
 
@@ -40,8 +40,8 @@ export const Configure: FC<ConfigureProps> = ({
                     addon={selectedAddon}
                     key={track.key}
                     track={track}
-                    isSelected={selectedTrack() === track}
-                    isInstalled={installedTrack() === track}
+                    isSelected={selectedTrack === track}
+                    isInstalled={installedTrack === track}
                     handleSelected={() => onTrackSelection(track)}
                   />
                 ))}
@@ -57,8 +57,8 @@ export const Configure: FC<ConfigureProps> = ({
                     addon={selectedAddon}
                     key={track.key}
                     track={track}
-                    isSelected={selectedTrack() === track}
-                    isInstalled={installedTrack() === track}
+                    isSelected={selectedTrack === track}
+                    isInstalled={installedTrack === track}
                     handleSelected={() => onTrackSelection(track)}
                   />
                 ))}
@@ -69,15 +69,15 @@ export const Configure: FC<ConfigureProps> = ({
             )}
           </div>
         </div>
-        {selectedTrack() && selectedTrack().description && (
+        {selectedTrack && selectedTrack.description && (
           <div className="mt-10">
             <h2 className="font-bold text-white">Description</h2>
             <p className="font-manrope text-xl leading-relaxed text-white">
               <ReactMarkdown
                 className="font-manrope text-xl font-light leading-relaxed text-white"
                 linkTarget={'_blank'}
               >
-                {selectedTrack().description}
+                {selectedTrack.description}
               </ReactMarkdown>
             </p>
           </div>

diff --git a/src/renderer/components/AddonSection/index.tsx b/src/renderer/components/AddonSection/index.tsx
@@ -126,14 +126,7 @@ export const AddonSection = (): JSX.Element => {
     setSelectedAddon(addonToSelect);
   }, [history, publisherData.addons, publisherName]);
 
-  const installedTrack = (): AddonTrack => {
-    try {
-      return installedTracks[selectedAddon.key] as AddonTrack;
-    } catch (e) {
-      setCurrentlyInstalledTrack(null);
-      return null;
-    }
-  };
+  const installedTrack = (installedTracks[selectedAddon.key] as AddonTrack) ?? null;
 
   const setCurrentlyInstalledTrack = useCallback(
     (newInstalledTrack: AddonTrack) => {
@@ -149,14 +142,7 @@ export const AddonSection = (): JSX.Element => {
     [dispatch, selectedAddon.key],
   );
 
-  const selectedTrack = useCallback((): AddonTrack => {
-    try {
-      return selectedTracks[selectedAddon.key] as AddonTrack;
-    } catch (e) {
-      setCurrentlySelectedTrack(null);
-      return null;
-    }
-  }, [selectedAddon.key, selectedTracks, setCurrentlySelectedTrack]);
+  const selectedTrack = (selectedTracks[selectedAddon.key] as AddonTrack) ?? null;
 
   const selectAndSetTrack = useCallback(
     (key: string) => {
@@ -185,9 +171,9 @@ export const AddonSection = (): JSX.Element => {
   const findInstalledTrack = useCallback((): AddonTrack => {
     if (!Directories.isFragmenterInstall(selectedAddon)) {
       console.log('Not installed');
-      if (selectedTrack()) {
-        selectAndSetTrack(selectedTrack().key);
-        return selectedTrack();
+      if (selectedTrack) {
+        selectAndSetTrack(selectedTrack.key);
+        return selectedTrack;
       } else {
         setCurrentlySelectedTrack(selectedAddon.tracks[0]);
         return selectedAddon.tracks[0];
@@ -205,19 +191,19 @@ export const AddonSection = (): JSX.Element => {
 
       console.log('Currently installed', track);
       setCurrentlyInstalledTrack(track);
-      if (selectedTrack()) {
-        selectAndSetTrack(selectedTrack().key);
-        return selectedTrack();
+      if (selectedTrack) {
+        selectAndSetTrack(selectedTrack.key);
+        return selectedTrack;
       } else {
         setCurrentlySelectedTrack(track);
         return track;
       }
     } catch (e) {
       console.error(e);
       console.log('Not installed');
-      if (selectedTrack()) {
-        selectAndSetTrack(selectedTrack().key);
-        return selectedTrack();
+      if (selectedTrack) {
+        selectAndSetTrack(selectedTrack.key);
+        return selectedTrack;
       } else {
         setCurrentlySelectedTrack(selectedAddon.tracks[0]);
         return selectedAddon.tracks[0];