From a60f2e87284e1b0e359b8adfbb00d6a8180a7db8 Mon Sep 17 00:00:00 2001
From: schakrad <58915923+schakrad@users.noreply.github.com>
Date: Thu, 20 Jul 2023 14:21:04 -0700
Subject: [PATCH] resolve conflict
Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
---
.../application-node-info/application-node-info.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/src/app/applications/components/application-node-info/application-node-info.tsx b/ui/src/app/applications/components/application-node-info/application-node-info.tsx
index 05c3dcae95ab3..18ff44e381c55 100644
--- a/ui/src/app/applications/components/application-node-info/application-node-info.tsx
+++ b/ui/src/app/applications/components/application-node-info/application-node-info.tsx
@@ -48,8 +48,8 @@ const RenderContainerState = (props: {container: any}) => {
)}
<>
{' '}
- It is {props.container?.started ? 'started' : 'not started'} and
- {props.container?.ready ? ' ready.' : ' not ready.'}
+ It is {props.container?.started ? 'started' : 'not started'}
+ {status === 'Completed' ? '.' : props.container?.ready ? ' and ready.' : ' and not ready.'}
>
{lastState && (