From eecd4e4b7d21c5fa70181fd87f6edd5d624924ff Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 21 Dec 2021 19:18:36 -0600
Subject: [PATCH] New: Allow Import to update existing Custom Formats

Fixes #6178
---
 .../EditCustomFormatModalContent.css          |  5 +++
 .../EditCustomFormatModalContent.js           | 37 +++++++++----------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
index cdf21ca8a..8e9242797 100644
--- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
@@ -4,6 +4,11 @@
   margin-right: auto;
 }
 
+.rightButtons {
+  justify-content: flex-end;
+  margin-right: auto;
+}
+
 .addSpecification {
   composes: customFormat from '~./CustomFormat.css';
 
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
index 46707dd6e..8b090dd9d 100644
--- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
@@ -198,26 +198,25 @@ class EditCustomFormatModalContent extends Component {
           </div>
         </ModalBody>
         <ModalFooter>
-          {
-            id &&
-              <Button
-                className={styles.deleteButton}
-                kind={kinds.DANGER}
-                onPress={onDeleteCustomFormatPress}
-              >
-                {translate('Delete')}
-              </Button>
-          }
+          <div className={styles.rightButtons}>
+            {
+              id &&
+                <Button
+                  className={styles.deleteButton}
+                  kind={kinds.DANGER}
+                  onPress={onDeleteCustomFormatPress}
+                >
+                  {translate('Delete')}
+                </Button>
+            }
 
-          {
-            !id &&
-              <Button
-                className={styles.deleteButton}
-                onPress={this.onImportPress}
-              >
-                {translate('Import')}
-              </Button>
-          }
+            <Button
+              className={styles.deleteButton}
+              onPress={this.onImportPress}
+            >
+              {translate('Import')}
+            </Button>
+          </div>
 
           <Button
             onPress={onModalClose}