diff --git a/docs/admin-treasury-api.md b/docs/admin-treasury-api.md
index 9cafe204..80bbd239 100644
--- a/docs/admin-treasury-api.md
+++ b/docs/admin-treasury-api.md
@@ -4,22 +4,20 @@ The treasury panel calls the authenticated backend API; this client repository d
 
 All routes use the existing `BaseApiService` credentials and return the standard `{ success, data, message }` envelope.
 
-| Method | Route | `data` |
-| --- | --- | --- |
-| `GET` | `/admin/treasury` | `{ accumulatedFeesStroops: string, updatedAt?: string }` |
-| `GET` | `/admin/treasury/distributions` | `TreasuryDistribution[]` |
-| `GET` | `/admin/treasury/fees` | Recent `FeeCollected` records, newest first |
-| `POST` | `/admin/treasury/distributions` | Confirmed `{ epoch: number, transactionHash: string }` |
+| Method | Route                           | `data`                                                   |
+| ------ | ------------------------------- | -------------------------------------------------------- |
+| `GET`  | `/admin/treasury`               | `{ accumulatedFeesStroops: string, updatedAt?: string }` |
+| `GET`  | `/admin/treasury/distributions` | `TreasuryDistribution[]`                                 |
+| `GET`  | `/admin/treasury/fees`          | Recent `FeeCollected` records, newest first              |
+| `POST` | `/admin/treasury/distributions` | Confirmed `{ epoch: number, transactionHash: string }`   |
 
 Distribution request body:
 
 ```json
 {
-  "admin": "G...",
-  "totalAmountStroops": "10000000",
-  "recipients": [
-    { "address": "G...", "amountStroops": "10000000" }
-  ]
+	"admin": "G...",
+	"totalAmountStroops": "10000000",
+	"recipients": [{ "address": "G...", "amountStroops": "10000000" }]
 }
 ```
 
diff --git a/src/components/common/TradeDialog.tsx b/src/components/common/TradeDialog.tsx
index c9ce716e..991cf639 100644
--- a/src/components/common/TradeDialog.tsx
+++ b/src/components/common/TradeDialog.tsx
@@ -240,7 +240,8 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 	// On open: reset state, kick off allowance check + cap fetch.
 	useEffect(() => {
 		if (open) {
-			triggerElementRef.current = document.activeElement as HTMLElement | null;
+			triggerElementRef.current =
+				document.activeElement as HTMLElement | null;
 			setAmountText('1');
 			setTouched(false);
 			setAdjustmentNote(null);
@@ -274,10 +275,18 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 			}
 			if (event.ctrlKey || event.metaKey || event.altKey) return;
 			const key = event.key;
-			const presets: Record<string, number> = { '1': 1, '2': 2, '3': 3, '4': 5, '5': 10 };
+			const presets: Record<string, number> = {
+				'1': 1,
+				'2': 2,
+				'3': 3,
+				'4': 5,
+				'5': 10,
+			};
 			if (!event.shiftKey && presets[key] !== undefined) {
 				event.preventDefault();
-				setAmountText(clampBuyQuantity(presets[key].toString()).value.toString());
+				setAmountText(
+					clampBuyQuantity(presets[key].toString()).value.toString()
+				);
 				setTouched(true);
 				return;
 			}
@@ -312,13 +321,21 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 			maxBuyable !== null
 				? Math.min(BUY_QUANTITY_BOUNDS.MAX_QTY, maxBuyable)
 				: BUY_QUANTITY_BOUNDS.MAX_QTY;
-		const res = clampBuyQuantity(amountText.trim(), BUY_QUANTITY_BOUNDS.MIN_QTY, maxClamp);
+		const res = clampBuyQuantity(
+			amountText.trim(),
+			BUY_QUANTITY_BOUNDS.MIN_QTY,
+			maxClamp
+		);
 		if (res.adjusted) {
 			setAmountText(res.value.toString());
 			if (res.reason === 'below_min') {
-				setAdjustmentNote(`Quantity adjusted to the minimum of ${res.value}.`);
+				setAdjustmentNote(
+					`Quantity adjusted to the minimum of ${res.value}.`
+				);
 			} else if (res.reason === 'above_max') {
-				setAdjustmentNote(`Quantity adjusted to the maximum of ${res.value}.`);
+				setAdjustmentNote(
+					`Quantity adjusted to the maximum of ${res.value}.`
+				);
 			} else {
 				setAdjustmentNote(`Quantity rounded to ${res.value}.`);
 			}
@@ -336,14 +353,20 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 	const validationError = useMemo((): string | null => {
 		const normalized = amountText.trim();
 		if (!normalized) return 'Please enter an amount.';
-		if (!Number.isFinite(parsedAmount)) return 'Amount must be a valid number.';
+		if (!Number.isFinite(parsedAmount))
+			return 'Amount must be a valid number.';
 		if (parsedAmount <= 0) return 'Amount must be greater than zero.';
-		if (isPaused) return 'Trading is currently suspended because the contract is paused.';
+		if (isPaused)
+			return 'Trading is currently suspended because the contract is paused.';
 		if (side === 'buy' && atCap)
 			return 'You have reached the maximum holding cap for this creator.';
 		if (side === 'buy' && maxBuyable !== null && parsedAmount > maxBuyable)
 			return `You can only buy up to ${formatNumber(maxBuyable)} more key${maxBuyable !== 1 ? 's' : ''} (holding cap).`;
-		if (side === 'buy' && maxBuyQuantity != null && parsedAmount > maxBuyQuantity)
+		if (
+			side === 'buy' &&
+			maxBuyQuantity != null &&
+			parsedAmount > maxBuyQuantity
+		)
 			return `Maximum ${formatNumber(maxBuyQuantity)} keys per transaction for this key`;
 		if (
 			(side === 'sell' || side === 'stake' || side === 'transfer') &&
@@ -351,14 +374,32 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 		)
 			return `You can't ${side} more than your holdings (${formatNumber(availableHoldings)} keys).`;
 		return null;
-	}, [amountText, parsedAmount, side, availableHoldings, atCap, maxBuyable, maxBuyQuantity, isPaused]);
+	}, [
+		amountText,
+		parsedAmount,
+		side,
+		availableHoldings,
+		atCap,
+		maxBuyable,
+		maxBuyQuantity,
+		isPaused,
+	]);
 
 	const amountValid = validationError === null;
 	const showError = touched && validationError !== null;
 
 	const priceImpactPercent = useMemo(() => {
-		if (!amountValid || !Number.isFinite(parsedAmount) || (side !== 'buy' && side !== 'sell')) return 0;
-		return calculateTradePriceImpact({ side, quantity: parsedAmount, currentSupply: currentSupply ?? 0 });
+		if (
+			!amountValid ||
+			!Number.isFinite(parsedAmount) ||
+			(side !== 'buy' && side !== 'sell')
+		)
+			return 0;
+		return calculateTradePriceImpact({
+			side,
+			quantity: parsedAmount,
+			currentSupply: currentSupply ?? 0,
+		});
 	}, [amountValid, parsedAmount, side, currentSupply]);
 
 	const effectiveCircuitBreakerThresholdPercent =
@@ -389,7 +430,8 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 		side === 'buy' && circuitBreakerStatus?.isBreached
 	);
 
-	const isAllowanceChecking = side === 'stake' && allowanceStatus === 'checking';
+	const isAllowanceChecking =
+		side === 'stake' && allowanceStatus === 'checking';
 	const requiresAllowanceApproval = side === 'stake' && needsApproval;
 	const confirmDisabled =
 		!amountValid ||
@@ -401,13 +443,17 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 		isPaused ||
 		requiresAllowanceApproval;
 
-	const displayCreatorName = normalizeCreatorDisplayName(creatorName) || 'Unnamed creator';
+	const displayCreatorName =
+		normalizeCreatorDisplayName(creatorName) || 'Unnamed creator';
 
 	const title =
-		side === 'buy' ? 'Buy keys'
-		: side === 'sell' ? 'Sell keys'
-		: side === 'stake' ? 'Stake keys'
-		: 'Transfer keys';
+		side === 'buy'
+			? 'Buy keys'
+			: side === 'sell'
+				? 'Sell keys'
+				: side === 'stake'
+					? 'Stake keys'
+					: 'Transfer keys';
 
 	const confirmLabel =
 		side === 'buy'
@@ -443,45 +489,92 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 
 	// Network fee estimation effect.
 	useEffect(() => {
-		if (!open) { setNetworkFeeEstimate({ status: 'idle', fee: null }); return; }
+		if (!open) {
+			setNetworkFeeEstimate({ status: 'idle', fee: null });
+			return;
+		}
 		if (!amountValid || !networkFeeEstimateProvider) {
-			setNetworkFeeEstimate({ status: 'error', fee: null }); return;
+			setNetworkFeeEstimate({ status: 'error', fee: null });
+			return;
 		}
 		let cancelled = false;
 		setNetworkFeeEstimate({ status: 'loading', fee: null });
 		const feeSide = side === 'buy' || side === 'sell' ? side : 'buy';
-		fetchTradeNetworkFeeEstimate(networkFeeEstimateProvider, { side: feeSide, amount: parsedAmount })
+		fetchTradeNetworkFeeEstimate(networkFeeEstimateProvider, {
+			side: feeSide,
+			amount: parsedAmount,
+		})
 			.then(fee => {
 				if (cancelled) return;
-				setNetworkFeeEstimate(fee == null ? { status: 'error', fee: null } : { status: 'success', fee });
+				setNetworkFeeEstimate(
+					fee == null
+						? { status: 'error', fee: null }
+						: { status: 'success', fee }
+				);
 			})
-			.catch(() => { if (!cancelled) setNetworkFeeEstimate({ status: 'error', fee: null }); });
-		return () => { cancelled = true; };
+			.catch(() => {
+				if (!cancelled)
+					setNetworkFeeEstimate({ status: 'error', fee: null });
+			});
+		return () => {
+			cancelled = true;
+		};
 	}, [amountValid, networkFeeEstimateProvider, open, parsedAmount, side]);
 
 	const estimatedProceedsStroops = useMemo(() => {
-		if (side !== 'sell' || !Number.isFinite(parsedAmount) || parsedAmount <= 0) return null;
+		if (
+			side !== 'sell' ||
+			!Number.isFinite(parsedAmount) ||
+			parsedAmount <= 0
+		)
+			return null;
 		return estimateSellProceeds(keyPriceStroops, currentSupply, parsedAmount);
 	}, [side, keyPriceStroops, currentSupply, parsedAmount]);
 
 	const launchPenalty = useMemo(
-		() => calculateLaunchPenalty(estimatedProceedsStroops, createdAtLedger, currentLedger, launchPenaltyBps),
-		[estimatedProceedsStroops, createdAtLedger, currentLedger, launchPenaltyBps]
+		() =>
+			calculateLaunchPenalty(
+				estimatedProceedsStroops,
+				createdAtLedger,
+				currentLedger,
+				launchPenaltyBps
+			),
+		[
+			estimatedProceedsStroops,
+			createdAtLedger,
+			currentLedger,
+			launchPenaltyBps,
+		]
 	);
 
 	const estimatedTotalStroops = useMemo(() => {
-		if (side !== 'buy' || !Number.isFinite(parsedAmount) || parsedAmount <= 0 || keyPriceStroops == null) return null;
+		if (
+			side !== 'buy' ||
+			!Number.isFinite(parsedAmount) ||
+			parsedAmount <= 0 ||
+			keyPriceStroops == null
+		)
+			return null;
 		return keyPriceStroops * parsedAmount;
 	}, [side, keyPriceStroops, parsedAmount]);
 
 	const slippageReferencePriceStroops = useMemo(() => {
-		if (side === 'buy') return pricePreview?.totalCostStroops ?? estimatedTotalStroops ?? null;
+		if (side === 'buy')
+			return pricePreview?.totalCostStroops ?? estimatedTotalStroops ?? null;
 		return estimatedProceedsStroops;
 	}, [side, pricePreview, estimatedTotalStroops, estimatedProceedsStroops]);
 
 	const slippageBounds = useMemo<SlippageBounds | null>(() => {
-		if (slippageReferencePriceStroops == null || (side !== 'buy' && side !== 'sell')) return null;
-		return computeSlippageBounds(side, slippageReferencePriceStroops, slippageTolerancePercent);
+		if (
+			slippageReferencePriceStroops == null ||
+			(side !== 'buy' && side !== 'sell')
+		)
+			return null;
+		return computeSlippageBounds(
+			side,
+			slippageReferencePriceStroops,
+			slippageTolerancePercent
+		);
 	}, [side, slippageReferencePriceStroops, slippageTolerancePercent]);
 
 	const handleMaxClick = () => {
@@ -489,7 +582,10 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 		if (side === 'sell') {
 			setAmountText(String(Math.max(0, availableHoldings)));
 		} else {
-			const maxVal = maxBuyQuantity != null ? maxBuyQuantity : BUY_QUANTITY_BOUNDS.MAX_QTY;
+			const maxVal =
+				maxBuyQuantity != null
+					? maxBuyQuantity
+					: BUY_QUANTITY_BOUNDS.MAX_QTY;
 			setAmountText(String(maxVal));
 		}
 	};
