From 24f68835d3885283f8e03d379c47e3fbf9c34078 Mon Sep 17 00:00:00 2001
From: Alexander Matyushentsev <Alexander_Matyushentsev@intuit.com>
Date: Tue, 2 Jul 2019 09:28:49 -0700
Subject: [PATCH] Issue #1855 - Fix jumping app status panel (#1856)

---
 .../components/application-details/application-details.tsx    | 4 ++--
 .../application-status-panel/application-status-panel.scss    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/applications/components/application-details/application-details.tsx b/ui/src/app/applications/components/application-details/application-details.tsx
index bd5ea73e17..df5cfa99d5 100644
--- a/ui/src/app/applications/components/application-details/application-details.tsx
+++ b/ui/src/app/applications/components/application-details/application-details.tsx
@@ -301,12 +301,12 @@ export class ApplicationDetails extends React.Component<RouteComponentProps<{ na
             iconClassName: 'fa fa-sync',
             title: <span className='show-for-medium'>Sync</span>,
             action: () => this.showDeploy('all'),
-        }, ...(application.status.operationState && [{
+        }, {
             iconClassName: 'fa fa-info-circle',
             title: <span className='show-for-medium'>Sync Status</span>,
             action:  () => this.setOperationStatusVisible(true),
             disabled: !application.status.operationState,
-        }] || []), {
+        }, {
             iconClassName: 'fa fa-history',
             title: <span className='show-for-medium'>History and rollback</span>,
             action: () => this.setRollbackPanelVisible(0),
diff --git a/ui/src/app/applications/components/application-status-panel/application-status-panel.scss b/ui/src/app/applications/components/application-status-panel/application-status-panel.scss
index 37fe69d011..587d1eb6cf 100644
--- a/ui/src/app/applications/components/application-status-panel/application-status-panel.scss
+++ b/ui/src/app/applications/components/application-status-panel/application-status-panel.scss
@@ -11,6 +11,7 @@
     box-shadow: 1px 2px 3px rgba(0, 0, 0, 0.1);
 
     &__item {
+        min-height: 90px;
         margin: 10px 0;
         padding: 5px 20px;
         font-size: .8em;