| ... | ... | @@ -2,6 +2,7 @@ import { parseChangeRequestUrl } from "@t3tools/shared/changeRequestUrl"; |
| 2 | 2 | import { useAtomValue } from "@effect/atom-react"; |
| 3 | 3 | import { usePullRequestStack } from "~/state/usePullRequestStack"; |
| 4 | 4 | import { RefreshIcon } from "~/components/ui/refresh-icon"; |
| 5 | import { AnimatedWidth } from "~/components/AnimatedWidth"; |
| 5 | 6 | import { |
| 6 | 7 | scopedThreadKey, |
| 7 | 8 | scopeProjectRef, |
| ... | ... | @@ -2122,21 +2123,20 @@ export function PullRequestDetailPanel({ |
| 2122 | 2123 | ) : ( |
| 2123 | 2124 | <PullRequestGlyph.merged aria-hidden className="size-3.5" /> |
| 2124 | 2125 | )} |
| 2125 | | <span className="inline-grid @max-[30rem]/pr-header:hidden"> |
| 2126 | | <span aria-hidden className="invisible col-start-1 row-start-1"> |
| 2127 | | {selectedMergeMethodLabel} |
| 2128 | | </span> |
| 2129 | | <span aria-hidden className="invisible col-start-1 row-start-1"> |
| 2130 | | Confirm merge? |
| 2126 | <AnimatedWidth className="@max-[30rem]/pr-header:hidden"> |
| 2127 | <span className="grid"> |
| 2128 | <span aria-hidden className="invisible col-start-1 row-start-1"> |
| 2129 | {selectedMergeMethodLabel} |
| 2130 | </span> |
| 2131 | <span className="col-start-1 row-start-1"> |
| 2132 | {pendingAction === "merge" |
| 2133 | ? "Merging..." |
| 2134 | : inlineConfirm.isArmed("merge") |
| 2135 | ? "Confirm merge?" |
| 2136 | : selectedMergeMethodLabel} |
| 2137 | </span> |
| 2131 | 2138 | </span> |
| 2132 | | <span className="col-start-1 row-start-1"> |
| 2133 | | {pendingAction === "merge" |
| 2134 | | ? "Merging..." |
| 2135 | | : inlineConfirm.isArmed("merge") |
| 2136 | | ? "Confirm merge?" |
| 2137 | | : selectedMergeMethodLabel} |
| 2138 | | </span> |
| 2139 | | </span> |
| 2139 | </AnimatedWidth> |
| 2140 | 2140 | </Button> |
| 2141 | 2141 | </span> |
| 2142 | 2142 | } |