Skip to content

Issue 1139 naira onramp #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Miracle656 merged 5 commits into from
Oct 29, 2026
Merged

Issue 1139 naira onramp #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a27f482
Add Cable TV and Betting bill payment categories
funds0033-cmyk Oct 21, 2026
f542a82
Add bounded polling with unconfirmed state for bill payments
funds0033-cmyk Oct 21, 2026
36cbf06
Add naira onramp screen to main (issue #1139)
funds0033-cmyk Oct 21, 2026
d5ed2b3
Merge branch 'issue-1139-naira-onramp' from funds0033-cmyk
funds0033-cmyk Oct 28, 2026
a7aa7c5
Merge upstream/main into issue-1139-naira-onramp
funds0033-cmyk Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 142 additions & 38 deletions frontend/mobile/app/airtime.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import {
getOnrampRate,
payBill,
type NairaCoin,
classifyBillStatus,
} from '../lib/onramp';
import {
getCategoryDeclaration,
Expand All @@ -84,8 +85,9 @@ import {
type PersistedBillOrder,
} from '../lib/billOrders';
import { classifyBillPollStatus } from '../lib/billFlow';
import { BillPoller, MAX_CONSECUTIVE_POLL_ERRORS } from '../lib/billPolling';

type Step = 'form' | 'confirm' | 'paying' | 'done' | 'failed';
type Step = 'form' | 'confirm' | 'paying' | 'done' | 'failed' | 'unconfirmed';

const QUICK_AMOUNTS = [200, 500, 1000, 2000];

Expand Down Expand Up @@ -159,7 +161,9 @@ export default function AirtimeScreen() {
const [spent, setSpent] = useState<number | null>(null);
const [waitingForPasskey, setWaitingForPasskey] = useState(false);

const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
const pollerRef = useRef<ReturnType<typeof BillPoller> | null>(null);
const [pollErrorCount, setPollErrorCount] = useState(0);
const [unconfirmedReason, setUnconfirmedReason] = useState<'error' | 'timeout' | null>(null);

const refreshOrders = useCallback(async () => {
try {
Expand Down Expand Up @@ -229,47 +233,40 @@ export default function AirtimeScreen() {
void loadRate();
}, [loadRate]);

// Poll the vend result. Unlike the onramp, nothing on-chain says whether the
// airtime landed — the deposit leaving this wallet is visible, the top-up is
// not — so asking is the only way to know.
// Poll the vend result using BillPoller for bounded wait and error recovery
useEffect(() => {
if (!orderId || !customerRef || step !== 'paying' || !payHash) return;
const check = async () => {
try {
const s = await getBillStatus(customerRef, orderId);
const token = s.token ?? s.prepaidToken;
if (/complete|success|delivered/i.test(s.status)) {
setStep('done');

const poller = new BillPoller(
customerRef,
orderId,
{
onDone: async (status) => {
const token = status?.token ?? status?.prepaidToken;
if (token) setPrepaidToken(token);
await updateBillOrderStatus(orderId, s.status, token);
await updateBillOrderStatus(orderId, status?.status ?? 'completed', token);
void refreshOrders();
}
if (/fail|refund|revers/i.test(s.status)) {
setStep('failed');
await updateBillOrderStatus(orderId, s.status);
setStep('done');
},
onFailed: async (status) => {
await updateBillOrderStatus(orderId, status?.status ?? 'failed');
void refreshOrders();
}
// One classifier for every bill screen. This used to be an inline
// regex that did not know "settled"/"disbursed" — the words Linq
// actually ends a vend with — so a delivered top-up never left this
// screen.
const outcome = classifyBillPollStatus(s.status);
if (outcome === 'done') setStep('done');
if (outcome === 'failed') setStep('failed');
} catch (err) {
// Silent *to the user*: a failed poll is nothing they can act on, and
// the payment has already left, so an error here would read as if it
// had not. But silent to us as well is how a top-up that landed sat on
// a spinner with no way to find out why — the status was fine, the
// request never got there, and nothing anywhere said so.
console.warn('[airtime] status poll failed:', errorMessage(err));
}
};
void check();
pollRef.current = setInterval(check, 10_000);
setStep('failed');
},
onUnconfirmed: (reason) => {
setUnconfirmedReason(reason);
setStep('unconfirmed');
},
onErrorCountChange: (count) => setPollErrorCount(count),
},
);
pollerRef.current = poller;
poller.start();
return () => {
if (pollRef.current) clearInterval(pollRef.current);
pollRef.current = null;
if (pollerRef.current) {
pollerRef.current.stop();
pollerRef.current = null;
}
};
}, [orderId, customerRef, step, payHash, refreshOrders]);

Expand Down Expand Up @@ -352,6 +349,8 @@ export default function AirtimeScreen() {
if (!customerRef || !refundAddress || !rate) return;
setStep('paying');
setError(null);
setPollErrorCount(0);
setUnconfirmedReason(null);
try {
// Reserve first, spend second. A reservation that fails costs nothing;
// a spend with no order behind it is money sent to an address that was
Expand Down Expand Up @@ -420,6 +419,16 @@ export default function AirtimeScreen() {
}
}, [customerRef, refundAddress, rate, ngn, provider, phoneDigits, coin, wallet.deploy, code]);

// Stop polling on unmount
useEffect(() => {
return () => {
if (pollerRef.current) {
pollerRef.current.stop();
pollerRef.current = null;
}
};
}, []);

const stepNumber = step === 'form' ? 1 : 2;

const tokenTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
Expand Down Expand Up @@ -681,7 +690,9 @@ export default function AirtimeScreen() {
<Text style={styles.hint}>
{waitingForPasskey
? 'Face ID, fingerprint or device PIN, whichever this phone uses.'
: `${provider} is vending ${naira(ngn)} to ${phoneDigits}.`}
: pollErrorCount > 0
? `Checking status failed — retrying (${pollErrorCount}/${MAX_CONSECUTIVE_POLL_ERRORS})…`
: `${provider} is vending ${naira(ngn)} to ${phoneDigits}.`}
</Text>
</View>

Expand Down Expand Up @@ -764,8 +775,13 @@ export default function AirtimeScreen() {
setOrderId(null);
setPayHash(null);
setSpent(null);
<<<<<<< HEAD
setPrepaidToken(null);
setTokenCopied(false);
=======
setPollErrorCount(0);
setUnconfirmedReason(null);
>>>>>>> funds0033-cmyk/issue-1139-naira-onramp
void loadRate();
void refreshOrders();
}}
Expand Down Expand Up @@ -814,6 +830,8 @@ export default function AirtimeScreen() {
setOrderId(null);
setPayHash(null);
setError(null);
setPollErrorCount(0);
setUnconfirmedReason(null);
void loadRate();
}}
style={({ pressed }) => [styles.primaryBtn, pressed && styles.pressed]}
Expand All @@ -831,6 +849,92 @@ export default function AirtimeScreen() {
) : null}
</>
)}

