From fde67dca74dcdc44348614610801e62f725d7ada Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 5 Jun 2025 21:05:11 +0900
Subject: [PATCH] enhance(frontend): tweak server setup wizard

---
 cypress/e2e/basic.cy.ts                       |  1 -
 packages/frontend/src/pages/welcome.setup.vue | 26 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/cypress/e2e/basic.cy.ts b/cypress/e2e/basic.cy.ts
index bd4021d2e3..2ce39737ed 100644
--- a/cypress/e2e/basic.cy.ts
+++ b/cypress/e2e/basic.cy.ts
@@ -34,7 +34,6 @@ describe('Before setup instance', () => {
 
 		cy.intercept('POST', '/api/admin/update-meta').as('update-meta');
 
-		cy.get('[data-cy-next]').click();
 		cy.get('[data-cy-next]').click();
 		cy.get('[data-cy-server-name] input').type('Testskey');
 		cy.get('[data-cy-server-setup-wizard-apply]').click();
diff --git a/packages/frontend/src/pages/welcome.setup.vue b/packages/frontend/src/pages/welcome.setup.vue
index 675e82a71d..3e2d086858 100644
--- a/packages/frontend/src/pages/welcome.setup.vue
+++ b/packages/frontend/src/pages/welcome.setup.vue
@@ -81,18 +81,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkButton>
 				</div>
 				<div v-else-if="step === 1" class="_gaps_m">
-					<div style="text-align: center;" class="_gaps_s">
-						<div><b>{{ i18n.ts._serverSetupWizard.donationRequest }}</b></div>
-						<div>{{ i18n.ts._serverSetupWizard._donationRequest.text1 }}<br>{{ i18n.ts._serverSetupWizard._donationRequest.text2 }}<br>{{ i18n.ts._serverSetupWizard._donationRequest.text3 }}</div>
-					</div>
-					<MkLink target="_blank" url="https://misskey-hub.net/docs/donate/" style="margin: 0 auto;">{{ i18n.ts.learnMore }}</MkLink>
-					<div class="_buttonsCenter">
-						<MkButton gradate large rounded data-cy-next style="margin: 0 auto;" @click="step++">
-							{{ i18n.ts.next }}
-						</MkButton>
-					</div>
-				</div>
-				<div v-else-if="step === 2" class="_gaps_m">
 					<div style="text-align: center;" class="_gaps_s">
 						<div style="font-size: 120%;"><b>{{ i18n.ts._serverSetupWizard.serverSetting }}</b></div>
 						<div>{{ i18n.ts._serverSetupWizard.youCanEasilyConfigureOptimalServerSettingsWithThisWizard }}</div>
@@ -105,12 +93,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 						{{ i18n.ts._serverSetupWizard.skipSettings }}
 					</MkButton>
 				</div>
-				<div v-else-if="step === 3" class="_gaps_m">
+				<div v-else-if="step === 2" class="_gaps_m">
 					<div style="text-align: center;" class="_gaps_s">
 						<div><b>{{ i18n.ts._serverSetupWizard.settingsCompleted }}</b></div>
 						<div>{{ i18n.ts._serverSetupWizard.settingsCompleted_description }}</div>
 						<div>{{ i18n.ts._serverSetupWizard.settingsCompleted_description2 }}</div>
 					</div>
+					<div class="_gaps_s" :class="$style.donation">
+						<div><b>{{ i18n.ts._serverSetupWizard.donationRequest }}</b></div>
+						<div>{{ i18n.ts._serverSetupWizard._donationRequest.text1 }}<br>{{ i18n.ts._serverSetupWizard._donationRequest.text2 }}<br>{{ i18n.ts._serverSetupWizard._donationRequest.text3 }}</div>
+						<MkLink target="_blank" url="https://misskey-hub.net/docs/donate/" style="margin: 0 auto;">{{ i18n.ts.learnMore }}</MkLink>
+					</div>
 					<div class="_buttonsCenter">
 						<MkButton gradate large rounded data-cy-next style="margin: 0 auto;" @click="finish">
 							{{ i18n.ts.start }}
@@ -232,4 +225,11 @@ function finish() {
 	font-weight: normal;
 	opacity: 0.7;
 }
+
+.donation {
+	background: var(--MI_THEME-accentedBg);
+	border-radius: 12px;
+	padding: 16px;
+	text-align: center;
+}
 </style>