react-native-fpay 0.4.33 → 0.4.35

package/src/core/api/index.ts

@@ -2,14 +2,12 @@
 import { http } from './client';
 import {
   type FPBankItem,
-  type FPTransaction,
   type FPNQRData,
   type FPTxStatus,
   type FPProximityPeer,
   type FPSendPaymentRequest,
   type FPUserInfo,
   type FPAccount,
-  type FPSendWalletPaymentRequest,
   type FPTransactionResponse,
   type FPBalance,
   type HttpCallResponseFormat,
@@ -24,6 +22,7 @@ import {
   type FPDataPurchaseRequest,
   type FPElectricityPurchaseRequest,
   type FPCablePurchaseRequest,
+  type FPBillPurchaseRequest,
   type FPBillTransaction,
   BUSINESSID,
 } from '../types';
@@ -32,56 +31,58 @@ export const healthAPI = {
   ping: () =>
     http()
       .get('/health')
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 };
 
 export const authenticateAPI = {
   login: (appId: string) =>
     http()
       .post('/auth', { user_id: appId })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   profile: () =>
     http()
       .get(`/get-user-details`)
-      .then((r: any) => r.data.payload),
+      .then((r) => r.data.payload),
 
   logout: () =>
     http()
       .post('/auth/logout')
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   validateOtp: (otp: string, email: string) =>
     http()
       .post<{ Response: any }>('/verify-otp', { otp, email })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   validateToken: () =>
-    http().get<{response: HttpCallResponseFormat}>('/auth/agent/validate-token').then((r: any) => r.data),
+    http()
+      .get<{ response: HttpCallResponseFormat }>('/auth/agent/validate-token')
+      .then((r) => r.data),
 
-  sendSmsOtp: async(payload: any)=>
+  sendSmsOtp: async (payload: any) =>
     http()
       .post<{
-        status:  boolean;
+        status: boolean;
         message: string;
-        payload:any
-      }>("shared/send-sms-otp", payload)
-      .then((r: any)=>r.data),
-  
-  verifyBvn: async() => 
-    http()
-      .get<{response: HttpCallResponseFormat}>("verify-bvn")
-      .then((r: any)=>r.data),
-
-  verifySms: async(payload: any)=>
-     http()
-      .post<{response: HttpCallResponseFormat}>("verify-bvn", payload)
-      .then((r: any)=>r.data),
-
-  updateProfile: async(payload: any)=>
-     http()
-      .put<{response: HttpCallResponseFormat}>("update-user-agent", payload)
-      .then((r: any)=>r.data),
+        payload: any;
+      }>('shared/send-sms-otp', payload)
+      .then((r) => r.data),
+
+  verifyBvn: async () =>
+    http()
+      .get<{ response: HttpCallResponseFormat }>('verify-bvn')
+      .then((r) => r.data),
+
+  verifySms: async (payload: any) =>
+    http()
+      .post<{ response: HttpCallResponseFormat }>('verify-bvn', payload)
+      .then((r) => r.data),
+
+  updateProfile: async (payload: any) =>
+    http()
+      .put<{ response: HttpCallResponseFormat }>('update-user-agent', payload)
+      .then((r) => r.data),
 };
 
 export const accountAPI = {
@@ -97,25 +98,25 @@ export const accountAPI = {
         nin: user.nin ?? '',
         dateOfBirth: user.dateOfBirth ?? '',
       })
-      .then((r: any) => r.data.payload),
+      .then((r) => r.data.payload),
 
   // Get account details using PSSP id
   getAccount: () =>
     http()
       .get<{ payload: FPAccount }>(`/get-accounts-details`)
-      .then((r: any) => r.data.payload),
+      .then((r) => r.data.payload),
 
   getAgentBalance: () =>
-    http().get<{ payload: FPBalance }>(`/get-balance`)
-      .then((r: any) => r.data.payload),
-      
+    http()
+      .get<{ payload: FPBalance }>(`/get-balance`)
+      .then((r) => r.data.payload),
 };
 
 export const transferAPI = {
   getBanks: () =>
     http()
       .get<FPBankItem[]>('/get-banks')
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   verifyAccount: (accountNumber: string, bankCode: string) =>
     http()
@@ -128,7 +129,7 @@ export const transferAPI = {
         account_no: accountNumber,
         institution_code: bankCode,
       })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   verifyWalletAccount: (accountNumber: string) =>
     http()
@@ -138,16 +139,20 @@ export const transferAPI = {
         bankName: string;
         bankCode: string;
       }>('/wallet-name-enquiry', { account_number: accountNumber })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   validateTransfer: (pin: string, userId: string, receiverId: string) =>
     http()
