fixup! feature: add ensure node libraries installed on PC

spacemeshos · Sep 20, 2023 · 3bbf51f · 3bbf51f
1 parent 5007ccd
commit 3bbf51f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/app/screens/network/Network.tsx b/app/screens/network/Network.tsx
@@ -280,6 +280,12 @@ const Network = ({ history }) => {
     eventsService.showFileInFolder({ isLogFile: true });
   };
 
+  const isShowNotSpecifiedErrorCheckList = [
+    NodeErrorType.NOT_SPECIFIED,
+    NodeErrorType.OPEN_CL_NOT_INSTALLED,
+    NodeErrorType.REDIST_NOT_INSTALLED,
+  ].includes((nodeError?.type as unknown) as NodeErrorType);
+
   return (
     <>
       <WrapperWith2SideBars
@@ -294,16 +300,6 @@ const Network = ({ history }) => {
             <>
               <ErrorMessage compact>
                 {nodeError.msg || nodeError.stackTrace}
-                {nodeError?.type === NodeErrorType.NOT_SPECIFIED && (
-                  <ErrorMessage compact>
-                    WE HAVE A CHECKLIST THAT CAN HELP YOU DETECT THE ISSUE.{' '}
-                    <Link
-                      style={{ display: 'inline-block' }}
-                      onClick={() => setOpenCheckListModal(true)}
-                      text="OPEN CHECKLIST."
-                    />
-                  </ErrorMessage>
-                )}
                 {nodeError?.type === NodeErrorType.OPEN_CL_NOT_INSTALLED && (
                   <>
                     {isWindows && (
@@ -329,6 +325,16 @@ const Network = ({ history }) => {
                     text="REDIST INSTALLATION GUIDE."
                   />
                 )}
+                {isShowNotSpecifiedErrorCheckList && (
+                  <ErrorMessage compact>
+                    WE HAVE A CHECKLIST THAT CAN HELP YOU DETECT THE ISSUE.{' '}
+                    <Link
+                      style={{ display: 'inline-block' }}
+                      onClick={() => setOpenCheckListModal(true)}
+                      text="OPEN CHECKLIST."
+                    />
+                  </ErrorMessage>
+                )}
               </ErrorMessage>
             </>
           )}

diff --git a/desktop/checkRequiredLibs.ts b/desktop/checkRequiredLibs.ts
@@ -13,15 +13,17 @@ const exec = promisify(execCallback);
 const access = promisify(fs.access);
 
 const generateInstallationError = (packageName, type): NodeError => ({
-  msg: `Oops! It looks like ${packageName} is missing or not set up on your system. Our application requires ${packageName} support to run properly.\n`,
+  msg: `Oops! It looks like ${packageName} is missing or not set up on your system.\n`,
   stackTrace: '',
   type,
   level: NodeErrorLevel.LOG_LEVEL_FATAL,
   module: 'NodeManager',
 });
 
 const checkVisualCppRedist = async () => {
-  const command = 'wmic product get description | find "Microsoft Visual C++"';
+  // Find software names containing "Microsoft Visual C++"
+  const command =
+    'wmic product where "name like \'%%Microsoft Visual C++%%\'" get name';
 
   try {
     const { stdout, stderr } = await exec(command);