refactor: improvements

flybywiresim · Sep 28, 2024 · 28abf7d · 28abf7d
1 parent 8970755
commit 28abf7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/renderer/components/AddonSection/Configure/TrackSelector.tsx b/src/renderer/components/AddonSection/Configure/TrackSelector.tsx
@@ -21,25 +21,22 @@ type TrackProps = {
 };
 
 export const Track: React.FC<TrackProps> = ({ isSelected, isInstalled, handleSelected, addon, track }) => {
-  const latestVersionName = useSelector<InstallerStore, string>(
-    (state) => state.latestVersionNames[addon.key]?.[track.key]?.name ?? '<unknown>',
+  const latestVersionName = useSelector<InstallerStore, string | undefined>(
+    (state) => state.latestVersionNames[addon.key]?.[track.key]?.name,
   );
 
   return (
     <div
       className={twMerge(
-        `relative flex w-60 cursor-pointer flex-row items-center rounded-sm-md border-2 border-transparent bg-navy-dark text-white transition-all duration-200 hover:border-navy-lightest hover:text-gray-300`,
+        `flex w-60 h-24 cursor-pointer flex-col rounded-sm-md border-2 border-transparent bg-navy-dark text-white transition-all duration-200 hover:border-navy-lightest hover:text-gray-300`,
         isSelected && 'border-2 border-cyan text-cyan',
       )}
       onClick={() => handleSelected(track)}
     >
-      <div
-        className={`h-12 w-1 rounded-r-xl transition-all duration-200${isSelected ? 'scale-y-100' : 'scale-y-50'}`}
-      />
       <div className="flex flex-col px-3 py-2.5">
         <span className="text-xl text-current">{track.name}</span>
         <span className="mt-0.5 font-manrope text-3xl font-medium tracking-wider text-current">
-          {latestVersionName}
+          {latestVersionName ?? <span className="mt-1.5 block h-7 w-32 animate-pulse bg-navy-light"></span>}
         </span>
       </div>
       {isInstalled && <Check className={`absolute right-4 stroke-current text-cyan`} strokeWidth={3} />}

diff --git a/src/renderer/components/AddonSection/index.tsx b/src/renderer/components/AddonSection/index.tsx
@@ -209,6 +209,9 @@ export const AddonSection = (): JSX.Element => {
             confirmColor={ButtonType.Caution}
             onConfirm={() => {
               setCurrentlySelectedTrack(track);
+
+              // Update install state
+              void InstallManager.refreshAddonInstallState(selectedAddon);
             }}
             dontShowAgainSettingName="mainSettings.disableExperimentalWarning"
           />,

diff --git a/src/renderer/components/App/index.tsx b/src/renderer/components/App/index.tsx
@@ -35,7 +35,8 @@ const App = () => {
 
   useEffect(() => {
     for (const addon of addons) {
-      void InstallManager.getAddonInstallState(addon).then(() => InstallManager.checkForUpdates(addon));
+      void InstallManager.checkForUpdates(addon);
+      void InstallManager.refreshAddonInstallState(addon);
     }
 
     if (settings.get('cache.main.lastShownSection')) {