@@ -497,52 +593,99 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 	// Price preview fetch (buy only).
 	useEffect(() => {
 		if (side !== 'buy' || keyPriceStroops == null) {
-			setPricePreview(null); setPreviewLoading(false); return;
+			setPricePreview(null);
+			setPreviewLoading(false);
+			return;
 		}
 		if (!Number.isFinite(parsedAmount) || parsedAmount <= 0) {
-			setPricePreview(null); setPreviewLoading(false); setPreviewError(null); return;
+			setPricePreview(null);
+			setPreviewLoading(false);
+			setPreviewError(null);
+			return;
 		}
 		const timeoutId = window.setTimeout(async () => {
-			if (previewAbortControllerRef.current) previewAbortControllerRef.current.abort();
+			if (previewAbortControllerRef.current)
+				previewAbortControllerRef.current.abort();
 			setPreviewLoading(true);
 			setPreviewError(null);
 			try {
 				const preview = await fetchPricePreview({
-					quantity: parsedAmount, keyPriceStroops, currentSupply: currentSupply ?? 0, protocolFeeBps, creatorFeeBps,
+					quantity: parsedAmount,
+					keyPriceStroops,
+					currentSupply: currentSupply ?? 0,
+					protocolFeeBps,
+					creatorFeeBps,
 				});
 				setPricePreview(preview);
 			} catch (error) {
 				if (error instanceof Error && error.name === 'AbortError') return;
-				setPreviewError(error instanceof Error ? error.message : 'Failed to fetch price preview');
+				setPreviewError(
+					error instanceof Error
+						? error.message
+						: 'Failed to fetch price preview'
+				);
 				setPricePreview(null);
 			} finally {
 				setPreviewLoading(false);
 			}
 		}, 200);
 		return () => clearTimeout(timeoutId);
-	}, [side, parsedAmount, keyPriceStroops, currentSupply, protocolFeeBps, creatorFeeBps]);
+	}, [
+		side,
+		parsedAmount,
+		keyPriceStroops,
+		currentSupply,
+		protocolFeeBps,
+		creatorFeeBps,
+	]);
 
 	// Price preview failure logging.
 	useEffect(() => {
-		if (process.env.NODE_ENV === 'test' || !open || pricePreviewFailureLogged.current) return;
+		if (
+			process.env.NODE_ENV === 'test' ||
+			!open ||
+			pricePreviewFailureLogged.current
+		)
+			return;
 		if (side === 'buy' && keyPriceStroops == null) {
-			console.debug('[price-preview-failure]', { creator_name: creatorName, quantity: Number.isFinite(parsedAmount) ? parsedAmount : null, side: 'buy', reason: 'key_price_missing', timestamp: new Date().toISOString() });
+			console.debug('[price-preview-failure]', {
+				creator_name: creatorName,
+				quantity: Number.isFinite(parsedAmount) ? parsedAmount : null,
+				side: 'buy',
+				reason: 'key_price_missing',
+				timestamp: new Date().toISOString(),
+			});
 			pricePreviewFailureLogged.current = true;
 		}
 	}, [open, side, keyPriceStroops, creatorName, parsedAmount]);
 	useEffect(() => {
-		if (process.env.NODE_ENV === 'test' || !open || pricePreviewFailureLogged.current) return;
+		if (
+			process.env.NODE_ENV === 'test' ||
+			!open ||
+			pricePreviewFailureLogged.current
+		)
+			return;
 		if (side === 'sell' && estimatedProceedsStroops == null) {
-			console.debug('[price-preview-failure]', { creator_name: creatorName, quantity: Number.isFinite(parsedAmount) ? parsedAmount : null, side: 'sell', reason: 'estimate_unavailable', timestamp: new Date().toISOString() });
+			console.debug('[price-preview-failure]', {
+				creator_name: creatorName,
+				quantity: Number.isFinite(parsedAmount) ? parsedAmount : null,
+				side: 'sell',
+				reason: 'estimate_unavailable',
+				timestamp: new Date().toISOString(),
+			});
 			pricePreviewFailureLogged.current = true;
 		}
 	}, [open, side, estimatedProceedsStroops, creatorName, parsedAmount]);
 
 	const handleConfirm = async () => {
 		if (confirmDisabled) return;
-		if (requireConfirmation) { setConfirmationOpen(true); return; }
+		if (requireConfirmation) {
+			setConfirmationOpen(true);
+			return;
+		}
 		await onConfirm(parsedAmount, pricePreview, slippageBounds);
-		if (side === 'buy' && creatorId) incrementHolding(creatorId, parsedAmount);
+		if (side === 'buy' && creatorId)
+			incrementHolding(creatorId, parsedAmount);
 	};
 
 	const isMobile = useIsMobile();
@@ -553,19 +696,21 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 	// the confirmation screen quotes the rate the contract will actually
 	// charge. The breakdown is derived from the live rates and the current
 	// trade notional, so it refreshes whenever the amount changes.
-	const [dynamicFeeRates, setDynamicFeeRates] = useState<ContractDynamicFeeRate>(
-		{
+	const [dynamicFeeRates, setDynamicFeeRates] =
+		useState<ContractDynamicFeeRate>({
 			protocolFeeBps,
 			creatorRoyaltyBps: creatorFeeBps,
-		}
-	);
+		});
 	const [isFeeRateLoading, setFeeRateLoading] = useState(false);
 	const [feeRateError, setFeeRateError] = useState<string | null>(null);
 	const feeRateAbortRef = useRef<AbortController | null>(null);
 
 	useEffect(() => {
 		if (!open) {
-			setDynamicFeeRates({ protocolFeeBps, creatorRoyaltyBps: creatorFeeBps });
+			setDynamicFeeRates({
+				protocolFeeBps,
+				creatorRoyaltyBps: creatorFeeBps,
+			});
 			setFeeRateLoading(false);
 			setFeeRateError(null);
 			return;
@@ -581,7 +726,9 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 			setFeeRateError(null);
 
 			courseService
-				.getDynamicFeeRate(creatorName, { signal: controller.signal })
+				.getDynamicFeeRate(creatorId ?? creatorName, {
+					signal: controller.signal,
+				})
 				.then(rates => {
 					if (controller.signal.aborted) return;
 					// Merge over the dialog's configured rates so a partial
@@ -594,14 +741,17 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 					);
 					setFeeRateLoading(false);
 				})
-				.catch(error => {
+				.catch((error: unknown) => {
 					if (
 						controller.signal.aborted ||
 						(error instanceof Error && error.name === 'CanceledError')
 					) {
 						return;
 					}
-					if (error instanceof DOMException && error.name === 'AbortError') {
+					if (
+						error instanceof DOMException &&
+						error.name === 'AbortError'
+					) {
 						return;
 					}
 					// Keep the last known good rates; just surface the error.
@@ -615,13 +765,13 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 		}, 200);
 
 		return () => clearTimeout(timeoutId);
-	}, [open, creatorName, protocolFeeBps, creatorFeeBps]);
+	}, [open, creatorId, creatorName, protocolFeeBps, creatorFeeBps]);
 
 	const handleFeeRateRetry = useCallback(() => {
 		setFeeRateError(null);
 		setFeeRateLoading(true);
 		courseService
-			.getDynamicFeeRate(creatorName)
+			.getDynamicFeeRate(creatorId ?? creatorName)
 			.then(rates => {
 				setDynamicFeeRates(
 					mergeFeeRates(
@@ -631,7 +781,7 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 				);
 				setFeeRateLoading(false);
 			})
-			.catch(error => {
+			.catch((error: unknown) => {
 				setFeeRateError(
 					error instanceof Error
 						? error.message
@@ -639,7 +789,7 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 				);
 				setFeeRateLoading(false);
 			});
-	}, [creatorName, protocolFeeBps, creatorFeeBps]);
+	}, [creatorId, creatorName, protocolFeeBps, creatorFeeBps]);
 
 	const dynamicFeeBreakdown = useMemo<DynamicFeeBreakdownData | null>(() => {
 		if (side === 'buy') {
@@ -688,11 +838,17 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 					data-testid="trade-dialog-paused-alert"
 					className="flex items-start gap-2.5 rounded-xl border border-red-500/30 bg-red-500/10 p-3 text-xs text-red-200"
 				>
-					<ShieldAlert className="mt-0.5 size-4 shrink-0 text-red-400" aria-hidden="true" />
+					<ShieldAlert
+						className="mt-0.5 size-4 shrink-0 text-red-400"
+						aria-hidden="true"
+					/>
 					<div>
-						<p className="font-semibold text-red-300">Trading suspended — contract paused</p>
+						<p className="font-semibold text-red-300">
+							Trading suspended — contract paused
+						</p>
 						<p className="mt-0.5 text-red-200/80">
-							Actions are disabled until the emergency pause is lifted by the admin.
+							Actions are disabled until the emergency pause is lifted by
+							the admin.
 						</p>
 					</div>
 				</div>
@@ -717,7 +873,10 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 			/>
 
 			{side === 'sell' && (
-				<LaunchPenaltyWarning visible={launchPenalty.applies} penaltyBps={launchPenalty.penaltyBps} />
+				<LaunchPenaltyWarning
+					visible={launchPenalty.applies}
+					penaltyBps={launchPenalty.penaltyBps}
+				/>
 			)}
 
 			{/* Holding cap warning (#961) — buy side only */}
@@ -741,10 +900,12 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 							'w-full rounded-xl border bg-white/[0.04] px-3 py-2 pr-16 text-white outline-none transition-colors',
 							'border-white/10 focus:border-amber-500/50 focus:ring-2 focus:ring-amber-500/15',
 							showError ? 'border-red-500/60' : '',
-							(atCap || isPaused) ? 'opacity-40 cursor-not-allowed' : ''
+							atCap || isPaused ? 'opacity-40 cursor-not-allowed' : ''
 						)}
 						aria-label="Trade amount"
-						aria-describedby={showError ? 'trade-amount-error' : undefined}
+						aria-describedby={
+							showError ? 'trade-amount-error' : undefined
+						}
 						aria-invalid={showError || undefined}
 						data-focus-order="1"
 						data-testid="trade-dialog-amount"
@@ -753,7 +914,9 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 						type="button"
 						data-testid="trade-dialog-max-button"
 						onClick={handleMaxClick}
-						disabled={isSubmitting || (side === 'sell' && availableHoldings <= 0)}
+						disabled={
+							isSubmitting || (side === 'sell' && availableHoldings <= 0)
+						}
 						className="absolute right-2 rounded-md border border-amber-400/30 bg-amber-400/10 px-2 py-0.5 text-xs font-bold text-amber-300 transition-colors hover:bg-amber-400/20 active:scale-95 disabled:pointer-events-none disabled:opacity-40"
 					>
 						MAX
@@ -761,13 +924,21 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 				</div>
 
 				{side === 'buy' && adjustmentNote && (
-					<div className="text-xs text-amber-400 font-medium animate-in fade-in duration-200" data-testid="buy-qty-adjustment-note">
+					<div
+						className="text-xs text-amber-400 font-medium animate-in fade-in duration-200"
+						data-testid="buy-qty-adjustment-note"
+					>
 						{adjustmentNote}
 					</div>
 				)}
 
 				{showError && (
-					<p id="trade-amount-error" role="alert" className="text-xs text-red-300" data-testid="trade-dialog-amount-error">
+					<p
+						id="trade-amount-error"
+						role="alert"
+						className="text-xs text-red-300"
+						data-testid="trade-dialog-amount-error"
+					>
 						{validationError}
 					</p>
 				)}
@@ -782,7 +953,9 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 				)}
 
 				<div className="flex flex-wrap items-center gap-2 text-xs text-white/45">
-					<span aria-label={`Current wallet holdings: ${formatNumber(availableHoldings)} keys`}>
+					<span
+						aria-label={`Current wallet holdings: ${formatNumber(availableHoldings)} keys`}
+					>
 						Holdings: {formatNumber(availableHoldings)} keys
 					</span>
 					{(side === 'sell' || side === 'stake' || side === 'transfer') &&
@@ -792,7 +965,11 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 							<PercentageBadge
 								label="of holdings"
 								value={(parsedAmount / availableHoldings) * 100}
-								tone={parsedAmount > availableHoldings ? 'negative' : 'neutral'}
+								tone={
+									parsedAmount > availableHoldings
+										? 'negative'
+										: 'neutral'
+								}
 							/>
 						)}
 				</div>
@@ -806,14 +983,22 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 					/>
 				)}
 
-				<NetworkFeeHint variant="text" label="Approx. network fee" fee={networkFeeCopy} className="text-white/45" />
+				<NetworkFeeHint
+					variant="text"
+					label="Approx. network fee"
+					fee={networkFeeCopy}
+					className="text-white/45"
+				/>
 
 				{side === 'buy' && amountValid && (
 					<BuyFeeBreakdown
 						breakdown={pricePreview}
 						isLoading={previewLoading}
 						error={previewError}
-						onRetry={() => { setPreviewError(null); setPreviewLoading(true); }}
+						onRetry={() => {
+							setPreviewError(null);
+							setPreviewLoading(true);
+						}}
 					/>
 				)}
 				{side === 'buy' && estimatedTotalStroops != null && (
@@ -825,7 +1010,10 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 					</div>
 				)}
 				{side === 'sell' && (
-					<SellFeeBreakdown grossProceedsStroops={estimatedProceedsStroops} launchPenalty={launchPenalty} />
+					<SellFeeBreakdown
+						grossProceedsStroops={estimatedProceedsStroops}
+						launchPenalty={launchPenalty}
+					/>
 				)}
 
 				{amountValid && (
@@ -836,17 +1024,38 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 							disabled={isSubmitting}
 						/>
 						{slippageBounds && (
-							<p className="mt-2 text-[0.7rem] text-white/45" data-testid="trade-dialog-slippage-bound">
+							<p
+								className="mt-2 text-[0.7rem] text-white/45"
+								data-testid="trade-dialog-slippage-bound"
+							>
 								{side === 'buy'
 									? slippageBounds.maxPriceStroops != null && (
-										<>Max price: <span className="font-semibold text-white/70 tabular-nums">{formatDisplayKeyPrice(slippageBounds.maxPriceStroops)}</span></>
-									)
+											<>
+												Max price:{' '}
+												<span className="font-semibold text-white/70 tabular-nums">
+													{formatDisplayKeyPrice(
+														slippageBounds.maxPriceStroops
+													)}
+												</span>
+											</>
+										)
 									: slippageBounds.minPriceStroops != null && (
-										<>Min price: <span className="font-semibold text-white/70 tabular-nums">{formatDisplayKeyPrice(slippageBounds.minPriceStroops)}</span></>
-									)}
+											<>
+												Min price:{' '}
+												<span className="font-semibold text-white/70 tabular-nums">
+													{formatDisplayKeyPrice(
+														slippageBounds.minPriceStroops
+													)}
+												</span>
+											</>
+										)}
 							</p>
 						)}
-						<PriceImpactWarning impactPercent={priceImpactPercent} threshold={PRICE_IMPACT_THRESHOLD_PERCENT} className="mt-2" />
+						<PriceImpactWarning
+							impactPercent={priceImpactPercent}
+							threshold={PRICE_IMPACT_THRESHOLD_PERCENT}
+							className="mt-2"
+						/>
 					</div>
 				)}
 			</div>
@@ -879,66 +1088,91 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 				onClick={handleConfirm}
 				disabled={confirmDisabled}
 				aria-busy={isSubmitting || undefined}
-				title={isPaused ? 'Trading suspended: contract is paused' : undefined}
+				title={
+					isPaused ? 'Trading suspended: contract is paused' : undefined
+				}
 				data-focus-order="3"
 				data-testid="trade-dialog-confirm"
 			>
-				<StableButtonContent isLoading={isSubmitting} loadingLabel="Submitting…">
+				<StableButtonContent
+					isLoading={isSubmitting}
+					loadingLabel="Submitting…"
+				>
 					{confirmLabel}
 				</StableButtonContent>
 			</Button>
 		</>
 	);
 
