Merge branch 'main' into aslobodian/incorrect-certificate-profile-for…

…-code-signing

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peculiar/fortify-tools",
   "homepage": "https://tools.fortifyapp.com",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "PeculiarVentures Team",
   "license": "MIT",
   "private": true,
@@ -72,4 +72,4 @@
     "predeploy": "yarn build",
     "deploy": "gh-pages -d dist"
   }
-}
+}

src/app.tsx

@@ -25,6 +25,7 @@ export function App() {
     certificates,
     handleCertificatesDataReload,
     handleProviderChange,
+    handleRetryConection,
   } = useApp();
 
   const {
@@ -110,7 +111,11 @@ export function App() {
         loading={!fetching.certificates || fetching.certificates === "pending"}
         highlightedText={searchedText}
       />
-      <FetchingStatusOwerlay fetching={fetching} challenge={challenge} />
+      <FetchingStatusOwerlay
+        fetching={fetching}
+        challenge={challenge}
+        onReload={handleRetryConection}
+      />
       {certificateViewerDialog()}
       {certificateDeleteDialog()}
       {certificateImportDialog()}

src/components/connection-not-approved/ConnectionNotApproved.tsx

@@ -5,7 +5,14 @@ import FortifyIcon from "../../icons/fortify.svg?react";
 
 import styles from "./styles/index.module.scss";
 
-export const ConnectionNotApproved: React.FunctionComponent = () => {
+interface ConnectionNotApprovedProps {
+  onReload: () => void;
+}
+
+export const ConnectionNotApproved: React.FunctionComponent<
+  ConnectionNotApprovedProps
+> = (props) => {
+  const { onReload } = props;
   const { t } = useTranslation();
 
   return (
@@ -28,14 +35,8 @@ export const ConnectionNotApproved: React.FunctionComponent = () => {
         {t("connection.error.connection-not-approved.description")}
       </Typography>
       <div className={styles.buttons_wrapper}>
-        <Button
-          variant="contained"
-          color="primary"
-          onClick={() => {
-            window.location.reload();
-          }}
-        >
-          {t("connection.error.connection-not-approved.button")}
+        <Button variant="contained" color="primary" onClick={onReload}>
+          {t("button.try-again")}
         </Button>
       </div>
     </div>

src/components/connection-not-detected/ConnectionNotDetected.tsx

@@ -6,7 +6,14 @@ import LaunchAppIcon from "../../icons/launch-app.svg?react";
 
 import styles from "./styles/index.module.scss";
 
-export const ConnectionNotDetected: React.FunctionComponent = () => {
+interface ConnectionNotDetectedProps {
+  onReload: () => void;
+}
+
+export const ConnectionNotDetected: React.FunctionComponent<
+  ConnectionNotDetectedProps
+> = (props) => {
+  const { onReload } = props;
   const { t } = useTranslation();
 
   return (
@@ -29,6 +36,9 @@ export const ConnectionNotDetected: React.FunctionComponent = () => {
         >
           {t("connection.error.connection-not-detect.button")}
         </Button>
+        <Button variant="contained" color="primary" onClick={onReload}>
+          {t("button.try-again")}
+        </Button>
       </div>
     </div>
   );

src/components/connection-not-detected/styles/index.module.scss

@@ -9,6 +9,8 @@
     padding-bottom: var(--pv-size-base-2);
   }
   .buttons_wrapper {
+    display: flex;
+    gap: var(--pv-size-base-2);
     padding-top: var(--pv-size-base-2);
   }
 }

src/components/fetching-status-owerlay/FetchingStatusOwerlay.tsx

@@ -13,11 +13,13 @@ import styles from "./styles/index.module.scss";
 export interface FetchingStatusOwerlayProps {
   fetching: AppFetchingType;
   challenge: string | null;
+  onReload: () => void;
 }
 export const FetchingStatusOwerlay: React.FunctionComponent<
   FetchingStatusOwerlayProps
 > = (props) => {
-  const { fetching, challenge } = props;
+  const { fetching, challenge, onReload } = props;
+
   const { t } = useTranslation();
 
   function dialogAttrs() {
@@ -42,14 +44,14 @@ export const FetchingStatusOwerlay: React.FunctionComponent<
     if (fetching.connectionDetect === "rejected") {
       return {
         isShow: true,
-        element: <ConnectionNotDetected />,
+        element: <ConnectionNotDetected onReload={onReload} />,
       };
     }
 
     if (fetching.connectionApprove === "rejected") {
       return {
         isShow: true,
-        element: <ConnectionNotApproved />,
+        element: <ConnectionNotApproved onReload={onReload} />,
       };
     }
 

src/hooks/app/useApp.tsx

@@ -131,8 +131,6 @@ export function useApp() {
     try {
       await fortifyClient.current.connect();
     } catch (error) {
-      // console.error(error);
-
       if (error && error instanceof Error) {
         if (
           error.message.indexOf("update your client to the latest version") !==
@@ -204,6 +202,10 @@ export function useApp() {
     }
   };
 
+  const handleRetryConection = () => {
+    window.location.reload();
+  };
+
   return {
     fortifyClient: fortifyClient.current,
     fetching,
@@ -213,5 +215,6 @@ export function useApp() {
     certificates,
     handleCertificatesDataReload,
     handleProviderChange,
+    handleRetryConection,
   };
 }

src/i18n/locales/en/main.json

@@ -152,8 +152,7 @@
       },
       "connection-not-approved": {
         "message": "You did not approve <0>{{name}}</0> use of Fortify",
-        "description": "If you want to try again click button below.",
-        "button": "Try again"
+        "description": "If you want to try again click button below."
       },
       "unresolved-status": {
         "message": "Oops! Something went wrong.",
@@ -180,7 +179,8 @@
   "button": {
     "cancel": "Cancel",
     "clear": "Clear",
-    "import-certificate": "Import certificate"
+    "import-certificate": "Import certificate",
+    "try-again": "Try again"
   },
   "app-error": {
     "message": "Oops! Something went wrong.",