-      .post<{ status: boolean; message: string; payload?: { temp_id: string } }>('/validate-transaction', {
+      .post<{
+        status: boolean;
+        message: string;
+        payload?: { temp_id: string };
+      }>('/validate-transaction', {
         pin,
         sender_type: 'AGENT',
         receiver_id: receiverId,
       })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   sendToWallet: (payload: any, temptId: string) =>
     http()
@@ -155,7 +160,7 @@ export const transferAPI = {
         ...payload,
         temp_id: temptId,
       })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   // Send to external bank account
   sendToBank: (payload: FPSendPaymentRequest, temptId: string) =>
@@ -164,19 +169,19 @@ export const transferAPI = {
         ...payload,
         temp_id: temptId,
       })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   status: (reference: string) =>
     http()
       .get<{ status: FPTxStatus; reference: string }>(
         '/get-transaction-status/' + reference
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   verify: (reference: string) =>
     http()
       .get<{ FPTransactionResponse: any }>('/transaction/verify/' + reference)
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 };
 
 export const nqrAPI = {
@@ -188,19 +193,19 @@ export const nqrAPI = {
   }) =>
     http()
       .post<FPNQRData>('/generate-nqr', payload)
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   pay: (payload: FPSendPaymentRequest, temptId: string) =>
     http()
       .post<FPTransactionResponse>('/pay-nqr', { ...payload, temp_id: temptId })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 };
 
 export const nfcAPI = {
   pay: (payload: FPSendPaymentRequest, temptId: string) =>
     http()
       .post<FPTransactionResponse>('/pay-nfc', { ...payload, temp_id: temptId })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 };
 
 export const proximityAPI = {
@@ -210,7 +215,7 @@ export const proximityAPI = {
   ) =>
     http()
       .post<{ sessionId: string }>(`/broadcast-proximity/${psspId}`, payload)
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   heartbeat: (sessionId: string, lat: number, lng: number) =>
     http().patch(`/broadcast-proximity/${sessionId}`, {
@@ -228,113 +233,219 @@ export const proximityAPI = {
         longitude: lng,
         radius_meters,
       })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 };
 
-
 export const subscriptionAPI = {
-  create: (
-    payload: any
-  ) =>
+  create: (payload: any) =>
     http()
       .post<{ sessionId: string }>(`/subscription/`, payload)
-      .then((r: any) => r.data),
+      .then((r) => r.data),
+};
+
+/** Context every bill purchase needs beyond the category-specific fields —
+ * mirrors what SendScreen already assembles for transfers (agent identity,
+ * terminal, geo-location for terminal transactions, idempotency reference).
+ * Built once by BillsScreen and passed to whichever purchaseX() applies. */
+export interface FPBillPurchaseContext {
+  agentId: string; // getFPStore().psspId
+  terminalId?: string;
+  /** Only present for terminal/agent transactions — mirrors SendScreen's
+   * requestLocation() + isTerminalTransaction gating exactly. */
+  geoLocation?: { latitude: number; longitude: number };
+  currency: string;
+  tnxRef: string;
+  paymentType?: string; // defaults to "ONLINE" to match Tapit's existing screens
+  /** Self-service vs. third-party recipient — only meaningful for
+   * ELECTRICITY today, but accepted generically since BuypowerPurchaseView
+   * branches on `for_self` for the name/email/phone substitution. */
+  forSelf?: boolean;
+  agentName?: string;
+  agentEmail?: string;
+  agentPhone?: string;
+}
+
+/** Maps this SDK's clean, kobo-based internal request shape onto the real
+ * wire format BuypowerPurchaseView (Django) expects. Kept as one function
+ * so every purchase call builds the body identically — if the backend
+ * contract changes, this is the one place to update. */
+function toBillWirePayload(
+  payload: FPBillPurchaseRequest,
+  ctx: FPBillPurchaseContext
+): Record<string, unknown> {
+  const base: Record<string, unknown> = {
+    agent_id: ctx.agentId,
+    amount: (payload.amountInKobo / 100).toFixed(2),
+    channel: payload.category,
+    terminal_id: ctx.terminalId,
+    tnx_ref: ctx.tnxRef,
+    currency: ctx.currency,
+    payment_type: ctx.paymentType ?? 'ONLINE',
+    geo_location: ctx.geoLocation,
+    for_self: ctx.forSelf ?? true,
+  };
+
+  switch (payload.category) {
+    case 'AIRTIME':
+      return {
+        ...base,
+        meter: payload.phoneNumber, // BuypowerPurchaseView reuses `meter` as the recipient identifier across categories
+        disco: payload.network,
+        phone: ctx.agentPhone,
+        name: ctx.agentName,
+        email: ctx.agentEmail,
+      };
+    case 'DATA':
+      return {
+        ...base,
+        meter: payload.phoneNumber,
+        disco: payload.network,
+        tariff_class: payload.planId,
+        phone: ctx.agentPhone,
+        name: ctx.agentName,
+        email: ctx.agentEmail,
+      };
+    case 'ELECTRICITY':
+      return {
+        ...base,
+        meter: payload.meterNumber,
+        disco: payload.disco,
+        vend_type: payload.meterType,
+        for_self: payload.forSelf,
+        phone: payload.forSelf ? ctx.agentPhone : payload.phoneNumber,
+        email: payload.forSelf ? ctx.agentEmail : payload.email,
+        name: ctx.agentName,
+      };
+    case 'CABLE':
+      return {
+        ...base,
+        meter: payload.smartcardNumber,
+        disco: payload.provider,
+        tariff_class: payload.tariffCode,
+        phone: payload.phoneNumber,
+        name: ctx.agentName,
+        email: ctx.agentEmail,
+      };
+    default: {
+      // Exhaustiveness check — if a fifth category is ever added to
+      // FPBillPurchaseRequest without a case here, this fails to compile
+      // instead of silently sending an unmapped payload to the backend.
+      const _exhaustive: never = payload;
+      throw new Error(
+        `Unhandled bill category: ${JSON.stringify(_exhaustive)}`
+      );
+    }
+  }
 }
 
 export const billsAPI = {
   getNetworks: () =>
     http()
       .get<{ status: boolean; payload: FPNetworkOperator[] }>('/bills/networks')
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   getDataPlans: (network: FPNetworkCode) =>
     http()
       .get<{ status: boolean; payload: FPDataPlan[] }>('/bills/data-plans', {
         params: { network },
       })
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   getDiscos: () =>
     http()
-      .get<{ status: boolean; payload: FPBillProvider[] }>('/bills/electricity/discos')
-      .then((r: any) => r.data),
+      .get<{ status: boolean; payload: FPBillProvider[] }>(
+        '/bills/electricity/discos'
+      )
+      .then((r) => r.data),
 
-  /** Validates a meter number against a disco before purchase — mirrors
-   * the existing CheckMeterNo() lookup in Tapit's BuyPower-backed
-   * Electricity screen, generalized behind this SDK's own endpoint. */
   validateMeter: (meterNumber: string, disco: string, meterType: FPMeterType) =>
     http()
       .post<{ status: boolean; message: string; payload: FPMeterLookupResult }>(
         '/bills/electricity/validate-meter',
         { meter_number: meterNumber, disco, meter_type: meterType }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   getCableProviders: () =>
     http()
-      .get<{ status: boolean; payload: FPBillProvider[] }>('/bills/cable/providers')
-      .then((r: any) => r.data),
+      .get<{ status: boolean; payload: FPBillProvider[] }>(
+        '/bills/cable/providers'
+      )
+      .then((r) => r.data),
 
   getCableTariffs: (provider: string) =>
     http()
-      .get<{ status: boolean; payload: FPBillTariff[] }>('/bills/cable/tariffs', {
-        params: { provider },
-      })
-      .then((r: any) => r.data),
+      .get<{ status: boolean; payload: FPBillTariff[] }>(
+        '/bills/cable/tariffs',
+        {
+          params: { provider },
+        }
+      )
+      .then((r) => r.data),
 
-  /** Validates a smartcard/IUC number before purchase. */
   validateSmartcard: (smartcardNumber: string, provider: string) =>
     http()
       .post<{ status: boolean; message: string; payload: FPMeterLookupResult }>(
         '/bills/cable/validate-smartcard',
         { smartcard_number: smartcardNumber, provider }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
-  /** Separate from transferAPI.validateTransfer — bills have no transfer
-   * recipient, so this hits its own backend endpoint rather than reusing
-   * /validate-transaction's receiver_id-shaped contract. One endpoint
-   * covers all four categories — the backend doesn't need to know which
-   * category is being authorized at PIN-check time. */
   validateBillPin: (pin: string, userId: string) =>
     http()
       .post<{ status: boolean; message: string; payload: { temp_id: string } }>(
         '/bills/validate-pin',
         { pin, user_id: userId }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
-  purchaseAirtime: (payload: FPAirtimePurchaseRequest, tempId: string) =>
+  purchaseAirtime: (
+    payload: FPAirtimePurchaseRequest,
+    ctx: FPBillPurchaseContext,
+    tempId: string
+  ) =>
     http()
       .post<{ status: boolean; message: string; payload: FPBillTransaction }>(
         '/bills/airtime',
-        { ...payload, temp_id: tempId }
+        { ...toBillWirePayload(payload, ctx), temp_id: tempId }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
-  purchaseData: (payload: FPDataPurchaseRequest, tempId: string) =>
+  purchaseData: (
+    payload: FPDataPurchaseRequest,
+    ctx: FPBillPurchaseContext,
+    tempId: string
+  ) =>
     http()
       .post<{ status: boolean; message: string; payload: FPBillTransaction }>(
         '/bills/data',
-        { ...payload, temp_id: tempId }
+        { ...toBillWirePayload(payload, ctx), temp_id: tempId }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
-  purchaseElectricity: (payload: FPElectricityPurchaseRequest, tempId: string) =>
+  purchaseElectricity: (
+    payload: FPElectricityPurchaseRequest,
+    ctx: FPBillPurchaseContext,
+    tempId: string
+  ) =>
     http()
       .post<{ status: boolean; message: string; payload: FPBillTransaction }>(
         '/bills/electricity',
-        { ...payload, temp_id: tempId }
+        { ...toBillWirePayload(payload, ctx), temp_id: tempId }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
-  purchaseCable: (payload: FPCablePurchaseRequest, tempId: string) =>
+  purchaseCable: (
+    payload: FPCablePurchaseRequest,
+    ctx: FPBillPurchaseContext,
+    tempId: string
+  ) =>
     http()
       .post<{ status: boolean; message: string; payload: FPBillTransaction }>(
         '/bills/cable',
-        { ...payload, temp_id: tempId }
+        { ...toBillWirePayload(payload, ctx), temp_id: tempId }
       )
-      .then((r: any) => r.data),
+      .then((r) => r.data),
 
   /** Bill transactions live in the same agencyTransaction table as
    * transfers, so the existing status endpoint is reused as-is. */

package/src/ui/components/ConfirmScreen.tsx

@@ -199,49 +199,50 @@ interface ConfirmScreenProps {
 
 const getAmountInWords = (amount: number): string => {
   const ones = [
-    'One',
-    'Two',
-    'Three',
-    'Four',
-    'Five',
-    'Six',
-    'Seven',
-    'Eight',
-    'Nine',
-    'Ten',
-    'Eleven',
-    'Twelve',
-    'Thirteen',
-    'Fourteen',
-    'Fifteen',
-    'Sixteen',
-    'Seventeen',
-    'Eighteen',
-    'Nineteen',
+    'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine',
+    'Ten', 'Eleven', 'Twelve', 'Thirteen', 'Fourteen', 'Fifteen', 'Sixteen',
+    'Seventeen', 'Eighteen', 'Nineteen',
   ];
   const tens = [
-    '',
-    '',
-    'Twenty',
-    'Thirty',
-    'Forty',
-    'Fifty',
-    'Sixty',
-    'Seventy',
-    'Eighty',
-    'Ninety',
+    '', '', 'Twenty', 'Thirty', 'Forty', 'Fifty', 'Sixty', 'Seventy', 'Eighty', 'Ninety',
   ];
+  // index 0 = the base 0-999 group (no suffix), then Thousand, Million, etc.
+  const scale = ['', 'Thousand', 'Million', 'Billion', 'Trillion'];
+
+  // Converts a 0-999 chunk to words — no recursion past 3 digits.
+  const chunkToWords = (n: number): string => {
+    if (n === 0) return '';
+    if (n < 20) return ones[n - 1] as string;
+    if (n < 100) {
+      const t: string = tens[Math.floor(n / 10)] || '';
+      const o: number = n % 10;
+      return o ? `${t} ${ones[o - 1]}` : t;
+    }
+    const hundredsDigit = Math.floor(n / 100);
+    const remainder = n % 100;
+    const hundredsPart = `${ones[hundredsDigit - 1]} Hundred`;
+    return remainder ? `${hundredsPart} ${chunkToWords(remainder)}` : hundredsPart;
+  };
 
   const integer = Math.floor(amount);
-
   if (integer === 0) return 'Zero';
-  if (integer < 20) return ones[integer] || '';
-  if (integer < 100)
-    return `${tens[Math.floor(integer / 10)]}${integer % 10 ? ' ' + ones[integer % 10] : ''}`;
-  if (integer < 1000)
-    return `${ones[Math.floor(integer / 100)]} Hundred${integer % 100 ? ' ' + getAmountInWords(integer % 100) : ''}`;
 
-  return `${integer.toLocaleString()}`;
+  // Break into groups of 3 digits, smallest group first.
+  const groups: number[] = [];
+  let n = integer;
+  while (n > 0) {
+    groups.push(n % 1000);
+    n = Math.floor(n / 1000);
+  }
+
+  const parts: string[] = [];
+  for (let i = groups.length - 1; i >= 0; i--) {
+    if (groups[i] === 0) continue;
+    const words = chunkToWords(groups[i] as number);
+    parts.push(scale[i] ? `${words} ${scale[i]}` : words);
+  }
+
+  return parts.join(' ');
 };
 // ─── Sub-components ──────────────────────────────────────────────────────────
 const DetailRow: React.FC<{ label: string; value: string }> = ({