From 82cbeff9b534722645e591d486314b6cd914c25f Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 28 Dec 2023 13:56:05 +1100
Subject: [PATCH] Revert modal button order change (#4400)

---
 ui/v2.5/src/components/Shared/Modal.tsx | 36 ++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ui/v2.5/src/components/Shared/Modal.tsx b/ui/v2.5/src/components/Shared/Modal.tsx
index 09d58e38e..4e04f89ee 100644
--- a/ui/v2.5/src/components/Shared/Modal.tsx
+++ b/ui/v2.5/src/components/Shared/Modal.tsx
@@ -60,24 +60,6 @@ export const ModalComponent: React.FC<IModal> = ({
       <div>{leftFooterButtons}</div>
       <div>
         {footerButtons}
-        <Button
-          disabled={isRunning || disabled}
-          variant={accept?.variant ?? "primary"}
-          onClick={accept?.onClick}
-          className="ml-2"
-        >
-          {isRunning ? (
-            <Spinner animation="border" role="status" size="sm" />
-          ) : (
-            accept?.text ?? (
-              <FormattedMessage
-                id="actions.close"
-                defaultMessage="Close"
-                description="Closes the current modal."
-              />
-            )
-          )}
-        </Button>
         {cancel ? (
           <Button
             disabled={isRunning}
@@ -96,6 +78,24 @@ export const ModalComponent: React.FC<IModal> = ({
         ) : (
           ""
         )}
+        <Button
+          disabled={isRunning || disabled}
+          variant={accept?.variant ?? "primary"}
+          onClick={accept?.onClick}
+          className="ml-2"
+        >
+          {isRunning ? (
+            <Spinner animation="border" role="status" size="sm" />
+          ) : (
+            accept?.text ?? (
+              <FormattedMessage
+                id="actions.close"
+                defaultMessage="Close"
+                description="Closes the current modal."
+              />
+            )
+          )}
+        </Button>
       </div>
     </Modal.Footer>
   </Modal>