{/* ── b6 · unconfirmed (bounded wait ended or consecutive poll errors) */}
{!mainnetOnly && step === 'unconfirmed' && (
<>
<View style={styles.card}>
<Text style={styles.question}>
{unconfirmedReason === 'error'
? "Couldn't confirm status"
: 'Delivery taking longer than usual'}
</Text>
<Text style={styles.hint}>
{unconfirmedReason === 'error'
? `Checking status failed after ${MAX_CONSECUTIVE_POLL_ERRORS} attempts. The network service could not be reached, but your top-up may already have arrived.`
: `Confirmation from ${provider} is taking longer than usual. Your top-up may already have arrived.`}
</Text>
</View>

<View style={styles.card}>
<View style={styles.row}>
<Text style={styles.rowLabel}>Network</Text>
<Text style={styles.rowValue}>{provider}</Text>
</View>
<View style={styles.row}>
<Text style={styles.rowLabel}>Recipient</Text>
<Text style={styles.rowValue}>{phoneDigits}</Text>
</View>
<View style={styles.row}>
<Text style={styles.rowLabel}>Payment</Text>
<Text style={styles.rowValue}>
{(spent ?? cost).toFixed(coin === 'xlm' ? 4 : 2)} {code} sent
</Text>
</View>
{orderId ? (
<View style={styles.row}>
<Text style={styles.rowLabel}>Reference</Text>
<Text style={styles.rowValue}>{orderId.slice(0, 8).toUpperCase()}</Text>
</View>
) : null}
</View>

<View style={styles.noteCard}>
<Text style={styles.eyebrow}>WHAT IS KNOWN</Text>
<Text style={styles.hint}>
• Your {(spent ?? cost).toFixed(coin === 'xlm' ? 4 : 2)} {code} left this wallet.
</Text>
<Text style={styles.hint}>
• The {naira(ngn)} airtime may already have arrived on {phoneDigits}.
</Text>
<Text style={styles.hint}>
• Check the recipient's phone balance (dial your network's balance code) or ask them directly.
</Text>
<Text style={styles.hint}>
• If the airtime has not arrived, contact support with reference{' '}
<Text style={styles.linkText}>
{orderId ? orderId.slice(0, 8).toUpperCase() : 'above'}
</Text>.
</Text>
</View>

<Pressable
disabled={isRechecking}
onPress={() => {
if (!pollerRef.current || isRechecking) return;
setIsRechecking(true);
pollerRef.current.manualCheck().then((result) => {
setIsRechecking(false);
if (result === 'done') setStep('done');
else if (result === 'failed') setStep('failed');
else if (result === 'error') setUnconfirmedReason('error');
else setUnconfirmedReason('timeout');
});
}}
style={({ pressed }) => [styles.primaryBtn, pressed && styles.pressed]}
>
<Text style={styles.primaryText}>
{isRechecking ? 'Checking status…' : 'Check status again'}
</Text>
</Pressable>
<Pressable
onPress={() => router.back()}
style={({ pressed }) => [styles.secondaryBtn, pressed && styles.pressed]}
>
<Text style={styles.secondaryText}>Back to home</Text>
</Pressable>
</>
)}
</ScrollView>
</KeyboardAvoidingView>
</SafeAreaView>
Expand Down
Loading
Loading