-	const confirmationModal = (side === 'buy' || side === 'sell') ? (
-		<TradeConfirmationModal
-			open={confirmationOpen}
-			onOpenChange={setConfirmationOpen}
-			side={side}
-			creatorName={creatorName}
-			amount={parsedAmount}
-			unitPriceStroops={keyPriceStroops}
-			totalStroops={slippageReferencePriceStroops}
-			feeBreakdown={dynamicFeeBreakdown}
-			feeIsLoading={isFeeRateLoading}
-			feeError={feeRateError}
-			onFeeRetry={handleFeeRateRetry}
-			slippageTolerancePercent={slippageTolerancePercent}
-			maxPriceStroops={slippageBounds?.maxPriceStroops ?? null}
-			minPriceStroops={slippageBounds?.minPriceStroops ?? null}
-			priceImpactPercent={priceImpactPercent}
-			onConfirm={async () => {
-				if (isCircuitBreakerBreached) return;
-				await onConfirm(parsedAmount, pricePreview, slippageBounds);
-				if (side === 'buy' && creatorId) incrementHolding(creatorId, parsedAmount);
-				setConfirmationOpen(false);
-			}}
-			onCancel={() => setConfirmationOpen(false)}
-			isSubmitting={isSubmitting}
-		/>
-	) : null;
+	const confirmationModal =
+		side === 'buy' || side === 'sell' ? (
+			<TradeConfirmationModal
+				open={confirmationOpen}
+				onOpenChange={setConfirmationOpen}
+				side={side}
+				creatorName={creatorName}
+				amount={parsedAmount}
+				unitPriceStroops={keyPriceStroops}
+				totalStroops={slippageReferencePriceStroops}
+				feeBreakdown={dynamicFeeBreakdown}
+				feeIsLoading={isFeeRateLoading}
+				feeError={feeRateError}
+				onFeeRetry={handleFeeRateRetry}
+				slippageTolerancePercent={slippageTolerancePercent}
+				maxPriceStroops={slippageBounds?.maxPriceStroops ?? null}
+				minPriceStroops={slippageBounds?.minPriceStroops ?? null}
+				priceImpactPercent={priceImpactPercent}
+				onConfirm={async () => {
+					if (isCircuitBreakerBreached) return;
+					await onConfirm(parsedAmount, pricePreview, slippageBounds);
+					if (side === 'buy' && creatorId)
+						incrementHolding(creatorId, parsedAmount);
+					setConfirmationOpen(false);
+				}}
+				onCancel={() => setConfirmationOpen(false)}
+				isSubmitting={isSubmitting}
+			/>
+		) : null;
 
 	if (isMobile) {
 		return (
 			<>
-				<BottomSheet open={open} onOpenChange={next => !isBusy && onOpenChange(next)}>
+				<BottomSheet
+					open={open}
+					onOpenChange={next => !isBusy && onOpenChange(next)}
+				>
 					<BottomSheetContent
 						className="max-h-[calc(100vh-80px)] overflow-y-auto"
 						enableDrag={!isBusy}
 						hideCloseButton={isBusy}
-						onOpenAutoFocus={event => { event.preventDefault(); amountInputRef.current?.focus(); }}
-						onCloseAutoFocus={event => { event.preventDefault(); triggerElementRef.current?.focus(); }}
-						onEscapeKeyDown={event => { if (isBusy) event.preventDefault(); }}
-						onInteractOutside={event => { if (isBusy) event.preventDefault(); }}
+						onOpenAutoFocus={event => {
+							event.preventDefault();
+							amountInputRef.current?.focus();
+						}}
+						onCloseAutoFocus={event => {
+							event.preventDefault();
+							triggerElementRef.current?.focus();
+						}}
+						onEscapeKeyDown={event => {
+							if (isBusy) event.preventDefault();
+						}}
+						onInteractOutside={event => {
+							if (isBusy) event.preventDefault();
+						}}
 					>
 						<BottomSheetHandle />
 						<div className="flex flex-col gap-2 text-center sm:text-left mb-4">
-							<BottomSheetTitle className="text-lg leading-none font-semibold">{title}</BottomSheetTitle>
+							<BottomSheetTitle className="text-lg leading-none font-semibold">
+								{title}
+							</BottomSheetTitle>
 							<BottomSheetDescription className="text-muted-foreground text-sm">
-								{side === 'buy' ? `Purchase creator keys for ${displayCreatorName}.`
-									: side === 'sell' ? `Sell creator keys for ${displayCreatorName}.`
-									: side === 'stake' ? `Stake creator keys for ${displayCreatorName}.`
-									: `Transfer creator keys for ${displayCreatorName}.`}
+								{side === 'buy'
+									? `Purchase creator keys for ${displayCreatorName}.`
+									: side === 'sell'
+										? `Sell creator keys for ${displayCreatorName}.`
+										: side === 'stake'
+											? `Stake creator keys for ${displayCreatorName}.`
+											: `Transfer creator keys for ${displayCreatorName}.`}
 							</BottomSheetDescription>
 						</div>
 						{bodyContent}
@@ -954,23 +1188,39 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 
 	return (
 		<>
-			<Dialog open={open} onOpenChange={next => !isBusy && onOpenChange(next)}>
+			<Dialog
+				open={open}
+				onOpenChange={next => !isBusy && onOpenChange(next)}
+			>
 				<DialogContent
 					className="max-w-md"
 					showCloseButton={!isBusy}
 					showEscapeHint={!isBusy}
-					onOpenAutoFocus={event => { event.preventDefault(); amountInputRef.current?.focus(); }}
-					onCloseAutoFocus={event => { event.preventDefault(); triggerElementRef.current?.focus(); }}
-					onEscapeKeyDown={event => { if (isBusy) event.preventDefault(); }}
-					onInteractOutside={event => { if (isBusy) event.preventDefault(); }}
+					onOpenAutoFocus={event => {
+						event.preventDefault();
+						amountInputRef.current?.focus();
+					}}
+					onCloseAutoFocus={event => {
+						event.preventDefault();
+						triggerElementRef.current?.focus();
+					}}
+					onEscapeKeyDown={event => {
+						if (isBusy) event.preventDefault();
+					}}
+					onInteractOutside={event => {
+						if (isBusy) event.preventDefault();
+					}}
 				>
 					<DialogHeader>
 						<DialogTitle>{title}</DialogTitle>
 						<DialogDescription>
-							{side === 'buy' ? `Purchase creator keys for ${displayCreatorName}.`
-								: side === 'sell' ? `Sell creator keys for ${displayCreatorName}.`
-								: side === 'stake' ? `Stake creator keys for ${displayCreatorName}.`
-								: `Transfer creator keys for ${displayCreatorName}.`}
+							{side === 'buy'
+								? `Purchase creator keys for ${displayCreatorName}.`
+								: side === 'sell'
+									? `Sell creator keys for ${displayCreatorName}.`
+									: side === 'stake'
+										? `Stake creator keys for ${displayCreatorName}.`
+										: `Transfer creator keys for ${displayCreatorName}.`}
 						</DialogDescription>
 					</DialogHeader>
 
@@ -995,16 +1245,24 @@ const TradeDialog: React.FC<TradeDialogProps> = ({
 						data-testid="trade-dialog-shortcut-hint"
 					>
 						<span className="flex items-center gap-1">
-							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">Enter</kbd>
+							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">
+								Enter
+							</kbd>
 							confirm
 						</span>
 						<span className="flex items-center gap-1">
-							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">Esc</kbd>
+							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">
+								Esc
+							</kbd>
 							close
 						</span>
 						<span className="flex items-center gap-1">
-							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">+</kbd>
-							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">-</kbd>
+							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">
+								+
+							</kbd>
+							<kbd className="rounded border border-white/10 bg-white/[0.04] px-1 py-0.5 font-mono text-[10px]">
+								-
+							</kbd>
 							adjust
 						</span>
 					</div>
diff --git a/src/components/home/TrendingCreatorCard.tsx b/src/components/home/TrendingCreatorCard.tsx
index f61f7805..bf3f39c0 100644
--- a/src/components/home/TrendingCreatorCard.tsx
+++ b/src/components/home/TrendingCreatorCard.tsx
@@ -25,7 +25,6 @@ export default function TrendingCreatorCard({ creator }: Props) {
 					className="h-full w-full object-cover transition-transform duration-500 group-hover:scale-[1.03]"
 					style={{ imageRendering: 'pixelated' }}
 				/>
-
 			</div>
 
 			{/* Body */}
@@ -35,7 +34,7 @@ export default function TrendingCreatorCard({ creator }: Props) {
 					{/* Deprecation badge (issue #996): a deprecated key must be
 					    marked in marketplace listings so buyers see its status
 					    before they click through. */}
-					{creator.deprecation && (
+					{creator.deprecated && (
 						<span
 							data-testid="deprecation-badge"
 							className="ml-2 inline-flex items-center rounded-full border border-amber-500/40 bg-amber-100 px-2 py-0.5 align-middle text-[10px] font-bold uppercase tracking-wide text-amber-700"
@@ -59,7 +58,11 @@ export default function TrendingCreatorCard({ creator }: Props) {
 				{/* Stats row */}
 				<div className="mt-4 flex items-center justify-between border-t border-gray-100 pt-4">
 					<div className="flex items-center gap-1.5">
-						<img src="/icons/key.svg" alt="" className="size-3.5 opacity-40 invert" />
+						<img
+							src="/icons/key.svg"
+							alt=""
+							className="size-3.5 opacity-40 invert"
+						/>
 						<span className="font-jakarta text-sm font-semibold text-gray-900">
 							{priceXlm} XLM
 						</span>
@@ -83,6 +86,6 @@ export default function TrendingCreatorCard({ creator }: Props) {
 					<ArrowRight className="size-3.5 transition-transform group-hover:translate-x-0.5" />
 				</Link>
 			</div>
-		</article> 
+		</article>
 	);
 }
diff --git a/src/hooks/useUpdateCreatorProfile.ts b/src/hooks/useUpdateCreatorProfile.ts
index f31ad4c9..c832f397 100644
--- a/src/hooks/useUpdateCreatorProfile.ts
+++ b/src/hooks/useUpdateCreatorProfile.ts
@@ -1,6 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { courseService, type Course } from '@/services/course.service';
 import { queryKeys } from '@/lib/queryKeys';
+import { cacheManager } from '@/utils/cache.utils';
 import showToast from '@/utils/toast.util';
 
 interface UpdateCreatorProfileVariables {
@@ -12,7 +13,7 @@ interface UpdateCreatorProfileVariables {
  * Mutation hook for updating a creator's profile information.
  *
  * On success:
- * - Invalidates the creator profile query to refetch fresh data
+ * - Replaces the creator profile cache with the saved course
  * - Shows success toast: "Profile updated successfully"
  * - Toast auto-dismisses after 4 seconds
  *
@@ -30,19 +31,25 @@ export function useUpdateCreatorProfile() {
 	const queryClient = useQueryClient();
 
 	return useMutation({
-		mutationFn: async ({ creatorId, data }: UpdateCreatorProfileVariables) => {
+		mutationFn: async ({
+			creatorId,
+			data,
+		}: UpdateCreatorProfileVariables) => {
 			return courseService.updateCourse(creatorId, data);
 		},
-		onError: (error) => {
+		onError: error => {
 			const errorMessage =
 				error instanceof Error ? error.message : 'Failed to update profile';
 			showToast.error(errorMessage);
 		},
-		onSuccess: (_, variables) => {
-			// Invalidate the creator profile query to refetch fresh data
-			queryClient.invalidateQueries({
-				queryKey: queryKeys.creators.detail(variables.creatorId),
-			});
+		onSuccess: (updatedCourse, variables) => {
+			cacheManager.invalidate(`course_${variables.creatorId}`);
+			if (updatedCourse) {
+				queryClient.setQueryData(
+					queryKeys.creators.detail(variables.creatorId),
+					updatedCourse
+				);
+			}
 
 			// Show success toast that auto-dismisses after 4 seconds
 			showToast.success('Profile updated successfully');
diff --git a/src/pages/CreatorDashboardPage.tsx b/src/pages/CreatorDashboardPage.tsx
index 81dbb5ef..49ee7a32 100644
--- a/src/pages/CreatorDashboardPage.tsx
+++ b/src/pages/CreatorDashboardPage.tsx
@@ -37,11 +37,10 @@ import {
 	resolveCreatorKeyPriceStroops,
 } from '@/utils/keyPriceDisplay.utils';
 import { formatNumber } from '@/utils/numberFormat.utils';
+import { useUpdateCreatorProfile } from '@/hooks/useUpdateCreatorProfile';
 
 import { GraduatedCurveMilestoneChart } from '@/components/common/GraduatedCurveMilestoneChart';
 import CreatorRevenuePanel from '@/components/common/CreatorRevenuePanel';
-import RoyaltyEarningsCard from '@/components/creator/RoyaltyEarningsCard';
-import FundRewardPoolForm from '@/components/creator/FundRewardPoolForm';
 
 const TABS = [
 	{ label: 'Overview', value: 'overview' },
@@ -77,6 +76,7 @@ export default function CreatorDashboardPage() {
 	const configureGraduatedCurve = useConfigureGraduatedCurveMutation(id);
 	const setBuyCooldown = useSetBuyCooldownMutation(id);
 	const deprecateKey = useDeprecateKeyMutation(id);
+	const updateCreatorProfile = useUpdateCreatorProfile();
 
 	const {
 		entries: whitelistEntries,
@@ -98,10 +98,12 @@ export default function CreatorDashboardPage() {
 		isLoading: isVestingLoading,
 		isError: isVestingError,
 	} = useKeyVesting(isKeyCreator ? id : undefined, address);
+
 	const { data: vestingClaims = [] } = useKeyVestingClaims(
 		isKeyCreator ? id : undefined,
 		address
 	);
+
 	const claimVestedTokens = useClaimVestedTokensMutation(id, address ?? '');
 
 	// Curve migrations change the pricing every holder buys at, so the panel is
@@ -112,6 +114,7 @@ export default function CreatorDashboardPage() {
 		isLoading: isCurveMigrationsLoading,
 		isError: isCurveMigrationsError,
 	} = useCurveMigrations(isKeyCreator ? id : undefined);
+
 	const executeCurveMigration = useExecuteCurveMigrationMutation(id);
 
 	const setTab = (value: string) => {
@@ -164,6 +167,7 @@ export default function CreatorDashboardPage() {
 					<p className="mt-2 text-sm text-white/50">
 						Manage your key profile and auction configuration.
 					</p>
+
 					<div className="mt-4 flex flex-wrap items-center gap-4">
 						<Link
 							to={`/creator/${id}/bundles`}
@@ -172,6 +176,7 @@ export default function CreatorDashboardPage() {
 						>
 							Manage key bundles
 						</Link>
+
 						<Link
 							to={`/creator/${id}/revenue`}
 							className="inline-flex items-center gap-1.5 text-sm font-semibold text-emerald-400 underline-offset-4 hover:text-emerald-300 hover:underline"
@@ -188,11 +193,13 @@ export default function CreatorDashboardPage() {
 						data-testid="key-deprecated-banner"
 					>
 						<div className="flex items-center gap-3">
-							<AlertTriangle className="size-6 text-amber-400 shrink-0" />
+							<AlertTriangle className="size-6 shrink-0 text-amber-400" />
+
 							<div>
 								<h2 className="font-grotesque text-xl font-bold text-amber-300">
 									Key deprecated
 								</h2>
+
 								<p className="mt-1 text-sm text-white/70">
 									This key has been deprecated. All new buys are
 									disabled and holders can redeem their keys for
@@ -221,29 +228,35 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-4 font-grotesque text-xl font-black tracking-tight">
 								Overview
 							</h2>
+
 							<dl className="grid grid-cols-1 gap-4 sm:grid-cols-3">
 								<div>
 									<dt className="text-[0.65rem] font-bold uppercase tracking-[0.22em] text-white/40">
 										Current price
 									</dt>
+
 									<dd className="mt-1 font-jakarta font-bold">
 										{formatDisplayKeyPrice(
 											resolveCreatorKeyPriceStroops(creator)
 										)}
 									</dd>
 								</div>
+
 								<div>
 									<dt className="text-[0.65rem] font-bold uppercase tracking-[0.22em] text-white/40">
 										Key supply
 									</dt>
+
 									<dd className="mt-1 font-jakarta font-bold">
 										{formatNumber(creator.creatorShareSupply ?? 100)}
 									</dd>
 								</div>
+
 								<div>
 									<dt className="text-[0.65rem] font-bold uppercase tracking-[0.22em] text-white/40">
 										Category
 									</dt>
+
 									<dd className="mt-1 font-jakarta font-bold">
 										{creator.category}
 									</dd>
@@ -255,13 +268,6 @@ export default function CreatorDashboardPage() {
 							keyId={id}
 							currentSupply={creator.creatorShareSupply ?? 100}
 						/>
-
-						{/* Royalty earnings tracker (#987) and the staking reward
-						    pool funding form (#1023) are creator-only by
-						    construction: both components render null for any
-						    other wallet. */}
-						{isKeyCreator && <RoyaltyEarningsCard keyId={id} />}
-						{isKeyCreator && <FundRewardPoolForm keyId={id} />}
 					</div>
 				)}
 
@@ -292,10 +298,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Edit Profile
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Update the display name, bio and avatar stored with your
 								key.
 							</p>
+
 							<CreatorMetadataForm
 								initialName={creator.name ?? creator.title ?? ''}
 								initialBio={creator.bio ?? creator.description ?? ''}
@@ -307,6 +315,62 @@ export default function CreatorDashboardPage() {
 							/>
 						</section>
 
+						<section
+							className={CARD_CLASS}
+							data-testid="early-access-section"
+						>
+							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
+								Early access
+							</h2>
+
+							<p className="mb-5 text-sm text-white/50">
+								Limit purchases to whitelisted wallets until public
+								launch.
+							</p>
+
+							<label className="flex max-w-md items-center justify-between gap-4 rounded-lg border border-white/10 bg-white/[0.03] px-4 py-3">
+								<span>
+									<span className="block text-sm font-semibold text-white">
+										Enable early access
+									</span>
+
+									<span className="mt-1 block text-xs text-white/50">
+										{creator.earlyAccessEnabled
+											? 'Only whitelisted wallets can buy during early access.'
+											: 'All connected wallets can buy this key.'}
+									</span>
+								</span>
+
+								<input
+									type="checkbox"
+									checked={creator.earlyAccessEnabled ?? false}
+									disabled={updateCreatorProfile.isPending}
+									aria-label="Enable early access"
+									className="size-5 shrink-0 accent-amber-400"
+									onChange={event =>
+										updateCreatorProfile.mutate({
+											creatorId: id,
+											data: {
+												earlyAccessEnabled:
+													event.currentTarget.checked,
+											},
+										})
+									}
+								/>
+							</label>
+
+							{creator.publicLaunchDate && (
+								<p className="mt-4 text-xs text-white/55">
+									Public launch:{' '}
+									<time dateTime={creator.publicLaunchDate}>
+										{new Date(
+											creator.publicLaunchDate
+										).toLocaleString()}
+									</time>
+								</p>
+							)}
+						</section>
+
 						<section
 							className={CARD_CLASS}
 							data-testid="auction-setup-section"
@@ -314,10 +378,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Auction Setup
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Set a fixed auction price and supply allocation before
 								your key goes live.
 							</p>
+
 							<AuctionSetupPanel
 								auctionPrice={creator.auctionPrice}
 								auctionSupply={creator.auctionSupply}
@@ -356,10 +422,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Launch Penalty
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Charge early sellers a percentage fee during the first 7
 								days after key creation.
 							</p>
+
 							<LaunchPenaltyPanel
 								launchPenaltyBps={creator.launchPenaltyBps}
 								isSubmitting={setLaunchPenalty.isPending}
@@ -376,10 +444,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Buy Cooldown
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Set a delay in minutes between consecutive buys from the
 								same wallet.
 							</p>
+
 							<BuyCooldownPanel
 								buyCooldownLedgers={creator.buyCooldownLedgers}
 								isSubmitting={setBuyCooldown.isPending}
@@ -396,10 +466,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Max Buy Per Transaction
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Limit how many keys a wallet can buy in a single
 								transaction.
 							</p>
+
 							<MaxBuyQuantityPanel
 								maxBuyQuantity={creator.maxBuyQuantity}
 								isSubmitting={setMaxBuyQuantity.isPending}
@@ -414,10 +486,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Graduated Curve
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Configure up to five supply milestones and the exponent
 								applied to each tier.
 							</p>
+
 							<GraduatedCurvePanel
 								isSubmitting={configureGraduatedCurve.isPending}
 								onSubmit={milestones =>
@@ -433,10 +507,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Deprecate Key
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Initiate a key wind-down by setting a buyback price and
 								escrowing the required XLM.
 							</p>
+
 							<DeprecateKeyPanel
 								creatorId={id}
 								circulatingSupply={creator.creatorShareSupply ?? 100}
@@ -455,10 +531,12 @@ export default function CreatorDashboardPage() {
 								<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 									Vesting Schedule
 								</h2>
+
 								<p className="mb-6 text-sm text-white/50">
 									Track the creator allocation reserved for your
 									wallet, and claim the tokens that have vested.
 								</p>
+
 								<VestingSchedulePanel
 									schedule={vesting}
 									cliffAt={vestingData?.cliffAt}
@@ -491,10 +569,12 @@ export default function CreatorDashboardPage() {
 							<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 								Quorum Settings
 							</h2>
+
 							<p className="mb-6 text-sm text-white/50">
 								Set the minimum percentage of holders that must
 								participate in a vote for a proposal to pass.
 							</p>
+
 							<QuorumSettingsPanel
 								quorumBps={creator.quorumBps}
 								isSubmitting={setQuorumBps.isPending}
@@ -511,11 +591,13 @@ export default function CreatorDashboardPage() {
 								<h2 className="mb-1 font-grotesque text-xl font-black tracking-tight">
 									Curve Migrations
 								</h2>
+
 								<p className="mb-6 text-sm text-white/50">
 									Review pending bonding-curve changes, follow the
 									timelock and holder vote, then execute a migration
 									once both conditions are met.
 								</p>
+
 								<CurveMigrationPanel
 									migrations={curveMigrations}
 									isLoading={isCurveMigrationsLoading}
@@ -536,4 +618,4 @@ export default function CreatorDashboardPage() {
 			</div>
 		</main>
 	);
-}
+}
\ No newline at end of file
diff --git a/src/pages/CreatorDetailPage.tsx b/src/pages/CreatorDetailPage.tsx
index a55ab67f..514fc79f 100644
--- a/src/pages/CreatorDetailPage.tsx
+++ b/src/pages/CreatorDetailPage.tsx
@@ -68,7 +68,6 @@ import { usePerformanceBond } from '@/hooks/usePerformanceBond';
 import PerformanceBondPanel from '@/components/common/PerformanceBondPanel';
 import WhitelistStatusBadge from '@/components/common/WhitelistStatusBadge';
 import ShareModal from '@/components/common/ShareModal';
-
 import {
 	useTradeCooldownStatus,
 	invalidateTradeCooldownStatus,
@@ -82,12 +81,16 @@ import TradeCooldownButton from '@/components/common/TradeCooldownButton';
 import KeyHolderList from '@/components/common/KeyHolderList';
 import HolderConcentrationChart from '@/components/common/HolderConcentrationChart';
 import SectionErrorBoundary from '@/components/common/SectionErrorBoundary';
+import { useAccount } from 'wagmi';
+
 function CreatorDetailPageContent() {
 	usePurchaseConfetti();
 
 	const { id } = useParams<{ id: string }>();
 	const location = useLocation();
 	const navigate = useNavigate();
+	const queryClient = useQueryClient();
+
 	const [hasMounted, setHasMounted] = useState(false);
 	const [buybackModalOpen, setBuybackModalOpen] = useState(false);
 	const [recentSettlement, setRecentSettlement] =
@@ -97,6 +100,10 @@ function CreatorDetailPageContent() {
 		number | null
 	>(null);
 	const [deprecationDismissed, setDeprecationDismissed] = useState(false);
+	const [buyDialogOpen, setBuyDialogOpen] = useState(false);
+	const [tradeSubmitting, setTradeSubmitting] = useState(false);
+	const [interval, setInterval] = useState<PriceHistoryInterval>('24h');
+
 	const {
 		data: creator,
 		isLoading,
@@ -105,7 +112,6 @@ function CreatorDetailPageContent() {
 		refetch,
 	} = useCreatorDetail(id || '');
 
-	const [interval, setInterval] = useState<PriceHistoryInterval>('24h');
 	const { data: priceHistory, isLoading: isPriceHistoryLoading } =
 		usePriceHistory(id || '', interval);
 
@@ -118,9 +124,9 @@ function CreatorDetailPageContent() {
 
 	const recordVisit = useRecentlyViewed(state => state.addKey);
 
-	// Record this key as recently viewed once the detail data is available.
 	useEffect(() => {
 		if (!creator) return;
+
 		recordVisit({
 			id: creator.id,
 			title: creator.title || creator.name || 'Unnamed creator',
@@ -136,35 +142,47 @@ function CreatorDetailPageContent() {
 	const { holders, hasNextPage, isFetchingNextPage, fetchNextPage } =
 		useKeyHolders(id || '');
 
-	// User holdings for Share to X button
+	/*
+	 * Wallet integration:
+	 * Prefer the currently connected wagmi wallet, then fall back to the
+	 * profile-store address for compatibility with the existing application.
+	 */
 	const profile = useProfileStore(state => state.profile);
-	const userAddress = profile?.id;
+	const { address: connectedWalletAddress } = useAccount();
+	const userAddress = connectedWalletAddress ?? profile?.id;
+
 	const { data: holdings = [] } = useWalletHoldings(userAddress ?? '');
+
 	const userPosition = holdings.find(h => h.creatorId === (id || ''));
 	const holdingsCount = userPosition?.quantity ?? 0;
-	// Per-user buy cooldown (#873): prefer the user's own position-level
-	// value; fall back to a creator-wide cooldown if the backend doesn't yet
-	// return a per-user one. Only shown for authenticated users.
+
+	/*
+	 * Per-user buy cooldown:
+	 * Prefer the user's position-level value and fall back to the creator-wide
+	 * value returned by the creator detail endpoint.
+	 */
 	const nextBuyAllowedAt =
 		userPosition?.nextBuyAllowedAt ?? creator?.nextBuyAllowedAt ?? null;
+
 	const { data: twap, isLoading: isTwapLoading } = useKeyTwap(id || '');
+
 	const {
 		data: keyStats,
 		isLoading: isKeyStatsLoading,
 		isError: isKeyStatsError,
 	} = useKeyStats(id || '');
+
 	const { data: uniqueTraders, isLoading: isUniqueTradersLoading } =
 		useKeyUniqueTraders(id || '');
-	// Live key config powers the bid-ask spread shown next to the buy
-	// action and inside the trade dialog (#951).
+
 	const { data: keyConfig, isLoading: isKeyConfigLoading } = useKeyConfig(
 		id || ''
 	);
+
 	const spotPriceStroops = creator
 		? resolveCreatorKeyPriceStroops(creator)
 		: null;
-	// External oracle price shown alongside the bonding-curve spot price so a
-	// significant divergence is visible before trading (#967).
+
 	const {
 		comparison: oracleComparison,
 		freshness: oracleFreshness,
@@ -172,17 +190,18 @@ function CreatorDetailPageContent() {
 		isLoading: isOracleLoading,
 	} = useKeyOraclePrice(id || '', { spotPriceStroops });
 
-	// Performance bond status for creator key protection (#975)
 	const {
 		data: performanceBondData,
 		isLoading: isPerformanceBondLoading,
 		isError: isPerformanceBondError,
 	} = usePerformanceBond(id || '');
+
 	const performanceBond =
 		performanceBondData ?? creator?.performanceBond ?? null;
 
-	// Pre-launch auction phase (#924): a live tick that drives the countdown
-	// and flips the page back to the bonding curve view once the auction ends.
+	/*
+	 * Pre-launch auction phase.
+	 */
 	const { phase: auctionPhase } = useAuctionPhase({
 		auctionPrice: creator?.auctionPrice ?? null,
 		auctionSupply: creator?.auctionSupply ?? null,
@@ -190,22 +209,62 @@ function CreatorDetailPageContent() {
 		auctionEndsAt: creator?.auctionEndsAt ?? null,
 	});
 
-	// Whitelist gate check for early access keys (#1031)
+	/*
+	 * Early-access / whitelist logic.
+	 *
+	 * Supports both the newer whitelist fields from the maintainer and
+	 * the early-access fields from your branch.
+	 */
 	const isWhitelistGateActive = Boolean(
-		creator?.isWhitelistEnabled ?? creator?.whitelistEnabled ?? false
+		creator?.isWhitelistEnabled ??
+		creator?.whitelistEnabled ??
+		creator?.earlyAccessEnabled ??
+		false
+	);
+
+	const whitelistEntries = creator?.whitelist ?? [];
+
+	const isUserWhitelisted = Boolean(
+		userAddress &&
+		(whitelistEntries.some(
+			entry =>
+				entry.walletAddress?.toUpperCase() === userAddress.toUpperCase()
+		) ||
+			(creator?.earlyAccessWhitelist ?? []).some(
+				address => address.toLowerCase() === userAddress.toLowerCase()
+			) ||
+			(creator?.instructorId &&
+				creator.instructorId.toUpperCase() === userAddress.toUpperCase()))
 	);
-	const isUserWhitelisted = userAddress
-		? Boolean(
-				(creator?.whitelist ?? []).some(
-					w => w.walletAddress.toUpperCase() === userAddress.toUpperCase()
-				) ||
-				(creator?.instructorId &&
-					creator.instructorId.toUpperCase() === userAddress.toUpperCase())
-			)
-		: false;
-	const isLockedOut = isWhitelistGateActive && !isUserWhitelisted;
-
-	// On-chain metadata fetch (#1033)
+
+	const publicLaunchTimestamp = creator?.publicLaunchDate
+		? Date.parse(creator.publicLaunchDate)
+		: null;
+
+	const hasValidPublicLaunchDate =
+		publicLaunchTimestamp != null && Number.isFinite(publicLaunchTimestamp);
+
+	const isPublicLaunchPending =
+		hasValidPublicLaunchDate && publicLaunchTimestamp > Date.now();
+
+	const isEarlyAccessRestricted =
+		creator?.earlyAccessEnabled === true &&
+		(!hasValidPublicLaunchDate || isPublicLaunchPending);
+
+	const isLockedOut =
+		isWhitelistGateActive &&
+		!isUserWhitelisted &&
+		(isEarlyAccessRestricted || !creator?.publicLaunchDate);
+
+	const buyDisabledReason = !userAddress
+		? 'Connect your wallet to buy this key.'
+		: isLockedOut
+			? 'Early access is restricted to approved whitelisted wallets.'
+			: undefined;
+
+	/*
+	 * On-chain metadata.
+	 */
 	const {
 		data: onChainMetadata,
 		isLoading: isOnChainLoading,
@@ -218,9 +277,12 @@ function CreatorDetailPageContent() {
 
 	const displayName =
 		metadata.name || creator?.title || creator?.name || 'Unnamed creator';
+
 	const displaySymbol = metadata.symbol;
+
 	const displayDescription =
 		metadata.description || creator?.description || creator?.bio;
+
 	const rawAvatar =
 		metadata.image ||
 		metadata.imageCid ||
@@ -230,10 +292,13 @@ function CreatorDetailPageContent() {
 		metadata.avatarUri ||
 		metadata.avatar_uri ||
 		metadata.cid;
+
 	const displayAvatar =
 		resolveIpfsUrl(rawAvatar) || creator?.avatarUri || creator?.thumbnail;
 
-	// Track stale data indicator (including fallback active state)
+	/*
+	 * Track stale data indicator, including the on-chain metadata fallback.
+	 */
 	const { shouldShowBadge, handleRefetch } = useCreatorProfileStaleIndicator(
 		id || '',
 		isFetching || isOnChainLoading,
@@ -245,21 +310,23 @@ function CreatorDetailPageContent() {
 
 	const showStaleIndicator = shouldShowBadge || isFallbackActive;
 
-	const [buyDialogOpen, setBuyDialogOpen] = useState(false);
-	const [tradeSubmitting, setTradeSubmitting] = useState(false);
-	const tradeMutation = useTradeMutation(userAddress ?? 'demo-wallet');
+	/*
+	 * Trade mutation.
+	 *
+	 * Use the connected wallet rather than a hard-coded demo wallet.
+	 */
+	const tradeMutation = useTradeMutation(connectedWalletAddress ?? '');
 
-	// #998 — trade cooldown for this key: fetched on page load and refetched
-	// after each completed buy so the Buy button shows a live countdown and
-	// stays disabled until the cooldown expires. The user's own position-level
-	// `nextBuyAllowedAt` (#873) is the fallback when the dedicated endpoint
-	// has no data.
-	const queryClient = useQueryClient();
+	/*
+	 * Trade cooldown for this key.
+	 */
 	const { data: tradeCooldownStatus } = useTradeCooldownStatus(id || '');
+
 	const tradeCooldown: ActiveTradeCooldown | null = resolveActiveTradeCooldown(
 		tradeCooldownStatus,
 		nextBuyAllowedAt
 	);
+
 	const isTradeCooldownActive = isActiveCooldown(tradeCooldown);
 
 	const handleConfirmBuy = async (
@@ -268,10 +335,12 @@ function CreatorDetailPageContent() {
 		slippage?: { maxPriceStroops: number | null } | null
 	) => {
 		setTradeSubmitting(true);
+
 		try {
 			showToast.loading(
 				`Submitting buy for ${amount} key${amount === 1 ? '' : 's'}...`
 			);
+
 			await tradeMutation.mutateAsync({
 				creatorId: id || '',
 				amount,
@@ -281,21 +350,24 @@ function CreatorDetailPageContent() {
 				price: creator?.price,
 				maxPriceStroops: slippage?.maxPriceStroops ?? null,
 			});
+
 			showToast.transactionSuccess(
 				'Trade confirmed',
-				`Bought ${formatNumber(amount)} key${amount === 1 ? '' : 's'} from ${
-					creator?.title || 'Creator'
-				}`
+				`Bought ${formatNumber(amount)} key${
+					amount === 1 ? '' : 's'
+				} from ${creator?.title || 'Creator'}`
 			);
+
 			setBuyDialogOpen(false);
 			setLastPurchasedAmount(amount);
 			setShareModalOpen(true);
 		} catch (error) {
 			showToast.error(getSignatureErrorMessage(error));
 		} finally {
-			// #998 — refetch the cooldown after the settled trade so the Buy
-			// button reflects the freshly committed cooldown window.
-			if (id) invalidateTradeCooldownStatus(queryClient, id);
+			if (id) {
+				invalidateTradeCooldownStatus(queryClient, id);
+			}
+
 			setTradeSubmitting(false);
 		}
 	};
@@ -313,21 +385,25 @@ function CreatorDetailPageContent() {
 	if (error || !creator) {
 		const is404 =
 			!creator || (error instanceof ApiError && error.status === 404);
+
 		if (is404) {
 			return (
 				<main className="flex min-h-screen flex-col items-center justify-center gap-6 bg-[#06111f] px-6 py-16 text-center text-white">
 					<h1 className="font-grotesque text-3xl font-black">
 						Creator not found
 					</h1>
-					<p className="text-white/70 font-jakarta">
+
+					<p className="font-jakarta text-white/70">
 						We couldn't find a creator with that ID.
 					</p>
+
 					<Link to="/creators" className="text-amber-400 hover:underline">
 						Back to creators
 					</Link>
 				</main>
 			);
 		}
+
 		throw error;
 	}
 
@@ -344,12 +420,15 @@ function CreatorDetailPageContent() {
 		},
 	];
 
-	// During the pre-launch auction phase (#808/#924) the bonding curve price
-	// is not live yet — surface the current highest bid (or early-access price).
+	/*
+	 * During the pre-launch auction phase, show the current highest bid
+	 * instead of the bonding-curve spot price.
+	 */
 	const auctionLeadBid =
 		auctionPhase === 'active'
 			? resolveHighestBid(creator.auctionBids, creator.auctionHighestBid)
 			: null;
+
 	const auctionStatValue =
 		auctionLeadBid != null
 			? formatAuctionBidAmount(auctionLeadBid)
@@ -392,8 +471,10 @@ function CreatorDetailPageContent() {
 		supply: (index + 1) * 20,
 		priceXLM: priceStroops / 10_000_000,
 	}));
+
 	const spotPrice = resolveCreatorKeyPriceStroops(creator);
 	const twapPrice = twap?.priceStroops ?? null;
+
 	const twapDelta =
 		twapPrice != null && spotPrice != null ? twapPrice - spotPrice : null;
 
@@ -401,6 +482,7 @@ function CreatorDetailPageContent() {
 		creator.stakingPoolBalance != null ||
 		creator.totalStaked != null ||
 		creator.recentFeeInflow != null;
+
 	const stakingStats = hasRealStakingData
 		? {
 				stakingPoolBalance: creator.stakingPoolBalance,
@@ -424,12 +506,14 @@ function CreatorDetailPageContent() {
 						onDismiss={() => setDeprecationDismissed(true)}
 					/>
 				)}
+
 				<CreatorBreadcrumb
 					parentLabel="Marketplace"
 					parentHref="/"
 					currentLabel={`${creator.title} Profile`}
 				/>
-				{/* Key deprecation notice & guaranteed buyback flow (#923) */}
+
+				{/* Key deprecation notice & guaranteed buyback flow */}
 				{isKeyDeprecated(creator) && (
 					<KeyDeprecationBanner
 						creator={creator}
@@ -439,12 +523,14 @@ function CreatorDetailPageContent() {
 						recentSettlement={recentSettlement}
 					/>
 				)}
-				{/* Merge proposal voting for source key holders (#983) */}
+
+				{/* Merge proposal voting for source key holders */}
 				<MergeProposalBanner
 					sourceKeyId={id || ''}
 					holdingsCount={holdingsCount}
 					isConnected={Boolean(userAddress)}
 				/>
+
 				<div className="flex items-start gap-3">
 					<div className="min-w-0 flex-1 space-y-2">
 						<CreatorProfileStaleIndicator
@@ -455,6 +541,7 @@ function CreatorDetailPageContent() {
 								void refetchOnChainMetadata();
 							}}
 						/>
+
 						<CreatorProfileHeader
 							name={displayName}
 							symbol={displaySymbol}
@@ -474,17 +561,19 @@ function CreatorDetailPageContent() {
 									navigate(-1);
 									return;
 								}
+
 								navigate('/creators');
 							}}
 						/>
 					</div>
+
 					<WatchlistButton
 						creator={creator}
 						labelName={displayName}
-						// ≥44px tap target on mobile (WCAG 2.5.5); compact on sm+.
 						className="mt-3 size-11 shrink-0 sm:size-9"
 					/>
 				</div>
+
 				{/* Historical Price Chart */}
 				<SectionErrorBoundary sectionName="price history">
 					<PriceHistoryChart
@@ -494,11 +583,13 @@ function CreatorDetailPageContent() {
 						onIntervalChange={setInterval}
 					/>
 				</SectionErrorBoundary>
+
 				{/* 4 Stat Cards */}
 				<div data-testid="creator-stat-cards">
 					<CreatorProfileStatRow items={statItems} />
 				</div>
-				{/* Key Stats Panel (#952) */}
+
+				{/* Key Stats Panel */}
 				<SectionErrorBoundary sectionName="key statistics">
 					<KeyStatsPanel
 						stats={keyStats}
@@ -508,7 +599,8 @@ function CreatorDetailPageContent() {
 						isUniqueTradersLoading={isUniqueTradersLoading}
 					/>
 				</SectionErrorBoundary>
-				{/* Performance Bond Status Panel (#975) */}
+
+				{/* Performance Bond Status Panel */}
 				<SectionErrorBoundary sectionName="performance bond">
 					<PerformanceBondPanel
 						bond={performanceBond}
@@ -516,33 +608,34 @@ function CreatorDetailPageContent() {
 						isError={isPerformanceBondError}
 					/>
 				</SectionErrorBoundary>
-				{/* Deprecation Notice and Buy Action on Key Detail Page */}
+
+				{/* Deprecation Notice */}
 				{isKeyDeprecated(creator) && (
 					<div className="rounded-2xl border border-rose-500/30 bg-rose-500/10 p-4">
 						<DeprecationNotice reason={creator.deprecationReason} />
 					</div>
 				)}
-				{/*
-				 * Key Purchase CTA row (#1055): stacks vertically on mobile so the
-				 * buy action stays reachable and full-width with a 44px tap target;
-				 * desktop keeps the horizontal layout.
-				 */}
+
+				{/* Key Purchase CTA */}
 				<div className="flex flex-col gap-4 rounded-2xl border border-white/10 bg-white/[0.03] px-5 py-4 sm:flex-row sm:items-center sm:justify-between">
 					<div className="min-w-0">
 						<div className="flex items-center gap-2">
 							<p className="text-xs font-semibold uppercase tracking-wider text-white/55">
 								Key Purchase
 							</p>
+
 							{isLockedOut && <WhitelistStatusBadge />}
 						</div>
+
 						<p className="mt-0.5 text-sm text-white/80">
 							{isKeyDeprecated(creator)
 								? 'Key is deprecated. New buys are disabled.'
-								: isLockedOut
-									? 'Early access is restricted to approved whitelisted wallets.'
+								: buyDisabledReason
+									? buyDisabledReason
 									: 'Purchase keys for this creator.'}
 						</p>
-						{/* Configurable bid-ask spread between buy and sell price (#951) */}
+
+						{/* Configurable bid-ask spread */}
 						<SpreadIndicator
 							className="mt-2"
 							buyPriceStroops={keyConfig?.buyPriceStroops}
@@ -551,7 +644,8 @@ function CreatorDetailPageContent() {
 							spreadBps={keyConfig?.spreadBps}
 							isLoading={isKeyConfigLoading}
 						/>
-						{/* Oracle reference price next to the curve spot price (#967) */}
+
+						{/* Oracle reference price */}
 						<OraclePriceIndicator
 							className="mt-2"
 							comparison={oracleComparison}
@@ -559,22 +653,60 @@ function CreatorDetailPageContent() {
 							source={oracleSource}
 							isLoading={isOracleLoading}
 						/>
+
+						{/* Early access launch information */}
+						{creator.earlyAccessEnabled && (
+							<span className="mt-2 inline-flex items-center rounded-full border border-amber-300/30 bg-amber-300/10 px-2.5 py-1 text-xs font-bold text-amber-200">
+								Early access
+							</span>
+						)}
+
+						{creator.publicLaunchDate && hasValidPublicLaunchDate && (
+							<p className="mt-2 text-sm text-white/70">
+								{isPublicLaunchPending
+									? 'Public launch: '
+									: 'Public trading is open. '}
+
+								{isPublicLaunchPending && (
+									<time dateTime={creator.publicLaunchDate}>
+										{new Date(
+											creator.publicLaunchDate
+										).toLocaleString()}
+									</time>
+								)}
+							</p>
+						)}
 					</div>
+
 					{isKeyDeprecated(creator) ? (
 						<Button
 							disabled
 							data-testid="key-detail-buy-button"
 							variant="outline"
-							// ≥44px tap target on mobile; full-width, compact on sm+ (#1055).
 							className="min-h-11 w-full rounded-xl font-bold sm:h-10 sm:min-h-0 sm:w-auto"
 						>
 							Buy Disabled (Deprecated)
 						</Button>
+					) : buyDisabledReason ? (
+						<Tooltip content={buyDisabledReason}>
+							<span
+								className="inline-flex w-full sm:w-auto"
+								tabIndex={0}
+							>
+								<Button
+									type="button"
+									disabled
+									data-testid="key-detail-buy-button"
+									className="min-h-11 w-full rounded-xl bg-amber-400 font-bold text-slate-950 hover:bg-amber-300 sm:h-10 sm:min-h-0 sm:w-auto"
+								>
+									Buy Key
+								</Button>
+							</span>
+						</Tooltip>
 					) : (
 						<TradeCooldownButton
 							cooldown={tradeCooldown}
 							label="Buy Key"
-							// ≥44px tap target on mobile; full-width, compact on sm+ (#1055).
 							className="min-h-11 w-full rounded-xl font-bold sm:h-10 sm:min-h-0 sm:w-auto"
 							onClick={() => setBuyDialogOpen(true)}
 							buttonProps={{
@@ -583,7 +715,8 @@ function CreatorDetailPageContent() {
 						/>
 					)}
 				</div>
-				{/* Pre-Launch Auction Phase (#924) */}
+
+				{/* Pre-Launch Auction Phase */}
 				{auctionPhase !== 'inactive' && (
 					<AuctionPhaseSection
 						creatorId={creator.id}
@@ -596,11 +729,13 @@ function CreatorDetailPageContent() {
 						auctionBids={creator.auctionBids}
 					/>
 				)}
-				{/* Buy Cooldown Countdown (only meaningful for authenticated users) */}
+
+				{/* Buy Cooldown Countdown */}
 				{userAddress && !isTradeCooldownActive && (
 					<BuyCooldownCountdown nextBuyAllowedAt={nextBuyAllowedAt} />
 				)}
-				{/* Share to X Button (only visible for authenticated holders) */}
+
+				{/* Share to X */}
 				<div className="flex justify-end">
 					<ShareTwitterButton
 						creatorId={creator.id}
@@ -616,6 +751,8 @@ function CreatorDetailPageContent() {
 						}}
 					/>
 				</div>
+
+				{/* TWAP */}
 				{isTwapLoading ? (
 					<div
 						className="rounded-2xl border border-white/10 bg-white/[0.03] px-5 py-4"
@@ -645,6 +782,7 @@ function CreatorDetailPageContent() {
 									>
 										TWAP (24h)
 									</span>
+
 									<Tooltip content="Time-weighted average price over the past 24 hours. Less sensitive to short-term manipulation.">
 										<button
 											type="button"
@@ -655,10 +793,12 @@ function CreatorDetailPageContent() {
 										</button>
 									</Tooltip>
 								</div>
+
 								<div className="mt-1 text-xl font-bold text-white">
 									{formatDisplayKeyPrice(twapPrice)}
 								</div>
 							</div>
+
 							{twapDelta != null && (
 								<span
 									className={
@@ -674,130 +814,54 @@ function CreatorDetailPageContent() {
 						</div>
 					</div>
 				) : null}
+
 				{/* Staking Rewards */}
 				<StakingRewardsSection {...stakingStats} isLoading={isLoading} />
-				{/* Price Curve Chart */}
-				<div
-					className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8"
-					data-testid="creator-chart-container"
-				>
-					<h2 className="font-grotesque text-xl font-black tracking-tight text-white mb-6">
-						Price Curve
-					</h2>
-					<BondingCurveChart
-						data={chartData}
-						currentSupply={creator.creatorShareSupply ?? 100}
-						height={300}
-					/>
-				</div>
-				<SectionErrorBoundary sectionName="curve milestones">
-					<GraduatedCurveMilestoneChart
-						keyId={creator.id}
-						currentSupply={creator.creatorShareSupply ?? 0}
-					/>
-				</SectionErrorBoundary>
-				{/* Buy Simulation Tool */}
-				<KeySimulationTool
-					currentSupply={creator.creatorShareSupply ?? 100}
-					protocolFeeBps={creator.protocolFeeBps}
-					creatorFeeBps={creator.creatorFeeBps}
-				/>
-				{/* TWAP for the live curve — not meaningful during the pre-launch auction */}
-				{auctionPhase !== 'active' &&
-					(isTwapLoading ? (
-						<div
-							className="rounded-2xl border border-white/10 bg-white/[0.03] px-5 py-4"
-							data-testid="twap-price"
-						>
-							<div aria-label="Loading 24 hour TWAP" role="status">
-								<Skeleton className="h-3 w-24" />
-								<Skeleton className="mt-2 h-6 w-32" />
-							</div>
-						</div>
-					) : twapPrice != null ? (
+
+				{/* Price Curve */}
+				{auctionPhase !== 'active' && (
+					<>
 						<div
-							className="rounded-2xl border border-white/10 bg-white/[0.03] px-5 py-4"
-							data-testid="twap-price"
+							className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8"
+							data-testid="creator-chart-container"
 						>
-							<div className="flex items-center justify-between gap-4">
-								<div>
-									<div className="flex items-center gap-2 text-xs font-semibold uppercase tracking-wider text-white/55">
-										<span
-											className={
-												twapDelta != null
-													? twapDelta < 0
-														? 'text-emerald-400'
-														: 'text-rose-400'
-													: ''
-											}
-										>
-											TWAP (24h)
-										</span>
-										<Tooltip content="Time-weighted average price over the past 24 hours. Less sensitive to short-term manipulation.">
-											<button
-												type="button"
-												aria-label="What is 24 hour TWAP?"
-												className="text-white/50"
-											>
-												ⓘ
-											</button>
-										</Tooltip>
-									</div>
-									<div className="mt-1 text-xl font-bold text-white">
-										{formatDisplayKeyPrice(twapPrice)}
-									</div>
-								</div>
-								{twapDelta != null && (
-									<span
-										className={
-											twapDelta < 0
-												? 'text-sm font-semibold text-emerald-400'
-												: 'text-sm font-semibold text-rose-400'
-										}
-									>
-										{twapDelta < 0 ? '▼' : '▲'}{' '}
-										{formatDisplayKeyPrice(Math.abs(twapDelta))} vs
-										spot
-									</span>
-								)}
-							</div>
+							<h2 className="mb-6 font-grotesque text-xl font-black tracking-tight text-white">
+								Price Curve
+							</h2>
+
+							<BondingCurveChart
+								data={chartData}
+								currentSupply={creator.creatorShareSupply ?? 100}
+								height={300}
+							/>
 						</div>
-					) : null)}
-				{/* Staking Rewards */}
-				<StakingRewardsSection {...stakingStats} isLoading={isLoading} />
-				{/* Price Chart — hidden during the pre-launch auction phase (#924) and
-				shown again once the auction closes and the curve activates */}
-				{auctionPhase !== 'active' && (
-					<div
-						className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8"
-						data-testid="creator-chart-container"
-					>
-						<h2 className="font-grotesque text-xl font-black tracking-tight text-white mb-6">
-							Price Curve
-						</h2>
-						<BondingCurveChart
-							data={chartData}
+
+						{/* Graduated Curve Milestones */}
+						<SectionErrorBoundary sectionName="curve milestones">
+							<GraduatedCurveMilestoneChart
+								keyId={creator.id}
+								currentSupply={creator.creatorShareSupply ?? 0}
+							/>
+						</SectionErrorBoundary>
+
+						{/* Buy Simulation Tool */}
+						<KeySimulationTool
 							currentSupply={creator.creatorShareSupply ?? 100}
-							height={300}
+							protocolFeeBps={creator.protocolFeeBps}
+							creatorFeeBps={creator.creatorFeeBps}
 						/>
-					</div>
-				)}
-				{/* Buy Simulation Tool — likewise only once the curve is live */}
-				{auctionPhase !== 'active' && (
-					<KeySimulationTool
-						currentSupply={creator.creatorShareSupply ?? 100}
-						protocolFeeBps={creator.protocolFeeBps}
-						creatorFeeBps={creator.creatorFeeBps}
-					/>
+					</>
 				)}
+
 				{/* Holder Concentration */}
 				<div
 					className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8"
 					data-testid="holder-concentration-container"
 				>
-					<h2 className="font-grotesque text-xl font-black tracking-tight text-white mb-6">
+					<h2 className="mb-6 font-grotesque text-xl font-black tracking-tight text-white">
 						Holder Concentration
 					</h2>
+
 					<SectionErrorBoundary sectionName="holder concentration">
 						<HolderConcentrationChart
 							holders={holders}
@@ -805,21 +869,25 @@ function CreatorDetailPageContent() {
 						/>
 					</SectionErrorBoundary>
 				</div>
+
 				{/* Fee Structure */}
 				<div className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8">
-					<div className="flex items-center justify-between gap-4 mb-6">
+					<div className="mb-6 flex items-center justify-between gap-4">
 						<h2 className="font-grotesque text-xl font-black tracking-tight text-white">
 							Fee Structure
 						</h2>
+
 						<CreatorProfileStaleIndicator
 							visible={shouldShowBadge}
-							isRefetching={isFetching}
+							isRefetching={isFetching || isOnChainLoading}
 							onRefresh={handleRefetch}
 						/>
 					</div>
+
 					<CreatorProfileInfoGrid items={feeItems} />
 				</div>
-				{/* Co-Creator Section */}{' '}
+
+				{/* Co-Creator Section */}
 				<SectionErrorBoundary sectionName="co-creator information">
 					<CoCreatorSection
 						courseId={creator.id}
@@ -829,14 +897,16 @@ function CreatorDetailPageContent() {
 						totalPaidToCreator={creator.totalPaidToCreator}
 					/>
 				</SectionErrorBoundary>
+
 				{/* Key Holders */}
 				<div
 					data-testid="creator-holders-container"
 					className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8"
 				>
-					<h2 className="font-grotesque text-xl font-black tracking-tight text-white mb-6">
+					<h2 className="mb-6 font-grotesque text-xl font-black tracking-tight text-white">
 						Key Holders
 					</h2>
+
 					<SectionErrorBoundary sectionName="key holders">
 						<KeyHolderList
 							holders={holders}
@@ -848,17 +918,19 @@ function CreatorDetailPageContent() {
 						/>
 					</SectionErrorBoundary>
 				</div>
+
 				{/* Gated Content */}
 				<div className="rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8">
-					<h2 className="font-grotesque text-xl font-black tracking-tight text-white mb-6">
+					<h2 className="mb-6 font-grotesque text-xl font-black tracking-tight text-white">
 						Exclusive Content
 					</h2>
+
 					<SubscriptionAccessGate
 						creatorId={creator.id}
 						minimumHolding={1}
 						onBuyClick={() => setBuyDialogOpen(true)}
 					>
-						<div className="rounded-xl bg-white/[0.03] p-6 border border-white/10">
+						<div className="rounded-xl border border-white/10 bg-white/[0.03] p-6">
 							<p className="text-white/80">
 								🎉 Welcome to the exclusive content section! Here you
 								can access premium videos, articles, and perks from{' '}
@@ -867,15 +939,19 @@ function CreatorDetailPageContent() {
 						</div>
 					</SubscriptionAccessGate>
 				</div>
+
+				{/* Activity */}
 				<div className="mt-8 rounded-[2rem] border border-white/10 bg-white/[0.02] p-6 shadow-2xl backdrop-blur-md md:p-8">
-					<h2 className="font-grotesque text-xl font-black tracking-tight text-white mb-6">
+					<h2 className="mb-6 font-grotesque text-xl font-black tracking-tight text-white">
 						Activity
 					</h2>
+
 					<SectionErrorBoundary sectionName="creator activity">
 						<CreatorActivityFeed creatorId={creator.id} />
 					</SectionErrorBoundary>
 				</div>
-				{/* Key Buyback Modal (#923) */}
+
+				{/* Key Buyback Modal */}
 				{isKeyDeprecated(creator) && (
 					<KeyBuybackModal
 						open={buybackModalOpen}
@@ -892,6 +968,8 @@ function CreatorDetailPageContent() {
 						}}
 					/>
 				)}
+
+				{/* Trade Dialog */}
 				{creator && (
 					<TradeDialog
 						open={buyDialogOpen}
@@ -910,6 +988,8 @@ function CreatorDetailPageContent() {
 						requireConfirmation={true}
 					/>
 				)}
+
+				{/* Share Modal */}
 				{creator && (
 					<ShareModal
 						open={shareModalOpen}
diff --git a/src/pages/__tests__/CreatorDetailPage.integration.test.tsx b/src/pages/__tests__/CreatorDetailPage.integration.test.tsx
index c5bf5ae9..045a30a3 100644
--- a/src/pages/__tests__/CreatorDetailPage.integration.test.tsx
+++ b/src/pages/__tests__/CreatorDetailPage.integration.test.tsx
@@ -1,22 +1,29 @@
 import type { ComponentProps, ReactNode } from 'react';
-import { act, render, screen } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { MemoryRouter, Routes, Route } from 'react-router';
 import CreatorDetailPage from '@/pages/CreatorDetailPage';
+import CreatorDashboardPage from '@/pages/CreatorDashboardPage';
 import { courseService } from '@/services/course.service';
 import { ApiError } from '@/services/api.service';
 import { queryKeys } from '@/lib/queryKeys';
+import { useAccount } from 'wagmi';
 
 vi.mock('@/services/course.service', () => ({
 	courseService: {
 		getCourse: vi.fn(),
 		getPriceHistory: vi.fn(),
 		getHoldersPage: vi.fn(),
+		updateCourse: vi.fn(),
 	},
 }));
 
+vi.mock('wagmi', () => ({
+	useAccount: vi.fn(),
+}));
+
 vi.mock('framer-motion', async () => {
 	const React = await import('react');
 	type MotionProps = ComponentProps<'div'> & {
@@ -47,6 +54,8 @@ vi.mock('framer-motion', async () => {
 const mockGetCourse = vi.mocked(courseService.getCourse);
 const mockGetPriceHistory = vi.mocked(courseService.getPriceHistory);
 const mockGetHoldersPage = vi.mocked(courseService.getHoldersPage);
+const mockUpdateCourse = vi.mocked(courseService.updateCourse);
+const mockUseAccount = vi.mocked(useAccount);
 
 function makeFreshQueryClient() {
 	return new QueryClient({
@@ -74,6 +83,10 @@ describe('CreatorDetailPage Integration', () => {
 		mockGetCourse.mockReset();
 		mockGetPriceHistory.mockResolvedValue([]);
 		mockGetHoldersPage.mockReset();
+		mockUpdateCourse.mockReset();
+		mockUseAccount.mockReturnValue({ address: undefined } as ReturnType<
+			typeof useAccount
+		>);
 		mockGetHoldersPage.mockResolvedValue({
 			holders: [],
 			nextCursor: null,
@@ -341,4 +354,134 @@ describe('CreatorDetailPage Integration', () => {
 			screen.queryByText(/this creator page could not load/i)
 		).not.toBeInTheDocument();
 	});
+
+	it('shows early access only when enabled and gates buys by wallet whitelist', async () => {
+		const walletAddress =
+			'GABCDE1234567890ABCDE1234567890ABCDE1234567890ABCDEF';
+		mockUseAccount.mockReturnValue({ address: walletAddress } as ReturnType<
+			typeof useAccount
+		>);
+		const creator = {
+			id: 'creator-123',
+			title: 'Alex Rivers',
+			description: 'Digital Artist & Illustrator',
+			price: 0.05,
+			priceStroops: 500_000,
+			creatorShareSupply: 100,
+			instructorId: 'arivers',
+			category: 'Art',
+			level: 'BEGINNER' as const,
+			earlyAccessEnabled: true,
+			earlyAccessWhitelist: [
+				'GOTHER1234567890ABCDE1234567890ABCDE1234567890ABCDEF',
+			],
+		};
+		mockGetCourse.mockResolvedValue(creator);
+
+		render(
+			<QueryClientProvider client={queryClient}>
+				<MemoryRouter initialEntries={['/creator/creator-123']}>
+					<Routes>
+						<Route path="/creator/:id" element={<CreatorDetailPage />} />
+					</Routes>
+				</MemoryRouter>
+			</QueryClientProvider>
+		);
+
+		expect(
+			await screen.findByTestId('early-access-badge')
+		).toBeInTheDocument();
+		const buyButton = screen.getByTestId('creator-buy-button');
+		expect(buyButton).toBeDisabled();
+		expect(screen.getByRole('tooltip')).toHaveTextContent(
+			'Your wallet is not on the whitelist'
+		);
+
+		act(() => {
+			queryClient.setQueryData(queryKeys.creators.detail('creator-123'), {
+				...creator,
+				earlyAccessWhitelist: [walletAddress.toLowerCase()],
+			});
+		});
+		await waitFor(() => expect(buyButton).toBeEnabled());
+	});
+
+	it('shows the configured public launch date and removes early access badge when disabled', async () => {
+		mockGetCourse.mockResolvedValue({
+			id: 'creator-123',
+			title: 'Alex Rivers',
+			description: 'Digital Artist & Illustrator',
+			price: 0.05,
+			priceStroops: 500_000,
+			creatorShareSupply: 100,
+			instructorId: 'arivers',
+			category: 'Art',
+			level: 'BEGINNER',
+			earlyAccessEnabled: false,
+			publicLaunchDate: '2030-01-01T12:00:00.000Z',
+		});
+
+		render(
+			<QueryClientProvider client={queryClient}>
+				<MemoryRouter initialEntries={['/creator/creator-123']}>
+					<Routes>
+						<Route path="/creator/:id" element={<CreatorDetailPage />} />
+					</Routes>
+				</MemoryRouter>
+			</QueryClientProvider>
+		);
+
+		expect(await screen.findByText(/public launch:/i)).toBeInTheDocument();
+		expect(
+			screen.queryByTestId('early-access-badge')
+		).not.toBeInTheDocument();
+	});
+
+	it('persists an early access mode change from the creator settings panel', async () => {
+		const user = userEvent.setup();
+		const creator = {
+			id: 'creator-123',
+			title: 'Alex Rivers',
+			description: 'Digital Artist & Illustrator',
+			price: 0.05,
+			priceStroops: 500_000,
+			creatorShareSupply: 100,
+			instructorId: 'arivers',
+			category: 'Art',
+			level: 'BEGINNER' as const,
+			earlyAccessEnabled: false,
+		};
+		mockGetCourse.mockResolvedValue(creator);
+		mockUpdateCourse.mockResolvedValue({
+			...creator,
+			earlyAccessEnabled: true,
+		});
+
+		render(
+			<QueryClientProvider client={queryClient}>
+				<MemoryRouter
+					initialEntries={['/creators/creator-123/dashboard?tab=settings']}
+				>
+					<Routes>
+						<Route
+							path="/creators/:id/dashboard"
+							element={<CreatorDashboardPage />}
+						/>
+					</Routes>
+				</MemoryRouter>
+			</QueryClientProvider>
+		);
+
+		const toggle = await screen.findByRole('checkbox', {
+			name: 'Enable early access',
+		});
+		await user.click(toggle);
+
+		expect(mockUpdateCourse).toHaveBeenCalledWith('creator-123', {
+			earlyAccessEnabled: true,
+		});
+		expect(
+			await screen.findByText(/only whitelisted wallets can buy/i)
+		).toBeInTheDocument();
+	});
 });
diff --git a/src/services/course.service.ts b/src/services/course.service.ts
index 1a9fe55f..1313be2f 100644
--- a/src/services/course.service.ts
+++ b/src/services/course.service.ts
@@ -35,7 +35,7 @@ export interface Course {
 	protocolFeeBps?: number;
 	/** Max keys that can be bought in a single transaction; null means no limit. */
 	maxBuyQuantity?: number | null;
-	/** Maximum holding cap per wallet configured by creator (#1015); null or undefined means unlimited. */
+	/** Maximum holding cap per wallet configured by creator (#1015). */
 	holdingCap?: number | null;
 	maxHoldingCap?: number | null;
 	/** Last up to 7 price history points in stroops, oldest to newest. */
@@ -45,20 +45,6 @@ export interface Course {
 	holders?: number;
 	/** XLM currently held in the staking reward pool for this key. */
 	stakingPoolBalance?: number;
-	/**
-	 * Deprecation record for this key (issue #996), when deprecated.
-	 * Shape matches DeprecationBanner's KeyDeprecation props.
-	 */
-	deprecation?: {
-		/** ISO 8601 date the key was (or will be) deprecated. */
-		deprecatedAt: string;
-		/** Human-readable reason the key was deprecated. */
-		reason: string;
-		/** Successor key's creator id, when one has been designated. */
-		successorId?: string;
-		/** Display name of the successor key, for the CTA label. */
-		successorName?: string;
-	};
 	/** Number of keys staked across all holders. */
 	totalStaked?: number;
 	/** Protocol fees that flowed into the staking pool over the last month. */
@@ -75,20 +61,15 @@ export interface Course {
 	auctionSold?: number;
 	/**
 	 * ISO timestamp for when the pre-launch bidding window closes and the
-	 * key goes live on the bonding curve (#924). When absent, the auction
-	 * ends once `auctionSold` reaches `auctionSupply`.
+	 * key goes live on the bonding curve (#924).
 	 */
 	auctionEndsAt?: string;
 	/**
-	 * Minimum amount (XLM) a new bid must exceed the current highest bid by
-	 * (#924). When absent, a 5% increment over the highest bid is assumed.
+	 * Minimum amount (XLM) a new bid must exceed the current highest bid by.
+	 * Defaults to a 5% increment when absent.
 	 */
 	auctionMinIncrement?: number;
-	/**
-	 * Current highest bid in XLM (#924). When `auctionBids` is present this
-	 * is usually derived from the history instead; the explicit field is the
-	 * source of truth for auctions whose history hasn't been loaded yet.
-	 */
+	/** Current highest bid in XLM. */
 	auctionHighestBid?: number;
 	/** Pre-launch auction bid history, newest first (#924). */
 	auctionBids?: AuctionBidEntry[];
@@ -98,19 +79,16 @@ export interface Course {
 	 */
 	launchPenaltyBps?: number;
 	/**
-	 * Per-wallet delay between consecutive buys, expressed in Stellar ledgers
-	 * (~5 seconds per ledger) as returned by the contract's `set_buy_cooldown`.
-	 * The dashboard displays this converted to minutes.
+	 * Per-wallet delay between consecutive buys, expressed in Stellar ledgers.
 	 */
 	buyCooldownLedgers?: number;
 	/**
 	 * Proposal quorum threshold in basis points (100–5000 = 1%–50%).
-	 * Minimum holder participation required for a governance proposal to pass.
 	 */
 	quorumBps?: number;
-	/** Ledger sequence at which this key was created; anchors the 7-day launch window. */
+	/** Ledger sequence at which this key was created. */
 	createdAtLedger?: number;
-	/** Network ledger sequence as of this response, used to evaluate the launch window. */
+	/** Network ledger sequence as of this response. */
 	currentLedger?: number;
 	/** Optional co-creator wallet configured for this creator key. */
 	coCreatorAddress?: string;
@@ -121,45 +99,59 @@ export interface Course {
 	/** Lifetime payout to the primary creator, expressed in stroops. */
 	totalPaidToCreator?: number;
 	/**
-	 * Fallback, creator-wide buy-cooldown expiry (#873) used when no
-	 * per-user `nextBuyAllowedAt` is present on the caller's held position.
-	 * Timestamp after which buys are allowed again.
+	 * Fallback, creator-wide buy-cooldown expiry used when no per-user
+	 * nextBuyAllowedAt is present on the caller's held position.
 	 */
 	nextBuyAllowedAt?: number | string | null;
 	/**
-	 * Cooldown policy for this key in seconds (#998): how long after a
-	 * trade the next trade of the same key is blocked. Drives the tooltip
-	 * copy on the disabled trade buttons. Absent when unknown.
+	 * Cooldown policy for this key in seconds. Drives tooltip copy on
+	 * disabled trade buttons.
 	 */
 	tradeCooldownSeconds?: number | null;
 	/**
-	 * Cooldown policy for this key expressed in Stellar ledgers (~5 seconds
-	 * per ledger), as configured via the contract's `set_buy_cooldown`.
-	 * Preferred over `tradeCooldownSeconds` when both are present.
+	 * Cooldown policy expressed in Stellar ledgers (~5 seconds per ledger).
+	 * Preferred over tradeCooldownSeconds when both are present.
 	 */
 	tradeCooldownLedgers?: number | null;
 	/**
-	 * Whether this key has been marked deprecated (#871) — e.g. the creator
-	 * left the platform or the key was superseded. Deprecated keys can no
-	 * longer be bought/sold; holders can redeem their position instead.
+	 * Whether this key has been marked deprecated.
+	 * Deprecated keys can no longer be bought or sold.
 	 */
 	deprecated?: boolean;
 	/** Optional human-readable reason surfaced in the deprecation notice. */
 	deprecationReason?: string | null;
 	/** Performance bond status for creator key protection (#975). */
 	performanceBond?: PerformanceBond | null;
-	/**
-	 * Key-level circuit breaker price impact threshold in basis points (e.g. 1500 = 15%) (#1034).
-	 * Buy orders whose price impact equals or exceeds this threshold will be halted.
-	 */
+	/** Key-level circuit breaker price impact threshold in basis points. */
 	circuitBreakerThresholdBps?: number | null;
-	/** Key-level circuit breaker price impact threshold in percent (e.g. 15 = 15%) (#1034). */
+	/** Key-level circuit breaker price impact threshold in percent. */
 	circuitBreakerThresholdPercent?: number | null;
-	/** Whether the early access whitelist gate is enabled for this creator key (#1031). */
+	/** Whether the early-access whitelist gate is enabled (#1031). */
 	isWhitelistEnabled?: boolean;
+	/** Backward-compatible alias for isWhitelistEnabled. */
 	whitelistEnabled?: boolean;
-	/** Approved wallet addresses on the early access whitelist (#1031). */
+	/** Approved wallet addresses on the early-access whitelist (#1031). */
 	whitelist?: WhitelistEntry[];
+	/** Migration details shown when a deprecated key has a successor. */
+	deprecation?: KeyDeprecation | null;
+
+	/** Whether purchases are restricted to the early-access whitelist. */
+	earlyAccessEnabled?: boolean;
+	/** Wallet addresses allowed to buy while early access is active. */
+	earlyAccessWhitelist?: string[];
+	/** ISO timestamp for when public purchases begin. */
+	publicLaunchDate?: string | null;
+}
+
+export interface KeyDeprecation {
+	/** ISO 8601 date the key was (or will be) deprecated. */
+	deprecatedAt: string;
+	/** Human-readable reason for deprecation. */
+	reason: string;
+	/** Successor creator ID, when one has been designated. */
+	successorId?: string;
+	/** Display name of the successor key. */
+	successorName?: string;
 }
 
 export interface WhitelistEntry {
@@ -181,35 +173,33 @@ export interface GraduatedCurveConfig {
 	milestones?: CurveMilestone[];
 }
 
-/**
- * Live trading configuration for a single creator key (#951).
- *
- * Returned by `GET /keys/:keyId/config` and used to surface the bid-ask
- * spread between the current buy (ask) and sell (bid) price. All prices are
- * in stroops (1 XLM = 10,000,000 stroops).
- */
 /**
  * Trade cooldown status for a creator key (#998).
  *
- * Returned by `GET /keys/:keyId/trade-cooldown` and consumed by the disabled
- * buy/sell buttons' countdown. `nextBuyAllowedAt` is the absolute timestamp
- * after which the authenticated wallet may trade the key again; it is `null`
- * when no cooldown is in effect for the caller.
+ * Returned by GET /keys/:keyId/trade-cooldown.
+ * nextBuyAllowedAt is the absolute timestamp after which the authenticated
+ * wallet may trade the key again. It is null when no cooldown is in effect.
  */
 export interface TradeCooldownInfo {
 	/** Key this cooldown status belongs to, when the backend echoes it back. */
 	keyId?: string;
 	/**
-	 * Absolute timestamp (seconds epoch, ms epoch, or ISO string) after which
-	 * trading is allowed again. `null` means no cooldown is in effect.
+	 * Absolute timestamp (seconds epoch, milliseconds epoch, or ISO string)
+	 * after which trading is allowed again.
 	 */
 	nextBuyAllowedAt?: number | string | null;
 	/** Cooldown policy length in seconds, when reported explicitly. */
 	cooldownDurationSeconds?: number | null;
-	/** Cooldown policy length in Stellar ledgers (~5s each), when reported. */
+	/** Cooldown policy length in Stellar ledgers (~5 seconds per ledger). */
 	cooldownDurationLedgers?: number | null;
 }
 
+/**
+ * Live trading configuration for a single creator key (#951).
+ *
+ * Returned by GET /keys/:keyId/config.
+ * All prices are in stroops (1 XLM = 10,000,000 stroops).
+ */
 export interface KeyConfig {
 	/** Key this config belongs to, when the backend echoes it back. */
 	keyId?: string;
@@ -217,30 +207,29 @@ export interface KeyConfig {
 	buyPriceStroops?: number | null;
 	/** Current price to sell one key, in stroops. */
 	sellPriceStroops?: number | null;
-	/** Absolute spread (buy - sell) in stroops, when reported explicitly. */
+	/** Absolute spread (buy - sell) in stroops. */
 	spreadStroops?: number | null;
-	/** Spread expressed in basis points of the buy price, when reported. */
+	/** Spread expressed in basis points of the buy price. */
 	spreadBps?: number | null;
-	/** Maximum holding cap per wallet, when reported by the key config endpoint (#1015). */
+	/** Maximum holding cap per wallet, when reported by the config endpoint. */
 	holdingCap?: number | null;
-	/** Alias for holdingCap — maximum holding cap per wallet (#1015). */
+	/** Alias for holdingCap. */
 	maxHoldingCap?: number | null;
-	/** Key-level circuit breaker price impact threshold in basis points (#1034). */
+	/** Key-level circuit breaker price impact threshold in basis points. */
 	circuitBreakerThresholdBps?: number | null;
-	/** Key-level circuit breaker price impact threshold in percent (#1034). */
+	/** Key-level circuit breaker price impact threshold in percent. */
 	circuitBreakerThresholdPercent?: number | null;
 }
 
 /**
  * Vesting schedule for a creator key's reserved creator allocation (#960).
  *
- * All amounts are expressed in XLM; dates are ISO timestamps. The contract
- * remains the source of truth for `vestedAmountXlm` / `claimableXlm` — the
- * client only derives progress percentages for the timeline.
+ * Amounts are expressed in XLM; dates are ISO timestamps.
+ * The contract remains the source of truth for vested and claimable amounts.
  */
 export interface KeyVestingSchedule {
 	keyId?: string;
-	/** Wallet the allocation is registered to (the key's creator). */
+	/** Wallet the allocation is registered to. */
 	beneficiary?: string | null;
 	/** Total allocation subject to vesting, in XLM. */
 	totalAllocationXlm?: number | null;
@@ -273,8 +262,8 @@ export interface KeyVestingClaim {
 /**
  * External oracle price for a creator key (#967).
  *
- * `priceStroops` is the oracle's view of the key's value, surfaced next to the
- * bonding-curve spot price so a large divergence is visible before trading.
+ * priceStroops is the oracle's view of the key's value, surfaced next to
+ * the bonding-curve spot price.
  */
 export interface KeyOraclePrice {
 	keyId?: string;
@@ -282,11 +271,11 @@ export interface KeyOraclePrice {
 	priceStroops?: number | null;
 	/** ISO timestamp the oracle last published this price. */
 	updatedAt?: string | null;
-	/** Feed identifier, shown in the tooltip explaining the source. */
+	/** Feed identifier shown in the source tooltip. */
 	source?: string | null;
 	/**
-	 * Maximum age, in seconds, after which the feed is considered stale.
-	 * Falls back to the default staleness window when not reported.
+	 * Maximum age in seconds before the feed is considered stale.
+	 * Falls back to the default staleness window when absent.
 	 */
 	maxAgeSeconds?: number | null;
 }
@@ -296,24 +285,23 @@ export type PerformanceBondState = 'staked' | 'released' | 'forfeited';
 /**
  * Creator performance bond status (#975).
  *
- * Surfaces the bonded amount, current state ('staked' | 'released' | 'forfeited'),
- * target milestone required for release, and state-specific details (release timestamp
- * or forfeiture reason).
+ * Surfaces the bonded amount, current state, target milestone, and
+ * state-specific details such as release timestamp or forfeiture reason.
  */
 export interface PerformanceBond {
 	keyId?: string;
 	/** Bonded amount in XLM. */
 	amountXlm?: number | null;
-	/** Bonded amount in stroops (1 XLM = 10,000,000 stroops). */
+	/** Bonded amount in stroops. */
 	amountStroops?: number | null;
-	/** Current state of the bond: 'staked' | 'released' | 'forfeited'. */
+	/** Current state of the bond. */
 	state: PerformanceBondState | string;
-	/** Maturity milestone required for bond release (e.g. "1,000 Keys Sold"). */
+	/** Maturity milestone required for bond release. */
 	milestone?: string | null;
 	targetMilestone?: string | null;
-	/** ISO timestamp when the bond was released (present for 'released' state). */
+	/** ISO timestamp when the bond was released. */
 	releasedAt?: string | null;
-	/** Reason for forfeiture (present for 'forfeited' state). */
+	/** Reason for forfeiture. */
 	forfeitureReason?: string | null;
 	reason?: string | null;
 }
@@ -362,9 +350,8 @@ export interface KeyHolderEntry {
 	/** Total keys held by this holder, including any that are staked. */
 	keyCount: number;
 	/**
-	 * How many of `keyCount` are currently locked in the staking contract.
-	 * Absent on responses from the pre-staking holders endpoint; callers
-	 * should treat a missing value as `0`.
+	 * How many of keyCount are currently locked in the staking contract.
+	 * Missing values should be treated as 0.
 	 */
 	stakedQuantity?: number;
 }
@@ -409,7 +396,6 @@ export interface KeyStats {
 	twap24h: number | null;
 }
 
-
 /** Single bid placed during a key's pre-launch auction window (#924). */
 export interface AuctionBidEntry {
 	/** Unique bid id from the contract. */
@@ -425,15 +411,14 @@ export interface AuctionBidEntry {
 }
 
 /**
- * Unique trader count for a creator key (#1020): distinct wallets that have
- * bought or sold the key at least once.
+ * Unique trader count for a creator key (#1020).
+ * Counts distinct wallets that have bought or sold the key at least once.
  */
 export interface KeyUniqueTraders {
 	/** Current all-time unique trader count. */
 	uniqueTraders: number | null;
-	/** Unique trader count as of 24 hours ago, used for the trend indicator. */
+	/** Unique trader count as of 24 hours ago. */
 	uniqueTraders24hAgo: number | null;
-
 }
 
 class CourseService extends BaseApiService {
@@ -461,13 +446,10 @@ class CourseService extends BaseApiService {
 
 	/**
 	 * Get one cursor-paginated page of courses for infinite-scroll marketplace
-	 * browsing - GET /courses (#685). `page` is used as the cursor: pass the
-	 * previous response's `page + 1` to fetch the next page.
+	 * browsing - GET /courses (#685).
 	 *
-	 * `hasMore` is read from the response's `has_more`/`hasMore` field when
-	 * the backend provides it, falling back to "this page was full" (item
-	 * count equals the requested limit) when it doesn't -- a full page means
-	 * there could be more, an under-full page means we've reached the end.
+	 * page is used as the cursor: pass the previous response's page + 1
+	 * to fetch the next page.
 	 */
 	async getCoursesPage(
 		page: number,
@@ -485,15 +467,18 @@ class CourseService extends BaseApiService {
 			>('/courses', { params: requestParams });
 
 			const raw = response.data.data;
+
 			const items: Course[] = Array.isArray(raw)
 				? raw
 				: (raw.items ?? raw.data ?? []);
+
 			const hasMore: boolean = Array.isArray(raw)
 				? items.length === limit
 				: (raw.has_more ?? raw.hasMore ?? items.length === limit);
 
 			const result: CoursesPage = { items, page, hasMore };
 			cacheManager.set(cacheKey, result, this.PROFILE_CACHE_TTL);
+
 			return result;
 		} catch (error) {
 			throw this.handleError(error);
@@ -513,6 +498,7 @@ class CourseService extends BaseApiService {
 
 			const data = response.data.data;
 			cacheManager.set(cacheKey, data, this.PROFILE_CACHE_TTL);
+
 			return data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -543,7 +529,10 @@ class CourseService extends BaseApiService {
 	): Promise<KeyHoldersPage> {
 		try {
 			const params: Record<string, string> = {};
-			if (cursor) params.cursor = cursor;
+
+			if (cursor) {
+				params.cursor = cursor;
+			}
 
 			const response = await this.api.get<APIResponse<KeyHoldersPage>>(
 				`/keys/${keyId}/holders`,
@@ -563,6 +552,7 @@ class CourseService extends BaseApiService {
 				`/keys/${keyId}/twap`,
 				{ params: { window } }
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -575,23 +565,23 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<KeyStats>>(
 				`/keys/${keyId}/stats`
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
 		}
 	}
 
-
 	/**
-	 * Get the live pre-launch auction bid history for a key (#924) —
-	 * GET /keys/:keyId/auction/bids. Returns the bids newest first so the
-	 * client can render the current leader without extra sorting.
+	 * Get live pre-launch auction bid history for a key (#924).
+	 * GET /keys/:keyId/auction/bids
 	 */
 	async getAuctionBids(keyId: string): Promise<AuctionBidEntry[]> {
 		try {
-			const response = await this.api.get<
-				APIResponse<AuctionBidEntry[]>
-			>(`/keys/${keyId}/auction/bids`);
+			const response = await this.api.get<APIResponse<AuctionBidEntry[]>>(
+				`/keys/${keyId}/auction/bids`
+			);
+
 			return response.data.data ?? [];
 		} catch (error) {
 			throw this.handleError(error);
@@ -604,6 +594,7 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<KeyUniqueTraders>>(
 				`/keys/${keyId}/unique-traders`
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -665,7 +656,10 @@ class CourseService extends BaseApiService {
 	// Search keys - GET /keys/search?q=:query
 	async searchKeys(query: string): Promise<Course[]> {
 		const trimmed = query.trim();
-		if (!trimmed) return [];
+
+		if (!trimmed) {
+			return [];
+		}
 
 		try {
 			const response = await this.api.get<
@@ -675,7 +669,11 @@ class CourseService extends BaseApiService {
 			});
 
 			const raw = response.data.data;
-			if (Array.isArray(raw)) return raw;
+
+			if (Array.isArray(raw)) {
+				return raw;
+			}
+
 			if (
 				raw &&
 				typeof raw === 'object' &&
@@ -684,13 +682,14 @@ class CourseService extends BaseApiService {
 			) {
 				return raw.items;
 			}
+
 			return [];
 		} catch (error) {
 			throw this.handleError(error);
 		}
 	}
 
-	// Set co-creator address and split — POST /courses/:id/co-creator
+	// Set co-creator address and split - POST /courses/:id/co-creator
 	async setCoCreator(
 		courseId: string,
 		address: string,
@@ -717,6 +716,7 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<
 				APIResponse<Record<string, number>>
 			>(`/keys/${keyId}/simulate`, { params: { quantity } });
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -729,6 +729,7 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<GraduatedCurveConfig>>(
 				`/keys/${keyId}/curve-config`
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -741,6 +742,7 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<KeyBuybackInfo>>(
 				`/keys/${keyId}/buyback`
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -753,6 +755,7 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<KeyConfig>>(
 				`/keys/${keyId}/config`
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -765,18 +768,27 @@ class CourseService extends BaseApiService {
 		config?: { signal?: AbortSignal }
 	): Promise<ContractDynamicFeeRate> {
 		try {
-			const response = await this.api.get<APIResponse<ContractDynamicFeeRate>>(
-				`/keys/${keyId}/fee-rate`,
-				{ signal: config?.signal }
-			);
+			const response = await this.api.get<
+				APIResponse<ContractDynamicFeeRate>
+			>(`/keys/${keyId}/fee-rate`, { signal: config?.signal });
+
 			return response.data.data;
-		} catch (error) {
-			// Cancellation must propagate untouched so callers can ignore it.
-			const name = (error as { name?: string } | null)?.name;
-			const code = (error as { code?: string } | null)?.code;
-			if (name === 'CanceledError' || name === 'AbortError' || code === 'ERR_CANCELED') {
+		} catch (error: unknown) {
+			if (
+				error instanceof Error &&
+				(error.name === 'CanceledError' || error.name === 'AbortError')
+			) {
+				throw error;
+			}
+			if (
+				typeof error === 'object' &&
+				error !== null &&
+				'code' in error &&
+				error.code === 'ERR_CANCELED'
+			) {
 				throw error;
 			}
+
 			throw this.handleError(error);
 		}
 	}
@@ -791,6 +803,7 @@ class CourseService extends BaseApiService {
 				`/keys/${keyId}/vesting`,
 				{ params: wallet ? { wallet } : undefined }
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -807,7 +820,9 @@ class CourseService extends BaseApiService {
 				`/keys/${keyId}/vesting/claims`,
 				{ params: { wallet } }
 			);
+
 			const data = response.data.data;
+
 			return Array.isArray(data) ? data : [];
 		} catch (error) {
 			throw this.handleError(error);
@@ -820,6 +835,7 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<KeyOraclePrice>>(
 				`/keys/${keyId}/oracle`
 			);
+
 			return response.data.data;
 		} catch (error) {
 			throw this.handleError(error);
@@ -827,18 +843,22 @@ class CourseService extends BaseApiService {
 	}
 
 	// Get trade cooldown status - GET /keys/:keyId/trade-cooldown (#998)
-	async getTradeCooldownStatus(keyId: string): Promise<TradeCooldownInfo | null> {
+	async getTradeCooldownStatus(
+		keyId: string
+	): Promise<TradeCooldownInfo | null> {
 		try {
 			const response = await this.api.get<APIResponse<TradeCooldownInfo>>(
 				`/keys/${keyId}/trade-cooldown`
 			);
+
 			return response.data.data;
 		} catch (error: unknown) {
 			if (error instanceof ApiError && error.status === 404) {
-				// No cooldown concept deployed for this key yet — treat as
-				// "no cooldown data" so buttons stay enabled.
+				// No cooldown concept deployed for this key yet.
+				// Treat as no cooldown data so trade buttons stay enabled.
 				return null;
 			}
+
 			throw this.handleError(error);
 		}
 	}
@@ -849,11 +869,13 @@ class CourseService extends BaseApiService {
 			const response = await this.api.get<APIResponse<PerformanceBond>>(
 				`/keys/${keyId}/performance-bond`
 			);
+
 			return response.data.data;
 		} catch (error: unknown) {
 			if (error instanceof ApiError && error.status === 404) {
 				return null;
 			}
+
 			throw this.handleError(error);
 		}
 	}