Redesign faucet claim flow: login → loading → eligibility → claim

- Backend: payout is now random between FAUCET_MIN_SATS and FAUCET_MAX_SATS
- Remove weighted buckets; simplify config and .env.example
- Frontend: show loading and eligibility in main body, modal only for confirm/success
- Rename Confirm payout to Claim; add styles for body loading and eligible state

Made-with: Cursor
This commit is contained in:
SatsFaucet
2026-03-02 14:59:37 +01:00
parent 381597c96f
commit 623eb720dc
6 changed files with 67 additions and 74 deletions

View File

@@ -36,8 +36,6 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
const nostrProfile = useNostrProfile(pubkey);
const isConnected = !!pubkey;
const isBusy = claim.loading !== "idle";
const hasResult = !!claim.quote || !!claim.denial || !!claim.success || !!claim.confirmError;
useEffect(() => {
if (!pubkey) {
@@ -73,15 +71,14 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
const addr = lightningAddress.trim();
if (!addr || !isValidLightningAddress(addr)) return;
autoCheckRef.current = pubkey;
setClaimModalOpen(true);
claim.checkEligibility(addr);
}, [pubkey, lightningAddress, claim.loading, claim.claimState, claim.checkEligibility]);
useEffect(() => {
if (isBusy || hasResult) {
if (claim.loading === "confirm" || claim.success || claim.confirmError) {
setClaimModalOpen(true);
}
}, [isBusy, hasResult]);
}, [claim.loading, claim.success, claim.confirmError]);
const handleDisconnect = () => {
onPubkeyChange(null);
@@ -105,10 +102,10 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
claim.clearConfirmError();
setLightningAddressTouched(false);
setClaimModalOpen(false);
autoCheckRef.current = null;
};
const handleCheckEligibility = () => {
setClaimModalOpen(true);
claim.checkEligibility(lightningAddress);
};
@@ -137,6 +134,10 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
setClaimModalOpen(false);
};
const handleClaimClick = () => {
setClaimModalOpen(true);
};
const lightningAddressInvalid =
lightningAddressTouched && lightningAddress.trim() !== "" && !isValidLightningAddress(lightningAddress);
const fromProfile =
@@ -151,7 +152,7 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
if (claim.success) return "Sats sent!";
if (claim.confirmError) return "Something went wrong";
if (claim.loading === "confirm") return "Sending sats…";
if (claim.quote) return "Confirm payout";
if (claim.quote) return "Confirm claim";
if (claim.denial) return "Not eligible";
if (claim.loading === "quote") return "Checking eligibility";
return "Claim";
@@ -185,6 +186,39 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
onConnect={(pk, method) => onPubkeyChange(pk, method)}
onDisconnect={handleDisconnect}
/>
) : claim.loading === "quote" ? (
<div className="claim-wizard-body-loading" role="status" aria-live="polite">
<div className="claim-wizard-progress-bar" />
<p className="claim-wizard-progress-text">
{ELIGIBILITY_PROGRESS_STEPS[claim.eligibilityProgressStep ?? 0]}
</p>
</div>
) : claim.denial ? (
<ClaimDenialPanel
denial={claim.denial}
onDismiss={handleDismissDenial}
onCheckAgain={handleCheckAgain}
/>
) : claim.quote && !quoteExpired ? (
<div className="claim-wizard-step claim-wizard-step-eligible">
<h3 className="claim-wizard-step-title">You&apos;re eligible!</h3>
<div className="claim-wizard-quote-amount claim-wizard-quote-amount--main">
<span className="claim-wizard-quote-amount-value">{claim.quote.payout_sats}</span>
<span className="claim-wizard-quote-amount-unit"> sats</span>
</div>
<p className="claim-wizard-quote-destination">
To <strong>{lightningAddress}</strong>
</p>
<div className="claim-wizard-step-actions">
<button
type="button"
className="btn-primary claim-wizard-btn-primary"
onClick={handleClaimClick}
>
Claim
</button>
</div>
</div>
) : (
<EligibilityStep
lightningAddress={lightningAddress}
@@ -194,7 +228,7 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
invalid={lightningAddressInvalid}
fromProfile={fromProfile}
readOnly={loginMethod === "npub"}
loading={claim.loading === "quote"}
loading={false}
onCheckEligibility={handleCheckEligibility}
/>
)}
@@ -208,23 +242,6 @@ export function ClaimWizard({ pubkey, loginMethod, onPubkeyChange, onClaimSucces
preventClose={claim.loading !== "idle"}
>
<div className="claim-modal-body">
{claim.loading === "quote" && (
<div className="claim-modal-progress" role="status" aria-live="polite">
<div className="claim-wizard-progress-bar" />
<p className="claim-modal-progress-text">
{ELIGIBILITY_PROGRESS_STEPS[claim.eligibilityProgressStep ?? 0]}
</p>
</div>
)}
{claim.denial && (
<ClaimDenialPanel
denial={claim.denial}
onDismiss={handleDismissDenial}
onCheckAgain={handleCheckAgain}
/>
)}
{(claim.claimState === "quote_ready" || claim.claimState === "confirming" || claim.claimState === "error") && claim.quote && (
<ConfirmStep
quote={claim.quote}

View File

@@ -80,7 +80,7 @@ export function ConfirmStep({
exit={{ opacity: 0 }}
transition={{ duration: 0.2 }}
>
<h3 className="claim-wizard-step-title">Confirm payout</h3>
<h3 className="claim-wizard-step-title">Confirm claim</h3>
<div className="claim-wizard-quote-amount">
<span className="claim-wizard-quote-amount-value">{quote.payout_sats}</span>
<span className="claim-wizard-quote-amount-unit">sats</span>
@@ -99,7 +99,7 @@ export function ConfirmStep({
onClick={onConfirm}
disabled={quoteExpired}
>
Confirm payout
Claim
</button>
<button type="button" className="btn-secondary" onClick={onCancel}>
Cancel

View File

@@ -1766,6 +1766,20 @@ h1 {
margin-top: 4px;
margin-bottom: 12px;
}
.claim-wizard-body-loading {
display: flex;
flex-direction: column;
align-items: center;
gap: 16px;
padding: 32px 0;
}
.claim-wizard-body-loading .claim-wizard-progress-bar {
width: 100%;
max-width: 280px;
}
.claim-wizard-step-eligible .claim-wizard-quote-amount--main {
margin: 24px 0 16px;
}
.claim-wizard-progress {
margin: 16px 0;
}