From 820bdbe0efae737dc931bbf2ee8ba5dc4208a62d Mon Sep 17 00:00:00 2001
From: Steve Garon <steve.garon@cyber.gc.ca>
Date: Mon, 27 Sep 2021 13:52:07 +0000
Subject: [PATCH 1/3] Fix error viewer tool version

---
 src/components/routes/admin/error_viewer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/routes/admin/error_viewer.tsx b/src/components/routes/admin/error_viewer.tsx
index 0b5a4755b..fc47d12ef 100644
--- a/src/components/routes/admin/error_viewer.tsx
+++ b/src/components/routes/admin/error_viewer.tsx
@@ -72,7 +72,7 @@ function ErrorDetail({ error }) {
           <Typography variant="h5">{error.response.service_name}</Typography>
           <Typography variant="caption">
             {`${error.response.service_version}${
-              error.response.service_tool_version && ` (${error.response.service_tool_version})`
+              error.response.service_tool_version ? ` (${error.response.service_tool_version})` : ''
             }`}
           </Typography>
         </Grid>

From f5658495a508938c3542750248d7713b879af676 Mon Sep 17 00:00:00 2001
From: Steve Garon <steve.garon@cyber.gc.ca>
Date: Mon, 27 Sep 2021 14:35:56 +0000
Subject: [PATCH 2/3] Don't show 0 versions

---
 src/components/routes/admin/error_viewer.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/routes/admin/error_viewer.tsx b/src/components/routes/admin/error_viewer.tsx
index fc47d12ef..023f84999 100644
--- a/src/components/routes/admin/error_viewer.tsx
+++ b/src/components/routes/admin/error_viewer.tsx
@@ -71,9 +71,9 @@ function ErrorDetail({ error }) {
         <Grid item xs={6} sm={8}>
           <Typography variant="h5">{error.response.service_name}</Typography>
           <Typography variant="caption">
-            {`${error.response.service_version}${
-              error.response.service_tool_version ? ` (${error.response.service_tool_version})` : ''
-            }`}
+            {(error.response.service_version !== 0 || error.response.service_version !== '0') &&
+              error.response.service_version}
+            {error.response.service_tool_version && ` (${error.response.service_tool_version})`}
           </Typography>
         </Grid>
         <Grid item xs={6} sm={4}>

From d05ab3d4ee5a84ba107230842329f5d698f4d72c Mon Sep 17 00:00:00 2001
From: Steve Garon <steve.garon@cyber.gc.ca>
Date: Mon, 27 Sep 2021 14:46:12 +0000
Subject: [PATCH 3/3] Don't show 0 versions

---
 src/components/routes/admin/error_viewer.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/routes/admin/error_viewer.tsx b/src/components/routes/admin/error_viewer.tsx
index 023f84999..4c0099b54 100644
--- a/src/components/routes/admin/error_viewer.tsx
+++ b/src/components/routes/admin/error_viewer.tsx
@@ -71,7 +71,8 @@ function ErrorDetail({ error }) {
         <Grid item xs={6} sm={8}>
           <Typography variant="h5">{error.response.service_name}</Typography>
           <Typography variant="caption">
-            {(error.response.service_version !== 0 || error.response.service_version !== '0') &&
+            {error.response.service_version !== 0 &&
+              error.response.service_version !== '0' &&
               error.response.service_version}
             {error.response.service_tool_version && ` (${error.response.service_tool_version})`}
           </Typography>