From 0a00392b657134a46a7bb8a7fd01e9af9a466fce Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Mon, 31 Aug 2026 11:52:56 -0700
Subject: [PATCH] Swap order of Keep editing and Discard buttons (#11606)

---
 oxlint-suppressions.json                      |  5 -----
 src/view/com/composer/Composer.tsx            |  2 +-
 src/view/com/composer/drafts/DraftsButton.tsx | 18 +++++++-----------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 1bb22bde7a..354ad958ff 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -1318,11 +1318,6 @@
       "count": 1
     }
   },
-  "src/view/com/composer/drafts/DraftsButton.tsx": {
-    "typescript/no-misused-promises": {
-      "count": 1
-    }
-  },
   "src/view/com/composer/drafts/state/queries.ts": {
     "typescript/no-explicit-any": {
       "count": 2
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index ea288830a3..3fb8db78fa 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -1555,12 +1555,12 @@ export const ComposePost = ({
                   color="primary"
                 />
               )}
+              <Prompt.Cancel cta={l`Keep editing`} />
               <Prompt.Action
                 cta={l`Discard`}
                 onPress={handleDiscard}
                 color="negative_subtle"
               />
-              <Prompt.Cancel cta={l`Keep editing`} />
             </Prompt.Actions>
           </Prompt.Outer>
         )}
diff --git a/src/view/com/composer/drafts/DraftsButton.tsx b/src/view/com/composer/drafts/DraftsButton.tsx
index 11628544b6..23ef62b761 100644
--- a/src/view/com/composer/drafts/DraftsButton.tsx
+++ b/src/view/com/composer/drafts/DraftsButton.tsx
@@ -1,6 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
+import {Trans, useLingui} from '@lingui/react/macro'
 
 import {atoms as a} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
@@ -30,7 +28,7 @@ export function DraftsButton({
   canSaveDraft: boolean
   textLength: number
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const draftsDialogControl = Dialog.useDialogControl()
   const savePromptControl = Prompt.usePromptControl()
@@ -67,7 +65,7 @@ export function DraftsButton({
   return (
     <>
       <Button
-        label={_(msg`Drafts`)}
+        label={l`Drafts`}
         variant="ghost"
         color="primary"
         shape="default"
@@ -79,12 +77,10 @@ export function DraftsButton({
           <Trans>Drafts</Trans>
         </ButtonText>
       </Button>
-
       <DraftsListDialog
         control={draftsDialogControl}
         onSelectDraft={onSelectDraft}
       />
-
       <Prompt.Outer control={savePromptControl}>
         <Prompt.Content>
           <Prompt.TitleText>
@@ -122,17 +118,17 @@ export function DraftsButton({
         <Prompt.Actions>
           {canSaveDraft && (
             <Prompt.Action
-              cta={isEditingDraft ? _(msg`Save changes`) : _(msg`Save draft`)}
-              onPress={handleSaveAndOpen}
+              cta={isEditingDraft ? l`Save changes` : l`Save draft`}
+              onPress={() => void handleSaveAndOpen()}
               color="primary"
             />
           )}
+          <Prompt.Cancel cta={l`Keep editing`} />
           <Prompt.Action
-            cta={_(msg`Discard`)}
+            cta={l`Discard`}
             onPress={handleDiscardAndOpen}
             color="negative_subtle"
           />
-          <Prompt.Cancel cta={_(msg`Keep editing`)} />
         </Prompt.Actions>
       </Prompt.Outer>
     </>