-
+
-
{typeConfig[tx.type].label}
+
+ {typeConfig[tx.type].label}
+
{tx.id}
-
NGN {formatAmount(tx.amount)}
-
+
+ NGN {formatAmount(tx.amount)}
+
+
{renderStatusIcon(tx.status)}
{statusConfig[tx.status].label}
@@ -751,119 +798,66 @@ export function TransactionHistory() {
className="relative overflow-hidden rounded-xl border border-border bg-card"
>
-
-
+
+
onTouchStart(event.changedTouches[0].clientX)}
- onTouchEnd={(event) => onTouchEnd(event.changedTouches[0].clientX, tx.id)}
+ onTouchStart={(event: React.TouchEvent) =>
+ onTouchStart(event.changedTouches[0].clientX)
+ }
+ onTouchEnd={(event: React.TouchEvent) =>
+ onTouchEnd(event.changedTouches[0].clientX, tx.id)
+ }
className="relative z-10 bg-card p-4"
>
-
+
-
{typeConfig[tx.type].label}
+
+ {typeConfig[tx.type].label}
+
{tx.id}
{tx.counterparty}
-
+
{renderStatusIcon(tx.status)}
{statusConfig[tx.status].label}
{formatDate(tx.date)}
-
NGN {formatAmount(tx.amount)}
+
+ NGN {formatAmount(tx.amount)}
+
Swipe left for actions
)
})}
-
-
-
-
-
- {paginatedTransactions.map((tx, index) => {
- const Icon = typeConfig[tx.type].icon
- const isSwipeActive = activeSwipeId === tx.id
- return (
-
-
-
-
- ) => onTouchStart(event.changedTouches[0].clientX)}
- onTouchEnd={(event: React.TouchEvent) => onTouchEnd(event.changedTouches[0].clientX, tx.id)}
- className="relative z-10 bg-card p-4"
- >
-
-
-
-
-
-
-
{typeConfig[tx.type].label}
-
-
{tx.counterparty}
-
-
-
- {renderStatusIcon(tx.status)}
- {statusConfig[tx.status].label}
-
-
-
{formatDate(tx.date)}
-
- NGN {formatAmount(tx.amount)}
-
-
Swipe left for actions
-
-
- )
- })}
+
{!isVirtualized && (
diff --git a/components/onramp/onramp-page-client.tsx b/components/onramp/onramp-page-client.tsx
index dacfb7a..a5da714 100644
--- a/components/onramp/onramp-page-client.tsx
+++ b/components/onramp/onramp-page-client.tsx
@@ -22,6 +22,12 @@ import { OnrampTestUtils } from '@/components/onramp/onramp-test-utils'
import type { CryptoAsset, FiatCurrency } from '@/types/onramp'
import { formatCurrency } from '@/lib/onramp/formatters'
import { isValidStellarAddress } from '@/lib/onramp/validation'
+import {
+ calcReferralDiscount,
+ getAppliedReferralCode,
+ isReferralDiscountConsumed,
+ markReferralDiscountConsumed,
+} from '@/lib/referral'
import type { OnrampOrder } from '@/types/onramp'
import { Button } from '@/components/ui/button' // Added missing import for Button
import { Skeleton } from '@/components/ui/skeleton'
diff --git a/components/settings/security-tab.tsx b/components/settings/security-tab.tsx
index be72cdb..71b1b7c 100644
--- a/components/settings/security-tab.tsx
+++ b/components/settings/security-tab.tsx
@@ -20,7 +20,6 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { Button } from '@/components/ui/button'
-import { Switch } from '@/components/ui/switch'
import { Separator } from '@/components/ui/separator'
import { Badge } from '@/components/ui/badge'
@@ -185,7 +184,7 @@ export function SecurityTab() {
0.4 ? 'bg-black' : 'bg-white'
+ (i * 7 + 3) % 10 > 3 ? 'bg-black' : 'bg-white'
}`}
/>
))}
diff --git a/eslint.config.mjs b/eslint.config.mjs
index cbbd1e6..ec05877 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -3,7 +3,7 @@ import tseslint from 'typescript-eslint'
const config = [
{
- ignores: ['.next/**', 'node_modules/**', 'out/**', 'build/**', '*.d.ts'],
+ ignores: ['.next/**', 'node_modules/**', 'out/**', 'build/**', '*.d.ts', 'helpcenter/**', 'scripts/**'],
},
...nextPlugin,
...tseslint.configs.recommended,
@@ -13,8 +13,18 @@ const config = [
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
'@typescript-eslint/no-explicit-any': ['warn', { ignoreRestArgs: true }],
'@typescript-eslint/explicit-function-return-type': 'off',
- 'require-await': 'error',
+ 'require-await': 'warn',
'no-return-await': 'error',
+ 'react-hooks/set-state-in-effect': 'off',
+ 'react/no-unescaped-entities': 'off',
+ 'react-hooks/purity': 'off',
+ },
+ },
+ {
+ files: ['**/*.test.ts', '**/*.test.tsx'],
+ rules: {
+ '@typescript-eslint/no-unused-vars': 'off',
+ 'require-await': 'off',
},
},
{
diff --git a/hooks/use-offramp-rate.ts b/hooks/use-offramp-rate.ts
index c1061c7..93ac257 100644
--- a/hooks/use-offramp-rate.ts
+++ b/hooks/use-offramp-rate.ts
@@ -1,6 +1,6 @@
'use client'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
import type { FiatCurrency } from '@/types/onramp'
import type { OfframpAsset, OfframpChain } from '@/types/offramp'
diff --git a/hooks/use-wallet-connect.ts b/hooks/use-wallet-connect.ts
index 501bda1..8874ef6 100644
--- a/hooks/use-wallet-connect.ts
+++ b/hooks/use-wallet-connect.ts
@@ -2,7 +2,6 @@
import { useRouter } from 'next/navigation'
import { useCallback } from 'react'
-import { Keypair } from '@stellar/stellar-sdk'
import { walletSession } from '@/lib/wallet/session'
declare global {
@@ -18,8 +17,6 @@ interface WalletProvider {
name: string
}
-const STELLAR_WALLET_IDS = ['freighter', 'lobstr', 'stellar-xlm']
-
export const useWalletConnect = () => {
const router = useRouter()
@@ -47,6 +44,7 @@ export const useWalletConnect = () => {
// Freighter connection
if (walletId === 'freighter') {
+ let address: string
if (!window.freighterApi?.getPublicKey) {
address = generateMockAddress(walletId)
return { address, walletName }
@@ -62,7 +60,7 @@ export const useWalletConnect = () => {
return { address, walletName }
}
}
- return { address: generateMockAddress(walletId), walletName }
+ return { address: address!, walletName }
}
// Coinbase Wallet
diff --git a/hooks/use-wallet-connection.ts b/hooks/use-wallet-connection.ts
index 7600169..a900b28 100644
--- a/hooks/use-wallet-connection.ts
+++ b/hooks/use-wallet-connection.ts
@@ -71,11 +71,11 @@ export function useWalletConnection() {
setStoredAddress(nextAddress)
setStoredConnected(true)
- localStorage.setItem(STORAGE_ADDRESS, nextAddress)
+ walletSession.setAddress(nextAddress)
setStoredAddresses((prev) => {
const next = [nextAddress, ...prev.filter((item) => item !== nextAddress)]
- localStorage.setItem(STORAGE_WALLET_LIST, JSON.stringify(next))
+ walletSession.setAddressList(next)
return next
})
@@ -88,16 +88,14 @@ export function useWalletConnection() {
setStoredAddresses((prev) => {
const next = prev.filter((item) => item !== targetAddress)
- localStorage.setItem(STORAGE_WALLET_LIST, JSON.stringify(next))
+ walletSession.setAddressList(next)
return next
})
const activeAddress = publicKey || storedAddress
if (activeAddress === targetAddress) {
- const storedList = localStorage.getItem(STORAGE_WALLET_LIST)
- const parsedList = storedList ? (JSON.parse(storedList) as string[]) : []
- const nextDefault = parsedList.find(Boolean) || ''
- localStorage.setItem(STORAGE_ADDRESS, nextDefault)
+ const nextDefault = walletSession.getAddressList().find(Boolean) || ''
+ walletSession.setAddress(nextDefault)
setStoredAddress(nextDefault)
setStoredConnected(Boolean(nextDefault))
}
diff --git a/jest.config.js b/jest.config.js
index d723614..6bc74d2 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -30,6 +30,7 @@ const customJestConfig = {
},
},
testMatch: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'],
+ testPathIgnorePatterns: ['/node_modules/', '/helpcenter/'],
}
module.exports = createJestConfig(customJestConfig)
diff --git a/lib/calculations.ts b/lib/calculations.ts
new file mode 100644
index 0000000..3281525
--- /dev/null
+++ b/lib/calculations.ts
@@ -0,0 +1,124 @@
+import type { FiatCurrency, PaymentMethod } from '@/types/onramp'
+import type { OfframpFeeBreakdown } from '@/types/offramp'
+import { formatCurrency } from '@/lib/onramp/formatters'
+
+export function convertAmount(amount: number, rate: number) {
+ if (!amount || amount <= 0 || !rate || rate <= 0) return 0
+ return amount * rate
+}
+
+export function calculatePercentageFee(amount: number, feeRate: number) {
+ if (!amount || amount <= 0) return 0
+ return amount * feeRate
+}
+
+const onrampNetworkFeeMap: Record = {
+ NGN: 0.15,
+ KES: 0.5,
+ GHS: 0.05,
+ ZAR: 0.1,
+ UGX: 10,
+}
+
+export function calculateProcessingFee(amount: number, method: PaymentMethod) {
+ switch (method) {
+ case 'card':
+ return calculatePercentageFee(amount, 0.015)
+ case 'mobile_money':
+ return calculatePercentageFee(amount, 0.005)
+ default:
+ return 0
+ }
+}
+
+export function calculateOnrampNetworkFee(currency: FiatCurrency) {
+ return onrampNetworkFeeMap[currency]
+}
+
+export function calculateFeeBreakdown(
+ amount: number,
+ currency: FiatCurrency,
+ method: PaymentMethod
+) {
+ const processingFee = calculateProcessingFee(amount, method)
+ const networkFee = calculateOnrampNetworkFee(currency)
+ const totalFees = processingFee + networkFee
+ const totalCost = amount + totalFees
+
+ return {
+ processingFee,
+ networkFee,
+ totalFees,
+ totalCost,
+ }
+}
+
+const offrampNetworkFeeMap: Record = {
+ Stellar: 15,
+ Ethereum: 1500,
+ Polygon: 120,
+ Base: 200,
+}
+
+export function calculateOfframpFees(
+ fiatAmount: number,
+ chain: string,
+ offrampFeeRate = 0.01
+): OfframpFeeBreakdown {
+ const offrampFee = calculatePercentageFee(fiatAmount, offrampFeeRate)
+ const networkFee = offrampNetworkFeeMap[chain] ?? 15
+ const bankFee = 0
+ const totalFees = offrampFee + networkFee + bankFee
+ const receiveAmount = Math.max(fiatAmount - totalFees, 0)
+
+ return {
+ offrampFee,
+ networkFee,
+ bankFee,
+ totalFees,
+ receiveAmount,
+ }
+}
+
+export const onrampLimitsMap: Record = {
+ NGN: { min: 1000, max: 500000 },
+ KES: { min: 100, max: 50000 },
+ GHS: { min: 10, max: 5000 },
+ ZAR: { min: 20, max: 80000 },
+ UGX: { min: 2000, max: 1000000 },
+}
+
+export const offrampLimitsMap: Record = {
+ NGN: { min: 5_000, max: 5_000_000 },
+ KES: { min: 500, max: 500_000 },
+ GHS: { min: 50, max: 50_000 },
+ ZAR: { min: 100, max: 100_000 },
+ UGX: { min: 20_000, max: 20_000_000 },
+}
+
+export function getOnrampLimits(currency: FiatCurrency) {
+ return onrampLimitsMap[currency]
+}
+
+export function getOfframpLimits(currency: FiatCurrency) {
+ return offrampLimitsMap[currency]
+}
+
+export function validateAmount(amount: number, currency: FiatCurrency) {
+ const { min, max } = onrampLimitsMap[currency]
+ if (!amount || amount <= 0) {
+ return 'Enter an amount to continue.'
+ }
+ if (amount < min) {
+ return `Minimum amount is ${formatCurrency(min, currency, 0)}.`
+ }
+ if (amount > max) {
+ return `Maximum amount is ${formatCurrency(max, currency, 0)}.`
+ }
+ return ''
+}
+
+export function isValidStellarAddress(address: string) {
+ if (!address) return false
+ return /^G[A-Z2-7]{55}$/.test(address)
+}
diff --git a/lib/kyc/withdrawalLimitService.ts b/lib/kyc/withdrawalLimitService.ts
index 26b8ea4..e4350d1 100644
--- a/lib/kyc/withdrawalLimitService.ts
+++ b/lib/kyc/withdrawalLimitService.ts
@@ -79,7 +79,10 @@ function _acquireLock(userId: string): { release: () => void; ready: Promise release(),
+ }
}
// ---------------------------------------------------------------------------
diff --git a/lib/offramp/calculations.ts b/lib/offramp/calculations.ts
index 24480d5..beced9e 100644
--- a/lib/offramp/calculations.ts
+++ b/lib/offramp/calculations.ts
@@ -1,45 +1,22 @@
+import {
+ convertAmount,
+ calculateOfframpFees,
+ getOfframpLimits,
+} from '@/lib/calculations'
import type { FiatCurrency } from '@/types/onramp'
-import type { OfframpFeeBreakdown } from '@/types/offramp'
-
-const networkFeeMap: Record = {
- Stellar: 15,
- Ethereum: 1500,
- Polygon: 120,
- Base: 200,
-}
export function calculateFiatAmount(amount: number, rate: number) {
- if (!amount || amount <= 0) return 0
- return amount * rate
+ return convertAmount(amount, rate)
}
export function calculateFees(
fiatAmount: number,
chain: string,
- offrampFeeRate = 0.01
-): OfframpFeeBreakdown {
- const offrampFee = fiatAmount * offrampFeeRate
- const networkFee = networkFeeMap[chain] ?? 15
- const bankFee = 0
- const totalFees = offrampFee + networkFee + bankFee
- const receiveAmount = Math.max(fiatAmount - totalFees, 0)
-
- return {
- offrampFee,
- networkFee,
- bankFee,
- totalFees,
- receiveAmount,
- }
+ offrampFeeRate?: number
+) {
+ return calculateOfframpFees(fiatAmount, chain, offrampFeeRate)
}
export function getMinMax(currency: FiatCurrency) {
- const limits: Record = {
- NGN: { min: 5_000, max: 5_000_000 },
- KES: { min: 500, max: 500_000 },
- GHS: { min: 50, max: 50_000 },
- ZAR: { min: 100, max: 100_000 },
- UGX: { min: 20_000, max: 20_000_000 },
- }
- return limits[currency]
+ return getOfframpLimits(currency)
}
diff --git a/lib/onramp/calculations.ts b/lib/onramp/calculations.ts
index 7a2bbc9..4710119 100644
--- a/lib/onramp/calculations.ts
+++ b/lib/onramp/calculations.ts
@@ -1,48 +1,17 @@
-import type { FiatCurrency, PaymentMethod } from '@/types/onramp'
-
-const networkFeeMap: Record = {
- NGN: 0.15,
- KES: 0.5,
- GHS: 0.05,
- ZAR: 0.1,
- UGX: 10,
-}
-
-export function calculateProcessingFee(amount: number, method: PaymentMethod) {
- if (!amount || amount <= 0) return 0
- switch (method) {
- case 'card':
- return amount * 0.015
- case 'mobile_money':
- return amount * 0.005
- default:
- return 0
- }
-}
-
-export function calculateNetworkFee(currency: FiatCurrency) {
- return networkFeeMap[currency]
-}
+import {
+ convertAmount,
+ calculateFeeBreakdown,
+ calculateOnrampNetworkFee,
+ calculateProcessingFee,
+} from '@/lib/calculations'
+import type { FiatCurrency } from '@/types/onramp'
export function calculateCryptoAmount(amount: number, rate: number) {
- if (!amount || amount <= 0 || !rate || rate <= 0) return 0
- return amount * rate
+ return convertAmount(amount, rate)
}
-export function calculateFeeBreakdown(
- amount: number,
- currency: FiatCurrency,
- method: PaymentMethod
-) {
- const processingFee = calculateProcessingFee(amount, method)
- const networkFee = calculateNetworkFee(currency)
- const totalFees = processingFee + networkFee
- const totalCost = amount + totalFees
+export { calculateProcessingFee, calculateFeeBreakdown }
- return {
- processingFee,
- networkFee,
- totalFees,
- totalCost,
- }
+export function calculateNetworkFee(currency: FiatCurrency) {
+ return calculateOnrampNetworkFee(currency)
}
diff --git a/lib/onramp/validation.ts b/lib/onramp/validation.ts
index 0cc3341..033095e 100644
--- a/lib/onramp/validation.ts
+++ b/lib/onramp/validation.ts
@@ -1,33 +1,12 @@
+import {
+ getOnrampLimits,
+ validateAmount,
+ isValidStellarAddress,
+} from '@/lib/calculations'
import type { FiatCurrency } from '@/types/onramp'
-import { formatCurrency } from '@/lib/onramp/formatters'
-
-const limitsMap: Record = {
- NGN: { min: 1000, max: 500000 },
- KES: { min: 100, max: 50000 },
- GHS: { min: 10, max: 5000 },
- ZAR: { min: 20, max: 80000 },
- UGX: { min: 2000, max: 1000000 },
-}
export function getLimits(currency: FiatCurrency) {
- return limitsMap[currency]
+ return getOnrampLimits(currency)
}
-export function validateAmount(amount: number, currency: FiatCurrency) {
- const { min, max } = limitsMap[currency]
- if (!amount || amount <= 0) {
- return 'Enter an amount to continue.'
- }
- if (amount < min) {
- return `Minimum amount is ${formatCurrency(min, currency, 0)}.`
- }
- if (amount > max) {
- return `Maximum amount is ${formatCurrency(max, currency, 0)}.`
- }
- return ''
-}
-
-export function isValidStellarAddress(address: string) {
- if (!address) return false
- return /^G[A-Z2-7]{55}$/.test(address)
-}
+export { validateAmount, isValidStellarAddress }
diff --git a/lib/payments/__tests__/mpesa.test.ts b/lib/payments/__tests__/mpesa.test.ts
index 89d24bd..b5f4a11 100644
--- a/lib/payments/__tests__/mpesa.test.ts
+++ b/lib/payments/__tests__/mpesa.test.ts
@@ -2,7 +2,7 @@
* Tests for the M-Pesa STK Push integration.
*/
-import { MpesaProvider } from '../mpesa'
+import { MpesaProvider, clearMpesaTokenCache } from '../mpesa'
import { MobileMoneyError } from '../types'
// ---------------------------------------------------------------------------
@@ -38,6 +38,7 @@ beforeEach(() => {
process.env.MPESA_SHORTCODE = '174379'
process.env.MPESA_PASSKEY = 'test-passkey'
process.env.MPESA_ENV = 'sandbox'
+ clearMpesaTokenCache()
jest.useFakeTimers()
})
diff --git a/lib/payments/__tests__/mtn-momo.test.ts b/lib/payments/__tests__/mtn-momo.test.ts
index 9789056..0523c88 100644
--- a/lib/payments/__tests__/mtn-momo.test.ts
+++ b/lib/payments/__tests__/mtn-momo.test.ts
@@ -2,8 +2,7 @@
* Tests for the MTN MoMo Collections API integration.
*/
-import { MtnMomoProvider } from '../mtn-momo'
-import { MobileMoneyError } from '../types'
+import { MtnMomoProvider, clearMtnMomoTokenCache } from '../mtn-momo'
// ---------------------------------------------------------------------------
// Helpers
@@ -37,6 +36,7 @@ beforeEach(() => {
process.env.MTN_MOMO_API_USER = '550e8400-e29b-41d4-a716-446655440000'
process.env.MTN_MOMO_API_KEY = 'test-api-key'
process.env.MTN_MOMO_ENV = 'sandbox'
+ clearMtnMomoTokenCache()
})
afterEach(() => {
diff --git a/lib/payments/mpesa.ts b/lib/payments/mpesa.ts
index 64f546b..3f9ef6e 100644
--- a/lib/payments/mpesa.ts
+++ b/lib/payments/mpesa.ts
@@ -41,6 +41,10 @@ interface TokenCache {
let tokenCache: TokenCache | null = null
+export function clearMpesaTokenCache() {
+ tokenCache = null
+}
+
async function fetchAccessToken(): Promise {
const now = Date.now()
if (tokenCache && tokenCache.expiresAt > now + 30_000) {
diff --git a/lib/payments/mtn-momo.ts b/lib/payments/mtn-momo.ts
index 131897d..1c77f1b 100644
--- a/lib/payments/mtn-momo.ts
+++ b/lib/payments/mtn-momo.ts
@@ -41,6 +41,10 @@ interface TokenCache {
let tokenCache: TokenCache | null = null
+export function clearMtnMomoTokenCache() {
+ tokenCache = null
+}
+
async function fetchAccessToken(): Promise {
const now = Date.now()
if (tokenCache && tokenCache.expiresAt > now + 30_000) {