From 748fd14d5b1428e5fd204e53929f0dcbe66db454 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 7 Apr 2021 15:07:23 -0700
Subject: [PATCH] Fixed buttons for failed contention modal

---
 .../contention-dialog.component.html          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ui/src/app/contention/component/contention-dialog.component.html b/ui/src/app/contention/component/contention-dialog.component.html
index 1ff63bb4b..18b436d03 100644
--- a/ui/src/app/contention/component/contention-dialog.component.html
+++ b/ui/src/app/contention/component/contention-dialog.component.html
@@ -35,16 +35,17 @@ <h4 class="modal-title"><translate-i18n key="message.data-version-contention">Da
             </div>
         </div>
     </div>
-    <div class="modal-footer">
+    <div class="modal-footer" *ngIf="theirs.length < 1">
         <button
-           
-            class="btn btn-info"
-            (click)="activeModal.close(resolutionObj)"
-            [disabled]="!resolutionObj"><translate-i18n key="action.use-mine">Use My Changes</translate-i18n></button>
-        <button
-           
-            class="btn btn-danger"
-            (click)="activeModal.dismiss(rejectionObj)"
-            [disabled]="!rejectionObj"><translate-i18n key="action.use-theirs">Use Their Changes</translate-i18n></button>
+            class="btn btn-secondary"
+            (click)="activeModal.dismiss(rejectionObj)"><translate-i18n key="action.cancel">Cancel</translate-i18n></button>
+    </div>
+    <div class="modal-footer" *ngIf="theirs.length > 0">
+        <button class="btn btn-info" (click)="activeModal.close(resolutionObj)" [disabled]="!resolutionObj">
+            <translate-i18n key="action.use-mine">Use My Changes</translate-i18n>
+        </button>
+        <button class="btn btn-danger" (click)="activeModal.dismiss(rejectionObj)" [disabled]="!rejectionObj">
+            <translate-i18n key="action.use-theirs">Use Their Changes</translate-i18n>
+        </button>
     </div>
 </div>