From 36346bb07210b10a0dce941a32714a58963cfb37 Mon Sep 17 00:00:00 2001
From: Candy Tsai <candy02058912@gmail.com>
Date: Wed, 15 Jan 2025 15:14:05 +0800
Subject: [PATCH] Make the account restore button more prominent (#98338)

* Make the account restore button more prominent

* Clean up me/account-restore flag as it's in production
---
 client/me/account-close/closed.jsx | 36 ++++++++----------------------
 config/development.json            |  1 -
 config/horizon.json                |  1 -
 config/production.json             |  1 -
 config/stage.json                  |  1 -
 config/wpcalypso.json              |  1 -
 6 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/client/me/account-close/closed.jsx b/client/me/account-close/closed.jsx
index ec5e2ca85359e9..579c8add436e87 100644
--- a/client/me/account-close/closed.jsx
+++ b/client/me/account-close/closed.jsx
@@ -1,4 +1,3 @@
-import config from '@automattic/calypso-config';
 import { Button, Spinner } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
 import { useEffect } from 'react';
@@ -67,36 +66,19 @@ function AccountDeletedPage() {
 				<FormattedHeader
 					brandFont
 					headerText={ translate( 'Your account has been deleted' ) }
-					subHeaderText={
-						config.isEnabled( 'me/account-restore' )
-							? translate(
-									'Thanks for flying with WordPress.com. You have 30 days to restore your account if you change your mind.'
-							  )
-							: translate( 'Thanks for flying with WordPress.com.' )
-					}
+					subHeaderText={ translate(
+						'Thanks for flying with WordPress.com. You have 30 days to restore your account if you change your mind.'
+					) }
 				/>
 				<div className="account-deleted__buttons">
-					<Button variant="secondary" onClick={ onCancelClick }>
+					{ restoreToken && (
+						<Button variant="secondary" onClick={ onRestoreClick } isBusy={ isRestoring }>
+							{ translate( 'I made a mistake! Restore my account' ) }
+						</Button>
+					) }
+					<Button variant="link" onClick={ onCancelClick } className="account-deleted__button-link">
 						{ translate( 'Return to WordPress.com' ) }
 					</Button>
-					{ config.isEnabled( 'me/account-restore' ) &&
-						restoreToken &&
-						( isRestoring ? (
-							<div className="account-deleted__restoring">
-								<Spinner />
-								<span className="account-deleted__restoring-text">
-									{ translate( 'Restoring your account' ) }
-								</span>
-							</div>
-						) : (
-							<Button
-								variant="link"
-								className="account-deleted__button-link"
-								onClick={ onRestoreClick }
-							>
-								{ translate( 'I made a mistake! Restore my account' ) }
-							</Button>
-						) ) }
 				</div>
 			</BlankCanvas.Content>
 		</BlankCanvas>
diff --git a/config/development.json b/config/development.json
index 3c30404621a1f8..3e3a1cd12fc290 100644
--- a/config/development.json
+++ b/config/development.json
@@ -145,7 +145,6 @@
 		"marketplace-test": true,
 		"me/account-close": true,
 		"me/account/color-scheme-picker": true,
-		"me/account-restore": true,
 		"me/vat-details": true,
 		"migration-flow/experiment": false,
 		"migration-flow/introductory-offer": true,
diff --git a/config/horizon.json b/config/horizon.json
index a0e5c42007da78..3b7e48c0a75750 100644
--- a/config/horizon.json
+++ b/config/horizon.json
@@ -92,7 +92,6 @@
 		"marketplace-reviews-notification": false,
 		"marketplace-test": false,
 		"me/account/color-scheme-picker": true,
-		"me/account-restore": true,
 		"me/vat-details": true,
 		"migration-flow/experiment": false,
 		"migration-flow/introductory-offer": true,
diff --git a/config/production.json b/config/production.json
index 11305acc45d500..d2bcd73b831fd8 100644
--- a/config/production.json
+++ b/config/production.json
@@ -120,7 +120,6 @@
 		"marketplace-test": false,
 		"me/account-close": true,
 		"me/account/color-scheme-picker": true,
-		"me/account-restore": true,
 		"me/vat-details": true,
 		"migration-flow/experiment": false,
 		"migration-flow/introductory-offer": true,
diff --git a/config/stage.json b/config/stage.json
index 6df4a0f8f63653..ff3bf856b71c92 100644
--- a/config/stage.json
+++ b/config/stage.json
@@ -117,7 +117,6 @@
 		"marketplace-test": true,
 		"me/account-close": true,
 		"me/account/color-scheme-picker": true,
-		"me/account-restore": true,
 		"me/vat-details": true,
 		"migration-flow/experiment": false,
 		"migration-flow/introductory-offer": true,
diff --git a/config/wpcalypso.json b/config/wpcalypso.json
index 5983d00f728a26..057ee3b5a17a9e 100644
--- a/config/wpcalypso.json
+++ b/config/wpcalypso.json
@@ -113,7 +113,6 @@
 		"marketplace-test": true,
 		"me/account-close": true,
 		"me/account/color-scheme-picker": true,
-		"me/account-restore": true,
 		"me/vat-details": true,
 		"migration-flow/experiment": false,
 		"migration-flow/introductory-offer": true,