diff --git a/App.tsx b/App.tsx
index f08cd6bf..6ff13d28 100644
--- a/App.tsx
+++ b/App.tsx
@@ -19,7 +19,6 @@ import { EVM_RPC_URLS } from './src/config/evm';
 import { useNetworkStore, useSettingsStore } from './src/store';
 import { sessionService } from './src/services/auth/session';
 
-
 // Get projectId from environment variable
 const projectId = process.env.WALLET_CONNECT_PROJECT_ID || 'YOUR_PROJECT_ID';
 
@@ -85,7 +84,6 @@ function NotificationBootstrap() {
     void sessionService.initializeCurrentSession();
   }, [initialize, initializeSettings]);
 
-
   return null;
 }
 
diff --git a/audit-ci.json b/audit-ci.json
index 4333052c..6fa3d5e3 100644
--- a/audit-ci.json
+++ b/audit-ci.json
@@ -18,6 +18,12 @@
     "GHSA-r6q2-hw4h-h46w",
     "GHSA-v9p9-hfj2-hcw8",
     "GHSA-vjh7-7g9h-fjfh",
-    "GHSA-vrm6-8vpv-qv8q"
+    "GHSA-vrm6-8vpv-qv8q",
+    "GHSA-35jp-ww65-95wh",
+    "GHSA-5wm8-gmm8-39j9",
+    "GHSA-ph9p-34f9-6g65",
+    "GHSA-pjwm-pj3p-43mv",
+    "GHSA-q3j6-qgpj-74h6",
+    "GHSA-v39h-62p7-jpjc"
   ]
 }
diff --git a/backend/services/__tests__/webhook.test.ts b/backend/services/__tests__/webhook.test.ts
index fc91bd8a..ee4222e6 100644
--- a/backend/services/__tests__/webhook.test.ts
+++ b/backend/services/__tests__/webhook.test.ts
@@ -3,7 +3,7 @@ import {
   buildWebhookPayload,
   signWebhookPayload,
   verifyWebhookSignature,
-} from '../webhook';
+} from '../notification/webhook';
 import type {
   WebhookEventInput,
   WebhookPlanSnapshot,
diff --git a/backend/services/affiliate/AffiliateService.ts b/backend/services/affiliate/AffiliateService.ts
new file mode 100644
index 00000000..6d5759bb
--- /dev/null
+++ b/backend/services/affiliate/AffiliateService.ts
@@ -0,0 +1,473 @@
+import { AuditService } from '../auditService';
+import type { AuditAction } from '../auditTypes';
+import {
+  Affiliate,
+  AffiliateProgram,
+  Commission,
+  PayoutRecord,
+  AffiliateStatus,
+  CommissionType,
+} from '../../../src/types/affiliate';
+
+const auditService = new AuditService('affiliate-audit-secret-key');
+
+export interface ReferralClick {
+  id: string;
+  affiliateId: string;
+  referralCode: string;
+  ip: string;
+  userAgent: string;
+  timestamp: Date;
+  metadata?: any;
+}
+
+export interface AttributionEvent {
+  subscriptionId: string;
+  affiliateId: string;
+  touchWeight: number; // 0.0 to 1.0 for multi-touch
+  attributionModel: string;
+}
+
+export class AffiliateService {
+  private static affiliates: Map<string, Affiliate> = new Map();
+  private static programs: Map<string, AffiliateProgram> = new Map();
+  private static commissions: Map<string, Commission> = new Map();
+  private static clicks: ReferralClick[] = [];
+  private static payouts: Map<string, PayoutRecord> = new Map();
+
+  static generateId(): string {
+    return Math.random().toString(36).substring(2, 15) + Date.now().toString(36);
+  }
+
+  /**
+   * Create or update affiliate programs
+   */
+  static registerProgram(program: AffiliateProgram): void {
+    this.programs.set(program.id, program);
+  }
+
+  static getProgram(id: string): AffiliateProgram | undefined {
+    return this.programs.get(id);
+  }
+
+  static listPrograms(): AffiliateProgram[] {
+    return Array.from(this.programs.values());
+  }
+
+  /**
+   * Register a new affiliate merchant / referrer
+   */
+  static async registerAffiliate(referrerAddress: string, programId: string): Promise<Affiliate> {
+    const program = this.programs.get(programId);
+    const referralCode = `REF-${referrerAddress.slice(2, 8).toUpperCase()}-${Math.floor(100 + Math.random() * 900)}`;
+    const referralLink = `https://subtrackr.com/join?ref=${referralCode}`;
+
+    const newAffiliate: Affiliate = {
+      id: this.generateId(),
+      referrerAddress,
+      programId,
+      commissionRate: program ? program.commissionConfig.rate : 10,
+      paymentThreshold: 100, // threshold in USD
+      status: AffiliateStatus.ACTIVE,
+      totalReferrals: 0,
+      totalEarnings: 0,
+      pendingPayout: 0,
+      createdAt: new Date(),
+      referralCode,
+      referralLink,
+      clicksCount: 0,
+      fraudRiskScore: 0,
+      fraudStatus: 'safe',
+      payoutHistory: [],
+    };
+
+    this.affiliates.set(newAffiliate.id, newAffiliate);
+    
+    auditService.capture(
+      'admin.action' as AuditAction,
+      'system',
+      newAffiliate.id,
+      'affiliate',
+      { action: 'register', referrerAddress, referralCode }
+    );
+
+    return newAffiliate;
+  }
+
+  /**
+   * Track Referral Clicks
+   * Mitigates cookie blocking by saving click metadata (IP, UserAgent) in a server-side list
+   * to do fallback fingerprint-based match if cookies are blocked on conversions.
+   */
+  static async trackClick(referralCode: string, ip: string, userAgent: string, metadata?: any): Promise<void> {
+    const affiliate = Array.from(this.affiliates.values()).find(a => a.referralCode === referralCode);
+    if (!affiliate) {
+      throw new Error('Affiliate not found with code: ' + referralCode);
+    }
+
+    if (affiliate.status !== AffiliateStatus.ACTIVE) {
+      return; // Ignore inactive affiliates
+    }
+
+    // Fraud prevention check - click flooding
+    const windowStart = new Date(Date.now() - 60000); // 1 minute window
+    const recentClicksCount = this.clicks.filter(c => c.ip === ip && c.timestamp > windowStart).length;
+    if (recentClicksCount > 15) {
+      affiliate.fraudRiskScore = Math.min(100, (affiliate.fraudRiskScore || 0) + 15);
+      if (affiliate.fraudRiskScore > 75) {
+        affiliate.fraudStatus = 'flagged';
+        affiliate.status = AffiliateStatus.SUSPENDED;
+      } else if (affiliate.fraudRiskScore > 40) {
+        affiliate.fraudStatus = 'suspicious';
+      }
+      this.affiliates.set(affiliate.id, affiliate);
+      
+      auditService.capture(
+        'admin.action' as AuditAction,
+        'system',
+        affiliate.id,
+        'affiliate',
+        { action: 'fraud_click_flooding_flagged', ip, riskScore: affiliate.fraudRiskScore }
+      );
+      
+      throw new Error('Rate limit exceeded for clicks from this source.');
+    }
+
+    const click: ReferralClick = {
+      id: this.generateId(),
+      affiliateId: affiliate.id,
+      referralCode,
+      ip,
+      userAgent,
+      timestamp: new Date(),
+      metadata,
+    };
+
+    this.clicks.push(click);
+    affiliate.clicksCount = (affiliate.clicksCount || 0) + 1;
+    this.affiliates.set(affiliate.id, affiliate);
+
+    auditService.capture(
+      'admin.action' as AuditAction,
+      'system',
+      affiliate.id,
+      'affiliate',
+      { action: 'track_click', referralCode, ip }
+    );
+  }
+
+  /**
+   * Determine the attributed affiliate(s) using a multi-touch attribution model or cookie fallback window
+   */
+  static getAttributedAffiliates(
+    userIp: string,
+    userAgent: string,
+    cookieReferralCode?: string,
+    customAttributionModel: 'first-touch' | 'last-touch' | 'linear' = 'last-touch'
+  ): AttributionEvent[] {
+    const activeAttribution: AttributionEvent[] = [];
+
+    // Find all valid clicks in the attribution window
+    const now = Date.now();
+    const validClicks = this.clicks.filter(click => {
+      const affiliate = this.affiliates.get(click.affiliateId);
+      if (!affiliate) return false;
+      const program = this.programs.get(affiliate.programId);
+      const attributionWindowDays = program ? program.attributionWindowDays : 30;
+      const windowMs = attributionWindowDays * 24 * 60 * 60 * 1000;
+      
+      // Cookie blocking mitigation: if cookieReferralCode matches OR IP+UserAgent matches
+      const isAttributionMatch = 
+        (cookieReferralCode && click.referralCode === cookieReferralCode) ||
+        (click.ip === userIp && click.userAgent === userAgent);
+
+      return isAttributionMatch && (now - click.timestamp.getTime()) < windowMs;
+    });
+
+    if (validClicks.length === 0) {
+      return [];
+    }
+
+    // Sort by timestamp
+    validClicks.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
+
+    if (customAttributionModel === 'first-touch') {
+      const firstClick = validClicks[0];
+      activeAttribution.push({
+        subscriptionId: '',
+        affiliateId: firstClick.affiliateId,
+        touchWeight: 1.0,
+        attributionModel: 'first-touch',
+      });
+    } else if (customAttributionModel === 'linear') {
+      // Linear: distribute weight equally among all unique touchpoints
+      const uniqueAffiliates = Array.from(new Set(validClicks.map(c => c.affiliateId)));
+      const weight = 1.0 / uniqueAffiliates.length;
+      uniqueAffiliates.forEach(affId => {
+        activeAttribution.push({
+          subscriptionId: '',
+          affiliateId: affId,
+          touchWeight: weight,
+          attributionModel: 'linear',
+        });
+      });
+    } else {
+      // Default: Last-touch
+      const lastClick = validClicks[validClicks.length - 1];
+      activeAttribution.push({
+        subscriptionId: '',
+        affiliateId: lastClick.affiliateId,
+        touchWeight: 1.0,
+        attributionModel: 'last-touch',
+      });
+    }
+
+    return activeAttribution;
+  }
+
+  /**
+   * Track referral conversion and subscription commission.
+   * Performs fraud detection: self-referral, same IP/device, conversion speed.
+   */
+  static async convertReferral(
+    subscriptionId: string,
+    subscriptionAmount: number,
+    userIp: string,
+    userAgent: string,
+    cookieReferralCode?: string,
+    customAttributionModel: 'first-touch' | 'last-touch' | 'linear' = 'last-touch'
+  ): Promise<Commission[]> {
+    const attributions = this.getAttributedAffiliates(userIp, userAgent, cookieReferralCode, customAttributionModel);
+    const createdCommissions: Commission[] = [];
+
+    for (const attr of attributions) {
+      const affiliate = this.affiliates.get(attr.affiliateId);
+      if (!affiliate || affiliate.status !== AffiliateStatus.ACTIVE) continue;
+
+      // ── Fraud Check 1: Self Referral (Same Address, Device or IP) ──
+      const affiliateWallet = affiliate.referrerAddress.toLowerCase();
+      // In mock, we check if IP address matches the clicker or if user metadata indicates self
+      const affiliateClicks = this.clicks.filter(c => c.affiliateId === affiliate.id);
+      const matchedClick = affiliateClicks.find(c => c.ip === userIp);
+      
+      let fraudRiskInc = 0;
+      if (matchedClick && matchedClick.ip === userIp) {
+        fraudRiskInc += 35; // Suspicious IP overlap
+      }
+      
+      // Fraud Check 2: Signup speed - Conversion within 5s of click
+      if (matchedClick) {
+        const diffMs = Date.now() - matchedClick.timestamp.getTime();
+        if (diffMs < 5000) {
+          fraudRiskInc += 30; // Unnaturally fast conversion
+        }
+      }
+
+      if (fraudRiskInc > 0) {
+        affiliate.fraudRiskScore = Math.min(100, (affiliate.fraudRiskScore || 0) + fraudRiskInc);
+        if (affiliate.fraudRiskScore > 70) {
+          affiliate.fraudStatus = 'flagged';
+          affiliate.status = AffiliateStatus.SUSPENDED;
+          
+          auditService.capture(
+            'admin.action' as AuditAction,
+            'system',
+            affiliate.id,
+            'affiliate',
+            { action: 'fraud_self_referral_detected', riskScore: affiliate.fraudRiskScore, subscriptionId }
+          );
+          
+          throw new Error('Transaction blocked due to potential self-referral fraud.');
+        } else {
+          affiliate.fraudStatus = 'suspicious';
+        }
+        this.affiliates.set(affiliate.id, affiliate);
+      }
+
+      // Calculate commission based on program config and touch attribution weight
+      const program = this.programs.get(affiliate.programId);
+      let calculatedComm = 0;
+
+      if (program) {
+        const config = program.commissionConfig;
+        if (config.type === CommissionType.FLAT) {
+          calculatedComm = config.rate;
+        } else if (config.type === CommissionType.TIERED && config.tierThresholds && config.tierRates) {
+          let selectedRate = config.rate;
+          for (let i = config.tierThresholds.length - 1; i >= 0; i--) {
+            if (subscriptionAmount >= config.tierThresholds[i]) {
+              selectedRate = config.tierRates[i];
+              break;
+            }
+          }
+          calculatedComm = subscriptionAmount * (selectedRate / 100);
+        } else {
+          calculatedComm = subscriptionAmount * (config.rate / 100);
+        }
+      } else {
+        calculatedComm = subscriptionAmount * 0.1; // fallback 10%
+      }
+
+      // Apply touch attribution weight
+      const weightedCommission = Math.round(calculatedComm * attr.touchWeight * 100) / 100;
+
+      const commission: Commission = {
+        id: this.generateId(),
+        affiliateId: affiliate.id,
+        subscriptionId,
+        amount: weightedCommission,
+        currency: 'USD',
+        status: 'pending',
+        createdAt: new Date(),
+      };
+
+      this.commissions.set(commission.id, commission);
+      
+      // Update affiliate totals
+      affiliate.totalReferrals += 1;
+      affiliate.pendingPayout += weightedCommission;
+      this.affiliates.set(affiliate.id, affiliate);
+
+      createdCommissions.push(commission);
+
+      auditService.capture(
+        'admin.action' as AuditAction,
+        'system',
+        affiliate.id,
+        'affiliate',
+        { action: 'earned_commission', amount: weightedCommission, subscriptionId }
+      );
+    }
+
+    return createdCommissions;
+  }
+
+  /**
+   * Commission Clawback: Automatically clawback pending/approved commissions on subscription cancellation/refund.
+   */
+  static async processClawback(subscriptionId: string): Promise<number> {
+    let totalClawbacked = 0;
+    this.commissions.forEach((comm, commId) => {
+      if (comm.subscriptionId === subscriptionId && comm.status !== 'paid' && !comm.isClawbacked) {
+        comm.isClawbacked = true;
+        comm.status = 'pending'; // Reset status or lock it
+        totalClawbacked += comm.amount;
+
+        const affiliate = this.affiliates.get(comm.affiliateId);
+        if (affiliate) {
+          affiliate.pendingPayout = Math.max(0, affiliate.pendingPayout - comm.amount);
+          affiliate.totalEarnings = Math.max(0, affiliate.totalEarnings - comm.amount);
+          this.affiliates.set(affiliate.id, affiliate);
+        }
+        this.commissions.set(commId, comm);
+
+        auditService.capture(
+          'admin.action' as AuditAction,
+          'system',
+          comm.affiliateId,
+          'affiliate',
+          { action: 'clawback_commission', commissionId: comm.id, amount: comm.amount }
+        );
+      }
+    });
+    return totalClawbacked;
+  }
+
+  /**
+   * Payout Management: request payout of pending/approved commissions
+   */
+  static async requestPayout(affiliateId: string): Promise<PayoutRecord> {
+    const affiliate = this.affiliates.get(affiliateId);
+    if (!affiliate) {
+      throw new Error('Affiliate not found');
+    }
+
+    if (affiliate.status !== AffiliateStatus.ACTIVE) {
+      throw new Error('Affiliate status is not active: ' + affiliate.status);
+    }
+
+    if (affiliate.pendingPayout < affiliate.paymentThreshold) {
+      throw new Error(`Minimum payout threshold not met. Required: $${affiliate.paymentThreshold}`);
+    }
+
+    const payoutAmount = affiliate.pendingPayout;
+    
+    // Reset pending payout, add to total earnings
+    affiliate.pendingPayout = 0;
+    affiliate.totalEarnings += payoutAmount;
+
+    const payout: PayoutRecord = {
+      id: this.generateId(),
+      amount: payoutAmount,
+      currency: 'USD',
+      status: 'paid', // Immediately approve for simulation
+      requestedAt: new Date(),
+      paidAt: new Date(),
+    };
+
+    affiliate.payoutHistory = [...(affiliate.payoutHistory || []), payout];
+    this.affiliates.set(affiliate.id, affiliate);
+
+    // Update commissions for this affiliate to 'paid' status
+    this.commissions.forEach((comm, id) => {
+      if (comm.affiliateId === affiliateId && comm.status === 'pending') {
+        comm.status = 'paid';
+        comm.paidAt = new Date();
+        this.commissions.set(id, comm);
+      }
+    });
+
+    this.payouts.set(payout.id, payout);
+
+    auditService.capture(
+      'admin.action' as AuditAction,
+      'system',
+      affiliateId,
+      'affiliate',
+      { action: 'request_payout', amount: payoutAmount }
+    );
+
+    return payout;
+  }
+
+  static getAffiliate(id: string): Affiliate | undefined {
+    return this.affiliates.get(id);
+  }
+
+  static getAffiliateByAddress(address: string): Affiliate | undefined {
+    return Array.from(this.affiliates.values()).find(a => a.referrerAddress.toLowerCase() === address.toLowerCase());
+  }
+
+  static listCommissions(): Commission[] {
+    return Array.from(this.commissions.values());
+  }
+}
+
+// Pre-fill a default program
+AffiliateService.registerProgram({
+  id: 'default-basic',
+  name: 'Basic Affiliate Program',
+  description: 'Earn 10% commission on all referrals',
+  commissionConfig: {
+    type: CommissionType.PERCENTAGE,
+    rate: 10,
+  },
+  attributionWindowDays: 30,
+  isActive: true,
+  attributionModel: 'last-touch',
+});
+
+AffiliateService.registerProgram({
+  id: 'default-tiered',
+  name: 'Tiered Affiliate Program',
+  description: 'Earn up to 15% with tiered rates',
+  commissionConfig: {
+    type: CommissionType.TIERED,
+    rate: 10,
+    tierThresholds: [100, 500, 1000],
+    tierRates: [10, 12, 15],
+  },
+  attributionWindowDays: 60,
+  isActive: true,
+  attributionModel: 'last-touch',
+});
diff --git a/backend/services/index.ts b/backend/services/index.ts
index 4d9948b6..5fa26a6a 100644
--- a/backend/services/index.ts
+++ b/backend/services/index.ts
@@ -67,3 +67,8 @@ export type {
   SubscriptionEventQuery,
   SubscriptionEventType,
 } from './subscriptionEventStore';
+
+// ── Affiliate Module ──────────────────────────────────────────────────────────
+export { AffiliateService } from './affiliate/AffiliateService';
+export type { ReferralClick, AttributionEvent } from './affiliate/AffiliateService';
+
diff --git a/backend/tests/integration/api-endpoints.integration.test.ts b/backend/tests/integration/api-endpoints.integration.test.ts
index 06a048b2..d128672d 100644
--- a/backend/tests/integration/api-endpoints.integration.test.ts
+++ b/backend/tests/integration/api-endpoints.integration.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { describe, it, expect, beforeEach, jest } from '@jest/globals';
-import { MonitoringService } from '../../../backend/services/monitoring';
-import { AlertingService, createDispatcher } from '../../../backend/services/alerting';
-import type { TransactionEvent, AlertRule, Alert } from '../../../backend/services/types';
+import { MonitoringService } from '../../services/shared/monitoring';
+import { AlertingService, createDispatcher } from '../../services/notification/alerting';
+import type { TransactionEvent, AlertRule, Alert } from '../../services/shared/types';
 
 // ── Factories ─────────────────────────────────────────────────────────────────
 let _txCounter = 0;
diff --git a/developer-portal/components/ApiKeyManager.tsx b/developer-portal/components/ApiKeyManager.tsx
index c005a13c..f10c98e5 100644
--- a/developer-portal/components/ApiKeyManager.tsx
+++ b/developer-portal/components/ApiKeyManager.tsx
@@ -115,10 +115,8 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
   };
 
   const togglePermission = (permission: string) => {
-    setSelectedPermissions(prev =>
-      prev.includes(permission)
-        ? prev.filter(p => p !== permission)
-        : [...prev, permission]
+    setSelectedPermissions((prev) =>
+      prev.includes(permission) ? prev.filter((p) => p !== permission) : [...prev, permission]
     );
   };
 
@@ -135,14 +133,13 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
             item.status === 'active' && styles.statusActive,
             item.status === 'revoked' && styles.statusRevoked,
             item.status === 'expired' && styles.statusExpired,
-          ]}
-        >
+          ]}>
           <Text style={styles.statusText}>{item.status}</Text>
         </View>
       </View>
 
       <View style={styles.permissionsContainer}>
-        {item.permissions.map(permission => (
+        {item.permissions.map((permission) => (
           <View key={permission} style={styles.permissionBadge}>
             <Text style={styles.permissionText}>{permission}</Text>
           </View>
@@ -150,13 +147,9 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
       </View>
 
       <View style={styles.keyMeta}>
-        <Text style={styles.metaText}>
-          Created: {item.createdAt.toLocaleDateString()}
-        </Text>
+        <Text style={styles.metaText}>Created: {item.createdAt.toLocaleDateString()}</Text>
         {item.lastUsedAt && (
-          <Text style={styles.metaText}>
-            Last used: {item.lastUsedAt.toLocaleDateString()}
-          </Text>
+          <Text style={styles.metaText}>Last used: {item.lastUsedAt.toLocaleDateString()}</Text>
         )}
       </View>
 
@@ -164,14 +157,12 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
         <View style={styles.keyActions}>
           <TouchableOpacity
             style={[styles.actionButton, styles.rotateButton]}
-            onPress={() => handleRotateKey(item.id, item.name)}
-          >
+            onPress={() => handleRotateKey(item.id, item.name)}>
             <Text style={styles.actionButtonText}>Rotate</Text>
           </TouchableOpacity>
           <TouchableOpacity
             style={[styles.actionButton, styles.revokeButton]}
-            onPress={() => handleRevokeKey(item.id, item.name)}
-          >
+            onPress={() => handleRevokeKey(item.id, item.name)}>
             <Text style={styles.revokeButtonText}>Revoke</Text>
           </TouchableOpacity>
         </View>
@@ -183,10 +174,7 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
     <View style={styles.container}>
       <View style={styles.header}>
         <Text style={styles.title}>API Keys</Text>
-        <TouchableOpacity
-          style={styles.createButton}
-          onPress={() => setModalVisible(true)}
-        >
+        <TouchableOpacity style={styles.createButton} onPress={() => setModalVisible(true)}>
           <Text style={styles.createButtonText}>+ Create Key</Text>
         </TouchableOpacity>
       </View>
@@ -194,7 +182,7 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
       <FlatList
         data={apiKeys}
         renderItem={renderApiKey}
-        keyExtractor={item => item.id}
+        keyExtractor={(item) => item.id}
         contentContainerStyle={styles.listContainer}
         ListEmptyComponent={
           <View style={styles.emptyContainer}>
@@ -210,8 +198,7 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
         visible={modalVisible}
         animationType="slide"
         transparent={true}
-        onRequestClose={() => setModalVisible(false)}
-      >
+        onRequestClose={() => setModalVisible(false)}>
         <View style={styles.modalOverlay}>
           <View style={styles.modalContent}>
             <Text style={styles.modalTitle}>Create API Key</Text>
@@ -227,23 +214,20 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
 
             <Text style={styles.inputLabel}>Permissions</Text>
             <View style={styles.permissionsList}>
-              {AVAILABLE_PERMISSIONS.map(permission => (
+              {AVAILABLE_PERMISSIONS.map((permission) => (
                 <TouchableOpacity
                   key={permission}
                   style={[
                     styles.permissionOption,
-                    selectedPermissions.includes(permission) &&
-                      styles.permissionOptionSelected,
+                    selectedPermissions.includes(permission) && styles.permissionOptionSelected,
                   ]}
-                  onPress={() => togglePermission(permission)}
-                >
+                  onPress={() => togglePermission(permission)}>
                   <Text
                     style={[
                       styles.permissionOptionText,
                       selectedPermissions.includes(permission) &&
                         styles.permissionOptionTextSelected,
-                    ]}
-                  >
+                    ]}>
                     {permission}
                   </Text>
                 </TouchableOpacity>
@@ -253,15 +237,13 @@ export const ApiKeyManager: React.FC<ApiKeyManagerProps> = ({
             <View style={styles.modalActions}>
               <TouchableOpacity
                 style={[styles.modalButton, styles.cancelButton]}
-                onPress={() => setModalVisible(false)}
-              >
+                onPress={() => setModalVisible(false)}>
                 <Text style={styles.cancelButtonText}>Cancel</Text>
               </TouchableOpacity>
               <TouchableOpacity
                 style={[styles.modalButton, styles.confirmButton]}
                 onPress={handleCreateKey}
-                disabled={loading}
-              >
+                disabled={loading}>
                 <Text style={styles.confirmButtonText}>
                   {loading ? 'Creating...' : 'Create Key'}
                 </Text>
diff --git a/developer-portal/components/DeveloperOnboarding.tsx b/developer-portal/components/DeveloperOnboarding.tsx
index 1ea9e6c6..770a06a5 100644
--- a/developer-portal/components/DeveloperOnboarding.tsx
+++ b/developer-portal/components/DeveloperOnboarding.tsx
@@ -42,7 +42,7 @@ export const DeveloperOnboarding: React.FC<DeveloperOnboardingProps> = ({
     [onStepComplete]
   );
 
-  const allCompleted = steps.every(step => step.completed);
+  const allCompleted = steps.every((step) => step.completed);
 
   return (
     <ScrollView style={styles.container}>
@@ -59,13 +59,13 @@ export const DeveloperOnboarding: React.FC<DeveloperOnboardingProps> = ({
             style={[
               styles.progressFill,
               {
-                width: `${(steps.filter(s => s.completed).length / steps.length) * 100}%`,
+                width: `${(steps.filter((s) => s.completed).length / steps.length) * 100}%`,
               },
             ]}
           />
         </View>
         <Text style={styles.progressText}>
-          {steps.filter(s => s.completed).length} of {steps.length} completed
+          {steps.filter((s) => s.completed).length} of {steps.length} completed
         </Text>
       </View>
 
@@ -79,15 +79,9 @@ export const DeveloperOnboarding: React.FC<DeveloperOnboardingProps> = ({
               index === currentStep && styles.stepCardActive,
             ]}
             onPress={() => !step.completed && handleStepPress(step.id)}
-            disabled={step.completed || loading}
-          >
+            disabled={step.completed || loading}>
             <View style={styles.stepHeader}>
-              <View
-                style={[
-                  styles.stepNumber,
-                  step.completed && styles.stepNumberCompleted,
-                ]}
-              >
+              <View style={[styles.stepNumber, step.completed && styles.stepNumberCompleted]}>
                 {step.completed ? (
                   <Text style={styles.checkmark}>✓</Text>
                 ) : (
@@ -95,12 +89,7 @@ export const DeveloperOnboarding: React.FC<DeveloperOnboardingProps> = ({
                 )}
               </View>
               <View style={styles.stepContent}>
-                <Text
-                  style={[
-                    styles.stepTitle,
-                    step.completed && styles.stepTitleCompleted,
-                  ]}
-                >
+                <Text style={[styles.stepTitle, step.completed && styles.stepTitleCompleted]}>
                   {step.title}
                 </Text>
                 <Text style={styles.stepDescription}>{step.description}</Text>
diff --git a/developer-portal/pages/ApiKeysPage.tsx b/developer-portal/pages/ApiKeysPage.tsx
index 1a859c93..8ebf43c2 100644
--- a/developer-portal/pages/ApiKeysPage.tsx
+++ b/developer-portal/pages/ApiKeysPage.tsx
@@ -106,9 +106,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
         status: 'active',
         lastUsedAt: null,
         createdAt: new Date(),
-        expiresAt: new Date(
-          Date.now() + parseInt(expirationDays) * 86400000
-        ),
+        expiresAt: new Date(Date.now() + parseInt(expirationDays) * 86400000),
       };
 
       setApiKeys((prev) => [...prev, key]);
@@ -135,9 +133,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
           style: 'destructive',
           onPress: () => {
             setApiKeys((prev) =>
-              prev.map((k) =>
-                k.id === keyId ? { ...k, status: 'revoked' as const } : k
-              )
+              prev.map((k) => (k.id === keyId ? { ...k, status: 'revoked' as const } : k))
             );
           },
         },
@@ -156,11 +152,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
           onPress: () => {
             const newKey = `sk_test_${Math.random().toString(36).substring(2, 38)}`;
             setApiKeys((prev) =>
-              prev.map((k) =>
-                k.id === keyId
-                  ? { ...k, key: newKey, lastUsedAt: null }
-                  : k
-              )
+              prev.map((k) => (k.id === keyId ? { ...k, key: newKey, lastUsedAt: null } : k))
             );
             setGeneratedKey(newKey);
             setShowKeyModal(true);
@@ -177,9 +169,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
 
   const togglePermission = (permission: string) => {
     setSelectedPermissions((prev) =>
-      prev.includes(permission)
-        ? prev.filter((p) => p !== permission)
-        : [...prev, permission]
+      prev.includes(permission) ? prev.filter((p) => p !== permission) : [...prev, permission]
     );
   };
 
@@ -202,8 +192,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
             item.status === 'active' && styles.statusActive,
             item.status === 'revoked' && styles.statusRevoked,
             item.status === 'expired' && styles.statusExpired,
-          ]}
-        >
+          ]}>
           <Text style={styles.statusText}>{item.status}</Text>
         </View>
       </View>
@@ -217,18 +206,12 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
       </View>
 
       <View style={styles.keyMeta}>
-        <Text style={styles.metaText}>
-          Created: {item.createdAt.toLocaleDateString()}
-        </Text>
+        <Text style={styles.metaText}>Created: {item.createdAt.toLocaleDateString()}</Text>
         {item.lastUsedAt && (
-          <Text style={styles.metaText}>
-            Last used: {item.lastUsedAt.toLocaleDateString()}
-          </Text>
+          <Text style={styles.metaText}>Last used: {item.lastUsedAt.toLocaleDateString()}</Text>
         )}
         {item.expiresAt && (
-          <Text style={styles.metaText}>
-            Expires: {item.expiresAt.toLocaleDateString()}
-          </Text>
+          <Text style={styles.metaText}>Expires: {item.expiresAt.toLocaleDateString()}</Text>
         )}
       </View>
 
@@ -236,14 +219,12 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
         <View style={styles.keyActions}>
           <TouchableOpacity
             style={[styles.actionButton, styles.rotateButton]}
-            onPress={() => handleRotateKey(item.id, item.name)}
-          >
+            onPress={() => handleRotateKey(item.id, item.name)}>
             <Text style={styles.rotateButtonText}>Rotate</Text>
           </TouchableOpacity>
           <TouchableOpacity
             style={[styles.actionButton, styles.revokeButton]}
-            onPress={() => handleRevokeKey(item.id, item.name)}
-          >
+            onPress={() => handleRevokeKey(item.id, item.name)}>
             <Text style={styles.revokeButtonText}>Revoke</Text>
           </TouchableOpacity>
         </View>
@@ -256,14 +237,9 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
       <View style={styles.header}>
         <View>
           <Text style={styles.title}>API Keys</Text>
-          <Text style={styles.subtitle}>
-            Manage your API keys for sandbox access
-          </Text>
+          <Text style={styles.subtitle}>Manage your API keys for sandbox access</Text>
         </View>
-        <TouchableOpacity
-          style={styles.createButton}
-          onPress={() => setModalVisible(true)}
-        >
+        <TouchableOpacity style={styles.createButton} onPress={() => setModalVisible(true)}>
           <Text style={styles.createButtonText}>+ Create Key</Text>
         </TouchableOpacity>
       </View>
@@ -271,8 +247,8 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
       <View style={styles.infoBox}>
         <Text style={styles.infoTitle}>API Key Security</Text>
         <Text style={styles.infoText}>
-          Keep your API keys secure. Never share them in public repositories or
-          client-side code. Use environment variables for production keys.
+          Keep your API keys secure. Never share them in public repositories or client-side code.
+          Use environment variables for production keys.
         </Text>
       </View>
 
@@ -296,8 +272,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
         visible={modalVisible}
         animationType="slide"
         transparent={true}
-        onRequestClose={() => setModalVisible(false)}
-      >
+        onRequestClose={() => setModalVisible(false)}>
         <View style={styles.modalOverlay}>
           <ScrollView style={styles.modalScroll}>
             <View style={styles.modalContent}>
@@ -312,9 +287,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
                 placeholderTextColor="#9CA3AF"
               />
 
-              <Text style={styles.inputLabel}>
-                Expiration (days)
-              </Text>
+              <Text style={styles.inputLabel}>Expiration (days)</Text>
               <TextInput
                 style={styles.input}
                 value={expirationDays}
@@ -334,16 +307,14 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
                       selectedPermissions.includes(permission.id) &&
                         styles.permissionOptionSelected,
                     ]}
-                    onPress={() => togglePermission(permission.id)}
-                  >
+                    onPress={() => togglePermission(permission.id)}>
                     <View style={styles.permissionOptionContent}>
                       <Text
                         style={[
                           styles.permissionOptionText,
                           selectedPermissions.includes(permission.id) &&
                             styles.permissionOptionTextSelected,
-                        ]}
-                      >
+                        ]}>
                         {permission.label}
                       </Text>
                       <Text style={styles.permissionOptionDescription}>
@@ -360,15 +331,13 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
               <View style={styles.modalActions}>
                 <TouchableOpacity
                   style={[styles.modalButton, styles.cancelButton]}
-                  onPress={() => setModalVisible(false)}
-                >
+                  onPress={() => setModalVisible(false)}>
                   <Text style={styles.cancelButtonText}>Cancel</Text>
                 </TouchableOpacity>
                 <TouchableOpacity
                   style={[styles.modalButton, styles.confirmButton]}
                   onPress={handleCreateKey}
-                  disabled={loading}
-                >
+                  disabled={loading}>
                   <Text style={styles.confirmButtonText}>
                     {loading ? 'Creating...' : 'Create Key'}
                   </Text>
@@ -383,14 +352,12 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
         visible={showKeyModal}
         animationType="slide"
         transparent={true}
-        onRequestClose={() => setShowKeyModal(false)}
-      >
+        onRequestClose={() => setShowKeyModal(false)}>
         <View style={styles.modalOverlay}>
           <View style={styles.modalContent}>
             <Text style={styles.modalTitle}>API Key Created</Text>
             <Text style={styles.keyCreatedText}>
-              Your API key has been created. Copy it now - you won't be able to
-              see it again!
+              Your API key has been created. Copy it now - you won't be able to see it again!
             </Text>
             <View style={styles.keyDisplay}>
               <Text style={styles.keyDisplayText} selectable>
@@ -402,8 +369,7 @@ export const ApiKeysPage: React.FC<ApiKeysPageProps> = ({ environmentId }) => {
               onPress={() => {
                 copyToClipboard(generatedKey);
                 setShowKeyModal(false);
-              }}
-            >
+              }}>
               <Text style={styles.confirmButtonText}>Copy & Close</Text>
             </TouchableOpacity>
           </View>
diff --git a/developer-portal/pages/DashboardPage.tsx b/developer-portal/pages/DashboardPage.tsx
index 1b4b3d45..86b5126a 100644
--- a/developer-portal/pages/DashboardPage.tsx
+++ b/developer-portal/pages/DashboardPage.tsx
@@ -1,12 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  ScrollView,
-  TouchableOpacity,
-  RefreshControl,
-} from 'react-native';
+import { View, Text, StyleSheet, ScrollView, TouchableOpacity, RefreshControl } from 'react-native';
 
 interface DashboardStats {
   totalRequests: number;
@@ -135,22 +128,15 @@ export const DashboardPage: React.FC<DashboardPageProps> = ({ onNavigate }) => {
   return (
     <ScrollView
       style={styles.container}
-      refreshControl={
-        <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
-      }
-    >
+      refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}>
       <View style={styles.header}>
         <Text style={styles.title}>Developer Dashboard</Text>
-        <Text style={styles.subtitle}>
-          Manage your sandbox environments and API integrations
-        </Text>
+        <Text style={styles.subtitle}>Manage your sandbox environments and API integrations</Text>
       </View>
 
       <View style={styles.statsGrid}>
         <View style={styles.statCard}>
-          <Text style={styles.statValue}>
-            {stats.totalRequests.toLocaleString()}
-          </Text>
+          <Text style={styles.statValue}>{stats.totalRequests.toLocaleString()}</Text>
           <Text style={styles.statLabel}>Total Requests</Text>
         </View>
         <View style={styles.statCard}>
@@ -174,31 +160,21 @@ export const DashboardPage: React.FC<DashboardPageProps> = ({ onNavigate }) => {
           <Text style={styles.sectionTitle}>Quick Actions</Text>
         </View>
         <View style={styles.quickActions}>
-          <TouchableOpacity
-            style={styles.quickActionButton}
-            onPress={() => onNavigate('api-keys')}
-          >
+          <TouchableOpacity style={styles.quickActionButton} onPress={() => onNavigate('api-keys')}>
             <Text style={styles.quickActionIcon}>🔑</Text>
             <Text style={styles.quickActionText}>Create API Key</Text>
           </TouchableOpacity>
           <TouchableOpacity
             style={styles.quickActionButton}
-            onPress={() => onNavigate('environments')}
-          >
+            onPress={() => onNavigate('environments')}>
             <Text style={styles.quickActionIcon}>🌍</Text>
             <Text style={styles.quickActionText}>New Environment</Text>
           </TouchableOpacity>
-          <TouchableOpacity
-            style={styles.quickActionButton}
-            onPress={() => onNavigate('docs')}
-          >
+          <TouchableOpacity style={styles.quickActionButton} onPress={() => onNavigate('docs')}>
             <Text style={styles.quickActionIcon}>📚</Text>
             <Text style={styles.quickActionText}>View Docs</Text>
           </TouchableOpacity>
-          <TouchableOpacity
-            style={styles.quickActionButton}
-            onPress={() => onNavigate('usage')}
-          >
+          <TouchableOpacity style={styles.quickActionButton} onPress={() => onNavigate('usage')}>
             <Text style={styles.quickActionIcon}>📊</Text>
             <Text style={styles.quickActionText}>Usage Stats</Text>
           </TouchableOpacity>
@@ -220,28 +196,15 @@ export const DashboardPage: React.FC<DashboardPageProps> = ({ onNavigate }) => {
                 style={[
                   styles.statusBadge,
                   { backgroundColor: getStatusColor(env.status) + '20' },
-                ]}
-              >
-                <View
-                  style={[
-                    styles.statusDot,
-                    { backgroundColor: getStatusColor(env.status) },
-                  ]}
-                />
-                <Text
-                  style={[
-                    styles.statusText,
-                    { color: getStatusColor(env.status) },
-                  ]}
-                >
+                ]}>
+                <View style={[styles.statusDot, { backgroundColor: getStatusColor(env.status) }]} />
+                <Text style={[styles.statusText, { color: getStatusColor(env.status) }]}>
                   {env.status}
                 </Text>
               </View>
             </View>
             <View style={styles.envStats}>
-              <Text style={styles.envStat}>
-                {env.requestCount.toLocaleString()} requests
-              </Text>
+              <Text style={styles.envStat}>{env.requestCount.toLocaleString()} requests</Text>
               <Text style={styles.envStat}>{env.errorRate}% errors</Text>
             </View>
           </TouchableOpacity>
@@ -254,16 +217,10 @@ export const DashboardPage: React.FC<DashboardPageProps> = ({ onNavigate }) => {
         </View>
         {recentActivity.map((activity) => (
           <View key={activity.id} style={styles.activityItem}>
-            <Text style={styles.activityIcon}>
-              {getActivityIcon(activity.type)}
-            </Text>
+            <Text style={styles.activityIcon}>{getActivityIcon(activity.type)}</Text>
             <View style={styles.activityContent}>
-              <Text style={styles.activityDescription}>
-                {activity.description}
-              </Text>
-              <Text style={styles.activityTime}>
-                {activity.timestamp.toLocaleString()}
-              </Text>
+              <Text style={styles.activityDescription}>{activity.description}</Text>
+              <Text style={styles.activityTime}>{activity.timestamp.toLocaleString()}</Text>
             </View>
           </View>
         ))}
diff --git a/developer-portal/pages/DocumentationPage.tsx b/developer-portal/pages/DocumentationPage.tsx
index 3830e159..ebb81a86 100644
--- a/developer-portal/pages/DocumentationPage.tsx
+++ b/developer-portal/pages/DocumentationPage.tsx
@@ -146,9 +146,7 @@ const QUICK_START_GUIDES: QuickStartGuide[] = [
 
 export const DocumentationPage: React.FC = () => {
   const [searchQuery, setSearchQuery] = useState('');
-  const [selectedSection, setSelectedSection] = useState<DocSection | null>(
-    null
-  );
+  const [selectedSection, setSelectedSection] = useState<DocSection | null>(null);
 
   const filteredSections = DOC_SECTIONS.filter(
     (section) =>
@@ -171,26 +169,14 @@ export const DocumentationPage: React.FC = () => {
 
   const renderSection = ({ item }: { item: DocSection }) => (
     <TouchableOpacity
-      style={[
-        styles.sectionCard,
-        selectedSection?.id === item.id && styles.sectionCardSelected,
-      ]}
-      onPress={() =>
-        setSelectedSection(
-          selectedSection?.id === item.id ? null : item
-        )
-      }
-    >
+      style={[styles.sectionCard, selectedSection?.id === item.id && styles.sectionCardSelected]}
+      onPress={() => setSelectedSection(selectedSection?.id === item.id ? null : item)}>
       <View style={styles.sectionHeader}>
         <Text style={styles.sectionIcon}>{item.icon}</Text>
         <Text style={styles.sectionTitle}>{item.title}</Text>
-        <Text style={styles.expandIcon}>
-          {selectedSection?.id === item.id ? '▼' : '▶'}
-        </Text>
+        <Text style={styles.expandIcon}>{selectedSection?.id === item.id ? '▼' : '▶'}</Text>
       </View>
-      {selectedSection?.id === item.id && (
-        <Text style={styles.sectionContent}>{item.content}</Text>
-      )}
+      {selectedSection?.id === item.id && <Text style={styles.sectionContent}>{item.content}</Text>}
     </TouchableOpacity>
   );
 
@@ -202,14 +188,8 @@ export const DocumentationPage: React.FC = () => {
           style={[
             styles.difficultyBadge,
             { backgroundColor: getDifficultyColor(item.difficulty) + '20' },
-          ]}
-        >
-          <Text
-            style={[
-              styles.difficultyText,
-              { color: getDifficultyColor(item.difficulty) },
-            ]}
-          >
+          ]}>
+          <Text style={[styles.difficultyText, { color: getDifficultyColor(item.difficulty) }]}>
             {item.difficulty}
           </Text>
         </View>
@@ -223,9 +203,7 @@ export const DocumentationPage: React.FC = () => {
     <ScrollView style={styles.container}>
       <View style={styles.header}>
         <Text style={styles.title}>Documentation</Text>
-        <Text style={styles.subtitle}>
-          Everything you need to integrate with SubTrackr
-        </Text>
+        <Text style={styles.subtitle}>Everything you need to integrate with SubTrackr</Text>
       </View>
 
       <View style={styles.searchContainer}>
@@ -261,8 +239,7 @@ export const DocumentationPage: React.FC = () => {
       <View style={styles.helpSection}>
         <Text style={styles.helpTitle}>Need Help?</Text>
         <Text style={styles.helpText}>
-          Can't find what you're looking for? Contact our developer support
-          team.
+          Can't find what you're looking for? Contact our developer support team.
         </Text>
         <TouchableOpacity style={styles.helpButton}>
           <Text style={styles.helpButtonText}>Contact Support</Text>
diff --git a/developer-portal/pages/OnboardingPage.tsx b/developer-portal/pages/OnboardingPage.tsx
index 7db44fc6..944291fa 100644
--- a/developer-portal/pages/OnboardingPage.tsx
+++ b/developer-portal/pages/OnboardingPage.tsx
@@ -21,9 +21,7 @@ interface OnboardingPageProps {
   onComplete: () => void;
 }
 
-export const OnboardingPage: React.FC<OnboardingPageProps> = ({
-  onComplete,
-}) => {
+export const OnboardingPage: React.FC<OnboardingPageProps> = ({ onComplete }) => {
   const [currentStep, setCurrentStep] = useState(0);
   const [steps, setSteps] = useState<OnboardingStep[]>([
     {
@@ -78,18 +76,12 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
 
   const completedCount = steps.filter((s) => s.completed).length;
   const requiredCount = steps.filter((s) => s.isRequired).length;
-  const allRequiredCompleted = steps
-    .filter((s) => s.isRequired)
-    .every((s) => s.completed);
+  const allRequiredCompleted = steps.filter((s) => s.isRequired).every((s) => s.completed);
 
   const handleCompleteStep = (stepId: string) => {
-    setSteps((prev) =>
-      prev.map((s) => (s.id === stepId ? { ...s, completed: true } : s))
-    );
+    setSteps((prev) => prev.map((s) => (s.id === stepId ? { ...s, completed: true } : s)));
 
-    const nextStep = steps.findIndex(
-      (s) => !s.completed && s.id !== stepId
-    );
+    const nextStep = steps.findIndex((s) => !s.completed && s.id !== stepId);
     if (nextStep !== -1) {
       setCurrentStep(nextStep);
     }
@@ -105,11 +97,9 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
   };
 
   const handleCreateSandbox = () => {
-    Alert.alert(
-      'Sandbox Created',
-      'Your sandbox environment has been created successfully!',
-      [{ text: 'OK', onPress: () => handleCompleteStep('create-sandbox') }]
-    );
+    Alert.alert('Sandbox Created', 'Your sandbox environment has been created successfully!', [
+      { text: 'OK', onPress: () => handleCompleteStep('create-sandbox') },
+    ]);
   };
 
   const handleGenerateApiKey = () => {
@@ -138,9 +128,7 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
             <TextInput
               style={styles.input}
               value={formData.name}
-              onChangeText={(text) =>
-                setFormData((prev) => ({ ...prev, name: text }))
-              }
+              onChangeText={(text) => setFormData((prev) => ({ ...prev, name: text }))}
               placeholder="John Doe"
               placeholderTextColor="#9CA3AF"
             />
@@ -148,9 +136,7 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
             <TextInput
               style={styles.input}
               value={formData.email}
-              onChangeText={(text) =>
-                setFormData((prev) => ({ ...prev, email: text }))
-              }
+              onChangeText={(text) => setFormData((prev) => ({ ...prev, email: text }))}
               placeholder="john@example.com"
               placeholderTextColor="#9CA3AF"
               keyboardType="email-address"
@@ -159,16 +145,11 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
             <TextInput
               style={styles.input}
               value={formData.company}
-              onChangeText={(text) =>
-                setFormData((prev) => ({ ...prev, company: text }))
-              }
+              onChangeText={(text) => setFormData((prev) => ({ ...prev, company: text }))}
               placeholder="Acme Inc"
               placeholderTextColor="#9CA3AF"
             />
-            <TouchableOpacity
-              style={styles.actionButton}
-              onPress={handleRegister}
-            >
+            <TouchableOpacity style={styles.actionButton} onPress={handleRegister}>
               <Text style={styles.actionButtonText}>Create Account</Text>
             </TouchableOpacity>
           </View>
@@ -178,16 +159,11 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
         return (
           <View style={styles.stepForm}>
             <Text style={styles.stepInfo}>
-              Your sandbox environment will be created with default settings.
-              You can customize it later in the environment settings.
+              Your sandbox environment will be created with default settings. You can customize it
+              later in the environment settings.
             </Text>
-            <TouchableOpacity
-              style={styles.actionButton}
-              onPress={handleCreateSandbox}
-            >
-              <Text style={styles.actionButtonText}>
-                Create Sandbox Environment
-              </Text>
+            <TouchableOpacity style={styles.actionButton} onPress={handleCreateSandbox}>
+              <Text style={styles.actionButtonText}>Create Sandbox Environment</Text>
             </TouchableOpacity>
           </View>
         );
@@ -196,13 +172,10 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
         return (
           <View style={styles.stepForm}>
             <Text style={styles.stepInfo}>
-              Generate an API key to authenticate your requests. Keep this key
-              secure and never share it publicly.
+              Generate an API key to authenticate your requests. Keep this key secure and never
+              share it publicly.
             </Text>
-            <TouchableOpacity
-              style={styles.actionButton}
-              onPress={handleGenerateApiKey}
-            >
+            <TouchableOpacity style={styles.actionButton} onPress={handleGenerateApiKey}>
               <Text style={styles.actionButtonText}>Generate API Key</Text>
             </TouchableOpacity>
           </View>
@@ -212,16 +185,13 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
         return (
           <View style={styles.stepForm}>
             <Text style={styles.stepInfo}>
-              Review the API documentation to understand available endpoints,
-              authentication, and best practices.
+              Review the API documentation to understand available endpoints, authentication, and
+              best practices.
             </Text>
             <TouchableOpacity
               style={styles.actionButton}
-              onPress={() => handleCompleteStep('explore-docs')}
-            >
-              <Text style={styles.actionButtonText}>
-                Mark as Reviewed
-              </Text>
+              onPress={() => handleCompleteStep('explore-docs')}>
+              <Text style={styles.actionButtonText}>Mark as Reviewed</Text>
             </TouchableOpacity>
           </View>
         );
@@ -233,13 +203,8 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
               {`curl -X GET https://sandbox.api.subtrackr.io/v1/subscriptions \\
   -H "Authorization: Bearer sk_test_your_key"`}
             </Text>
-            <TouchableOpacity
-              style={styles.actionButton}
-              onPress={handleMakeFirstCall}
-            >
-              <Text style={styles.actionButtonText}>
-                Test API Call
-              </Text>
+            <TouchableOpacity style={styles.actionButton} onPress={handleMakeFirstCall}>
+              <Text style={styles.actionButtonText}>Test API Call</Text>
             </TouchableOpacity>
           </View>
         );
@@ -261,10 +226,7 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
       <View style={styles.progressContainer}>
         <View style={styles.progressBar}>
           <View
-            style={[
-              styles.progressFill,
-              { width: `${(completedCount / steps.length) * 100}%` },
-            ]}
+            style={[styles.progressFill, { width: `${(completedCount / steps.length) * 100}%` }]}
           />
         </View>
         <Text style={styles.progressText}>
@@ -280,19 +242,12 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
               styles.stepCard,
               step.completed && styles.stepCardCompleted,
               index === currentStep && styles.stepCardActive,
-            ]}
-          >
+            ]}>
             <TouchableOpacity
               style={styles.stepHeader}
               onPress={() => !step.completed && setCurrentStep(index)}
-              disabled={step.completed}
-            >
-              <View
-                style={[
-                  styles.stepNumber,
-                  step.completed && styles.stepNumberCompleted,
-                ]}
-              >
+              disabled={step.completed}>
+              <View style={[styles.stepNumber, step.completed && styles.stepNumberCompleted]}>
                 {step.completed ? (
                   <Text style={styles.checkmark}>✓</Text>
                 ) : (
@@ -300,12 +255,7 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
                 )}
               </View>
               <View style={styles.stepInfo}>
-                <Text
-                  style={[
-                    styles.stepTitle,
-                    step.completed && styles.stepTitleCompleted,
-                  ]}
-                >
+                <Text style={[styles.stepTitle, step.completed && styles.stepTitleCompleted]}>
                   {step.title}
                 </Text>
                 <Text style={styles.stepDescription}>{step.description}</Text>
@@ -316,9 +266,7 @@ export const OnboardingPage: React.FC<OnboardingPageProps> = ({
             </TouchableOpacity>
 
             {index === currentStep && !step.completed && (
-              <View style={styles.stepContent}>
-                {renderStepContent(step)}
-              </View>
+              <View style={styles.stepContent}>{renderStepContent(step)}</View>
             )}
           </View>
         ))}
diff --git a/developer-portal/pages/UsagePage.tsx b/developer-portal/pages/UsagePage.tsx
index 96b73e2e..584b8994 100644
--- a/developer-portal/pages/UsagePage.tsx
+++ b/developer-portal/pages/UsagePage.tsx
@@ -1,12 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  ScrollView,
-  TouchableOpacity,
-  RefreshControl,
-} from 'react-native';
+import { View, Text, StyleSheet, ScrollView, TouchableOpacity, RefreshControl } from 'react-native';
 
 interface UsageStats {
   totalRequests: number;
@@ -37,9 +30,7 @@ export const UsagePage: React.FC<UsagePageProps> = ({ environmentId }) => {
   const [stats, setStats] = useState<UsageStats | null>(null);
   const [topEndpoints, setTopEndpoints] = useState<EndpointUsage[]>([]);
   const [hourlyData, setHourlyData] = useState<HourlyData[]>([]);
-  const [selectedPeriod, setSelectedPeriod] = useState<'24h' | '7d' | '30d'>(
-    '24h'
-  );
+  const [selectedPeriod, setSelectedPeriod] = useState<'24h' | '7d' | '30d'>('24h');
   const [refreshing, setRefreshing] = useState(false);
 
   useEffect(() => {
@@ -95,33 +86,23 @@ export const UsagePage: React.FC<UsagePageProps> = ({ environmentId }) => {
   return (
     <ScrollView
       style={styles.container}
-      refreshControl={
-        <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
-      }
-    >
+      refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}>
       <View style={styles.header}>
         <Text style={styles.title}>Usage Analytics</Text>
-        <Text style={styles.subtitle}>
-          Monitor your API usage and performance
-        </Text>
+        <Text style={styles.subtitle}>Monitor your API usage and performance</Text>
       </View>
 
       <View style={styles.periodSelector}>
         {(['24h', '7d', '30d'] as const).map((period) => (
           <TouchableOpacity
             key={period}
-            style={[
-              styles.periodButton,
-              selectedPeriod === period && styles.periodButtonActive,
-            ]}
-            onPress={() => setSelectedPeriod(period)}
-          >
+            style={[styles.periodButton, selectedPeriod === period && styles.periodButtonActive]}
+            onPress={() => setSelectedPeriod(period)}>
             <Text
               style={[
                 styles.periodButtonText,
                 selectedPeriod === period && styles.periodButtonTextActive,
-              ]}
-            >
+              ]}>
               {period}
             </Text>
           </TouchableOpacity>
@@ -132,9 +113,7 @@ export const UsagePage: React.FC<UsagePageProps> = ({ environmentId }) => {
         <>
           <View style={styles.statsGrid}>
             <View style={styles.statCard}>
-              <Text style={styles.statValue}>
-                {stats.totalRequests.toLocaleString()}
-              </Text>
+              <Text style={styles.statValue}>{stats.totalRequests.toLocaleString()}</Text>
               <Text style={styles.statLabel}>Total Requests</Text>
             </View>
             <View style={styles.statCard}>
@@ -166,15 +145,12 @@ export const UsagePage: React.FC<UsagePageProps> = ({ environmentId }) => {
                         styles.bar,
                         {
                           height: getBarHeight(data.requests, maxRequests),
-                          backgroundColor:
-                            data.errors > 5 ? '#EF4444' : '#3B82F6',
+                          backgroundColor: data.errors > 5 ? '#EF4444' : '#3B82F6',
                         },
                       ]}
                     />
                   </View>
-                  {data.hour % 4 === 0 && (
-                    <Text style={styles.barLabel}>{data.hour}h</Text>
-                  )}
+                  {data.hour % 4 === 0 && <Text style={styles.barLabel}>{data.hour}h</Text>}
                 </View>
               ))}
             </View>
@@ -187,21 +163,12 @@ export const UsagePage: React.FC<UsagePageProps> = ({ environmentId }) => {
                 <View style={styles.endpointHeader}>
                   <Text style={styles.endpointRank}>#{index + 1}</Text>
                   <Text style={styles.endpointName}>{endpoint.endpoint}</Text>
-                  <Text style={styles.endpointCount}>
-                    {endpoint.count.toLocaleString()}
-                  </Text>
+                  <Text style={styles.endpointCount}>{endpoint.count.toLocaleString()}</Text>
                 </View>
                 <View style={styles.progressBar}>
-                  <View
-                    style={[
-                      styles.progressFill,
-                      { width: `${endpoint.percentage}%` },
-                    ]}
-                  />
+                  <View style={[styles.progressFill, { width: `${endpoint.percentage}%` }]} />
                 </View>
-                <Text style={styles.endpointPercentage}>
-                  {endpoint.percentage}% of total
-                </Text>
+                <Text style={styles.endpointPercentage}>{endpoint.percentage}% of total</Text>
               </View>
             ))}
           </View>
@@ -223,9 +190,7 @@ export const UsagePage: React.FC<UsagePageProps> = ({ environmentId }) => {
               </View>
               <View style={styles.metricRow}>
                 <Text style={styles.metricLabel}>Uptime</Text>
-                <Text style={[styles.metricValue, { color: '#22C55E' }]}>
-                  99.95%
-                </Text>
+                <Text style={[styles.metricValue, { color: '#22C55E' }]}>99.95%</Text>
               </View>
             </View>
           </View>
diff --git a/developer-portal/services/developerPortalService.ts b/developer-portal/services/developerPortalService.ts
index a320b926..e68821f1 100644
--- a/developer-portal/services/developerPortalService.ts
+++ b/developer-portal/services/developerPortalService.ts
@@ -53,7 +53,12 @@ export class DeveloperPortalService {
     this.alerts.set(developerId, []);
 
     await this.logActivity(developerId, 'developer.registered', 'developer', developerId);
-    await this.createAlert(developerId, 'info', 'Welcome!', 'Your developer account has been created. Please verify your email to continue.');
+    await this.createAlert(
+      developerId,
+      'info',
+      'Welcome!',
+      'Your developer account has been created. Please verify your email to continue.'
+    );
 
     return developer;
   }
@@ -66,7 +71,10 @@ export class DeveloperPortalService {
       return false;
     }
 
-    if (developer.onboardingStatus.verificationExpiresAt && developer.onboardingStatus.verificationExpiresAt < new Date()) {
+    if (
+      developer.onboardingStatus.verificationExpiresAt &&
+      developer.onboardingStatus.verificationExpiresAt < new Date()
+    ) {
       return false;
     }
 
@@ -88,17 +96,30 @@ export class DeveloperPortalService {
     const sandboxEnv = await sandboxService.createEnvironment(developerId, 'Default Sandbox');
 
     developer.onboardingStatus.step = 'completed';
-    developer.onboardingStatus.completedSteps.push('profile_completion', 'sandbox_setup', 'completed');
+    developer.onboardingStatus.completedSteps.push(
+      'profile_completion',
+      'sandbox_setup',
+      'completed'
+    );
     developer.onboardingStatus.completedAt = new Date();
     developer.sandboxEnvironments.push(sandboxEnv.id);
     developer.updatedAt = new Date();
 
     this.developers.set(developerId, developer);
 
-    const apiKey = await this.createApiKey(developerId, 'Default API Key', 'test', ['subscriptions:read', 'subscriptions:write', 'payments:read']);
+    const apiKey = await this.createApiKey(developerId, 'Default API Key', 'test', [
+      'subscriptions:read',
+      'subscriptions:write',
+      'payments:read',
+    ]);
 
     await this.logActivity(developerId, 'onboarding.completed', 'developer', developerId);
-    await this.createAlert(developerId, 'success', 'Onboarding Complete', 'Your developer account is now fully set up. You can start using the API!');
+    await this.createAlert(
+      developerId,
+      'success',
+      'Onboarding Complete',
+      'Your developer account is now fully set up. You can start using the API!'
+    );
 
     return developer;
   }
@@ -107,7 +128,10 @@ export class DeveloperPortalService {
     return this.developers.get(developerId) || null;
   }
 
-  async updateDeveloper(developerId: string, updates: Partial<Developer>): Promise<Developer | null> {
+  async updateDeveloper(
+    developerId: string,
+    updates: Partial<Developer>
+  ): Promise<Developer | null> {
     const developer = this.developers.get(developerId);
     if (!developer) return null;
 
@@ -150,7 +174,7 @@ export class DeveloperPortalService {
     const developer = this.developers.get(developerId);
     if (!developer) return false;
 
-    const apiKey = developer.apiKeys.find(key => key.id === apiKeyId);
+    const apiKey = developer.apiKeys.find((key) => key.id === apiKeyId);
     if (!apiKey) return false;
 
     apiKey.status = 'revoked';
@@ -168,7 +192,13 @@ export class DeveloperPortalService {
     return developer.apiKeys;
   }
 
-  async trackUsage(developerId: string, endpoint: string, method: string, responseTime: number, success: boolean): Promise<void> {
+  async trackUsage(
+    developerId: string,
+    endpoint: string,
+    method: string,
+    responseTime: number,
+    success: boolean
+  ): Promise<void> {
     const developer = this.developers.get(developerId);
     if (!developer) return;
 
@@ -180,7 +210,8 @@ export class DeveloperPortalService {
     }
 
     developer.usage.avgResponseTime =
-      (developer.usage.avgResponseTime * (developer.usage.totalRequests - 1) + responseTime) / developer.usage.totalRequests;
+      (developer.usage.avgResponseTime * (developer.usage.totalRequests - 1) + responseTime) /
+      developer.usage.totalRequests;
 
     developer.updatedAt = new Date();
     this.developers.set(developerId, developer);
@@ -197,7 +228,7 @@ export class DeveloperPortalService {
     if (!developer) return null;
 
     const sandboxEnvironments = await Promise.all(
-      developer.sandboxEnvironments.map(async envId => {
+      developer.sandboxEnvironments.map(async (envId) => {
         const env = await sandboxService.getEnvironment(envId);
         const metrics = await sandboxService.getMetrics(envId);
         return {
@@ -217,7 +248,7 @@ export class DeveloperPortalService {
       developer,
       sandboxEnvironments,
       recentActivity: recentActivity.slice(-10),
-      alerts: alerts.filter(a => !a.isRead).slice(-5),
+      alerts: alerts.filter((a) => !a.isRead).slice(-5),
       quickLinks: this.getQuickLinks(developer.tier),
     };
   }
@@ -225,20 +256,22 @@ export class DeveloperPortalService {
   async getDocumentation(category?: string): Promise<Documentation[]> {
     const docs = Array.from(this.documentation.values());
     if (category) {
-      return docs.filter(doc => doc.category === category && doc.isPublished);
+      return docs.filter((doc) => doc.category === category && doc.isPublished);
     }
-    return docs.filter(doc => doc.isPublished);
+    return docs.filter((doc) => doc.isPublished);
   }
 
   async getIntegrationGuides(platform?: string): Promise<IntegrationGuide[]> {
     const guides = Array.from(this.integrationGuides.values());
     if (platform) {
-      return guides.filter(guide => guide.platform.toLowerCase() === platform.toLowerCase());
+      return guides.filter((guide) => guide.platform.toLowerCase() === platform.toLowerCase());
     }
     return guides;
   }
 
-  async addDocumentation(doc: Omit<Documentation, 'id' | 'createdAt' | 'updatedAt'>): Promise<Documentation> {
+  async addDocumentation(
+    doc: Omit<Documentation, 'id' | 'createdAt' | 'updatedAt'>
+  ): Promise<Documentation> {
     const documentation: Documentation = {
       ...doc,
       id: this.generateDocId(),
@@ -261,7 +294,7 @@ export class DeveloperPortalService {
   }
 
   private findDeveloperByEmail(email: string): Developer | undefined {
-    return Array.from(this.developers.values()).find(dev => dev.email === email);
+    return Array.from(this.developers.values()).find((dev) => dev.email === email);
   }
 
   private generateDeveloperId(): string {
@@ -285,14 +318,34 @@ export class DeveloperPortalService {
     return `guide_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
   }
 
-  private getDefaultRateLimit(tier: string): { requestsPerMinute: number; requestsPerHour: number; requestsPerDay: number; burstLimit: number } {
+  private getDefaultRateLimit(tier: string): {
+    requestsPerMinute: number;
+    requestsPerHour: number;
+    requestsPerDay: number;
+    burstLimit: number;
+  } {
     switch (tier) {
       case 'enterprise':
-        return { requestsPerMinute: 1000, requestsPerHour: 50000, requestsPerDay: 500000, burstLimit: 2000 };
+        return {
+          requestsPerMinute: 1000,
+          requestsPerHour: 50000,
+          requestsPerDay: 500000,
+          burstLimit: 2000,
+        };
       case 'pro':
-        return { requestsPerMinute: 100, requestsPerHour: 5000, requestsPerDay: 50000, burstLimit: 200 };
+        return {
+          requestsPerMinute: 100,
+          requestsPerHour: 5000,
+          requestsPerDay: 50000,
+          burstLimit: 200,
+        };
       default:
-        return { requestsPerMinute: 20, requestsPerHour: 1000, requestsPerDay: 10000, burstLimit: 50 };
+        return {
+          requestsPerMinute: 20,
+          requestsPerHour: 1000,
+          requestsPerDay: 10000,
+          burstLimit: 50,
+        };
     }
   }
 
@@ -321,7 +374,13 @@ export class DeveloperPortalService {
     };
   }
 
-  private async logActivity(developerId: string, action: string, resource: string, resourceId: string, details?: Record<string, unknown>): Promise<void> {
+  private async logActivity(
+    developerId: string,
+    action: string,
+    resource: string,
+    resourceId: string,
+    details?: Record<string, unknown>
+  ): Promise<void> {
     const logs = this.activityLogs.get(developerId) || [];
     logs.push({
       id: `log_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
@@ -334,7 +393,13 @@ export class DeveloperPortalService {
     this.activityLogs.set(developerId, logs);
   }
 
-  private async createAlert(developerId: string, type: 'info' | 'warning' | 'error' | 'success', title: string, message: string, actionUrl?: string): Promise<void> {
+  private async createAlert(
+    developerId: string,
+    type: 'info' | 'warning' | 'error' | 'success',
+    title: string,
+    message: string,
+    actionUrl?: string
+  ): Promise<void> {
     const alerts = this.alerts.get(developerId) || [];
     alerts.push({
       id: `alert_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
@@ -348,20 +413,52 @@ export class DeveloperPortalService {
     this.alerts.set(developerId, alerts);
   }
 
-  private getQuickLinks(tier: string): Array<{ title: string; description: string; url: string; icon: string }> {
+  private getQuickLinks(
+    tier: string
+  ): Array<{ title: string; description: string; url: string; icon: string }> {
     const links = [
-      { title: 'API Documentation', description: 'View API reference documentation', url: '/docs/api', icon: 'book' },
-      { title: 'Sandbox', description: 'Access your sandbox environment', url: '/sandbox', icon: 'code' },
-      { title: 'API Keys', description: 'Manage your API keys', url: '/settings/api-keys', icon: 'key' },
-      { title: 'Usage', description: 'View your API usage', url: '/analytics/usage', icon: 'chart' },
+      {
+        title: 'API Documentation',
+        description: 'View API reference documentation',
+        url: '/docs/api',
+        icon: 'book',
+      },
+      {
+        title: 'Sandbox',
+        description: 'Access your sandbox environment',
+        url: '/sandbox',
+        icon: 'code',
+      },
+      {
+        title: 'API Keys',
+        description: 'Manage your API keys',
+        url: '/settings/api-keys',
+        icon: 'key',
+      },
+      {
+        title: 'Usage',
+        description: 'View your API usage',
+        url: '/analytics/usage',
+        icon: 'chart',
+      },
     ];
 
     if (tier === 'pro' || tier === 'enterprise') {
-      links.push({ title: 'Webhooks', description: 'Configure webhooks', url: '/settings/webhooks', icon: 'webhook' });
+      links.push({
+        title: 'Webhooks',
+        description: 'Configure webhooks',
+        url: '/settings/webhooks',
+        icon: 'webhook',
+      });
     }
 
     if (tier === 'enterprise') {
-      links.push({ title: 'Team', description: 'Manage team members', url: '/settings/team', icon: 'users' });
+      links.push({
+        title: 'Team',
+        description: 'Manage team members',
+        url: '/settings/team',
+        icon: 'users',
+      });
     }
 
     return links;
diff --git a/developer-portal/services/documentationService.ts b/developer-portal/services/documentationService.ts
index 122555fd..60cb95f4 100644
--- a/developer-portal/services/documentationService.ts
+++ b/developer-portal/services/documentationService.ts
@@ -278,8 +278,8 @@ app.post('/webhooks', (req, res) => {
       },
     ];
 
-    this.sections.forEach(section => {
-      section.articles.forEach(article => {
+    this.sections.forEach((section) => {
+      section.articles.forEach((article) => {
         this.articles.set(article.slug, article);
       });
     });
@@ -310,7 +310,7 @@ app.post('/webhooks', (req, res) => {
   }
 
   async getSection(sectionId: string): Promise<DocumentationSection | null> {
-    return this.sections.find(s => s.id === sectionId) || null;
+    return this.sections.find((s) => s.id === sectionId) || null;
   }
 
   async getArticle(slug: string): Promise<DocumentationArticle | null> {
@@ -321,12 +321,10 @@ app.post('/webhooks', (req, res) => {
     const lowerQuery = query.toLowerCase();
     const results: DocumentationArticle[] = [];
 
-    this.articles.forEach(article => {
+    this.articles.forEach((article) => {
       const matchesTitle = article.title.toLowerCase().includes(lowerQuery);
       const matchesContent = article.content.toLowerCase().includes(lowerQuery);
-      const matchesTags = article.tags.some(tag =>
-        tag.toLowerCase().includes(lowerQuery)
-      );
+      const matchesTags = article.tags.some((tag) => tag.toLowerCase().includes(lowerQuery));
 
       if (matchesTitle || matchesContent || matchesTags) {
         results.push(article);
@@ -347,7 +345,7 @@ app.post('/webhooks', (req, res) => {
     if (!article) return [];
 
     return Array.from(this.articles.values())
-      .filter(a => a.slug !== slug && a.category === article.category)
+      .filter((a) => a.slug !== slug && a.category === article.category)
       .slice(0, 3);
   }
 }
diff --git a/developer-portal/services/integrationGuidesService.ts b/developer-portal/services/integrationGuidesService.ts
index 52d2049c..452d9488 100644
--- a/developer-portal/services/integrationGuidesService.ts
+++ b/developer-portal/services/integrationGuidesService.ts
@@ -298,19 +298,19 @@ const subtrackr = new SubTrackr({
   }
 
   async getGuide(guideId: string): Promise<IntegrationGuide | null> {
-    return this.guides.find(g => g.id === guideId) || null;
+    return this.guides.find((g) => g.id === guideId) || null;
   }
 
   async getGuidesByDifficulty(
     difficulty: IntegrationGuide['difficulty']
   ): Promise<IntegrationGuide[]> {
-    return this.guides.filter(g => g.difficulty === difficulty);
+    return this.guides.filter((g) => g.difficulty === difficulty);
   }
 
   async searchGuides(query: string): Promise<IntegrationGuide[]> {
     const lowerQuery = query.toLowerCase();
     return this.guides.filter(
-      guide =>
+      (guide) =>
         guide.title.toLowerCase().includes(lowerQuery) ||
         guide.description.toLowerCase().includes(lowerQuery)
     );
diff --git a/developer-portal/services/portalService.ts b/developer-portal/services/portalService.ts
index 7ccd4c0d..fc6715ac 100644
--- a/developer-portal/services/portalService.ts
+++ b/developer-portal/services/portalService.ts
@@ -31,9 +31,7 @@ export class DeveloperPortalService {
     company: string,
     role: PortalUser['role'] = 'developer'
   ): Promise<PortalUser> {
-    const existingUser = Array.from(this.users.values()).find(
-      u => u.email === email
-    );
+    const existingUser = Array.from(this.users.values()).find((u) => u.email === email);
 
     if (existingUser) {
       throw new Error('User already exists');
@@ -90,9 +88,7 @@ export class DeveloperPortalService {
     this.activities.set(userId, activities.slice(0, 100));
   }
 
-  private async getEnvironmentSummaries(
-    userId: string
-  ): Promise<EnvironmentSummary[]> {
+  private async getEnvironmentSummaries(userId: string): Promise<EnvironmentSummary[]> {
     return [
       {
         id: '1',
diff --git a/developer-portal/src/components/DashboardCard.tsx b/developer-portal/src/components/DashboardCard.tsx
index b94f23f6..a3704584 100644
--- a/developer-portal/src/components/DashboardCard.tsx
+++ b/developer-portal/src/components/DashboardCard.tsx
@@ -46,9 +46,7 @@ export const DashboardCard: React.FC<DashboardCardProps> = ({
       <Text style={styles.title}>{title}</Text>
       <View style={styles.valueRow}>
         <Text style={styles.value}>{value}</Text>
-        {trend && (
-          <Text style={[styles.trend, { color: getTrendColor() }]}>{getTrendIcon()}</Text>
-        )}
+        {trend && <Text style={[styles.trend, { color: getTrendColor() }]}>{getTrendIcon()}</Text>}
       </View>
       {subtitle && <Text style={styles.subtitle}>{subtitle}</Text>}
     </View>
diff --git a/developer-portal/src/components/PermissionSelector.tsx b/developer-portal/src/components/PermissionSelector.tsx
index 90d83336..5c4bf482 100644
--- a/developer-portal/src/components/PermissionSelector.tsx
+++ b/developer-portal/src/components/PermissionSelector.tsx
@@ -58,7 +58,8 @@ export const PermissionSelector: React.FC<PermissionSelectorProps> = ({
             <View style={styles.permissionHeader}>
               <Text style={styles.permissionIcon}>{permission.icon}</Text>
               <View style={styles.permissionInfo}>
-                <Text style={[styles.permissionLabel, isSelected && styles.permissionLabelSelected]}>
+                <Text
+                  style={[styles.permissionLabel, isSelected && styles.permissionLabelSelected]}>
                   {permission.label}
                 </Text>
                 <Text style={styles.permissionDescription}>{permission.description}</Text>
diff --git a/developer-portal/src/screens/ApiKeyManagementScreen.tsx b/developer-portal/src/screens/ApiKeyManagementScreen.tsx
index b7870c25..015272cd 100644
--- a/developer-portal/src/screens/ApiKeyManagementScreen.tsx
+++ b/developer-portal/src/screens/ApiKeyManagementScreen.tsx
@@ -152,13 +152,9 @@ const ApiKeyManagementScreen: React.FC = () => {
         <View style={styles.header}>
           <View>
             <Text style={styles.title}>API Key Management</Text>
-            <Text style={styles.subtitle}>
-              Manage your API keys and configure permissions
-            </Text>
+            <Text style={styles.subtitle}>Manage your API keys and configure permissions</Text>
           </View>
-          <TouchableOpacity
-            style={styles.createButton}
-            onPress={() => setShowCreateModal(true)}>
+          <TouchableOpacity style={styles.createButton} onPress={() => setShowCreateModal(true)}>
             <Text style={styles.createButtonText}>+ New Key</Text>
           </TouchableOpacity>
         </View>
@@ -245,12 +241,9 @@ const ApiKeyManagementScreen: React.FC = () => {
             <Text style={styles.emptyIcon}>🔑</Text>
             <Text style={styles.emptyTitle}>No API Keys Yet</Text>
             <Text style={styles.emptyText}>
-              Create your first API key to start making authenticated requests to the SubTrackr
-              API
+              Create your first API key to start making authenticated requests to the SubTrackr API
             </Text>
-            <TouchableOpacity
-              style={styles.emptyButton}
-              onPress={() => setShowCreateModal(true)}>
+            <TouchableOpacity style={styles.emptyButton} onPress={() => setShowCreateModal(true)}>
               <Text style={styles.emptyButtonText}>Create API Key</Text>
             </TouchableOpacity>
           </View>
@@ -311,11 +304,7 @@ const ApiKeyManagementScreen: React.FC = () => {
             </TouchableOpacity>
             <Text style={styles.modalTitle}>Create API Key</Text>
             <TouchableOpacity onPress={handleCreateKey} disabled={!newKeyName.trim()}>
-              <Text
-                style={[
-                  styles.modalCreate,
-                  !newKeyName.trim() && styles.modalCreateDisabled,
-                ]}>
+              <Text style={[styles.modalCreate, !newKeyName.trim() && styles.modalCreateDisabled]}>
                 Create
               </Text>
             </TouchableOpacity>
@@ -405,9 +394,7 @@ const ApiKeyManagementScreen: React.FC = () => {
               }}>
               <Text style={styles.keyRevealButtonText}>Copy to Clipboard</Text>
             </TouchableOpacity>
-            <TouchableOpacity
-              style={styles.keyRevealClose}
-              onPress={() => setCreatedKey(null)}>
+            <TouchableOpacity style={styles.keyRevealClose} onPress={() => setCreatedKey(null)}>
               <Text style={styles.keyRevealCloseText}>I've Saved My Key</Text>
             </TouchableOpacity>
           </View>
diff --git a/developer-portal/src/screens/ApiTesterScreen.tsx b/developer-portal/src/screens/ApiTesterScreen.tsx
index c69ee6c4..fb19a9c0 100644
--- a/developer-portal/src/screens/ApiTesterScreen.tsx
+++ b/developer-portal/src/screens/ApiTesterScreen.tsx
@@ -90,7 +90,7 @@ const ApiTesterScreen: React.FC = () => {
     }
   };
 
-  const loadExample = (example: typeof EXAMPLE_ENDPOINTS[0]) => {
+  const loadExample = (example: (typeof EXAMPLE_ENDPOINTS)[0]) => {
     setSelectedMethod(example.method);
     setEndpoint(example.path);
     if (example.method === 'POST' || example.method === 'PUT') {
@@ -133,10 +133,7 @@ const ApiTesterScreen: React.FC = () => {
             {activeKeys.map((key) => (
               <TouchableOpacity
                 key={key.id}
-                style={[
-                  styles.keyChip,
-                  selectedApiKey === key.id && styles.keyChipSelected,
-                ]}
+                style={[styles.keyChip, selectedApiKey === key.id && styles.keyChipSelected]}
                 onPress={() => setSelectedApiKey(key.id)}>
                 <Text
                   style={[
@@ -157,7 +154,10 @@ const ApiTesterScreen: React.FC = () => {
         <View style={styles.section}>
           <Text style={styles.sectionTitle}>Request</Text>
           <View style={styles.requestRow}>
-            <ScrollView horizontal showsHorizontalScrollIndicator={false} style={styles.methodScroll}>
+            <ScrollView
+              horizontal
+              showsHorizontalScrollIndicator={false}
+              style={styles.methodScroll}>
               {HTTP_METHODS.map((method) => (
                 <TouchableOpacity
                   key={method}
@@ -252,16 +252,11 @@ const ApiTesterScreen: React.FC = () => {
           <View style={styles.section}>
             <View style={styles.responseHeader}>
               <Text style={styles.sectionTitle}>Response</Text>
-              {responseTime && (
-                <Text style={styles.responseTime}>{responseTime}ms</Text>
-              )}
+              {responseTime && <Text style={styles.responseTime}>{responseTime}ms</Text>}
             </View>
             <View style={styles.statusRow}>
               <View
-                style={[
-                  styles.statusBadge,
-                  { backgroundColor: getStatusColor(response.status) },
-                ]}>
+                style={[styles.statusBadge, { backgroundColor: getStatusColor(response.status) }]}>
                 <Text style={styles.statusText}>
                   {response.status} {response.statusText}
                 </Text>
diff --git a/developer-portal/src/screens/DeveloperPortalScreen.tsx b/developer-portal/src/screens/DeveloperPortalScreen.tsx
index f8975505..909b40df 100644
--- a/developer-portal/src/screens/DeveloperPortalScreen.tsx
+++ b/developer-portal/src/screens/DeveloperPortalScreen.tsx
@@ -70,34 +70,29 @@ const DeveloperPortalScreen: React.FC<{ navigation: any }> = ({ navigation }) =>
   const handleQuickCreateApiKey = async () => {
     if (!developer) return;
 
-    Alert.prompt(
-      'Create API Key',
-      'Enter a name for your new API key',
-      async (name) => {
-        if (name && name.trim()) {
-          try {
-            const newKey = await createApiKey(
-              developer.id,
-              name.trim(),
-              [ApiKeyPermission.READ, ApiKeyPermission.WRITE]
-            );
-            Alert.alert(
-              'API Key Created',
-              `Your new API key has been created:\n\n${newKey.key}\n\nCopy it now - it won't be shown again.`,
-              [
-                {
-                  text: 'View All Keys',
-                  onPress: () => navigation.navigate('ApiKeyManagement'),
-                },
-                { text: 'OK' },
-              ]
-            );
-          } catch (err) {
-            Alert.alert('Error', 'Failed to create API key');
-          }
+    Alert.prompt('Create API Key', 'Enter a name for your new API key', async (name) => {
+      if (name && name.trim()) {
+        try {
+          const newKey = await createApiKey(developer.id, name.trim(), [
+            ApiKeyPermission.READ,
+            ApiKeyPermission.WRITE,
+          ]);
+          Alert.alert(
+            'API Key Created',
+            `Your new API key has been created:\n\n${newKey.key}\n\nCopy it now - it won't be shown again.`,
+            [
+              {
+                text: 'View All Keys',
+                onPress: () => navigation.navigate('ApiKeyManagement'),
+              },
+              { text: 'OK' },
+            ]
+          );
+        } catch (err) {
+          Alert.alert('Error', 'Failed to create API key');
         }
       }
-    );
+    });
   };
 
   if (!developer) {
@@ -105,9 +100,7 @@ const DeveloperPortalScreen: React.FC<{ navigation: any }> = ({ navigation }) =>
       <SafeAreaView style={styles.container}>
         <View style={styles.centerContent}>
           <Text style={styles.title}>Welcome to Developer Portal</Text>
-          <Text style={styles.subtitle}>
-            Please register to access the developer portal
-          </Text>
+          <Text style={styles.subtitle}>Please register to access the developer portal</Text>
           <TouchableOpacity
             style={styles.primaryButton}
             onPress={() => navigation.navigate('DeveloperRegistration')}>
@@ -303,9 +296,7 @@ const DeveloperPortalScreen: React.FC<{ navigation: any }> = ({ navigation }) =>
             <Text style={styles.resourceIcon}>💬</Text>
             <View style={styles.resourceContent}>
               <Text style={styles.resourceTitle}>Developer Support</Text>
-              <Text style={styles.resourceDescription}>
-                Get help from our developer community
-              </Text>
+              <Text style={styles.resourceDescription}>Get help from our developer community</Text>
             </View>
             <Text style={styles.resourceArrow}>→</Text>
           </TouchableOpacity>
diff --git a/developer-portal/src/screens/UsageAnalyticsScreen.tsx b/developer-portal/src/screens/UsageAnalyticsScreen.tsx
index 5f373387..7ec8f107 100644
--- a/developer-portal/src/screens/UsageAnalyticsScreen.tsx
+++ b/developer-portal/src/screens/UsageAnalyticsScreen.tsx
@@ -183,8 +183,8 @@ const UsageAnalyticsScreen: React.FC = () => {
                         request.statusCode >= 200 && request.statusCode < 300
                           ? '#4CAF50'
                           : request.statusCode >= 400 && request.statusCode < 500
-                          ? '#FF9800'
-                          : '#F44336',
+                            ? '#FF9800'
+                            : '#F44336',
                     },
                   ]}>
                   <Text style={styles.statusText}>{request.statusCode}</Text>
@@ -207,9 +207,7 @@ const UsageAnalyticsScreen: React.FC = () => {
           <View style={styles.rateLimitCard}>
             <View style={styles.rateLimitHeader}>
               <Text style={styles.rateLimitTitle}>Current Usage</Text>
-              <Text style={styles.rateLimitValue}>
-                {usageStats?.totalCalls || 0} / 10,000
-              </Text>
+              <Text style={styles.rateLimitValue}>{usageStats?.totalCalls || 0} / 10,000</Text>
             </View>
             <View style={styles.rateLimitBar}>
               <View
diff --git a/developer-portal/src/screens/WebhookTesterScreen.tsx b/developer-portal/src/screens/WebhookTesterScreen.tsx
index 26a65ee1..d13e4f86 100644
--- a/developer-portal/src/screens/WebhookTesterScreen.tsx
+++ b/developer-portal/src/screens/WebhookTesterScreen.tsx
@@ -114,9 +114,7 @@ const WebhookTesterScreen: React.FC = () => {
             autoCapitalize="none"
             keyboardType="url"
           />
-          <Text style={styles.hint}>
-            Enter the URL where you want to receive webhook events
-          </Text>
+          <Text style={styles.hint}>Enter the URL where you want to receive webhook events</Text>
         </View>
 
         {/* Event Types */}
@@ -147,9 +145,7 @@ const WebhookTesterScreen: React.FC = () => {
                   styles.checkbox,
                   selectedEvents.includes(event.value) && styles.checkboxSelected,
                 ]}>
-                {selectedEvents.includes(event.value) && (
-                  <Text style={styles.checkmark}>✓</Text>
-                )}
+                {selectedEvents.includes(event.value) && <Text style={styles.checkmark}>✓</Text>}
               </View>
             </TouchableOpacity>
           ))}
@@ -171,9 +167,7 @@ const WebhookTesterScreen: React.FC = () => {
               <Text style={styles.generateButtonText}>Generate</Text>
             </TouchableOpacity>
           </View>
-          <Text style={styles.hint}>
-            Use this secret to verify webhook signatures
-          </Text>
+          <Text style={styles.hint}>Use this secret to verify webhook signatures</Text>
         </View>
 
         {/* Signature Option */}
@@ -235,9 +229,7 @@ const WebhookTesterScreen: React.FC = () => {
                   {new Date(testResults.timestamp).toLocaleString()}
                 </Text>
               )}
-              {testResults.error && (
-                <Text style={styles.resultsError}>{testResults.error}</Text>
-              )}
+              {testResults.error && <Text style={styles.resultsError}>{testResults.error}</Text>}
             </View>
           </View>
         )}
diff --git a/developer-portal/types/developer.ts b/developer-portal/types/developer.ts
index 538128c5..2e2b9339 100644
--- a/developer-portal/types/developer.ts
+++ b/developer-portal/types/developer.ts
@@ -16,7 +16,12 @@ export interface Developer {
 }
 
 export interface OnboardingStatus {
-  step: 'registration' | 'email_verification' | 'profile_completion' | 'sandbox_setup' | 'completed';
+  step:
+    | 'registration'
+    | 'email_verification'
+    | 'profile_completion'
+    | 'sandbox_setup'
+    | 'completed';
   completedSteps: string[];
   startedAt: Date;
   completedAt?: Date;
diff --git a/developer-portal/types/portal.ts b/developer-portal/types/portal.ts
index 3a5396f1..32687b89 100644
--- a/developer-portal/types/portal.ts
+++ b/developer-portal/types/portal.ts
@@ -26,7 +26,12 @@ export interface EnvironmentSummary {
 
 export interface ActivityEntry {
   id: string;
-  type: 'api_key_created' | 'environment_created' | 'request_made' | 'error_occurred' | 'webhook_triggered';
+  type:
+    | 'api_key_created'
+    | 'environment_created'
+    | 'request_made'
+    | 'error_occurred'
+    | 'webhook_triggered';
   description: string;
   timestamp: Date;
   metadata?: Record<string, unknown>;
diff --git a/developer-portal/utils/developerPortalUtils.ts b/developer-portal/utils/developerPortalUtils.ts
index 563d256e..9ae89da0 100644
--- a/developer-portal/utils/developerPortalUtils.ts
+++ b/developer-portal/utils/developerPortalUtils.ts
@@ -6,7 +6,11 @@ export class DeveloperPortalUtils {
     return emailRegex.test(email);
   }
 
-  static validateApiKey(key: string): { valid: boolean; type?: 'test' | 'production'; error?: string } {
+  static validateApiKey(key: string): {
+    valid: boolean;
+    type?: 'test' | 'production';
+    error?: string;
+  } {
     if (!key) {
       return { valid: false, error: 'API key is required' };
     }
@@ -31,7 +35,10 @@ export class DeveloperPortalUtils {
     return apiKey.permissions.includes(permission);
   }
 
-  static checkRateLimit(apiKey: ApiKey, currentUsage: { requestsPerMinute: number; requestsPerHour: number; requestsPerDay: number }): { allowed: boolean; retryAfter?: number } {
+  static checkRateLimit(
+    apiKey: ApiKey,
+    currentUsage: { requestsPerMinute: number; requestsPerHour: number; requestsPerDay: number }
+  ): { allowed: boolean; retryAfter?: number } {
     if (currentUsage.requestsPerMinute >= apiKey.rateLimit.requestsPerMinute) {
       return { allowed: false, retryAfter: 60 };
     }
@@ -62,13 +69,15 @@ export class DeveloperPortalUtils {
     avgResponseTime: string;
     errorRate: string;
   } {
-    const successRate = metrics.totalRequests > 0
-      ? ((metrics.successfulRequests / metrics.totalRequests) * 100).toFixed(2)
-      : '0.00';
+    const successRate =
+      metrics.totalRequests > 0
+        ? ((metrics.successfulRequests / metrics.totalRequests) * 100).toFixed(2)
+        : '0.00';
 
-    const errorRate = metrics.totalRequests > 0
-      ? ((metrics.failedRequests / metrics.totalRequests) * 100).toFixed(2)
-      : '0.00';
+    const errorRate =
+      metrics.totalRequests > 0
+        ? ((metrics.failedRequests / metrics.totalRequests) * 100).toFixed(2)
+        : '0.00';
 
     return {
       totalRequests: metrics.totalRequests.toLocaleString(),
@@ -78,7 +87,9 @@ export class DeveloperPortalUtils {
     };
   }
 
-  static generateOnboardingChecklist(developer: Developer): Array<{ step: string; completed: boolean; description: string }> {
+  static generateOnboardingChecklist(
+    developer: Developer
+  ): Array<{ step: string; completed: boolean; description: string }> {
     return [
       {
         step: 'register',
@@ -142,7 +153,14 @@ export class DeveloperPortalUtils {
           maxApiKeys: 50,
           maxSandboxEnvironments: 10,
           maxRequestsPerMonth: 1000000,
-          features: ['priority_support', 'custom_sla', 'dedicated_account_manager', 'advanced_analytics', 'webhooks', 'team_management'],
+          features: [
+            'priority_support',
+            'custom_sla',
+            'dedicated_account_manager',
+            'advanced_analytics',
+            'webhooks',
+            'team_management',
+          ],
         };
       case 'pro':
         return {
@@ -180,9 +198,9 @@ export class DeveloperPortalUtils {
   }
 
   static generateWebhookSecret(): string {
-    return 'whsec_' + Array.from({ length: 32 }, () =>
-      Math.random().toString(36).charAt(2)
-    ).join('');
+    return (
+      'whsec_' + Array.from({ length: 32 }, () => Math.random().toString(36).charAt(2)).join('')
+    );
   }
 
   static formatCurrency(amount: number, currency: string = 'USD'): string {
diff --git a/sandbox/__tests__/developerPortal.test.ts b/sandbox/__tests__/developerPortal.test.ts
index 5aca0a27..0ce5972d 100644
--- a/sandbox/__tests__/developerPortal.test.ts
+++ b/sandbox/__tests__/developerPortal.test.ts
@@ -10,11 +10,7 @@ describe('DeveloperPortalService', () => {
 
   describe('createUser', () => {
     it('should create a new user', async () => {
-      const user = await service.createUser(
-        'test@example.com',
-        'Test User',
-        'Test Company'
-      );
+      const user = await service.createUser('test@example.com', 'Test User', 'Test Company');
 
       expect(user).toBeDefined();
       expect(user.email).toBe('test@example.com');
@@ -26,9 +22,9 @@ describe('DeveloperPortalService', () => {
     it('should not allow duplicate email', async () => {
       await service.createUser('test@example.com', 'User 1', 'Company 1');
 
-      await expect(
-        service.createUser('test@example.com', 'User 2', 'Company 2')
-      ).rejects.toThrow('User already exists');
+      await expect(service.createUser('test@example.com', 'User 2', 'Company 2')).rejects.toThrow(
+        'User already exists'
+      );
     });
 
     it('should create user with custom role', async () => {
@@ -50,11 +46,7 @@ describe('DeveloperPortalService', () => {
     });
 
     it('should return existing user', async () => {
-      const created = await service.createUser(
-        'test@example.com',
-        'Test User',
-        'Test Company'
-      );
+      const created = await service.createUser('test@example.com', 'Test User', 'Test Company');
 
       const retrieved = await service.getUser(created.id);
       expect(retrieved).toBeDefined();
@@ -64,11 +56,7 @@ describe('DeveloperPortalService', () => {
 
   describe('updateUser', () => {
     it('should update user details', async () => {
-      const user = await service.createUser(
-        'test@example.com',
-        'Test User',
-        'Test Company'
-      );
+      const user = await service.createUser('test@example.com', 'Test User', 'Test Company');
 
       const updated = await service.updateUser(user.id, {
         name: 'Updated Name',
@@ -91,11 +79,7 @@ describe('DeveloperPortalService', () => {
 
   describe('getDashboard', () => {
     it('should return dashboard data', async () => {
-      const user = await service.createUser(
-        'test@example.com',
-        'Test User',
-        'Test Company'
-      );
+      const user = await service.createUser('test@example.com', 'Test User', 'Test Company');
 
       const dashboard = await service.getDashboard(user.id);
 
@@ -111,25 +95,15 @@ describe('DeveloperPortalService', () => {
     });
 
     it('should throw for non-existent user', async () => {
-      await expect(service.getDashboard('non-existent')).rejects.toThrow(
-        'User not found'
-      );
+      await expect(service.getDashboard('non-existent')).rejects.toThrow('User not found');
     });
   });
 
   describe('logActivity', () => {
     it('should log user activity', async () => {
-      const user = await service.createUser(
-        'test@example.com',
-        'Test User',
-        'Test Company'
-      );
+      const user = await service.createUser('test@example.com', 'Test User', 'Test Company');
 
-      await service.logActivity(
-        user.id,
-        'api_key_created',
-        'New API key created'
-      );
+      await service.logActivity(user.id, 'api_key_created', 'New API key created');
 
       const dashboard = await service.getDashboard(user.id);
       expect(dashboard.recentActivity.length).toBeGreaterThan(0);
diff --git a/sandbox/__tests__/sandbox.test.ts b/sandbox/__tests__/sandbox.test.ts
index edb3315b..1b627b17 100644
--- a/sandbox/__tests__/sandbox.test.ts
+++ b/sandbox/__tests__/sandbox.test.ts
@@ -135,22 +135,12 @@ describe('SandboxIsolationService', () => {
 
   describe('updateOnboardingStep', () => {
     it('should update onboarding step', async () => {
-      const developer = await service.registerDeveloper(
-        'test@example.com',
-        'Test Dev',
-        'Test Co'
-      );
+      const developer = await service.registerDeveloper('test@example.com', 'Test Dev', 'Test Co');
 
-      const updated = await service.updateOnboardingStep(
-        developer.id,
-        'create-sandbox',
-        true
-      );
+      const updated = await service.updateOnboardingStep(developer.id, 'create-sandbox', true);
 
       expect(updated).toBeDefined();
-      const step = updated?.onboardingStatus.steps.find(
-        (s) => s.id === 'create-sandbox'
-      );
+      const step = updated?.onboardingStatus.steps.find((s) => s.id === 'create-sandbox');
       expect(step?.completed).toBe(true);
     });
   });
@@ -179,9 +169,9 @@ describe('ApiKeyService', () => {
         await service.generateApiKey('env-1', `Key ${i}`, ['read']);
       }
 
-      await expect(
-        service.generateApiKey('env-1', 'Extra Key', ['read'])
-      ).rejects.toThrow('Maximum API keys limit reached');
+      await expect(service.generateApiKey('env-1', 'Extra Key', ['read'])).rejects.toThrow(
+        'Maximum API keys limit reached'
+      );
     });
   });
 
diff --git a/sandbox/api/sandboxApi.ts b/sandbox/api/sandboxApi.ts
index d40486c0..5dc2ca66 100644
--- a/sandbox/api/sandboxApi.ts
+++ b/sandbox/api/sandboxApi.ts
@@ -18,11 +18,7 @@ export class SandboxApi {
     config?: Partial<SandboxConfig>
   ): Promise<ApiResponse> {
     try {
-      const environment = await this.sandboxService.createEnvironment(
-        developerId,
-        name,
-        config
-      );
+      const environment = await this.sandboxService.createEnvironment(developerId, name, config);
 
       return {
         success: true,
@@ -76,10 +72,7 @@ export class SandboxApi {
     updates: Partial<SandboxConfig>
   ): Promise<ApiResponse> {
     try {
-      const environment = await this.sandboxService.updateConfig(
-        environmentId,
-        updates
-      );
+      const environment = await this.sandboxService.updateConfig(environmentId, updates);
 
       if (!environment) {
         return { success: false, error: 'Environment not found' };
diff --git a/sandbox/config/sandboxConfig.ts b/sandbox/config/sandboxConfig.ts
index 25b8ceae..d9c94816 100644
--- a/sandbox/config/sandboxConfig.ts
+++ b/sandbox/config/sandboxConfig.ts
@@ -118,9 +118,12 @@ export const SANDBOX_CONSTANTS = {
   DEFAULT_ENVIRONMENT_TTL_DAYS: 90,
 };
 
-export function getSandboxConfig(
-  tier: 'free' | 'pro' | 'enterprise' = 'free'
-): { resourceLimits: SandboxResourceLimits; rateLimits: RateLimit; features: SandboxFeatures; dataRetentionDays: number } {
+export function getSandboxConfig(tier: 'free' | 'pro' | 'enterprise' = 'free'): {
+  resourceLimits: SandboxResourceLimits;
+  rateLimits: RateLimit;
+  features: SandboxFeatures;
+  dataRetentionDays: number;
+} {
   return SANDBOX_TIERS[tier] || SANDBOX_TIERS.free;
 }
 
diff --git a/sandbox/middleware/sandboxMiddleware.ts b/sandbox/middleware/sandboxMiddleware.ts
index 330eb6b5..c41cf3bd 100644
--- a/sandbox/middleware/sandboxMiddleware.ts
+++ b/sandbox/middleware/sandboxMiddleware.ts
@@ -24,18 +24,14 @@ export interface SandboxResponse {
 }
 
 export class SandboxMiddleware {
-  private rateLimitStore: Map<string, { count: number; resetTime: number }> =
-    new Map();
+  private rateLimitStore: Map<string, { count: number; resetTime: number }> = new Map();
 
   async processRequest(request: SandboxRequest): Promise<SandboxResponse> {
     const startTime = Date.now();
     const requestId = this.generateRequestId();
 
     try {
-      const isValid = await sandboxService.validateAccess(
-        request.environmentId,
-        request.apiKey
-      );
+      const isValid = await sandboxService.validateAccess(request.environmentId, request.apiKey);
       if (!isValid) {
         return this.createErrorResponse(
           request,
@@ -46,9 +42,7 @@ export class SandboxMiddleware {
         );
       }
 
-      const context = await sandboxService.getIsolationContext(
-        request.environmentId
-      );
+      const context = await sandboxService.getIsolationContext(request.environmentId);
       if (!context) {
         return this.createErrorResponse(
           request,
@@ -74,20 +68,10 @@ export class SandboxMiddleware {
         context.resourceQuota
       );
       if (!rateLimitResult.allowed) {
-        return this.createErrorResponse(
-          request,
-          requestId,
-          startTime,
-          'Rate limit exceeded',
-          429
-        );
+        return this.createErrorResponse(request, requestId, startTime, 'Rate limit exceeded', 429);
       }
 
-      await sandboxService.recordRequest(
-        request.environmentId,
-        Date.now() - startTime,
-        false
-      );
+      await sandboxService.recordRequest(request.environmentId, Date.now() - startTime, false);
 
       return {
         success: true,
@@ -101,18 +85,8 @@ export class SandboxMiddleware {
         },
       };
     } catch (error) {
-      await sandboxService.recordRequest(
-        request.environmentId,
-        Date.now() - startTime,
-        true
-      );
-      return this.createErrorResponse(
-        request,
-        requestId,
-        startTime,
-        'Internal sandbox error',
-        500
-      );
+      await sandboxService.recordRequest(request.environmentId, Date.now() - startTime, true);
+      return this.createErrorResponse(request, requestId, startTime, 'Internal sandbox error', 500);
     }
   }
 
@@ -144,9 +118,7 @@ export class SandboxMiddleware {
     };
   }
 
-  async enforceResourceLimits(
-    envId: string
-  ): Promise<{ withinLimits: boolean; usage: unknown }> {
+  async enforceResourceLimits(envId: string): Promise<{ withinLimits: boolean; usage: unknown }> {
     const context = await sandboxService.getIsolationContext(envId);
     if (!context) throw new Error('Environment not found');
 
diff --git a/sandbox/services/apiKeyService.ts b/sandbox/services/apiKeyService.ts
index b04f67ad..83b94a0c 100644
--- a/sandbox/services/apiKeyService.ts
+++ b/sandbox/services/apiKeyService.ts
@@ -75,8 +75,10 @@ export class ApiKeyService {
       return false;
     }
 
-    return validation.apiKey.permissions.includes(permission) ||
-      validation.apiKey.permissions.includes('admin');
+    return (
+      validation.apiKey.permissions.includes(permission) ||
+      validation.apiKey.permissions.includes('admin')
+    );
   }
 
   async revokeApiKey(keyId: string): Promise<boolean> {
diff --git a/sandbox/services/sandboxIsolationService.ts b/sandbox/services/sandboxIsolationService.ts
index 5b54fe1f..21e1e7d3 100644
--- a/sandbox/services/sandboxIsolationService.ts
+++ b/sandbox/services/sandboxIsolationService.ts
@@ -65,9 +65,7 @@ export class SandboxIsolationService {
   }
 
   async getEnvironmentsByDeveloper(developerId: string): Promise<SandboxEnvironment[]> {
-    return Array.from(this.environments.values()).filter(
-      (env) => env.developerId === developerId
-    );
+    return Array.from(this.environments.values()).filter((env) => env.developerId === developerId);
   }
 
   async updateEnvironment(
@@ -164,11 +162,7 @@ export class SandboxIsolationService {
     }
   }
 
-  private validateRateLimits(
-    rateLimits: RateLimit,
-    errors: string[],
-    _warnings: string[]
-  ): void {
+  private validateRateLimits(rateLimits: RateLimit, errors: string[], _warnings: string[]): void {
     if (rateLimits.requestsPerMinute <= 0) {
       errors.push('Invalid requestsPerMinute rate limit');
     }
@@ -180,14 +174,8 @@ export class SandboxIsolationService {
     }
   }
 
-  async registerDeveloper(
-    email: string,
-    name: string,
-    company: string
-  ): Promise<Developer> {
-    const existingDeveloper = Array.from(this.developers.values()).find(
-      (d) => d.email === email
-    );
+  async registerDeveloper(email: string, name: string, company: string): Promise<Developer> {
+    const existingDeveloper = Array.from(this.developers.values()).find((d) => d.email === email);
 
     if (existingDeveloper) {
       throw new Error('Developer already registered');
@@ -268,8 +256,9 @@ export class SandboxIsolationService {
     developer.onboardingStatus.step = developer.onboardingStatus.steps.filter(
       (s) => s.completed
     ).length;
-    developer.onboardingStatus.completed =
-      developer.onboardingStatus.steps.every((s) => s.completed);
+    developer.onboardingStatus.completed = developer.onboardingStatus.steps.every(
+      (s) => s.completed
+    );
 
     this.developers.set(developerId, developer);
     return developer;
@@ -300,7 +289,16 @@ export class SandboxIsolationService {
 
   private generateTestSubscriptions(): SandboxTestData['subscriptions'] {
     const categories = ['streaming', 'software', 'gaming', 'productivity', 'fitness'];
-    const names = ['Netflix', 'Spotify', 'Adobe CC', 'Slack', 'Gym Membership', 'GitHub Pro', 'Figma', 'Notion'];
+    const names = [
+      'Netflix',
+      'Spotify',
+      'Adobe CC',
+      'Slack',
+      'Gym Membership',
+      'GitHub Pro',
+      'Figma',
+      'Notion',
+    ];
 
     return names.map((name, index) => ({
       id: `sub_test_${index + 1}`,
@@ -315,7 +313,9 @@ export class SandboxIsolationService {
     }));
   }
 
-  private generateTestPayments(subscriptions: SandboxTestData['subscriptions']): SandboxTestData['payments'] {
+  private generateTestPayments(
+    subscriptions: SandboxTestData['subscriptions']
+  ): SandboxTestData['payments'] {
     const payments: SandboxTestData['payments'] = [];
     const methods: Array<'card' | 'crypto' | 'bank'> = ['card', 'crypto', 'bank'];
 
diff --git a/sandbox/services/sandboxService.ts b/sandbox/services/sandboxService.ts
index 9ff0936d..30f5a2b5 100644
--- a/sandbox/services/sandboxService.ts
+++ b/sandbox/services/sandboxService.ts
@@ -91,9 +91,7 @@ export class SandboxService {
   }
 
   async getEnvironmentsByDeveloper(developerId: string): Promise<SandboxEnvironment[]> {
-    return Array.from(this.environments.values()).filter(
-      (env) => env.developerId === developerId
-    );
+    return Array.from(this.environments.values()).filter((env) => env.developerId === developerId);
   }
 
   async updateEnvironment(
@@ -130,10 +128,7 @@ export class SandboxService {
     return this.configs.get(envId) || null;
   }
 
-  async updateConfig(
-    envId: string,
-    config: Partial<SandboxConfig>
-  ): Promise<SandboxConfig | null> {
+  async updateConfig(envId: string, config: Partial<SandboxConfig>): Promise<SandboxConfig | null> {
     const existingConfig = this.configs.get(envId);
     if (!existingConfig) return null;
 
@@ -160,19 +155,14 @@ export class SandboxService {
     return this.metrics.get(envId) || null;
   }
 
-  async recordRequest(
-    envId: string,
-    responseTime: number,
-    isError: boolean
-  ): Promise<void> {
+  async recordRequest(envId: string, responseTime: number, isError: boolean): Promise<void> {
     const metrics = this.metrics.get(envId);
     if (!metrics) return;
 
     metrics.requestCount++;
     if (isError) metrics.errorCount++;
     metrics.avgResponseTime =
-      (metrics.avgResponseTime * (metrics.requestCount - 1) + responseTime) /
-      metrics.requestCount;
+      (metrics.avgResponseTime * (metrics.requestCount - 1) + responseTime) / metrics.requestCount;
     metrics.lastActivity = new Date();
 
     this.metrics.set(envId, metrics);
@@ -184,14 +174,16 @@ export class SandboxService {
     if (!env || !metrics) return null;
 
     const isWithinLimits = this.checkResourceLimits(
-      env.config.features ? {
-        maxRequestsPerMinute: env.config.rateLimits.requestsPerMinute,
-        maxRequestsPerDay: env.config.rateLimits.requestsPerDay,
-        maxStorageMB: 100,
-        maxConcurrentConnections: env.config.rateLimits.maxConcurrentRequests,
-        maxSubscriptions: 50,
-        maxWebhooks: 5,
-      } : this.getDefaultResourceLimits(),
+      env.config.features
+        ? {
+            maxRequestsPerMinute: env.config.rateLimits.requestsPerMinute,
+            maxRequestsPerDay: env.config.rateLimits.requestsPerDay,
+            maxStorageMB: 100,
+            maxConcurrentConnections: env.config.rateLimits.maxConcurrentRequests,
+            maxSubscriptions: 50,
+            maxWebhooks: 5,
+          }
+        : this.getDefaultResourceLimits(),
       metrics
     );
 
@@ -199,14 +191,16 @@ export class SandboxService {
       environmentId: envId,
       developerId: env.developerId,
       dataNamespace: `sandbox_${envId}`,
-      resourceQuota: env.config.features ? {
-        maxRequestsPerMinute: env.config.rateLimits.requestsPerMinute,
-        maxRequestsPerDay: env.config.rateLimits.requestsPerDay,
-        maxStorageMB: 100,
-        maxConcurrentConnections: env.config.rateLimits.maxConcurrentRequests,
-        maxSubscriptions: 50,
-        maxWebhooks: 5,
-      } : this.getDefaultResourceLimits(),
+      resourceQuota: env.config.features
+        ? {
+            maxRequestsPerMinute: env.config.rateLimits.requestsPerMinute,
+            maxRequestsPerDay: env.config.rateLimits.requestsPerDay,
+            maxStorageMB: 100,
+            maxConcurrentConnections: env.config.rateLimits.maxConcurrentRequests,
+            maxSubscriptions: 50,
+            maxWebhooks: 5,
+          }
+        : this.getDefaultResourceLimits(),
       currentUsage: metrics,
       isWithinLimits,
     };
@@ -266,16 +260,10 @@ export class SandboxService {
       category: categories[index % categories.length],
       price: Math.floor(Math.random() * 50) + 5,
       currency: 'USD',
-      billingCycle: (['monthly', 'yearly', 'weekly'] as const)[
-        Math.floor(Math.random() * 3)
-      ],
+      billingCycle: (['monthly', 'yearly', 'weekly'] as const)[Math.floor(Math.random() * 3)],
       status: 'active' as const,
-      startDate: new Date(
-        Date.now() - Math.random() * 365 * 24 * 60 * 60 * 1000
-      ),
-      nextBillingDate: new Date(
-        Date.now() + Math.random() * 30 * 24 * 60 * 60 * 1000
-      ),
+      startDate: new Date(Date.now() - Math.random() * 365 * 24 * 60 * 60 * 1000),
+      nextBillingDate: new Date(Date.now() + Math.random() * 30 * 24 * 60 * 60 * 1000),
     }));
   }
 
@@ -290,13 +278,9 @@ export class SandboxService {
           subscriptionId: sub.id,
           amount: sub.price,
           currency: sub.currency,
-          status: (['pending', 'completed', 'failed'] as const)[
-            Math.floor(Math.random() * 3)
-          ],
+          status: (['pending', 'completed', 'failed'] as const)[Math.floor(Math.random() * 3)],
           method: methods[Math.floor(Math.random() * methods.length)],
-          timestamp: new Date(
-            Date.now() - Math.random() * 90 * 24 * 60 * 60 * 1000
-          ),
+          timestamp: new Date(Date.now() - Math.random() * 90 * 24 * 60 * 60 * 1000),
         });
       }
     });
@@ -337,10 +321,7 @@ export class SandboxService {
     ];
   }
 
-  private checkResourceLimits(
-    limits: SandboxResourceLimits,
-    metrics: SandboxMetrics
-  ): boolean {
+  private checkResourceLimits(limits: SandboxResourceLimits, metrics: SandboxMetrics): boolean {
     return (
       metrics.requestCount < limits.maxRequestsPerDay &&
       metrics.storageUsedMB < limits.maxStorageMB &&
diff --git a/sandbox/services/usageTrackingService.ts b/sandbox/services/usageTrackingService.ts
index 1bf1f9c0..ee16da62 100644
--- a/sandbox/services/usageTrackingService.ts
+++ b/sandbox/services/usageTrackingService.ts
@@ -1,8 +1,4 @@
-import {
-  UsageMetrics,
-  HourlyUsage,
-  DailyUsage,
-} from '../types/sandbox';
+import { UsageMetrics, HourlyUsage, DailyUsage } from '../types/sandbox';
 
 export class UsageTrackingService {
   private usageData: Map<string, UsageMetrics> = new Map();
@@ -60,26 +56,18 @@ export class UsageTrackingService {
       statusCode?: number;
     }
   ): Promise<RequestLogEntry[]> {
-    let filtered = this.requestLog.filter(
-      (entry) => entry.environmentId === environmentId
-    );
+    let filtered = this.requestLog.filter((entry) => entry.environmentId === environmentId);
 
     if (options?.startDate) {
-      filtered = filtered.filter(
-        (entry) => entry.timestamp >= options.startDate!
-      );
+      filtered = filtered.filter((entry) => entry.timestamp >= options.startDate!);
     }
 
     if (options?.endDate) {
-      filtered = filtered.filter(
-        (entry) => entry.timestamp <= options.endDate!
-      );
+      filtered = filtered.filter((entry) => entry.timestamp <= options.endDate!);
     }
 
     if (options?.statusCode) {
-      filtered = filtered.filter(
-        (entry) => entry.statusCode === options.statusCode
-      );
+      filtered = filtered.filter((entry) => entry.statusCode === options.statusCode);
     }
 
     filtered.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime());
@@ -111,9 +99,7 @@ export class UsageTrackingService {
       successfulRequests: metrics.successfulRequests,
       failedRequests: metrics.failedRequests,
       successRate:
-        metrics.totalRequests > 0
-          ? (metrics.successfulRequests / metrics.totalRequests) * 100
-          : 0,
+        metrics.totalRequests > 0 ? (metrics.successfulRequests / metrics.totalRequests) * 100 : 0,
       averageResponseTime: metrics.averageResponseTime,
       requestsLast24Hours: last24Hours.length,
       requestsLast7Days: last7Days.length,
@@ -124,9 +110,7 @@ export class UsageTrackingService {
 
   async resetUsage(environmentId: string): Promise<boolean> {
     this.usageData.delete(environmentId);
-    this.requestLog = this.requestLog.filter(
-      (entry) => entry.environmentId !== environmentId
-    );
+    this.requestLog = this.requestLog.filter((entry) => entry.environmentId !== environmentId);
     return true;
   }
 
@@ -159,9 +143,7 @@ export class UsageTrackingService {
   }
 
   private calculateAverageResponseTime(environmentId: string): number {
-    const entries = this.requestLog.filter(
-      (entry) => entry.environmentId === environmentId
-    );
+    const entries = this.requestLog.filter((entry) => entry.environmentId === environmentId);
 
     if (entries.length === 0) return 0;
 
@@ -169,11 +151,7 @@ export class UsageTrackingService {
     return Math.round(total / entries.length);
   }
 
-  private updateHourlyUsage(
-    metrics: UsageMetrics,
-    statusCode: number,
-    responseTime: number
-  ): void {
+  private updateHourlyUsage(metrics: UsageMetrics, statusCode: number, responseTime: number): void {
     const currentHour = new Date().getHours();
     const hourlyData = metrics.last24Hours[currentHour];
 
@@ -189,11 +167,7 @@ export class UsageTrackingService {
     }
   }
 
-  private updateDailyUsage(
-    metrics: UsageMetrics,
-    statusCode: number,
-    responseTime: number
-  ): void {
+  private updateDailyUsage(metrics: UsageMetrics, statusCode: number, responseTime: number): void {
     const today = new Date().toISOString().split('T')[0];
     const dailyData = metrics.last7Days.find((d) => d.date === today);
 
@@ -203,16 +177,12 @@ export class UsageTrackingService {
         dailyData.errors++;
       }
       dailyData.avgResponseTime = Math.round(
-        (dailyData.avgResponseTime * (dailyData.requests - 1) + responseTime) /
-          dailyData.requests
+        (dailyData.avgResponseTime * (dailyData.requests - 1) + responseTime) / dailyData.requests
       );
     }
   }
 
-  private getTopEndpoints(
-    environmentId: string,
-    limit: number
-  ): EndpointUsage[] {
+  private getTopEndpoints(environmentId: string, limit: number): EndpointUsage[] {
     const endpointMap = new Map<string, number>();
 
     this.requestLog
@@ -232,10 +202,7 @@ export class UsageTrackingService {
     const errorMap = new Map<number, number>();
 
     this.requestLog
-      .filter(
-        (entry) =>
-          entry.environmentId === environmentId && entry.statusCode >= 400
-      )
+      .filter((entry) => entry.environmentId === environmentId && entry.statusCode >= 400)
       .forEach((entry) => {
         errorMap.set(entry.statusCode, (errorMap.get(entry.statusCode) || 0) + 1);
       });
diff --git a/sandbox/utils/sandboxUtils.ts b/sandbox/utils/sandboxUtils.ts
index 3f0692ba..0094ab68 100644
--- a/sandbox/utils/sandboxUtils.ts
+++ b/sandbox/utils/sandboxUtils.ts
@@ -25,7 +25,10 @@ export class SandboxUtils {
     return { valid: true };
   }
 
-  static calculateResourceUsage(testData: SandboxTestData): { storageMB: number; itemCount: number } {
+  static calculateResourceUsage(testData: SandboxTestData): {
+    storageMB: number;
+    itemCount: number;
+  } {
     const jsonString = JSON.stringify(testData);
     const bytes = new TextEncoder().encode(jsonString).length;
     const storageMB = bytes / (1024 * 1024);
@@ -41,24 +44,37 @@ export class SandboxUtils {
 
   static checkResourceLimits(
     limits: SandboxResourceLimits,
-    currentUsage: { requestsPerMinute: number; requestsPerDay: number; storageMB: number; connections: number }
+    currentUsage: {
+      requestsPerMinute: number;
+      requestsPerDay: number;
+      storageMB: number;
+      connections: number;
+    }
   ): { withinLimits: boolean; violations: string[] } {
     const violations: string[] = [];
 
     if (currentUsage.requestsPerMinute > limits.maxRequestsPerMinute) {
-      violations.push(`Requests per minute (${currentUsage.requestsPerMinute}) exceeds limit (${limits.maxRequestsPerMinute})`);
+      violations.push(
+        `Requests per minute (${currentUsage.requestsPerMinute}) exceeds limit (${limits.maxRequestsPerMinute})`
+      );
     }
 
     if (currentUsage.requestsPerDay > limits.maxRequestsPerDay) {
-      violations.push(`Requests per day (${currentUsage.requestsPerDay}) exceeds limit (${limits.maxRequestsPerDay})`);
+      violations.push(
+        `Requests per day (${currentUsage.requestsPerDay}) exceeds limit (${limits.maxRequestsPerDay})`
+      );
     }
 
     if (currentUsage.storageMB > limits.maxStorageMB) {
-      violations.push(`Storage (${currentUsage.storageMB}MB) exceeds limit (${limits.maxStorageMB}MB)`);
+      violations.push(
+        `Storage (${currentUsage.storageMB}MB) exceeds limit (${limits.maxStorageMB}MB)`
+      );
     }
 
     if (currentUsage.connections > limits.maxConcurrentConnections) {
-      violations.push(`Connections (${currentUsage.connections}) exceeds limit (${limits.maxConcurrentConnections})`);
+      violations.push(
+        `Connections (${currentUsage.connections}) exceeds limit (${limits.maxConcurrentConnections})`
+      );
     }
 
     return {
@@ -73,7 +89,7 @@ export class SandboxUtils {
     }
 
     if (Array.isArray(data)) {
-      return data.map(item => this.sanitizeForSandbox(item));
+      return data.map((item) => this.sanitizeForSandbox(item));
     }
 
     if (typeof data === 'object' && data !== null) {
@@ -116,7 +132,10 @@ export class SandboxUtils {
     };
   }
 
-  static createSandboxHeaders(envId: string, additionalHeaders: Record<string, string> = {}): Record<string, string> {
+  static createSandboxHeaders(
+    envId: string,
+    additionalHeaders: Record<string, string> = {}
+  ): Record<string, string> {
     return {
       'X-Sandbox-Environment': envId,
       'X-Sandbox-Mode': 'true',
@@ -125,7 +144,11 @@ export class SandboxUtils {
     };
   }
 
-  static parseSandboxHeaders(headers: Record<string, string>): { envId?: string; isSandbox: boolean; requestId?: string } {
+  static parseSandboxHeaders(headers: Record<string, string>): {
+    envId?: string;
+    isSandbox: boolean;
+    requestId?: string;
+  } {
     return {
       envId: headers['X-Sandbox-Environment'],
       isSandbox: headers['X-Sandbox-Mode'] === 'true',
diff --git a/sandbox/utils/testDataGenerator.ts b/sandbox/utils/testDataGenerator.ts
index 09d1eff9..9a93cb3a 100644
--- a/sandbox/utils/testDataGenerator.ts
+++ b/sandbox/utils/testDataGenerator.ts
@@ -42,8 +42,28 @@ export class TestDataGenerator {
     const domains = ['gmail.com', 'yahoo.com', 'outlook.com', 'company.io'];
 
     for (let i = 0; i < count; i++) {
-      const firstName = this.randomFrom(['Alice', 'Bob', 'Charlie', 'Diana', 'Eve', 'Frank', 'Grace', 'Henry', 'Ivy', 'Jack']);
-      const lastName = this.randomFrom(['Smith', 'Johnson', 'Williams', 'Brown', 'Jones', 'Garcia', 'Miller', 'Davis']);
+      const firstName = this.randomFrom([
+        'Alice',
+        'Bob',
+        'Charlie',
+        'Diana',
+        'Eve',
+        'Frank',
+        'Grace',
+        'Henry',
+        'Ivy',
+        'Jack',
+      ]);
+      const lastName = this.randomFrom([
+        'Smith',
+        'Johnson',
+        'Williams',
+        'Brown',
+        'Jones',
+        'Garcia',
+        'Miller',
+        'Davis',
+      ]);
       const domain = this.randomFrom(domains);
 
       users.push({
@@ -143,12 +163,15 @@ export class TestDataGenerator {
     return subscriptions;
   }
 
-  static generatePayments(
-    subscriptions: TestSubscription[],
-    count: number
-  ): TestPayment[] {
+  static generatePayments(subscriptions: TestSubscription[], count: number): TestPayment[] {
     const payments: TestPayment[] = [];
-    const statuses: TestPayment['status'][] = ['completed', 'completed', 'completed', 'pending', 'failed'];
+    const statuses: TestPayment['status'][] = [
+      'completed',
+      'completed',
+      'completed',
+      'pending',
+      'failed',
+    ];
 
     for (let i = 0; i < count; i++) {
       const subscription = this.randomFrom(subscriptions);
diff --git a/sdks/javascript/src/errors.ts b/sdks/javascript/src/errors.ts
index 7a956dbc..bbbe4bf0 100644
--- a/sdks/javascript/src/errors.ts
+++ b/sdks/javascript/src/errors.ts
@@ -1,5 +1,9 @@
 export class SubTrackrError extends Error {
-  constructor(public message: string, public statusCode?: number, public code?: string) {
+  constructor(
+    public message: string,
+    public statusCode?: number,
+    public code?: string
+  ) {
     super(message);
     this.name = 'SubTrackrError';
   }
diff --git a/src/components/UsageDashboard.tsx b/src/components/UsageDashboard.tsx
index 16ef639b..dc72715a 100644
--- a/src/components/UsageDashboard.tsx
+++ b/src/components/UsageDashboard.tsx
@@ -5,7 +5,7 @@ export const UsageDashboard = () => {
   return (
     <View style={styles.container}>
       <Text style={styles.title}>Usage & Billing</Text>
-      
+
       <View style={styles.card}>
         <Text style={styles.metricTitle}>API Calls</Text>
         <Text style={styles.metricValue}>85,000 / 100,000</Text>
diff --git a/src/components/common/ScreenTemplates.tsx b/src/components/common/ScreenTemplates.tsx
index 7ac1a171..4420aa3f 100644
--- a/src/components/common/ScreenTemplates.tsx
+++ b/src/components/common/ScreenTemplates.tsx
@@ -111,7 +111,11 @@ export function ListScreen<T>({
         style={styles.scroll}
         refreshControl={
           onRefresh ? (
-            <RefreshControl refreshing={refreshing} onRefresh={onRefresh} tintColor={colors.primary} />
+            <RefreshControl
+              refreshing={refreshing}
+              onRefresh={onRefresh}
+              tintColor={colors.primary}
+            />
           ) : undefined
         }>
         {data.length === 0 ? (
@@ -123,7 +127,9 @@ export function ListScreen<T>({
             onAction={onEmptyAction}
           />
         ) : (
-          data.map((item, index) => <View key={keyExtractor(item, index)}>{renderItem(item, index)}</View>)
+          data.map((item, index) => (
+            <View key={keyExtractor(item, index)}>{renderItem(item, index)}</View>
+          ))
         )}
       </ScrollView>
     </ScreenTemplate>
diff --git a/src/components/developer/DeveloperComponents.tsx b/src/components/developer/DeveloperComponents.tsx
index b6a77561..c051b327 100644
--- a/src/components/developer/DeveloperComponents.tsx
+++ b/src/components/developer/DeveloperComponents.tsx
@@ -46,8 +46,8 @@ export const StatCard: React.FC<StatCardProps> = ({ label, value, trend, trendDi
     trendDirection === 'up'
       ? colors.success
       : trendDirection === 'down'
-      ? colors.error
-      : colors.textSecondary;
+        ? colors.error
+        : colors.textSecondary;
 
   return (
     <Card style={styles.statCard}>
diff --git a/src/components/home/StatsCard.tsx b/src/components/home/StatsCard.tsx
index 867f2901..2e82f616 100644
--- a/src/components/home/StatsCard.tsx
+++ b/src/components/home/StatsCard.tsx
@@ -10,14 +10,12 @@ interface StatsCardProps {
   currency?: string;
 }
 
-
 export const StatsCard: React.FC<StatsCardProps> = ({
   totalMonthlySpend,
   totalActive,
   onWalletPress,
   currency = 'USD',
 }) => {
-
   return (
     <View style={styles.container} accessibilityRole="summary">
       {/* Monthly Spend Card - Primary Focus */}
@@ -42,7 +40,6 @@ export const StatsCard: React.FC<StatsCardProps> = ({
           importantForAccessibility="no">
           {formatCurrencyCompact(totalMonthlySpend, currency)}
         </Text>
-
       </View>
 
       {/* Active Count Card */}
diff --git a/src/components/subscription/SubscriptionCard.tsx b/src/components/subscription/SubscriptionCard.tsx
index accba0c4..b167bd7c 100644
--- a/src/components/subscription/SubscriptionCard.tsx
+++ b/src/components/subscription/SubscriptionCard.tsx
@@ -17,7 +17,6 @@ import {
 import { useSettingsStore } from '../../store/settingsStore';
 import { currencyService } from '../../services/currencyService';
 
-
 export interface SubscriptionCardProps {
   subscription: Subscription;
   onPress: (subscription: Subscription) => void;
@@ -50,7 +49,6 @@ export const SubscriptionCard: React.FC<SubscriptionCardProps> = React.memo(
       rates
     );
 
-
     return (
       <TouchableOpacity
         testID={`subscription-card-${subscription.id}`}
@@ -123,7 +121,6 @@ export const SubscriptionCard: React.FC<SubscriptionCardProps> = React.memo(
               ]}>
               /{formatBillingCycle(subscription.billingCycle)}
             </Text>
-
           </View>
 
           <View style={styles.billingInfo}>
diff --git a/src/config/features.ts b/src/config/features.ts
index fcae8511..1bacff7d 100644
--- a/src/config/features.ts
+++ b/src/config/features.ts
@@ -198,7 +198,8 @@ export const FEATURE_CONFIG: FeatureConfig = {
     [FeatureId.DEVELOPER_PORTAL]: {
       id: FeatureId.DEVELOPER_PORTAL,
       name: 'Developer Portal',
-      description: 'Access the developer portal with API documentation, integration guides, and sandbox environment',
+      description:
+        'Access the developer portal with API documentation, integration guides, and sandbox environment',
       enabled: true,
       tierAccess: [SubscriptionTier.ENTERPRISE],
       rolloutPercentage: 100,
diff --git a/src/navigation/AppNavigator.tsx b/src/navigation/AppNavigator.tsx
index 6ef92076..27fa8aa9 100644
--- a/src/navigation/AppNavigator.tsx
+++ b/src/navigation/AppNavigator.tsx
@@ -50,7 +50,60 @@ import IntegrationGuidesScreen from '../screens/IntegrationGuidesScreen';
 import PerformanceDashboardScreen from '../screens/PerformanceDashboardScreen';
 import { colors } from '../utils/constants';
 
-import { RootStackParamList, TabParamList } from './types';
+// Lazy loaded auxiliary and heavy screens with suspense/retry support
+const AddSubscriptionScreen = lazyScreen(() => import('../screens/AddSubscriptionScreen'));
+const CancellationFlowScreen = lazyScreen(() => import('../screens/CancellationFlowScreen'));
+const WalletConnectScreen = lazyScreen(() => import('../screens/WalletConnectV2Screen'));
+const CryptoPaymentScreen = lazyScreen(() => import('../screens/CryptoPaymentScreen'));
+const CommunityScreen = lazyScreen(() => import('../screens/CommunityScreen'));
+const ProfileScreen = lazyScreen(() => import('../screens/ProfileScreen'));
+const SubscriptionDetailScreen = lazyScreen(() => import('../screens/SubscriptionDetailScreen'));
+const InvoiceListScreen = lazyScreen(() => import('../screens/InvoiceListScreen'));
+const InvoiceDetailScreen = lazyScreen(() => import('../screens/InvoiceDetailScreen'));
+const AnalyticsScreen = lazyScreen(() => import('../screens/AnalyticsScreen'));
+const SlaDashboard = lazyScreen(() => import('../screens/SlaDashboard'));
+const GDPRSettingsScreen = lazyScreen(() => import('../screens/GDPRSettingsScreen'));
+const LanguageSettingsScreen = lazyScreen(() => import('../screens/LanguageSettingsScreen'));
+const SessionManagementScreen = lazyScreen(() => import('../screens/SessionManagementScreen'));
+const CalendarIntegrationScreen = lazyScreen(() => import('../screens/CalendarIntegrationScreen'));
+const AccountingExportScreen = lazyScreen(() => import('../screens/AccountingExportScreen'));
+const WebhookSettingsScreen = lazyScreen(() => import('../screens/WebhookSettingsScreen'));
+const ErrorDashboardScreen = lazyScreen(() => import('../screens/ErrorDashboardScreen'));
+const ImportScreen = lazyScreen(() => import('../screens/ImportScreen'));
+const ExportScreen = lazyScreen(() => import('../screens/ExportScreen'));
+const BatchOperationsScreen = lazyScreen(() =>
+  import('../../app/screens/BatchOperationsScreen').then((m) => ({
+    default: m.BatchOperationsScreen,
+  }))
+);
+const AdminDashboardScreen = lazyScreen(() => import('../screens/AdminDashboardScreen'));
+const FraudDashboard = lazyScreen(() => import('../screens/FraudDashboard'));
+const GroupManagementScreen = lazyScreen(() => import('../screens/GroupManagementScreen'));
+const TaxSettingsScreen = lazyScreen(() => import('../screens/TaxSettingsScreen'));
+const SupportDashboardScreen = lazyScreen(() => import('../screens/SupportDashboardScreen'));
+const SegmentManagementScreen = lazyScreen(() =>
+  import('../screens/SegmentManagementScreen').then((m) => ({ default: m.SegmentManagementScreen }))
+);
+const SegmentDetailScreen = lazyScreen(() =>
+  import('../screens/SegmentDetailScreen').then((m) => ({ default: m.SegmentDetailScreen }))
+);
+const GamificationScreen = lazyScreen(() =>
+  import('../screens/GamificationScreen').then((m) => ({ default: m.GamificationScreen }))
+);
+const RevenueReportScreen = lazyScreen(() => import('../screens/RevenueReportScreen'));
+const UsageDashboardScreen = lazyScreen(() => import('../screens/UsageDashboard'));
+const MerchantOnboardingScreen = lazyScreen(() => import('../screens/MerchantOnboardingScreen'));
+const AffiliateDashboardScreen = lazyScreen(() => import('../screens/AffiliateDashboardScreen'));
+const LoyaltyDashboardScreen = lazyScreen(() => import('../screens/LoyaltyDashboardScreen'));
+const CampaignManagementScreen = lazyScreen(() => import('../screens/CampaignManagementScreen'));
+const DeveloperPortalScreen = lazyScreen(() => import('../screens/DeveloperPortalScreen'));
+const SandboxDashboardScreen = lazyScreen(() => import('../screens/SandboxDashboardScreen'));
+const ApiKeyManagementScreen = lazyScreen(() => import('../screens/ApiKeyManagementScreen'));
+const DocumentationPortalScreen = lazyScreen(() => import('../screens/DocumentationPortalScreen'));
+const IntegrationGuidesScreen = lazyScreen(() => import('../screens/IntegrationGuidesScreen'));
+const PerformanceDashboardScreen = lazyScreen(
+  () => import('../screens/PerformanceDashboardScreen')
+);
 
 const Tab = createBottomTabNavigator<TabParamList>();
 const Stack = createNativeStackNavigator<RootStackParamList>();
diff --git a/src/screens/AffiliateDashboardScreen.tsx b/src/screens/AffiliateDashboardScreen.tsx
index c7095678..f797f261 100644
--- a/src/screens/AffiliateDashboardScreen.tsx
+++ b/src/screens/AffiliateDashboardScreen.tsx
@@ -7,39 +7,43 @@ import {
   SafeAreaView,
   TouchableOpacity,
   Alert,
-  ActivityIndicator,
   Modal,
-  FlatList,
+  TextInput,
 } from 'react-native';
 import { colors, spacing, typography, borderRadius } from '../utils/constants';
 import { useAffiliateStore } from '../store/affiliateStore';
 import { useWalletStore } from '../store/walletStore';
 import { Card } from '../components/common/Card';
-import { useNavigation } from '@react-navigation/native';
-import { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import { RootStackParamList } from '../navigation/types';
-import { AffiliateStatus, AffiliateProgram, Commission } from '../types/affiliate';
+import { AffiliateStatus } from '../types/affiliate';
 
 const AffiliateDashboardScreen: React.FC = () => {
-  const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList>>();
   const {
     affiliates,
     programs,
     commissions,
     metrics,
-    isLoading,
-    error,
     registerAffiliate,
+    trackClick,
     trackReferral,
-    calculateCommission,
     payoutCommission,
     updateAffiliateStatus,
+    triggerClawback,
     getMetrics,
   } = useAffiliateStore();
   const { address } = useWalletStore();
 
   const [programModalVisible, setProgramModalVisible] = useState(false);
   const [selectedProgram, setSelectedProgram] = useState<string>('');
+  const [selectedAttributionModel, setSelectedAttributionModel] = useState<
+    'first-touch' | 'last-touch' | 'linear'
+  >('last-touch');
+  const [customCookieWindow, setCustomCookieWindow] = useState('30');
+
+  // Simulation Inputs
+  const [simSubscriptionId, setSimSubscriptionId] = useState('sub_premium_99');
+  const [simAmount, setSimAmount] = useState('49.99');
+  const [simIp, setSimIp] = useState('192.168.1.105');
+  const [simUserAgent, setSimUserAgent] = useState('Mozilla/5.0 Chrome/120.0.0');
 
   useEffect(() => {
     const currentMetrics = getMetrics();
@@ -47,35 +51,110 @@ const AffiliateDashboardScreen: React.FC = () => {
   }, [affiliates, commissions, getMetrics]);
 
   const handleRegister = useCallback(async () => {
-    if (!address) {
-      Alert.alert('Error', 'Please connect your wallet first');
-      return;
-    }
+    // Fallback/Mock address if no wallet is connected
+    const activeAddress = address || '0x71C7656EC7ab88b098defB751B7401B5f6d8976F';
+
     if (!selectedProgram) {
       Alert.alert('Error', 'Please select a program');
       return;
     }
-    await registerAffiliate(address, selectedProgram);
+
+    await registerAffiliate(activeAddress, selectedProgram);
+
+    // Sync newly chosen program parameters to default programs
+    const updatedPrograms = programs.map((p) =>
+      p.id === selectedProgram
+        ? {
+            ...p,
+            attributionWindowDays: parseInt(customCookieWindow, 10) || 30,
+            attributionModel: selectedAttributionModel,
+          }
+        : p
+    );
+    useAffiliateStore.setState({ programs: updatedPrograms });
+
     setProgramModalVisible(false);
-    Alert.alert('Success', 'You are now an affiliate!');
-  }, [address, selectedProgram, registerAffiliate]);
+    Alert.alert('Success', 'Registered as an affiliate successfully!');
+  }, [
+    address,
+    selectedProgram,
+    registerAffiliate,
+    customCookieWindow,
+    selectedAttributionModel,
+    programs,
+  ]);
 
   const handlePayout = useCallback(
     async (affiliateId: string) => {
       const affiliate = affiliates.find((a) => a.id === affiliateId);
-      if (!affiliate || affiliate.pendingPayout < affiliate.paymentThreshold) {
+      if (!affiliate) return;
+
+      if (affiliate.pendingPayout < affiliate.paymentThreshold) {
         Alert.alert(
-          'Minimum Threshold',
-          `You need at least $${affiliate?.paymentThreshold} to request a payout`
+          'Payout Threshold',
+          `Required: $${affiliate.paymentThreshold.toFixed(2)}. Current pending balance: $${affiliate.pendingPayout.toFixed(2)}`
         );
         return;
       }
-      await payoutCommission(affiliateId);
-      Alert.alert('Success', 'Payout requested!');
+
+      try {
+        await payoutCommission(affiliateId);
+        Alert.alert('Success', 'Your payout request was processed instantly!');
+      } catch (err) {
+        Alert.alert('Error', err instanceof Error ? err.message : 'Payout failed');
+      }
     },
     [affiliates, payoutCommission]
   );
 
+  const handleCopyLink = useCallback((link: string) => {
+    Alert.alert('Copied to Clipboard!', link);
+  }, []);
+
+  const handleSimulationClick = useCallback(
+    async (referralCode: string) => {
+      try {
+        await trackClick(referralCode, simIp, simUserAgent);
+        Alert.alert('Success', `Simulated referral link click! Click logged for ${referralCode}`);
+      } catch (err) {
+        Alert.alert('Blocked', err instanceof Error ? err.message : 'Click limit reached');
+      }
+    },
+    [trackClick, simIp, simUserAgent]
+  );
+
+  const handleSimulationConversion = useCallback(
+    async (affiliateId: string) => {
+      try {
+        const amt = parseFloat(simAmount) || 29.99;
+        await trackReferral(
+          affiliateId,
+          simSubscriptionId,
+          amt,
+          simIp,
+          simUserAgent,
+          undefined,
+          selectedAttributionModel
+        );
+        Alert.alert('Success', 'Simulated recurring subscription sign up! Commission tracked.');
+      } catch (err) {
+        Alert.alert(
+          'Blocked by Fraud Engine',
+          err instanceof Error ? err.message : 'Conversion rejected'
+        );
+      }
+    },
+    [trackReferral, simSubscriptionId, simAmount, simIp, simUserAgent, selectedAttributionModel]
+  );
+
+  const handleSimulationClawback = useCallback(async () => {
+    await triggerClawback(simSubscriptionId);
+    Alert.alert(
+      'Success',
+      `Subscription ${simSubscriptionId} cancelled. Commissions within period clawed back successfully.`
+    );
+  }, [triggerClawback, simSubscriptionId]);
+
   const handleToggleStatus = useCallback(
     async (affiliateId: string, newStatus: AffiliateStatus) => {
       await updateAffiliateStatus(affiliateId, newStatus);
@@ -85,96 +164,204 @@ const AffiliateDashboardScreen: React.FC = () => {
 
   const renderMetricsCard = () => (
     <Card style={styles.metricsCard}>
-      <Text style={styles.metricsTitle}>Performance Overview</Text>
+      <Text style={styles.metricsTitle}>Real-time Performance Metrics</Text>
       <View style={styles.metricsGrid}>
         <View style={styles.metricItem}>
-          <Text style={styles.metricValue}>{metrics.totalReferrals}</Text>
-          <Text style={styles.metricLabel}>Total Referrals</Text>
+          <Text style={styles.metricValue}>{metrics.totalClicks || 0}</Text>
+          <Text style={styles.metricLabel}>Total Clicks</Text>
         </View>
         <View style={styles.metricItem}>
-          <Text style={styles.metricValue}>{metrics.activeReferrals}</Text>
-          <Text style={styles.metricLabel}>Active</Text>
+          <Text style={styles.metricValue}>{metrics.totalReferrals}</Text>
+          <Text style={styles.metricLabel}>Conversions</Text>
         </View>
         <View style={styles.metricItem}>
-          <Text style={styles.metricValue}>${metrics.totalEarnings.toFixed(2)}</Text>
+          <Text style={[styles.metricValue, { color: colors.success }]}>
+            ${metrics.totalEarnings.toFixed(2)}
+          </Text>
           <Text style={styles.metricLabel}>Total Earnings</Text>
         </View>
         <View style={styles.metricItem}>
-          <Text style={styles.metricValue}>${metrics.pendingPayout.toFixed(2)}</Text>
-          <Text style={styles.metricLabel}>Pending</Text>
+          <Text style={[styles.metricValue, { color: colors.warning }]}>
+            ${metrics.pendingPayout.toFixed(2)}
+          </Text>
+          <Text style={styles.metricLabel}>Pending Payout</Text>
         </View>
       </View>
       <View style={styles.conversionRow}>
         <Text style={styles.conversionLabel}>Conversion Rate</Text>
-        <Text style={styles.conversionValue}>{metrics.conversionRate.toFixed(1)}%</Text>
+        <Text style={styles.conversionValue}>{(metrics.conversionRate || 0).toFixed(1)}%</Text>
       </View>
     </Card>
   );
 
   const renderAffiliateList = () => (
     <Card style={styles.listCard}>
-      <Text style={styles.listTitle}>Your Affiliates</Text>
+      <Text style={styles.listTitle}>Referral Configuration & Operations</Text>
       {affiliates.length === 0 ? (
-        <Text style={styles.emptyText}>No affiliates yet</Text>
+        <Text style={styles.emptyText}>
+          No registered programs yet. Join a program below to start earning.
+        </Text>
       ) : (
-        affiliates.map((affiliate) => (
-          <View key={affiliate.id} style={styles.affiliateItem}>
-            <View style={styles.affiliateInfo}>
-              <Text style={styles.affiliateAddress}>
-                {affiliate.referrerAddress.slice(0, 6)}...
-                {affiliate.referrerAddress.slice(-4)}
-              </Text>
-              <View style={styles.affiliateStats}>
-                <Text style={styles.affiliateStat}>
-                  {affiliate.totalReferrals} referrals
-                </Text>
-                <Text style={styles.affiliateStat}>
-                  ${affiliate.totalEarnings.toFixed(2)} earned
-                </Text>
-              </View>
-            </View>
-            <View style={styles.affiliateActions}>
-              <View
-                style={[
-                  styles.statusBadge,
-                  {
-                    backgroundColor:
-                      affiliate.status === AffiliateStatus.ACTIVE
-                        ? colors.success
-                        : affiliate.status === AffiliateStatus.PAUSED
-                        ? colors.warning
-                        : colors.danger,
-                  },
-                ]}>
-                <Text style={styles.statusBadgeText}>{affiliate.status}</Text>
+        affiliates.map((affiliate) => {
+          const currentProg = programs.find((p) => p.id === affiliate.programId);
+          return (
+            <View key={affiliate.id} style={styles.affiliateContainer}>
+              <View style={styles.affiliateHeader}>
+                <View>
+                  <Text style={styles.affiliateProgramName}>
+                    {currentProg?.name || 'Basic Program'}
+                  </Text>
+                  <Text style={styles.affiliateCode}>Code: {affiliate.referralCode}</Text>
+                </View>
+                <View
+                  style={[
+                    styles.fraudBadge,
+                    {
+                      backgroundColor:
+                        affiliate.fraudStatus === 'flagged'
+                          ? 'rgba(239, 68, 68, 0.15)'
+                          : affiliate.fraudStatus === 'suspicious'
+                            ? 'rgba(245, 158, 11, 0.15)'
+                            : 'rgba(16, 185, 129, 0.15)',
+                    },
+                  ]}>
+                  <Text
+                    style={[
+                      styles.fraudBadgeText,
+                      {
+                        color:
+                          affiliate.fraudStatus === 'flagged'
+                            ? colors.error
+                            : affiliate.fraudStatus === 'suspicious'
+                              ? colors.warning
+                              : colors.success,
+                      },
+                    ]}>
+                    {affiliate.fraudStatus === 'flagged'
+                      ? '⚠️ Suspended'
+                      : affiliate.fraudStatus === 'suspicious'
+                        ? '⚠️ Suspicious'
+                        : '🛡️ Secure'}
+                  </Text>
+                </View>
               </View>
-              {affiliate.status === AffiliateStatus.ACTIVE ? (
+
+              {/* Referral Link & Custom Payout Controls */}
+              <View style={styles.referralLinkSection}>
+                <Text style={styles.referralLinkLabel} numberOfLines={1}>
+                  {affiliate.referralLink}
+                </Text>
                 <TouchableOpacity
-                  style={styles.pauseButton}
-                  onPress={() =>
-                    handleToggleStatus(affiliate.id, AffiliateStatus.PAUSED)
-                  }>
-                  <Text style={styles.pauseButtonText}>Pause</Text>
+                  style={styles.copyButton}
+                  onPress={() => handleCopyLink(affiliate.referralLink || '')}>
+                  <Text style={styles.copyButtonText}>Copy Link</Text>
                 </TouchableOpacity>
-              ) : (
+              </View>
+
+              <View style={styles.affiliateStatsRow}>
+                <Text style={styles.statMini}>Clicks: {affiliate.clicksCount || 0}</Text>
+                <Text style={styles.statMini}>Threshold: ${affiliate.paymentThreshold}</Text>
+                <Text style={styles.statMini}>Risk: {affiliate.fraudRiskScore || 0}%</Text>
+              </View>
+
+              <View style={styles.actionButtonsRow}>
                 <TouchableOpacity
-                  style={styles.resumeButton}
-                  onPress={() =>
-                    handleToggleStatus(affiliate.id, AffiliateStatus.ACTIVE)
-                  }>
-                  <Text style={styles.resumeButtonText}>Resume</Text>
+                  style={[
+                    styles.payoutActionButton,
+                    affiliate.pendingPayout < affiliate.paymentThreshold && styles.disabledButton,
+                  ]}
+                  onPress={() => handlePayout(affiliate.id)}>
+                  <Text style={styles.payoutActionText}>Request Payout</Text>
                 </TouchableOpacity>
-              )}
+
+                {affiliate.status === AffiliateStatus.ACTIVE ? (
+                  <TouchableOpacity
+                    style={styles.pauseButton}
+                    onPress={() => handleToggleStatus(affiliate.id, AffiliateStatus.PAUSED)}>
+                    <Text style={styles.pauseButtonText}>Pause</Text>
+                  </TouchableOpacity>
+                ) : (
+                  <TouchableOpacity
+                    style={styles.resumeButton}
+                    onPress={() => handleToggleStatus(affiliate.id, AffiliateStatus.ACTIVE)}>
+                    <Text style={styles.resumeButtonText}>Resume</Text>
+                  </TouchableOpacity>
+                )}
+              </View>
+
+              {/* SIMULATION BENCH */}
+              <View style={styles.simulatorBench}>
+                <Text style={styles.simulatorTitle}>Sandbox Simulator Bench</Text>
+                <Text style={styles.simulatorSubtitle}>
+                  Simulate visitor flow to test multi-touch attribution, fraud mitigation, and churn
+                  clawbacks.
+                </Text>
+
+                <View style={styles.simInputsRow}>
+                  <View style={styles.simInputBox}>
+                    <Text style={styles.inputLabel}>Sub ID</Text>
+                    <TextInput
+                      style={styles.simInput}
+                      value={simSubscriptionId}
+                      onChangeText={setSimSubscriptionId}
+                    />
+                  </View>
+                  <View style={styles.simInputBox}>
+                    <Text style={styles.inputLabel}>Amount ($)</Text>
+                    <TextInput
+                      style={styles.simInput}
+                      value={simAmount}
+                      onChangeText={setSimAmount}
+                      keyboardType="numeric"
+                    />
+                  </View>
+                </View>
+
+                <View style={styles.simInputsRow}>
+                  <View style={styles.simInputBox}>
+                    <Text style={styles.inputLabel}>Visitor IP</Text>
+                    <TextInput style={styles.simInput} value={simIp} onChangeText={setSimIp} />
+                  </View>
+                  <View style={styles.simInputBox}>
+                    <Text style={styles.inputLabel}>User Agent</Text>
+                    <TextInput
+                      style={styles.simInput}
+                      value={simUserAgent}
+                      onChangeText={setSimUserAgent}
+                    />
+                  </View>
+                </View>
+
+                <View style={styles.simButtonsContainer}>
+                  <TouchableOpacity
+                    style={styles.simBtn}
+                    onPress={() => handleSimulationClick(affiliate.referralCode || '')}>
+                    <Text style={styles.simBtnText}>1. Sim Click</Text>
+                  </TouchableOpacity>
+
+                  <TouchableOpacity
+                    style={[styles.simBtn, { backgroundColor: colors.primary }]}
+                    onPress={() => handleSimulationConversion(affiliate.id)}>
+                    <Text style={styles.simBtnText}>2. Sim Convert</Text>
+                  </TouchableOpacity>
+
+                  <TouchableOpacity
+                    style={[styles.simBtn, { backgroundColor: colors.error }]}
+                    onPress={handleSimulationClawback}>
+                    <Text style={styles.simBtnText}>3. Sim Churn</Text>
+                  </TouchableOpacity>
+                </View>
+              </View>
             </View>
-          </View>
-        ))
+          );
+        })
       )}
     </Card>
   );
 
   const renderProgramsCard = () => (
     <Card style={styles.listCard}>
-      <Text style={styles.listTitle}>Available Programs</Text>
+      <Text style={styles.listTitle}>Available Affiliate Programs</Text>
       {programs.map((program) => (
         <TouchableOpacity
           key={program.id}
@@ -186,16 +373,20 @@ const AffiliateDashboardScreen: React.FC = () => {
           <View style={styles.programInfo}>
             <Text style={styles.programName}>{program.name}</Text>
             <Text style={styles.programDescription}>{program.description}</Text>
+            <Text style={styles.programSubMeta}>
+              Attribution: {program.attributionModel || 'last-touch'} •{' '}
+              {program.attributionWindowDays} days cookie
+            </Text>
           </View>
           <View style={styles.programRate}>
             <Text style={styles.rateValue}>
               {program.commissionConfig.type === 'percentage'
                 ? `${program.commissionConfig.rate}%`
                 : program.commissionConfig.type === 'flat'
-                ? `$${program.commissionConfig.rate}`
-                : 'Tiered'}
+                  ? `$${program.commissionConfig.rate}`
+                  : 'Tiered'}
             </Text>
-            <Text style={styles.rateLabel}>commission</Text>
+            <Text style={styles.rateLabel}>Commission</Text>
           </View>
         </TouchableOpacity>
       ))}
@@ -204,67 +395,79 @@ const AffiliateDashboardScreen: React.FC = () => {
 
   const renderCommissionsList = () => (
     <Card style={styles.listCard}>
-      <Text style={styles.listTitle}>Recent Commissions</Text>
+      <Text style={styles.listTitle}>Recent Commission Ledger & Clawbacks</Text>
       {commissions.length === 0 ? (
-        <Text style={styles.emptyText}>No commissions yet</Text>
+        <Text style={styles.emptyText}>No commissions tracked yet.</Text>
       ) : (
-        commissions.slice(0, 5).map((commission) => (
-          <View key={commission.id} style={styles.commissionItem}>
-            <View style={styles.commissionInfo}>
-              <Text style={styles.commissionId}>
-                Sub: {commission.subscriptionId.slice(0, 8)}...
-              </Text>
-              <Text style={styles.commissionDate}>
-                {new Date(commission.createdAt).toLocaleDateString()}
-              </Text>
-            </View>
-            <View style={styles.commissionAmount}>
-              <Text style={styles.amountValue}>${commission.amount.toFixed(2)}</Text>
-              <View
-                style={[
-                  styles.commissionStatus,
-                  {
-                    backgroundColor:
-                      commission.status === 'paid'
-                        ? colors.success
-                        : commission.status === 'approved'
-                        ? colors.warning
-                        : colors.textSecondary,
-                  },
-                ]}>
-                <Text style={styles.commissionStatusText}>{commission.status}</Text>
+        commissions
+          .slice()
+          .reverse()
+          .slice(0, 5)
+          .map((commission) => (
+            <View key={commission.id} style={styles.commissionItem}>
+              <View style={styles.commissionInfo}>
+                <Text style={styles.commissionId}>Sub: {commission.subscriptionId}</Text>
+                <Text style={styles.commissionDate}>
+                  {new Date(commission.createdAt).toLocaleDateString()}
+                </Text>
+              </View>
+              <View style={styles.commissionAmount}>
+                <Text
+                  style={[
+                    styles.amountValue,
+                    commission.isClawbacked && {
+                      textDecorationLine: 'line-through',
+                      color: colors.error,
+                    },
+                  ]}>
+                  ${commission.amount.toFixed(2)}
+                </Text>
+                <View
+                  style={[
+                    styles.commissionStatus,
+                    {
+                      backgroundColor: commission.isClawbacked
+                        ? 'rgba(239, 68, 68, 0.15)'
+                        : commission.status === 'paid'
+                          ? 'rgba(16, 185, 129, 0.15)'
+                          : 'rgba(245, 158, 11, 0.15)',
+                    },
+                  ]}>
+                  <Text
+                    style={[
+                      styles.commissionStatusText,
+                      {
+                        color: commission.isClawbacked
+                          ? colors.error
+                          : commission.status === 'paid'
+                            ? colors.success
+                            : colors.warning,
+                      },
+                    ]}>
+                    {commission.isClawbacked ? 'Clawed back' : commission.status}
+                  </Text>
+                </View>
               </View>
             </View>
-          </View>
-        ))
+          ))
       )}
     </Card>
   );
 
-  if (isLoading) {
-    return (
-      <SafeAreaView style={styles.container}>
-        <View style={styles.loadingContainer}>
-          <ActivityIndicator size="large" color={colors.primary} />
-          <Text style={styles.loadingText}>Loading...</Text>
-        </View>
-      </SafeAreaView>
-    );
-  }
-
   return (
     <SafeAreaView style={styles.container}>
       <ScrollView style={styles.scrollView}>
         <View style={styles.header}>
-          <Text style={styles.title}>Affiliate Dashboard</Text>
+          <Text style={styles.title}>Affiliate & Referral Engine</Text>
           <Text style={styles.subtitle}>
-            Track referrals and earn commissions
+            Create marketing campaigns, track recurring conversions, mitigate fraud, and handle
+            payouts.
           </Text>
         </View>
 
         {renderMetricsCard()}
-        {renderProgramsCard()}
         {renderAffiliateList()}
+        {renderProgramsCard()}
         {renderCommissionsList()}
 
         <TouchableOpacity
@@ -272,67 +475,101 @@ const AffiliateDashboardScreen: React.FC = () => {
           onPress={() => setProgramModalVisible(true)}
           accessibilityRole="button"
           accessibilityLabel="Register as affiliate">
-          <Text style={styles.registerButtonText}>Become an Affiliate</Text>
+          <Text style={styles.registerButtonText}>Launch New Affiliate Campaign</Text>
         </TouchableOpacity>
       </ScrollView>
 
+      {/* Program Config Modal */}
       <Modal
         visible={programModalVisible}
         animationType="slide"
         transparent={true}
         onRequestClose={() => setProgramModalVisible(false)}>
         <View style={styles.modalOverlay}>
-          <View style={styles.modalContent}>
-            <Text style={styles.modalTitle}>Select Program</Text>
-            <Text style={styles.modalSubtitle}>
-              Choose an affiliate program to join
-            </Text>
+          <ScrollView contentContainerStyle={styles.modalScroll}>
+            <View style={styles.modalContent}>
+              <Text style={styles.modalTitle}>Configure Affiliate Program</Text>
+              <Text style={styles.modalSubtitle}>
+                Join a program and configure tracking constraints.
+              </Text>
 
-            {programs.map((program) => (
-              <TouchableOpacity
-                key={program.id}
-                style={[
-                  styles.programOption,
-                  selectedProgram === program.id && styles.programOptionSelected,
-                ]}
-                onPress={() => setSelectedProgram(program.id)}>
-                <View style={styles.programOptionInfo}>
-                  <Text style={styles.programOptionName}>{program.name}</Text>
-                  <Text style={styles.programOptionDesc}>
-                    {program.description}
-                  </Text>
-                </View>
-                <View
+              {programs.map((program) => (
+                <TouchableOpacity
+                  key={program.id}
                   style={[
-                    styles.radioCircle,
-                    selectedProgram === program.id && styles.radioCircleSelected,
-                  ]}>
-                  {selectedProgram === program.id && (
-                    <View style={styles.radioInner} />
-                  )}
-                </View>
-              </TouchableOpacity>
-            ))}
-
-            <View style={styles.modalButtons}>
-              <TouchableOpacity
-                style={styles.cancelButton}
-                onPress={() => setProgramModalVisible(false)}>
-                <Text style={styles.cancelButtonText}>Cancel</Text>
-              </TouchableOpacity>
-              <TouchableOpacity
-                style={styles.confirmButton}
-                onPress={handleRegister}>
-                <Text style={styles.confirmButtonText}>Join Program</Text>
-              </TouchableOpacity>
+                    styles.programOption,
+                    selectedProgram === program.id && styles.programOptionSelected,
+                  ]}
+                  onPress={() => setSelectedProgram(program.id)}>
+                  <View style={programOptionInfo}>
+                    <Text style={styles.programOptionName}>{program.name}</Text>
+                    <Text style={styles.programOptionDesc}>{program.description}</Text>
+                  </View>
+                  <View
+                    style={[
+                      styles.radioCircle,
+                      selectedProgram === program.id && styles.radioCircleSelected,
+                    ]}>
+                    {selectedProgram === program.id && <View style={styles.radioInner} />}
+                  </View>
+                </TouchableOpacity>
+              ))}
+
+              <Text style={styles.sectionLabelHeader}>Attribution & Window Parameters</Text>
+
+              <Text style={styles.inputTitleLabel}>Cookie Validity Window (Days)</Text>
+              <TextInput
+                style={styles.modalTextInput}
+                value={customCookieWindow}
+                onChangeText={setCustomCookieWindow}
+                keyboardType="numeric"
+                placeholder="e.g. 30"
+              />
+
+              <Text style={styles.inputTitleLabel}>Attribution Model</Text>
+              <View style={styles.optionsSelectorRow}>
+                {(['first-touch', 'last-touch', 'linear'] as const).map((model) => (
+                  <TouchableOpacity
+                    key={model}
+                    style={[
+                      styles.optionSelectorItem,
+                      selectedAttributionModel === model && styles.optionSelectorItemSelected,
+                    ]}
+                    onPress={() => setSelectedAttributionModel(model)}>
+                    <Text
+                      style={[
+                        styles.optionSelectorText,
+                        selectedAttributionModel === model && styles.optionSelectorTextActive,
+                      ]}>
+                      {model}
+                    </Text>
+                  </TouchableOpacity>
+                ))}
+              </View>
+
+              <View style={styles.modalButtons}>
+                <TouchableOpacity
+                  style={styles.cancelButton}
+                  onPress={() => setProgramModalVisible(false)}>
+                  <Text style={styles.cancelButtonText}>Cancel</Text>
+                </TouchableOpacity>
+                <TouchableOpacity style={styles.confirmButton} onPress={handleRegister}>
+                  <Text style={styles.confirmButtonText}>Join Program</Text>
+                </TouchableOpacity>
+              </View>
             </View>
-          </View>
+          </ScrollView>
         </View>
       </Modal>
     </SafeAreaView>
   );
 };
 
+// Extracted styles from theme safely
+const programOptionInfo = {
+  flex: 1,
+};
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -341,38 +578,30 @@ const styles = StyleSheet.create({
   scrollView: {
     flex: 1,
   },
-  loadingContainer: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  loadingText: {
-    marginTop: spacing.sm,
-    color: colors.textSecondary,
-    fontSize: typography.fontSizeMd,
-  },
   header: {
     padding: spacing.md,
     paddingTop: spacing.lg,
   },
   title: {
-    fontSize: typography.fontSizeXl,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.h2.fontSize,
+    fontWeight: typography.h2.fontWeight,
     color: colors.text,
   },
   subtitle: {
-    fontSize: typography.fontSizeMd,
+    fontSize: typography.caption.fontSize,
     color: colors.textSecondary,
     marginTop: spacing.xs,
+    lineHeight: 20,
   },
   metricsCard: {
     padding: spacing.md,
     margin: spacing.md,
     marginTop: 0,
+    backgroundColor: colors.surface,
   },
   metricsTitle: {
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
     marginBottom: spacing.md,
   },
@@ -386,16 +615,16 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     padding: spacing.md,
     marginBottom: spacing.sm,
-    backgroundColor: colors.surface,
+    backgroundColor: 'rgba(255, 255, 255, 0.03)',
     borderRadius: borderRadius.md,
   },
   metricValue: {
-    fontSize: typography.fontSizeLg,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.h3.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
   },
   metricLabel: {
-    fontSize: typography.fontSizeSm,
+    fontSize: typography.small.fontSize,
     color: colors.textSecondary,
     marginTop: spacing.xs,
   },
@@ -406,93 +635,205 @@ const styles = StyleSheet.create({
     paddingTop: spacing.md,
     borderTopWidth: 1,
     borderTopColor: colors.border,
+    marginTop: spacing.xs,
   },
   conversionLabel: {
-    fontSize: typography.fontSizeMd,
+    fontSize: typography.body2.fontSize,
     color: colors.textSecondary,
   },
   conversionValue: {
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.primary,
   },
   listCard: {
     padding: spacing.md,
     margin: spacing.md,
     marginTop: 0,
+    backgroundColor: colors.surface,
   },
   listTitle: {
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
     marginBottom: spacing.md,
   },
   emptyText: {
-    fontSize: typography.fontSizeMd,
+    fontSize: typography.body2.fontSize,
     color: colors.textSecondary,
     textAlign: 'center',
     paddingVertical: spacing.lg,
+    lineHeight: 20,
   },
-  affiliateItem: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    paddingVertical: spacing.sm,
+  affiliateContainer: {
+    paddingVertical: spacing.md,
     borderBottomWidth: 1,
     borderBottomColor: colors.border,
   },
-  affiliateInfo: {
-    flex: 1,
+  affiliateHeader: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
   },
-  affiliateAddress: {
-    fontSize: typography.fontSizeMd,
+  affiliateProgramName: {
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
-    fontFamily: typography.fontFamilyMono,
   },
-  affiliateStats: {
+  affiliateCode: {
+    fontSize: typography.body2.fontSize,
+    color: colors.textSecondary,
+    marginTop: 2,
+  },
+  fraudBadge: {
+    paddingHorizontal: spacing.sm,
+    paddingVertical: 4,
+    borderRadius: borderRadius.sm,
+  },
+  fraudBadgeText: {
+    fontSize: typography.small.fontSize,
+    fontWeight: 'bold',
+  },
+  referralLinkSection: {
     flexDirection: 'row',
-    marginTop: spacing.xs,
-    gap: spacing.md,
+    alignItems: 'center',
+    backgroundColor: 'rgba(255, 255, 255, 0.02)',
+    borderRadius: borderRadius.md,
+    padding: spacing.sm,
+    marginTop: spacing.md,
+    borderWidth: 1,
+    borderColor: colors.border,
   },
-  affiliateStat: {
-    fontSize: typography.fontSizeSm,
+  referralLinkLabel: {
+    flex: 1,
+    fontSize: typography.small.fontSize,
     color: colors.textSecondary,
   },
-  affiliateActions: {
-    alignItems: 'flex-end',
-  },
-  statusBadge: {
+  copyButton: {
+    backgroundColor: colors.primary,
     paddingHorizontal: spacing.sm,
-    paddingVertical: spacing.xs,
+    paddingVertical: 6,
     borderRadius: borderRadius.sm,
-    marginBottom: spacing.xs,
+    marginLeft: spacing.sm,
   },
-  statusBadgeText: {
+  copyButtonText: {
+    color: '#ffffff',
+    fontSize: typography.small.fontSize,
+    fontWeight: 'bold',
+  },
+  affiliateStatsRow: {
+    flexDirection: 'row',
+    marginTop: spacing.md,
+    gap: spacing.lg,
+  },
+  statMini: {
+    fontSize: typography.small.fontSize,
+    color: colors.textSecondary,
+  },
+  actionButtonsRow: {
+    flexDirection: 'row',
+    marginTop: spacing.md,
+    gap: spacing.md,
+  },
+  payoutActionButton: {
+    backgroundColor: colors.success,
+    borderRadius: borderRadius.sm,
+    paddingVertical: 8,
+    paddingHorizontal: spacing.md,
+    alignItems: 'center',
+  },
+  disabledButton: {
+    backgroundColor: 'rgba(255, 255, 255, 0.1)',
+  },
+  payoutActionText: {
     color: colors.text,
-    fontSize: typography.fontSizeXs,
-    fontWeight: typography.fontWeightMedium,
-    textTransform: 'capitalize',
+    fontSize: typography.body2.fontSize,
+    fontWeight: 'bold',
   },
   pauseButton: {
-    paddingHorizontal: spacing.sm,
-    paddingVertical: spacing.xs,
+    paddingHorizontal: spacing.md,
+    paddingVertical: 8,
     borderRadius: borderRadius.sm,
     borderWidth: 1,
     borderColor: colors.warning,
+    justifyContent: 'center',
   },
   pauseButtonText: {
     color: colors.warning,
-    fontSize: typography.fontSizeSm,
+    fontSize: typography.body2.fontSize,
+    fontWeight: 'bold',
   },
   resumeButton: {
-    paddingHorizontal: spacing.sm,
-    paddingVertical: spacing.xs,
+    paddingHorizontal: spacing.md,
+    paddingVertical: 8,
     borderRadius: borderRadius.sm,
     borderWidth: 1,
     borderColor: colors.success,
+    justifyContent: 'center',
   },
   resumeButtonText: {
     color: colors.success,
-    fontSize: typography.fontSizeSm,
+    fontSize: typography.body2.fontSize,
+    fontWeight: 'bold',
+  },
+  simulatorBench: {
+    marginTop: spacing.lg,
+    padding: spacing.md,
+    backgroundColor: 'rgba(255, 255, 255, 0.02)',
+    borderRadius: borderRadius.md,
+    borderWidth: 1,
+    borderColor: 'rgba(255, 255, 255, 0.05)',
+  },
+  simulatorTitle: {
+    fontSize: typography.body2.fontSize,
+    fontWeight: 'bold',
+    color: colors.text,
+  },
+  simulatorSubtitle: {
+    fontSize: typography.small.fontSize,
+    color: colors.textSecondary,
+    marginTop: 2,
+    lineHeight: 16,
+  },
+  simInputsRow: {
+    flexDirection: 'row',
+    gap: spacing.md,
+    marginTop: spacing.sm,
+  },
+  simInputBox: {
+    flex: 1,
+  },
+  inputLabel: {
+    fontSize: typography.small.fontSize,
+    color: colors.textSecondary,
+    marginBottom: 4,
+  },
+  simInput: {
+    backgroundColor: colors.background,
+    borderColor: colors.border,
+    borderWidth: 1,
+    borderRadius: borderRadius.sm,
+    padding: 6,
+    color: colors.text,
+    fontSize: typography.body2.fontSize,
+  },
+  simButtonsContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginTop: spacing.md,
+    gap: spacing.xs,
+  },
+  simBtn: {
+    flex: 1,
+    backgroundColor: 'rgba(255,255,255,0.08)',
+    paddingVertical: 8,
+    borderRadius: borderRadius.sm,
+    alignItems: 'center',
+  },
+  simBtnText: {
+    fontSize: 11,
+    fontWeight: 'bold',
+    color: colors.text,
   },
   programItem: {
     flexDirection: 'row',
@@ -505,25 +846,30 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   programName: {
-    fontSize: typography.fontSizeMd,
+    fontSize: typography.body.fontSize,
     color: colors.text,
-    fontWeight: typography.fontWeightMedium,
+    fontWeight: 'bold',
   },
   programDescription: {
-    fontSize: typography.fontSizeSm,
+    fontSize: typography.body2.fontSize,
     color: colors.textSecondary,
-    marginTop: spacing.xs,
+    marginTop: 4,
+  },
+  programSubMeta: {
+    fontSize: typography.small.fontSize,
+    color: colors.primary,
+    marginTop: 6,
   },
   programRate: {
     alignItems: 'flex-end',
   },
   rateValue: {
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.primary,
   },
   rateLabel: {
-    fontSize: typography.fontSizeXs,
+    fontSize: typography.small.fontSize,
     color: colors.textSecondary,
   },
   commissionItem: {
@@ -537,33 +883,32 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   commissionId: {
-    fontSize: typography.fontSizeSm,
+    fontSize: typography.body2.fontSize,
     color: colors.text,
-    fontFamily: typography.fontFamilyMono,
+    fontWeight: 'bold',
   },
   commissionDate: {
-    fontSize: typography.fontSizeXs,
+    fontSize: typography.small.fontSize,
     color: colors.textSecondary,
-    marginTop: spacing.xs,
+    marginTop: 4,
   },
   commissionAmount: {
     alignItems: 'flex-end',
   },
   amountValue: {
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
   },
   commissionStatus: {
     paddingHorizontal: spacing.sm,
     paddingVertical: 2,
     borderRadius: borderRadius.sm,
-    marginTop: spacing.xs,
+    marginTop: 4,
   },
   commissionStatusText: {
-    color: colors.text,
-    fontSize: typography.fontSizeXs,
-    fontWeight: typography.fontWeightMedium,
+    fontSize: typography.small.fontSize,
+    fontWeight: 'bold',
     textTransform: 'capitalize',
   },
   registerButton: {
@@ -574,13 +919,17 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   registerButtonText: {
-    color: colors.text,
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    color: '#ffffff',
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
   },
   modalOverlay: {
     flex: 1,
-    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    backgroundColor: 'rgba(0, 0, 0, 0.7)',
+    justifyContent: 'flex-end',
+  },
+  modalScroll: {
+    flexGrow: 1,
     justifyContent: 'flex-end',
   },
   modalContent: {
@@ -588,16 +937,15 @@ const styles = StyleSheet.create({
     borderTopLeftRadius: borderRadius.lg,
     borderTopRightRadius: borderRadius.lg,
     padding: spacing.lg,
-    maxHeight: '70%',
   },
   modalTitle: {
-    fontSize: typography.fontSizeLg,
-    fontWeight: typography.fontWeightBold,
+    fontSize: typography.h3.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
     marginBottom: spacing.xs,
   },
   modalSubtitle: {
-    fontSize: typography.fontSizeMd,
+    fontSize: typography.body2.fontSize,
     color: colors.textSecondary,
     marginBottom: spacing.lg,
   },
@@ -608,23 +956,22 @@ const styles = StyleSheet.create({
     borderRadius: borderRadius.md,
     marginBottom: spacing.sm,
     backgroundColor: colors.background,
+    borderWidth: 1,
+    borderColor: colors.border,
   },
   programOptionSelected: {
     borderWidth: 2,
     borderColor: colors.primary,
   },
-  programOptionInfo: {
-    flex: 1,
-  },
   programOptionName: {
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightMedium,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
     color: colors.text,
   },
   programOptionDesc: {
-    fontSize: typography.fontSizeSm,
+    fontSize: typography.body2.fontSize,
     color: colors.textSecondary,
-    marginTop: spacing.xs,
+    marginTop: 4,
   },
   radioCircle: {
     width: 24,
@@ -644,6 +991,55 @@ const styles = StyleSheet.create({
     borderRadius: 6,
     backgroundColor: colors.primary,
   },
+  sectionLabelHeader: {
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
+    color: colors.text,
+    marginTop: spacing.md,
+    marginBottom: spacing.xs,
+  },
+  inputTitleLabel: {
+    fontSize: typography.small.fontSize,
+    color: colors.textSecondary,
+    marginTop: spacing.sm,
+    marginBottom: 4,
+  },
+  modalTextInput: {
+    backgroundColor: colors.background,
+    borderColor: colors.border,
+    borderWidth: 1,
+    borderRadius: borderRadius.sm,
+    padding: 10,
+    color: colors.text,
+    fontSize: typography.body2.fontSize,
+    marginBottom: spacing.sm,
+  },
+  optionsSelectorRow: {
+    flexDirection: 'row',
+    gap: spacing.sm,
+    marginBottom: spacing.md,
+  },
+  optionSelectorItem: {
+    flex: 1,
+    backgroundColor: colors.background,
+    borderWidth: 1,
+    borderColor: colors.border,
+    borderRadius: borderRadius.sm,
+    paddingVertical: 10,
+    alignItems: 'center',
+  },
+  optionSelectorItemSelected: {
+    borderColor: colors.primary,
+    backgroundColor: 'rgba(255,255,255,0.03)',
+  },
+  optionSelectorText: {
+    fontSize: 12,
+    color: colors.textSecondary,
+  },
+  optionSelectorTextActive: {
+    color: colors.primary,
+    fontWeight: 'bold',
+  },
   modalButtons: {
     flexDirection: 'row',
     justifyContent: 'space-between',
@@ -656,11 +1052,13 @@ const styles = StyleSheet.create({
     borderRadius: borderRadius.md,
     padding: spacing.md,
     alignItems: 'center',
+    borderWidth: 1,
+    borderColor: colors.border,
   },
   cancelButtonText: {
     color: colors.text,
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightMedium,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
   },
   confirmButton: {
     flex: 1,
@@ -670,10 +1068,10 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   confirmButtonText: {
-    color: colors.text,
-    fontSize: typography.fontSizeMd,
-    fontWeight: typography.fontWeightBold,
+    color: colors.background,
+    fontSize: typography.body.fontSize,
+    fontWeight: 'bold',
   },
 });
 
-export default AffiliateDashboardScreen;
\ No newline at end of file
+export default AffiliateDashboardScreen;
diff --git a/src/screens/AnalyticsScreen.tsx b/src/screens/AnalyticsScreen.tsx
index 25bd9c55..5ba4d7e9 100644
--- a/src/screens/AnalyticsScreen.tsx
+++ b/src/screens/AnalyticsScreen.tsx
@@ -18,7 +18,6 @@ import { currencyService } from '../services/currencyService';
 import { calculateSubscriptionAnalytics } from '../services/analyticsService';
 import { formatCurrency } from '../utils/formatting';
 
-
 const { width: screenWidth } = Dimensions.get('window');
 const CHART_WIDTH = screenWidth - spacing.xl * 2;
 const CHART_HEIGHT = 200;
@@ -34,7 +33,6 @@ const AnalyticsScreen: React.FC = () => {
     calculateStats();
   }, [subscriptions, calculateStats, preferredCurrency, exchangeRates]);
 
-
   const categoryData = useMemo(() => {
     const categories = Object.values(SubscriptionCategory);
     return categories
@@ -103,7 +101,6 @@ const AnalyticsScreen: React.FC = () => {
             else if (sub.billingCycle === BillingCycle.YEARLY) total += priceInPreferred / 12;
             else if (sub.billingCycle === BillingCycle.WEEKLY) total += priceInPreferred * 4;
           }
-
         }
       });
       return { month, amount: total };
@@ -195,7 +192,6 @@ const AnalyticsScreen: React.FC = () => {
               importantForAccessibility="no">
               {formatCurrency(stats.totalMonthlySpend, preferredCurrency)}
             </Text>
-
           </Card>
           <Card style={styles.summaryCard}>
             <Text
@@ -210,7 +206,6 @@ const AnalyticsScreen: React.FC = () => {
               importantForAccessibility="no">
               {formatCurrency(stats.totalYearlySpend, preferredCurrency)}
             </Text>
-
           </Card>
         </View>
         <View style={styles.summaryContainer}>
@@ -301,7 +296,6 @@ const AnalyticsScreen: React.FC = () => {
                       textAnchor="middle">
                       {formatCurrency(data.amount, preferredCurrency)}
                     </SvgText>
-
                   )}
                 </G>
               );
@@ -389,7 +383,6 @@ const AnalyticsScreen: React.FC = () => {
               {formatCurrency(stats.totalYearlySpend, preferredCurrency)}
             </Text>
           </View>
-
         </Card>
       </ScrollView>
     </SafeAreaView>
diff --git a/src/screens/ApiKeyManagementScreen.tsx b/src/screens/ApiKeyManagementScreen.tsx
index 7be0fac3..4d198836 100644
--- a/src/screens/ApiKeyManagementScreen.tsx
+++ b/src/screens/ApiKeyManagementScreen.tsx
@@ -121,9 +121,7 @@ const ApiKeyManagementScreen: React.FC = () => {
             </TouchableOpacity>
           </View>
           <View style={styles.envHint}>
-            <Text style={styles.envHintText}>
-              Environment: Sandbox (Development)
-            </Text>
+            <Text style={styles.envHintText}>Environment: Sandbox (Development)</Text>
             <Text style={styles.envHintSubtext}>
               Keys are created for the current sandbox environment
             </Text>
@@ -142,14 +140,10 @@ const ApiKeyManagementScreen: React.FC = () => {
               </Text>
             </View>
             <View style={styles.keyActions}>
-              <TouchableOpacity
-                style={styles.copyButton}
-                onPress={() => handleCopyKey(showNewKey)}>
+              <TouchableOpacity style={styles.copyButton} onPress={() => handleCopyKey(showNewKey)}>
                 <Text style={styles.copyButtonText}>Copy Key</Text>
               </TouchableOpacity>
-              <TouchableOpacity
-                style={styles.dismissButton}
-                onPress={() => setShowNewKey(null)}>
+              <TouchableOpacity style={styles.dismissButton} onPress={() => setShowNewKey(null)}>
                 <Text style={styles.dismissButtonText}>Dismiss</Text>
               </TouchableOpacity>
             </View>
@@ -180,8 +174,8 @@ const ApiKeyManagementScreen: React.FC = () => {
                             key.status === ApiKeyStatus.ACTIVE
                               ? colors.success
                               : key.status === ApiKeyStatus.REVOKED
-                              ? colors.error
-                              : colors.warning,
+                                ? colors.error
+                                : colors.warning,
                         },
                       ]}>
                       <Text style={styles.statusText}>{key.status}</Text>
@@ -192,16 +186,15 @@ const ApiKeyManagementScreen: React.FC = () => {
                   </Text>
                 </View>
 
-                <Text style={styles.keyValue}>
-                  {apiKeyService.maskApiKey(key.key)}
-                </Text>
+                <Text style={styles.keyValue}>{apiKeyService.maskApiKey(key.key)}</Text>
 
                 <View style={styles.keyMeta}>
                   <Text style={styles.keyMetaText}>
                     Permissions: {(key.permissions ?? key.scopes ?? ['read']).join(', ')}
                   </Text>
                   <Text style={styles.keyMetaText}>
-                    Rate: {key.rateLimit?.requestsPerMinute ?? 60}/min · {key.rateLimit?.requestsPerDay ?? 10000}/day
+                    Rate: {key.rateLimit?.requestsPerMinute ?? 60}/min ·{' '}
+                    {key.rateLimit?.requestsPerDay ?? 10000}/day
                   </Text>
                   {key.lastUsedAt && (
                     <Text style={styles.keyMetaText}>
diff --git a/src/screens/CalendarIntegrationScreen.tsx b/src/screens/CalendarIntegrationScreen.tsx
index 4db03dcd..3da35840 100644
--- a/src/screens/CalendarIntegrationScreen.tsx
+++ b/src/screens/CalendarIntegrationScreen.tsx
@@ -132,9 +132,15 @@ const CalendarIntegrationScreen: React.FC = () => {
         message: payload.ical,
         title: payload.filename,
       });
-      Alert.alert('Calendar exported', `Exported ${payload.events.length} events to ${payload.filename}`);
+      Alert.alert(
+        'Calendar exported',
+        `Exported ${payload.events.length} events to ${payload.filename}`
+      );
     } catch (exportError) {
-      Alert.alert('Export failed', exportError instanceof Error ? exportError.message : 'Could not export calendar.');
+      Alert.alert(
+        'Export failed',
+        exportError instanceof Error ? exportError.message : 'Could not export calendar.'
+      );
     }
   }, [subscriptions, timezone, exportCalendar]);
 
@@ -424,13 +430,17 @@ const CalendarIntegrationScreen: React.FC = () => {
           <Text style={styles.sectionDescription}>
             Set your preferred timezone for calendar events. Current: {timezone}.
           </Text>
-          <ScrollView horizontal showsHorizontalScrollIndicator={false} style={styles.timezoneScroll}>
+          <ScrollView
+            horizontal
+            showsHorizontalScrollIndicator={false}
+            style={styles.timezoneScroll}>
             {SUBSCRIPTION_TIMEZONES.map((tz) => (
               <TouchableOpacity
                 key={tz}
                 style={[styles.timezoneChip, tz === timezone && styles.offsetChipActive]}
                 onPress={() => setTimezone(tz)}>
-                <Text style={[styles.offsetChipText, tz === timezone && styles.offsetChipTextActive]}>
+                <Text
+                  style={[styles.offsetChipText, tz === timezone && styles.offsetChipTextActive]}>
                   {tz}
                 </Text>
               </TouchableOpacity>
@@ -446,23 +456,26 @@ const CalendarIntegrationScreen: React.FC = () => {
           <TouchableOpacity style={styles.actionButton} onPress={handleCheckConflicts}>
             <Text style={styles.actionButtonText}>Check for conflicts</Text>
           </TouchableOpacity>
-          {scheduleConflicts.length > 0 ? (
-            scheduleConflicts.slice(0, 5).map((conflict) => (
-              <View key={conflict.date} style={styles.conflictRow}>
-                <Text style={styles.conflictDate}>{conflict.date}</Text>
-                <Text style={styles.conflictDetail}>
-                  {conflict.conflictingSubscriptions.length} subscriptions — {conflict.totalAmount.toFixed(2)} USD total
-                </Text>
-                {conflict.conflictingSubscriptions.map((sub) => (
-                  <Text key={sub.id} style={styles.conflictSub}>
-                    {sub.name}: {sub.currency} {sub.amount.toFixed(2)}
+          {scheduleConflicts.length > 0
+            ? scheduleConflicts.slice(0, 5).map((conflict) => (
+                <View key={conflict.date} style={styles.conflictRow}>
+                  <Text style={styles.conflictDate}>{conflict.date}</Text>
+                  <Text style={styles.conflictDetail}>
+                    {conflict.conflictingSubscriptions.length} subscriptions —{' '}
+                    {conflict.totalAmount.toFixed(2)} USD total
                   </Text>
-                ))}
-              </View>
-            ))
-          ) : scheduleConflicts.length === 0 && (
-            <Text style={styles.emptyPreview}>No conflicts detected. Tap "Check for conflicts" to scan.</Text>
-          )}
+                  {conflict.conflictingSubscriptions.map((sub) => (
+                    <Text key={sub.id} style={styles.conflictSub}>
+                      {sub.name}: {sub.currency} {sub.amount.toFixed(2)}
+                    </Text>
+                  ))}
+                </View>
+              ))
+            : scheduleConflicts.length === 0 && (
+                <Text style={styles.emptyPreview}>
+                  No conflicts detected. Tap "Check for conflicts" to scan.
+                </Text>
+              )}
         </Card>
 
         <Card style={styles.section}>
@@ -480,7 +493,9 @@ const CalendarIntegrationScreen: React.FC = () => {
                 <Text style={styles.conflictDetail}>
                   {payment.currency} {payment.amount.toFixed(2)} — {payment.status}
                 </Text>
-                <Text style={styles.conflictSub}>{new Date(payment.scheduledDate).toLocaleDateString()}</Text>
+                <Text style={styles.conflictSub}>
+                  {new Date(payment.scheduledDate).toLocaleDateString()}
+                </Text>
                 {payment.status === 'pending' && (
                   <TouchableOpacity
                     style={[styles.actionButton, styles.disconnectButton]}
diff --git a/src/screens/CampaignManagementScreen.tsx b/src/screens/CampaignManagementScreen.tsx
index a509eeeb..fb9b2e0e 100644
--- a/src/screens/CampaignManagementScreen.tsx
+++ b/src/screens/CampaignManagementScreen.tsx
@@ -104,10 +104,7 @@ const CampaignManagementScreen: React.FC = () => {
             <Text style={styles.campaignName}>{campaign.name}</Text>
             <View style={styles.campaignMeta}>
               <View
-                style={[
-                  styles.statusBadge,
-                  { backgroundColor: getStatusColor(campaign.status) },
-                ]}>
+                style={[styles.statusBadge, { backgroundColor: getStatusColor(campaign.status) }]}>
                 <Text style={styles.statusBadgeText}>{campaign.status}</Text>
               </View>
               <Text style={styles.campaignType}>{getTypeLabel(campaign.type)}</Text>
@@ -148,9 +145,7 @@ const CampaignManagementScreen: React.FC = () => {
         {analytics && (
           <View style={styles.analyticsGrid}>
             <View style={styles.analyticsItem}>
-              <Text style={styles.analyticsValue}>
-                {analytics.totalRecipients}
-              </Text>
+              <Text style={styles.analyticsValue}>{analytics.totalRecipients}</Text>
               <Text style={styles.analyticsLabel}>Recipients</Text>
             </View>
             <View style={styles.analyticsItem}>
@@ -281,8 +276,7 @@ const CampaignManagementScreen: React.FC = () => {
                   key={channel}
                   style={[
                     styles.channelOption,
-                    newCampaign.channels.includes(channel) &&
-                      styles.channelOptionSelected,
+                    newCampaign.channels.includes(channel) && styles.channelOptionSelected,
                   ]}
                   onPress={() => {
                     const channels = newCampaign.channels.includes(channel)
@@ -293,8 +287,7 @@ const CampaignManagementScreen: React.FC = () => {
                   <Text
                     style={[
                       styles.channelOptionText,
-                      newCampaign.channels.includes(channel) &&
-                        styles.channelOptionTextSelected,
+                      newCampaign.channels.includes(channel) && styles.channelOptionTextSelected,
                     ]}>
                     {channel}
                   </Text>
@@ -303,9 +296,7 @@ const CampaignManagementScreen: React.FC = () => {
             </View>
           </View>
 
-          <TouchableOpacity
-            style={styles.createButton}
-            onPress={handleCreateCampaign}>
+          <TouchableOpacity style={styles.createButton} onPress={handleCreateCampaign}>
             <Text style={styles.createButtonText}>Create Campaign</Text>
           </TouchableOpacity>
         </ScrollView>
@@ -329,9 +320,7 @@ const CampaignManagementScreen: React.FC = () => {
       <ScrollView style={styles.scrollView}>
         <View style={styles.header}>
           <Text style={styles.title}>Campaign Management</Text>
-          <Text style={styles.subtitle}>
-            Create and manage marketing campaigns
-          </Text>
+          <Text style={styles.subtitle}>Create and manage marketing campaigns</Text>
         </View>
 
         <TouchableOpacity
@@ -345,9 +334,7 @@ const CampaignManagementScreen: React.FC = () => {
         {campaigns.length === 0 ? (
           <Card style={styles.emptyCard}>
             <Text style={styles.emptyText}>No campaigns yet</Text>
-            <Text style={styles.emptySubtext}>
-              Create your first campaign to get started
-            </Text>
+            <Text style={styles.emptySubtext}>Create your first campaign to get started</Text>
           </Card>
         ) : (
           campaigns.map(renderCampaignItem)
@@ -635,4 +622,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default CampaignManagementScreen;
\ No newline at end of file
+export default CampaignManagementScreen;
diff --git a/src/screens/CancellationFlowScreen.tsx b/src/screens/CancellationFlowScreen.tsx
index 96ad8112..371cc9cb 100644
--- a/src/screens/CancellationFlowScreen.tsx
+++ b/src/screens/CancellationFlowScreen.tsx
@@ -81,7 +81,9 @@ const CancellationFlowScreen: React.FC<Props> = ({ route, navigation }) => {
         <Text style={styles.offerIcon}>{OFFER_TYPE_ICONS[offer.type] ?? '🎁'}</Text>
         <View style={styles.offerHeaderText}>
           <Text style={styles.offerTitle}>{offer.title}</Text>
-          <Text style={styles.offerBadge}>{offer.abVariant === 'A' ? 'Popular' : 'Best Value'}</Text>
+          <Text style={styles.offerBadge}>
+            {offer.abVariant === 'A' ? 'Popular' : 'Best Value'}
+          </Text>
         </View>
       </View>
       <Text style={styles.offerDescription}>{offer.description}</Text>
diff --git a/src/screens/DeveloperPortalScreen.tsx b/src/screens/DeveloperPortalScreen.tsx
index 87017952..3b41c791 100644
--- a/src/screens/DeveloperPortalScreen.tsx
+++ b/src/screens/DeveloperPortalScreen.tsx
@@ -54,7 +54,11 @@ const DeveloperPortalScreen: React.FC = () => {
       Alert.alert('Required fields', 'Name and email are required.');
       return;
     }
-    await createDeveloperProfile(profileForm.name, profileForm.email, profileForm.company || undefined);
+    await createDeveloperProfile(
+      profileForm.name,
+      profileForm.email,
+      profileForm.company || undefined
+    );
     await completeOnboardingStep(DeveloperOnboardingStep.CREATE_ACCOUNT);
     setShowOnboarding(false);
   };
@@ -63,7 +67,10 @@ const DeveloperPortalScreen: React.FC = () => {
     const name = newKeyName || 'Default Key';
     try {
       const key = await generateApiKey(name);
-      Alert.alert('API Key Generated', `Your new API key:\n\n${key}\n\nCopy it now, it won't be shown again.`);
+      Alert.alert(
+        'API Key Generated',
+        `Your new API key:\n\n${key}\n\nCopy it now, it won't be shown again.`
+      );
       setNewKeyName('');
     } catch {
       Alert.alert('Error', 'Failed to generate API key.');
@@ -161,31 +168,28 @@ const DeveloperPortalScreen: React.FC = () => {
       <ScrollView contentContainerStyle={styles.content}>
         <View style={styles.header}>
           <Text style={styles.title}>Developer Portal</Text>
-          <Text style={styles.subtitle}>
-            Welcome back, {developerProfile?.name || 'Developer'}
-          </Text>
+          <Text style={styles.subtitle}>Welcome back, {developerProfile?.name || 'Developer'}</Text>
         </View>
 
         <View style={styles.envBar}>
-          {[SandboxEnvironment.DEVELOPMENT, SandboxEnvironment.STAGING, SandboxEnvironment.PRODUCTION].map(
-            (env) => (
-              <EnvironmentBadge
-                key={env}
-                environment={env}
-                isActive={sandboxConfig.environment === env}
-                onPress={() => switchEnvironment(env)}
-              />
-            )
-          )}
+          {[
+            SandboxEnvironment.DEVELOPMENT,
+            SandboxEnvironment.STAGING,
+            SandboxEnvironment.PRODUCTION,
+          ].map((env) => (
+            <EnvironmentBadge
+              key={env}
+              environment={env}
+              isActive={sandboxConfig.environment === env}
+              onPress={() => switchEnvironment(env)}
+            />
+          ))}
         </View>
 
         <View style={styles.statsGrid}>
           <StatCard label="API Keys" value={apiKeys.length} />
           <StatCard label="Test Subs" value={testSubscriptions.length} />
-          <StatCard
-            label="API Calls"
-            value={usageStats?.totalRequests?.toLocaleString() || '0'}
-          />
+          <StatCard label="API Calls" value={usageStats?.totalRequests?.toLocaleString() || '0'} />
           <StatCard
             label="Success Rate"
             value={
@@ -305,9 +309,7 @@ const DeveloperPortalScreen: React.FC = () => {
                   {guide.difficulty} · {guide.estimatedTime}
                 </Text>
               </View>
-              {guide.isCompleted && (
-                <Text style={styles.completedBadge}>✓</Text>
-              )}
+              {guide.isCompleted && <Text style={styles.completedBadge}>✓</Text>}
             </View>
           ))}
         </Card>
@@ -330,8 +332,8 @@ const DeveloperPortalScreen: React.FC = () => {
                       sub.status === 'active'
                         ? colors.success
                         : sub.status === 'paused'
-                        ? colors.warning
-                        : colors.error,
+                          ? colors.warning
+                          : colors.error,
                   },
                 ]}>
                 <Text style={styles.statusText}>{sub.status}</Text>
diff --git a/src/screens/DocumentationPortalScreen.tsx b/src/screens/DocumentationPortalScreen.tsx
index de1ff3c0..0449256c 100644
--- a/src/screens/DocumentationPortalScreen.tsx
+++ b/src/screens/DocumentationPortalScreen.tsx
@@ -1,12 +1,5 @@
 import React, { useState } from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  ScrollView,
-  SafeAreaView,
-  TouchableOpacity,
-} from 'react-native';
+import { View, Text, StyleSheet, ScrollView, SafeAreaView, TouchableOpacity } from 'react-native';
 import { Card } from '../components/common/Card';
 import { colors, spacing, typography, borderRadius } from '../utils/constants';
 
@@ -28,7 +21,8 @@ const DOC_SECTIONS: DocSection[] = [
     subsections: [
       {
         title: 'Base URL',
-        content: 'Sandbox: https://api.sandbox.subtrackr.dev/v1\nProduction: https://api.subtrackr.dev/v1',
+        content:
+          'Sandbox: https://api.sandbox.subtrackr.dev/v1\nProduction: https://api.subtrackr.dev/v1',
       },
       {
         title: 'Authentication',
@@ -37,8 +31,7 @@ const DOC_SECTIONS: DocSection[] = [
       },
       {
         title: 'Rate Limits',
-        content:
-          'Sandbox: 60 requests/minute, 10,000 requests/day\nProduction: Varies by plan',
+        content: 'Sandbox: 60 requests/minute, 10,000 requests/day\nProduction: Varies by plan',
       },
     ],
   },
@@ -50,7 +43,8 @@ const DOC_SECTIONS: DocSection[] = [
     subsections: [
       {
         title: 'GET /subscriptions',
-        content: 'List all subscriptions with optional filtering and pagination.\n\nQuery params: status, category, page, limit',
+        content:
+          'List all subscriptions with optional filtering and pagination.\n\nQuery params: status, category, page, limit',
       },
       {
         title: 'POST /subscriptions',
@@ -146,12 +140,13 @@ const DOC_SECTIONS: DocSection[] = [
     subsections: [
       {
         title: 'Error Format',
-        content: 'All errors return: { "error": { "code": "string", "message": "string", "details": {} } }',
+        content:
+          'All errors return: { "error": { "code": "string", "message": "string", "details": {} } }',
       },
       {
         title: 'Common Error Codes',
         content:
-          '400 - Bad Request: Invalid parameters\n401 - Unauthorized: Invalid or missing API key\n403 - Forbidden: Insufficient permissions\n404 - Not Found: Resource doesn\'t exist\n429 - Rate Limited: Too many requests\n500 - Server Error: Internal error',
+          "400 - Bad Request: Invalid parameters\n401 - Unauthorized: Invalid or missing API key\n403 - Forbidden: Insufficient permissions\n404 - Not Found: Resource doesn't exist\n429 - Rate Limited: Too many requests\n500 - Server Error: Internal error",
       },
     ],
   },
@@ -166,9 +161,7 @@ const DocumentationPortalScreen: React.FC = () => {
       <ScrollView contentContainerStyle={styles.content}>
         <View style={styles.header}>
           <Text style={styles.title}>API Documentation</Text>
-          <Text style={styles.subtitle}>
-            Complete reference for the SubTrackr API
-          </Text>
+          <Text style={styles.subtitle}>Complete reference for the SubTrackr API</Text>
         </View>
 
         <Card style={styles.searchCard}>
@@ -181,13 +174,12 @@ const DocumentationPortalScreen: React.FC = () => {
             <TouchableOpacity
               key={section.id}
               style={[styles.tocItem, expandedSection === section.id && styles.tocItemActive]}
-              onPress={() => setExpandedSection(expandedSection === section.id ? null : section.id)}>
+              onPress={() =>
+                setExpandedSection(expandedSection === section.id ? null : section.id)
+              }>
               <Text style={styles.tocIcon}>{section.icon}</Text>
               <Text
-                style={[
-                  styles.tocText,
-                  expandedSection === section.id && styles.tocTextActive,
-                ]}>
+                style={[styles.tocText, expandedSection === section.id && styles.tocTextActive]}>
                 {section.title}
               </Text>
             </TouchableOpacity>
@@ -205,9 +197,7 @@ const DocumentationPortalScreen: React.FC = () => {
                 <Text style={styles.sectionIcon}>{section.icon}</Text>
                 <Text style={styles.sectionTitle}>{section.title}</Text>
               </View>
-              <Text style={styles.expandIcon}>
-                {expandedSection === section.id ? '▼' : '▶'}
-              </Text>
+              <Text style={styles.expandIcon}>{expandedSection === section.id ? '▼' : '▶'}</Text>
             </TouchableOpacity>
 
             {expandedSection === section.id && (
diff --git a/src/screens/FraudDashboard.tsx b/src/screens/FraudDashboard.tsx
index f26dd4b0..bb261eb6 100644
--- a/src/screens/FraudDashboard.tsx
+++ b/src/screens/FraudDashboard.tsx
@@ -73,15 +73,40 @@ const FraudDashboard: React.FC = () => {
         </View>
 
         <View style={[styles.metricsGrid, isWide && styles.metricsGridWide]}>
-          {renderMetric('Total checks', analytics.totalChecks.toString(), 'Subscriptions reviewed', colors.accent)}
-          {renderMetric('Blocked', analytics.blocked.toString(), 'Automated hard stops', colors.error)}
-          {renderMetric('Flagged', analytics.flagged.toString(), 'Queued for review', colors.warning)}
+          {renderMetric(
+            'Total checks',
+            analytics.totalChecks.toString(),
+            'Subscriptions reviewed',
+            colors.accent
+          )}
+          {renderMetric(
+            'Blocked',
+            analytics.blocked.toString(),
+            'Automated hard stops',
+            colors.error
+          )}
+          {renderMetric(
+            'Flagged',
+            analytics.flagged.toString(),
+            'Queued for review',
+            colors.warning
+          )}
           {renderMetric('Avg risk', `${analytics.avgRisk}`, 'Aggregate risk score', colors.primary)}
         </View>
 
         <View style={[styles.metricsGrid, isWide && styles.metricsGridWide]}>
-          {renderMetric('Velocity alerts', analytics.velocityAlerts.toString(), 'Rapid creation detected', colors.secondary)}
-          {renderMetric('Anomaly alerts', analytics.anomalyAlerts.toString(), 'Usage deviates from baseline', colors.accent)}
+          {renderMetric(
+            'Velocity alerts',
+            analytics.velocityAlerts.toString(),
+            'Rapid creation detected',
+            colors.secondary
+          )}
+          {renderMetric(
+            'Anomaly alerts',
+            analytics.anomalyAlerts.toString(),
+            'Usage deviates from baseline',
+            colors.accent
+          )}
           {renderMetric(
             'Chargeback predictions',
             analytics.chargebackPredictions.toString(),
@@ -121,19 +146,27 @@ const FraudDashboard: React.FC = () => {
                   </View>
                 </View>
                 <View style={styles.caseActions}>
-                  <TouchableOpacity style={styles.caseButton} onPress={() => approveSubscription(item.subscriptionId)}>
+                  <TouchableOpacity
+                    style={styles.caseButton}
+                    onPress={() => approveSubscription(item.subscriptionId)}>
                     <Text style={styles.caseButtonText}>Approve</Text>
                   </TouchableOpacity>
-                  <TouchableOpacity style={styles.caseButtonWarning} onPress={() => resolveCase(item.subscriptionId, 'flag')}>
+                  <TouchableOpacity
+                    style={styles.caseButtonWarning}
+                    onPress={() => resolveCase(item.subscriptionId, 'flag')}>
                     <Text style={styles.caseButtonText}>Flag</Text>
                   </TouchableOpacity>
-                  <TouchableOpacity style={styles.caseButtonDanger} onPress={() => blockSubscription(item.subscriptionId)}>
+                  <TouchableOpacity
+                    style={styles.caseButtonDanger}
+                    onPress={() => blockSubscription(item.subscriptionId)}>
                     <Text style={styles.caseButtonText}>Block</Text>
                   </TouchableOpacity>
                 </View>
               </View>
             ))}
-            {reviewQueue.length === 0 ? <Text style={styles.emptyText}>No cases awaiting manual review.</Text> : null}
+            {reviewQueue.length === 0 ? (
+              <Text style={styles.emptyText}>No cases awaiting manual review.</Text>
+            ) : null}
           </Card>
 
           <Card style={[styles.sectionCard, isWide && styles.halfCard]}>
@@ -181,7 +214,8 @@ const FraudDashboard: React.FC = () => {
                   <Text style={styles.scoreText}>{report.averageRisk}</Text>
                 </View>
                 <Text style={styles.caseDescription}>
-                  {report.totalSubscriptions} subs · {report.flaggedSubscriptions} flagged · {report.blockedSubscriptions} blocked
+                  {report.totalSubscriptions} subs · {report.flaggedSubscriptions} flagged ·{' '}
+                  {report.blockedSubscriptions} blocked
                 </Text>
                 <View style={styles.reportGrid}>
                   <Text style={styles.reportMetric}>Manual review {report.manualReviewCount}</Text>
@@ -201,21 +235,45 @@ const FraudDashboard: React.FC = () => {
             <View style={styles.distributionRow}>
               <Text style={styles.distributionLabel}>Approved</Text>
               <View style={styles.distributionBarTrack}>
-                <View style={[styles.distributionBar, { width: `${(analytics.approved / Math.max(analytics.totalChecks, 1)) * 100}%`, backgroundColor: colors.success }]} />
+                <View
+                  style={[
+                    styles.distributionBar,
+                    {
+                      width: `${(analytics.approved / Math.max(analytics.totalChecks, 1)) * 100}%`,
+                      backgroundColor: colors.success,
+                    },
+                  ]}
+                />
               </View>
               <Text style={styles.distributionValue}>{analytics.approved}</Text>
             </View>
             <View style={styles.distributionRow}>
               <Text style={styles.distributionLabel}>Flagged</Text>
               <View style={styles.distributionBarTrack}>
-                <View style={[styles.distributionBar, { width: `${(analytics.flagged / Math.max(analytics.totalChecks, 1)) * 100}%`, backgroundColor: colors.warning }]} />
+                <View
+                  style={[
+                    styles.distributionBar,
+                    {
+                      width: `${(analytics.flagged / Math.max(analytics.totalChecks, 1)) * 100}%`,
+                      backgroundColor: colors.warning,
+                    },
+                  ]}
+                />
               </View>
               <Text style={styles.distributionValue}>{analytics.flagged}</Text>
             </View>
             <View style={styles.distributionRow}>
               <Text style={styles.distributionLabel}>Blocked</Text>
               <View style={styles.distributionBarTrack}>
-                <View style={[styles.distributionBar, { width: `${(analytics.blocked / Math.max(analytics.totalChecks, 1)) * 100}%`, backgroundColor: colors.error }]} />
+                <View
+                  style={[
+                    styles.distributionBar,
+                    {
+                      width: `${(analytics.blocked / Math.max(analytics.totalChecks, 1)) * 100}%`,
+                      backgroundColor: colors.error,
+                    },
+                  ]}
+                />
               </View>
               <Text style={styles.distributionValue}>{analytics.blocked}</Text>
             </View>
diff --git a/src/screens/GroupManagementScreen.tsx b/src/screens/GroupManagementScreen.tsx
index 4b094d05..a40cf754 100644
--- a/src/screens/GroupManagementScreen.tsx
+++ b/src/screens/GroupManagementScreen.tsx
@@ -39,7 +39,9 @@ const GroupManagementScreen: React.FC = () => {
         <Text style={styles.meta}>
           Seats: {analytics?.activeSeats ?? group.members.length}/{group.planSharingRules.seatLimit}
         </Text>
-        <Text style={styles.meta}>Outstanding: ${analytics?.outstandingBalance.toFixed(2) ?? '0.00'}</Text>
+        <Text style={styles.meta}>
+          Outstanding: ${analytics?.outstandingBalance.toFixed(2) ?? '0.00'}
+        </Text>
         <View style={styles.actions}>
           <Button
             title="Invite"
diff --git a/src/screens/HomeScreen.tsx b/src/screens/HomeScreen.tsx
index 71b1206e..e9d787ab 100644
--- a/src/screens/HomeScreen.tsx
+++ b/src/screens/HomeScreen.tsx
@@ -44,7 +44,6 @@ const HomeScreen: React.FC = () => {
   const [upcomingSubscriptions, setUpcomingSubscriptions] = useState<Subscription[]>([]);
   const [showFilterModal, setShowFilterModal] = useState(false);
 
-
   // Use the new hook
   const { filters, filteredAndSorted, activeFilterCount, hasActiveFilters, clearAllFilters } =
     useFilteredSubscriptions(subscriptions);
@@ -64,7 +63,6 @@ const HomeScreen: React.FC = () => {
     if (subscriptions) setUpcomingSubscriptions(getUpcomingSubscriptions(subscriptions));
   }, [subscriptions, calculateStats, preferredCurrency, exchangeRates]);
 
-
   const onRefresh = async () => {
     setRefreshing(true);
     await fetchSubscriptions();
@@ -150,7 +148,6 @@ const HomeScreen: React.FC = () => {
           currency={preferredCurrency}
         />
 
-
         {!isOnline && (
           <View style={styles.offlineBanner}>
             <Text style={styles.offlineText}>
diff --git a/src/screens/IntegrationGuideDetailScreen.tsx b/src/screens/IntegrationGuideDetailScreen.tsx
index 9baa076d..f198cbe9 100644
--- a/src/screens/IntegrationGuideDetailScreen.tsx
+++ b/src/screens/IntegrationGuideDetailScreen.tsx
@@ -1,11 +1,5 @@
 import React from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  ScrollView,
-  TouchableOpacity,
-} from 'react-native';
+import { View, Text, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import { useNavigation, useRoute, RouteProp } from '@react-navigation/native';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RootStackParamList } from '../navigation/types';
@@ -23,10 +17,7 @@ export default function IntegrationGuideDetailScreen() {
     return (
       <View style={styles.emptyContainer}>
         <Text style={styles.emptyText}>No guide selected</Text>
-        <TouchableOpacity
-          style={styles.backButton}
-          onPress={() => navigation.goBack()}
-        >
+        <TouchableOpacity style={styles.backButton} onPress={() => navigation.goBack()}>
           <Text style={styles.backButtonText}>Go Back</Text>
         </TouchableOpacity>
       </View>
@@ -79,14 +70,12 @@ export default function IntegrationGuideDetailScreen() {
             style={[
               styles.difficultyBadge,
               { backgroundColor: getDifficultyColor(selectedGuide.difficulty) + '20' },
-            ]}
-          >
+            ]}>
             <Text
               style={[
                 styles.difficultyText,
                 { color: getDifficultyColor(selectedGuide.difficulty) },
-              ]}
-            >
+              ]}>
               {selectedGuide.difficulty}
             </Text>
           </View>
diff --git a/src/screens/IntegrationGuidesScreen.tsx b/src/screens/IntegrationGuidesScreen.tsx
index cdc9e395..1a8fa58c 100644
--- a/src/screens/IntegrationGuidesScreen.tsx
+++ b/src/screens/IntegrationGuidesScreen.tsx
@@ -1,12 +1,5 @@
 import React, { useState } from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  ScrollView,
-  SafeAreaView,
-  TouchableOpacity,
-} from 'react-native';
+import { View, Text, StyleSheet, ScrollView, SafeAreaView, TouchableOpacity } from 'react-native';
 import { Card } from '../components/common/Card';
 import { colors, spacing, typography, borderRadius } from '../utils/constants';
 import { useSandboxStore } from '../store/sandboxStore';
@@ -73,17 +66,15 @@ const IntegrationGuidesScreen: React.FC = () => {
           <TouchableOpacity
             style={[styles.categoryChip, !selectedCategory && styles.categoryChipActive]}
             onPress={() => setSelectedCategory(null)}>
-            <Text style={[styles.categoryChipText, !selectedCategory && styles.categoryChipTextActive]}>
+            <Text
+              style={[styles.categoryChipText, !selectedCategory && styles.categoryChipTextActive]}>
               All
             </Text>
           </TouchableOpacity>
           {Object.entries(CATEGORY_LABELS).map(([key, { label, icon }]) => (
             <TouchableOpacity
               key={key}
-              style={[
-                styles.categoryChip,
-                selectedCategory === key && styles.categoryChipActive,
-              ]}
+              style={[styles.categoryChip, selectedCategory === key && styles.categoryChipActive]}
               onPress={() =>
                 setSelectedCategory(
                   selectedCategory === key ? null : (key as IntegrationGuideCategory)
@@ -118,7 +109,9 @@ const IntegrationGuidesScreen: React.FC = () => {
                 <View
                   style={[
                     styles.difficultyBadge,
-                    { backgroundColor: DIFFICULTY_COLORS[guide.difficulty] || colors.textSecondary },
+                    {
+                      backgroundColor: DIFFICULTY_COLORS[guide.difficulty] || colors.textSecondary,
+                    },
                   ]}>
                   <Text style={styles.difficultyText}>{guide.difficulty}</Text>
                 </View>
@@ -142,16 +135,12 @@ const IntegrationGuidesScreen: React.FC = () => {
                   <View key={index} style={styles.stepCard}>
                     <TouchableOpacity
                       style={styles.stepHeader}
-                      onPress={() =>
-                        setExpandedStep(expandedStep === index ? null : index)
-                      }>
+                      onPress={() => setExpandedStep(expandedStep === index ? null : index)}>
                       <View style={styles.stepNumber}>
                         <Text style={styles.stepNumberText}>{index + 1}</Text>
                       </View>
                       <Text style={styles.stepTitle}>{step.title}</Text>
-                      <Text style={styles.expandIcon}>
-                        {expandedStep === index ? '▼' : '▶'}
-                      </Text>
+                      <Text style={styles.expandIcon}>{expandedStep === index ? '▼' : '▶'}</Text>
                     </TouchableOpacity>
                     {expandedStep === index && (
                       <View style={styles.stepContent}>
diff --git a/src/screens/LoyaltyDashboardScreen.tsx b/src/screens/LoyaltyDashboardScreen.tsx
index 6300ec07..4f1ff6f3 100644
--- a/src/screens/LoyaltyDashboardScreen.tsx
+++ b/src/screens/LoyaltyDashboardScreen.tsx
@@ -79,7 +79,7 @@ const LoyaltyDashboardScreen: React.FC = () => {
 
   const getNextTierInfo = (): TierBenefits | null => {
     if (!program || !loyaltyStatus) return null;
-    const currentTierIndex = program.tiers.findIndex(t => t.tier === loyaltyStatus.tier);
+    const currentTierIndex = program.tiers.findIndex((t) => t.tier === loyaltyStatus.tier);
     if (currentTierIndex >= program.tiers.length - 1) return null;
     return program.tiers[currentTierIndex + 1];
   };
@@ -89,33 +89,22 @@ const LoyaltyDashboardScreen: React.FC = () => {
       return (
         <Card style={styles.statusCard}>
           <Text style={styles.emptyText}>No loyalty status yet</Text>
-          <Text style={styles.emptySubtext}>
-            Start subscribing to earn rewards!
-          </Text>
+          <Text style={styles.emptySubtext}>Start subscribing to earn rewards!</Text>
         </Card>
       );
     }
 
     const nextTier = getNextTierInfo();
-    const pointsToNextTier = nextTier
-      ? nextTier.pointsThreshold - loyaltyStatus.lifetimePoints
-      : 0;
+    const pointsToNextTier = nextTier ? nextTier.pointsThreshold - loyaltyStatus.lifetimePoints : 0;
 
     return (
       <Card style={styles.statusCard}>
         <View style={styles.tierHeader}>
-          <View
-            style={[
-              styles.tierBadge,
-              { backgroundColor: getTierColor(loyaltyStatus.tier) },
-            ]}>
-            <Text style={styles.tierBadgeText}>
-              {loyaltyStatus.tier.toUpperCase()}
-            </Text>
+          <View style={[styles.tierBadge, { backgroundColor: getTierColor(loyaltyStatus.tier) }]}>
+            <Text style={styles.tierBadgeText}>{loyaltyStatus.tier.toUpperCase()}</Text>
           </View>
           <Text style={styles.memberSince}>
-            Member since{' '}
-            {new Date(loyaltyStatus.memberSince).toLocaleDateString()}
+            Member since {new Date(loyaltyStatus.memberSince).toLocaleDateString()}
           </Text>
         </View>
 
@@ -146,15 +135,11 @@ const LoyaltyDashboardScreen: React.FC = () => {
 
         <View style={styles.statsGrid}>
           <View style={styles.statItem}>
-            <Text style={styles.statValue}>
-              {loyaltyStatus.lifetimePoints.toLocaleString()}
-            </Text>
+            <Text style={styles.statValue}>{loyaltyStatus.lifetimePoints.toLocaleString()}</Text>
             <Text style={styles.statLabel}>Lifetime Points</Text>
           </View>
           <View style={styles.statItem}>
-            <Text style={styles.statValue}>
-              ${loyaltyStatus.totalSpent.toFixed(0)}
-            </Text>
+            <Text style={styles.statValue}>${loyaltyStatus.totalSpent.toFixed(0)}</Text>
             <Text style={styles.statLabel}>Total Spent</Text>
           </View>
         </View>
@@ -234,17 +219,10 @@ const LoyaltyDashboardScreen: React.FC = () => {
         {program.tiers.map((tier) => (
           <View key={tier.tier} style={styles.tierItem}>
             <View style={styles.tierInfo}>
-              <View
-                style={[
-                  styles.tierDot,
-                  { backgroundColor: getTierColor(tier.tier) },
-                ]}
-              />
+              <View style={[styles.tierDot, { backgroundColor: getTierColor(tier.tier) }]} />
               <Text style={styles.tierName}>{tier.tier.toUpperCase()}</Text>
             </View>
-            <Text style={styles.tierThreshold}>
-              {tier.pointsThreshold.toLocaleString()} pts
-            </Text>
+            <Text style={styles.tierThreshold}>{tier.pointsThreshold.toLocaleString()} pts</Text>
           </View>
         ))}
       </Card>
@@ -284,9 +262,7 @@ const LoyaltyDashboardScreen: React.FC = () => {
         <View style={styles.modalOverlay}>
           <View style={styles.modalContent}>
             <Text style={styles.modalTitle}>Redeem Reward</Text>
-            <Text style={styles.modalSubtitle}>
-              Select a reward to redeem your points
-            </Text>
+            <Text style={styles.modalSubtitle}>Select a reward to redeem your points</Text>
 
             <FlatList
               data={rewards.filter((r) => r.isActive)}
@@ -302,9 +278,7 @@ const LoyaltyDashboardScreen: React.FC = () => {
                     <Text style={styles.rewardOptionName}>{reward.name}</Text>
                     <Text style={styles.rewardOptionDesc}>{reward.description}</Text>
                   </View>
-                  <Text style={styles.rewardOptionCost}>
-                    {reward.pointsCost} pts
-                  </Text>
+                  <Text style={styles.rewardOptionCost}>{reward.pointsCost} pts</Text>
                 </TouchableOpacity>
               )}
             />
@@ -318,9 +292,7 @@ const LoyaltyDashboardScreen: React.FC = () => {
                 }}>
                 <Text style={styles.cancelButtonText}>Cancel</Text>
               </TouchableOpacity>
-              <TouchableOpacity
-                style={styles.confirmButton}
-                onPress={handleRedeemReward}>
+              <TouchableOpacity style={styles.confirmButton} onPress={handleRedeemReward}>
                 <Text style={styles.confirmButtonText}>Redeem</Text>
               </TouchableOpacity>
             </View>
@@ -673,4 +645,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default LoyaltyDashboardScreen;
\ No newline at end of file
+export default LoyaltyDashboardScreen;
diff --git a/src/screens/MerchantOnboardingScreen.tsx b/src/screens/MerchantOnboardingScreen.tsx
index 364dee49..2880f3c5 100644
--- a/src/screens/MerchantOnboardingScreen.tsx
+++ b/src/screens/MerchantOnboardingScreen.tsx
@@ -79,10 +79,7 @@ const MerchantOnboardingScreen: React.FC = () => {
                   isCompleted && styles.stepCircleCompleted,
                 ]}>
                 <Text
-                  style={[
-                    styles.stepNumber,
-                    (isActive || isCompleted) && styles.stepNumberActive,
-                  ]}>
+                  style={[styles.stepNumber, (isActive || isCompleted) && styles.stepNumberActive]}>
                   {isCompleted ? '✓' : index + 1}
                 </Text>
               </View>
@@ -222,9 +219,7 @@ const MerchantOnboardingScreen: React.FC = () => {
         </View>
         <View style={styles.summaryRow}>
           <Text style={styles.summaryLabel}>Documents</Text>
-          <Text style={styles.summaryValue}>
-            {onboarding?.documents.length || 0} uploaded
-          </Text>
+          <Text style={styles.summaryValue}>{onboarding?.documents.length || 0} uploaded</Text>
         </View>
       </Card>
 
@@ -264,9 +259,7 @@ const MerchantOnboardingScreen: React.FC = () => {
           <>
             <View style={styles.summaryRow}>
               <Text style={styles.summaryLabel}>Verification Tier</Text>
-              <Text style={styles.summaryValue}>
-                {onboarding.verificationResult.tier}
-              </Text>
+              <Text style={styles.summaryValue}>{onboarding.verificationResult.tier}</Text>
             </View>
             <View style={styles.summaryRow}>
               <Text style={styles.summaryLabel}>Monthly Limit</Text>
@@ -302,21 +295,16 @@ const MerchantOnboardingScreen: React.FC = () => {
       <ScrollView style={styles.scrollView}>
         <View style={styles.header}>
           <Text style={styles.title}>Merchant Onboarding</Text>
-          <Text style={styles.subtitle}>
-            Complete verification to start accepting payments
-          </Text>
+          <Text style={styles.subtitle}>Complete verification to start accepting payments</Text>
         </View>
 
         {onboarding ? (
           <>
             {renderStepIndicator()}
             {renderStatus()}
-            {onboarding.currentStep === OnboardingStep.BUSINESS_INFO &&
-              renderBusinessInfoStep()}
-            {onboarding.currentStep === OnboardingStep.ID_DOCUMENT &&
-              renderDocumentStep()}
-            {onboarding.currentStep === OnboardingStep.BUSINESS_LICENSE &&
-              renderDocumentStep()}
+            {onboarding.currentStep === OnboardingStep.BUSINESS_INFO && renderBusinessInfoStep()}
+            {onboarding.currentStep === OnboardingStep.ID_DOCUMENT && renderDocumentStep()}
+            {onboarding.currentStep === OnboardingStep.BUSINESS_LICENSE && renderDocumentStep()}
             {onboarding.currentStep === OnboardingStep.REVIEW && renderReviewStep()}
 
             <View style={styles.navigationButtons}>
@@ -344,8 +332,7 @@ const MerchantOnboardingScreen: React.FC = () => {
           <Card style={styles.startCard}>
             <Text style={styles.startTitle}>Get Started</Text>
             <Text style={styles.startDescription}>
-              Complete our merchant verification process to start accepting
-              subscription payments
+              Complete our merchant verification process to start accepting subscription payments
             </Text>
             <TouchableOpacity
               style={styles.startButton}
@@ -609,4 +596,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default MerchantOnboardingScreen;
\ No newline at end of file
+export default MerchantOnboardingScreen;
diff --git a/src/screens/RoleManagementScreen.tsx b/src/screens/RoleManagementScreen.tsx
index 4171776b..e9164a45 100644
--- a/src/screens/RoleManagementScreen.tsx
+++ b/src/screens/RoleManagementScreen.tsx
@@ -105,8 +105,24 @@ const PERMISSION_LABELS: Record<Permission, string> = {
 
 const ROLE_PERMISSIONS: Record<Role, Permission[]> = {
   Admin: Object.keys(PERMISSION_LABELS) as Permission[],
-  Merchant: ['CreatePlan', 'DeactivatePlan', 'SetPlanQuotas', 'SetRevenueRule', 'ViewPlans', 'ViewSubscriptions'],
-  Subscriber: ['Subscribe', 'CancelSubscription', 'PauseSubscription', 'ResumeSubscription', 'ChargeSubscription', 'RequestRefund', 'RequestTransfer', 'AcceptTransfer'],
+  Merchant: [
+    'CreatePlan',
+    'DeactivatePlan',
+    'SetPlanQuotas',
+    'SetRevenueRule',
+    'ViewPlans',
+    'ViewSubscriptions',
+  ],
+  Subscriber: [
+    'Subscribe',
+    'CancelSubscription',
+    'PauseSubscription',
+    'ResumeSubscription',
+    'ChargeSubscription',
+    'RequestRefund',
+    'RequestTransfer',
+    'AcceptTransfer',
+  ],
   Auditor: ['ViewAnalytics', 'ViewAuditLog', 'ViewPlans', 'ViewSubscriptions'],
 };
 
@@ -118,41 +134,67 @@ const SAMPLE_USERS: UserRoleEntry[] = [
 ];
 
 const SAMPLE_HISTORY: RoleChangeEntry[] = [
-  { id: 1, user: 'GABCD...1234', role: 'Admin', action: 'Granted', changedBy: 'System', timestamp: Date.now() - 86400000 },
-  { id: 2, user: 'GEFGH...5678', role: 'Merchant', action: 'Granted', changedBy: 'GABCD...1234', timestamp: Date.now() - 43200000 },
-  { id: 3, user: 'GIJKL...9012', role: 'Subscriber', action: 'Granted', changedBy: 'GABCD...1234', timestamp: Date.now() - 21600000 },
+  {
+    id: 1,
+    user: 'GABCD...1234',
+    role: 'Admin',
+    action: 'Granted',
+    changedBy: 'System',
+    timestamp: Date.now() - 86400000,
+  },
+  {
+    id: 2,
+    user: 'GEFGH...5678',
+    role: 'Merchant',
+    action: 'Granted',
+    changedBy: 'GABCD...1234',
+    timestamp: Date.now() - 43200000,
+  },
+  {
+    id: 3,
+    user: 'GIJKL...9012',
+    role: 'Subscriber',
+    action: 'Granted',
+    changedBy: 'GABCD...1234',
+    timestamp: Date.now() - 21600000,
+  },
 ];
 
 const SAMPLE_DELEGATIONS: DelegationEntry[] = [
-  { delegator: 'GEFGH...5678', delegate: 'GQRST...7890', permission: 'ViewPlans', expiresAt: Date.now() + 3600000 },
+  {
+    delegator: 'GEFGH...5678',
+    delegate: 'GQRST...7890',
+    permission: 'ViewPlans',
+    expiresAt: Date.now() + 3600000,
+  },
 ];
 
 const RoleManagementScreen: React.FC = () => {
-  const [activeTab, setActiveTab] = useState<'users' | 'permissions' | 'history' | 'delegations'>('users');
+  const [activeTab, setActiveTab] = useState<'users' | 'permissions' | 'history' | 'delegations'>(
+    'users'
+  );
   const [users] = useState<UserRoleEntry[]>(SAMPLE_USERS);
   const [history] = useState<RoleChangeEntry[]>(SAMPLE_HISTORY);
   const [delegations] = useState<DelegationEntry[]>(SAMPLE_DELEGATIONS);
 
   const handleGrantRole = (user: UserRoleEntry, role: Role) => {
-    Alert.alert(
-      'Grant Role',
-      `Grant ${role} role to ${user.label}?`,
-      [
-        { text: 'Cancel', style: 'cancel' },
-        { text: 'Grant', onPress: () => Alert.alert('Success', `${role} role granted to ${user.label}`) },
-      ],
-    );
+    Alert.alert('Grant Role', `Grant ${role} role to ${user.label}?`, [
+      { text: 'Cancel', style: 'cancel' },
+      {
+        text: 'Grant',
+        onPress: () => Alert.alert('Success', `${role} role granted to ${user.label}`),
+      },
+    ]);
   };
 
   const handleRevokeRole = (user: UserRoleEntry, role: Role) => {
-    Alert.alert(
-      'Revoke Role',
-      `Revoke ${role} role from ${user.label}?`,
-      [
-        { text: 'Cancel', style: 'cancel' },
-        { text: 'Revoke', onPress: () => Alert.alert('Success', `${role} role revoked from ${user.label}`) },
-      ],
-    );
+    Alert.alert('Revoke Role', `Revoke ${role} role from ${user.label}?`, [
+      { text: 'Cancel', style: 'cancel' },
+      {
+        text: 'Revoke',
+        onPress: () => Alert.alert('Success', `${role} role revoked from ${user.label}`),
+      },
+    ]);
   };
 
   const renderUserRow = (user: UserRoleEntry) => (
@@ -180,8 +222,9 @@ const RoleManagementScreen: React.FC = () => {
             <TouchableOpacity
               key={role}
               style={[styles.roleToggle, hasRole && styles.roleToggleActive]}
-              onPress={() => (hasRole ? handleRevokeRole(user, role) : handleGrantRole(user, role))}
-            >
+              onPress={() =>
+                hasRole ? handleRevokeRole(user, role) : handleGrantRole(user, role)
+              }>
               <Text style={[styles.roleToggleText, hasRole && styles.roleToggleTextActive]}>
                 {role}
               </Text>
@@ -213,7 +256,9 @@ const RoleManagementScreen: React.FC = () => {
   const renderHistoryRow = (entry: RoleChangeEntry) => (
     <View key={entry.id} style={styles.historyRow}>
       <View style={styles.historyDot}>
-        <View style={[styles.dot, entry.action === 'Granted' ? styles.dotGranted : styles.dotRevoked]} />
+        <View
+          style={[styles.dot, entry.action === 'Granted' ? styles.dotGranted : styles.dotRevoked]}
+        />
       </View>
       <View style={styles.historyInfo}>
         <Text style={styles.historyText}>
@@ -230,7 +275,8 @@ const RoleManagementScreen: React.FC = () => {
     <Card key={`${del.delegator}-${del.delegate}-${del.permission}`} style={styles.delegationCard}>
       <View style={styles.delegationInfo}>
         <Text style={styles.delegationText}>
-          <Text style={styles.bold}>{del.delegator}</Text> → <Text style={styles.bold}>{del.delegate}</Text>
+          <Text style={styles.bold}>{del.delegator}</Text> →{' '}
+          <Text style={styles.bold}>{del.delegate}</Text>
         </Text>
         <Text style={styles.delegationPerm}>{PERMISSION_LABELS[del.permission]}</Text>
         <Text style={styles.delegationExpiry}>
@@ -259,8 +305,7 @@ const RoleManagementScreen: React.FC = () => {
           <TouchableOpacity
             key={tab.key}
             style={[styles.tab, activeTab === tab.key && styles.tabActive]}
-            onPress={() => setActiveTab(tab.key)}
-          >
+            onPress={() => setActiveTab(tab.key)}>
             <Text style={[styles.tabText, activeTab === tab.key && styles.tabTextActive]}>
               {tab.label}
             </Text>
@@ -272,9 +317,7 @@ const RoleManagementScreen: React.FC = () => {
         {activeTab === 'users' && (
           <View>
             <Text style={styles.sectionTitle}>All Users</Text>
-            <Text style={styles.sectionSubtitle}>
-              Tap a role to grant or revoke it for a user
-            </Text>
+            <Text style={styles.sectionSubtitle}>Tap a role to grant or revoke it for a user</Text>
             {users.map(renderUserRow)}
           </View>
         )}
@@ -282,9 +325,7 @@ const RoleManagementScreen: React.FC = () => {
         {activeTab === 'permissions' && (
           <View>
             <Text style={styles.sectionTitle}>Permission Map</Text>
-            <Text style={styles.sectionSubtitle}>
-              Each role grants the following permissions
-            </Text>
+            <Text style={styles.sectionSubtitle}>Each role grants the following permissions</Text>
             <Card style={styles.permissionCard}>
               {(Object.keys(PERMISSION_LABELS) as Permission[]).map(renderPermissionRow)}
             </Card>
@@ -297,9 +338,7 @@ const RoleManagementScreen: React.FC = () => {
             <Text style={styles.sectionSubtitle}>
               Chronological log of all role grants and revocations
             </Text>
-            <Card style={styles.historyCard}>
-              {history.map(renderHistoryRow)}
-            </Card>
+            <Card style={styles.historyCard}>{history.map(renderHistoryRow)}</Card>
           </View>
         )}
 
diff --git a/src/screens/SandboxDashboardScreen.tsx b/src/screens/SandboxDashboardScreen.tsx
index 2e9112c6..0a6e17e2 100644
--- a/src/screens/SandboxDashboardScreen.tsx
+++ b/src/screens/SandboxDashboardScreen.tsx
@@ -56,38 +56,33 @@ const SandboxDashboardScreen: React.FC = () => {
       <ScrollView contentContainerStyle={styles.content}>
         <View style={styles.header}>
           <Text style={styles.title}>Sandbox Dashboard</Text>
-          <Text style={styles.subtitle}>
-            Manage your sandbox environment and test data
-          </Text>
+          <Text style={styles.subtitle}>Manage your sandbox environment and test data</Text>
         </View>
 
         <View style={styles.envSection}>
           <Text style={styles.sectionTitle}>Environment</Text>
           <View style={styles.envBar}>
-            {[SandboxEnvironment.DEVELOPMENT, SandboxEnvironment.STAGING, SandboxEnvironment.PRODUCTION].map(
-              (env) => (
-                <EnvironmentBadge
-                  key={env}
-                  environment={env}
-                  isActive={sandboxConfig.environment === env}
-                  onPress={() => switchEnvironment(env)}
-                />
-              )
-            )}
+            {[
+              SandboxEnvironment.DEVELOPMENT,
+              SandboxEnvironment.STAGING,
+              SandboxEnvironment.PRODUCTION,
+            ].map((env) => (
+              <EnvironmentBadge
+                key={env}
+                environment={env}
+                isActive={sandboxConfig.environment === env}
+                onPress={() => switchEnvironment(env)}
+              />
+            ))}
           </View>
-          <Text style={styles.envDescription}>
-            {sandboxConfig.description}
-          </Text>
+          <Text style={styles.envDescription}>{sandboxConfig.description}</Text>
         </View>
 
         <View style={styles.statsGrid}>
           <StatCard label="Test Subscriptions" value={testSubscriptions.length} />
           <StatCard label="Active" value={activeSubs.length} />
           <StatCard label="Monthly Total" value={`$${totalMonthly.toFixed(2)}`} />
-          <StatCard
-            label="API Calls"
-            value={usageStats?.totalRequests?.toLocaleString() || '0'}
-          />
+          <StatCard label="API Calls" value={usageStats?.totalRequests?.toLocaleString() || '0'} />
         </View>
 
         <Card style={styles.section}>
@@ -101,7 +96,9 @@ const SandboxDashboardScreen: React.FC = () => {
             </View>
             <View style={styles.configItem}>
               <Text style={styles.configLabel}>Max API Calls</Text>
-              <Text style={styles.configValue}>{(sandboxConfig.maxApiCalls ?? 10000).toLocaleString()}</Text>
+              <Text style={styles.configValue}>
+                {(sandboxConfig.maxApiCalls ?? 10000).toLocaleString()}
+              </Text>
             </View>
             <View style={styles.configItem}>
               <Text style={styles.configLabel}>Data Reset Interval</Text>
@@ -109,7 +106,11 @@ const SandboxDashboardScreen: React.FC = () => {
             </View>
             <View style={styles.configItem}>
               <Text style={styles.configLabel}>Status</Text>
-              <Text style={[styles.configValue, { color: sandboxConfig.isActive ? colors.success : colors.error }]}>
+              <Text
+                style={[
+                  styles.configValue,
+                  { color: sandboxConfig.isActive ? colors.success : colors.error },
+                ]}>
                 {sandboxConfig.isActive ? 'Active' : 'Inactive'}
               </Text>
             </View>
@@ -119,14 +120,14 @@ const SandboxDashboardScreen: React.FC = () => {
         <Card style={styles.section}>
           <View style={styles.sectionHeader}>
             <Text style={styles.sectionTitle}>Allowed Features</Text>
-            <Text style={styles.sectionMeta}>{(sandboxConfig.allowedFeatures ?? []).length} features</Text>
+            <Text style={styles.sectionMeta}>
+              {(sandboxConfig.allowedFeatures ?? []).length} features
+            </Text>
           </View>
           <View style={styles.featureGrid}>
             {(sandboxConfig.allowedFeatures ?? []).map((feature: string) => (
               <View key={feature} style={styles.featureChip}>
-                <Text style={styles.featureChipText}>
-                  {feature.replace(/_/g, ' ')}
-                </Text>
+                <Text style={styles.featureChipText}>{feature.replace(/_/g, ' ')}</Text>
               </View>
             ))}
           </View>
@@ -164,8 +165,8 @@ const SandboxDashboardScreen: React.FC = () => {
                           sub.status === 'active'
                             ? colors.success
                             : sub.status === 'paused'
-                            ? colors.warning
-                            : colors.error,
+                              ? colors.warning
+                              : colors.error,
                       },
                     ]}>
                     <Text style={styles.statusText}>{sub.status}</Text>
@@ -208,13 +209,15 @@ const SandboxDashboardScreen: React.FC = () => {
             {(usageStats.topErrors ?? []).length > 0 && (
               <>
                 <Text style={styles.subsectionTitle}>Top Errors</Text>
-                {(usageStats.topErrors ?? []).map((error: { code: number; count: number; message: string }) => (
-                  <View key={error.code} style={styles.errorRow}>
-                    <Text style={styles.errorCode}>{error.code}</Text>
-                    <Text style={styles.errorMessage}>{error.message}</Text>
-                    <Text style={styles.errorCount}>{error.count}x</Text>
-                  </View>
-                ))}
+                {(usageStats.topErrors ?? []).map(
+                  (error: { code: number; count: number; message: string }) => (
+                    <View key={error.code} style={styles.errorRow}>
+                      <Text style={styles.errorCode}>{error.code}</Text>
+                      <Text style={styles.errorMessage}>{error.message}</Text>
+                      <Text style={styles.errorCount}>{error.count}x</Text>
+                    </View>
+                  )
+                )}
               </>
             )}
           </Card>
diff --git a/src/screens/SandboxDetailScreen.tsx b/src/screens/SandboxDetailScreen.tsx
index 272282ee..cd6086ff 100644
--- a/src/screens/SandboxDetailScreen.tsx
+++ b/src/screens/SandboxDetailScreen.tsx
@@ -43,10 +43,7 @@ export default function SandboxDetailScreen() {
     return (
       <View style={styles.emptyContainer}>
         <Text style={styles.emptyText}>No sandbox selected</Text>
-        <TouchableOpacity
-          style={styles.backButton}
-          onPress={() => navigation.goBack()}
-        >
+        <TouchableOpacity style={styles.backButton} onPress={() => navigation.goBack()}>
           <Text style={styles.backButtonText}>Go Back</Text>
         </TouchableOpacity>
       </View>
@@ -96,8 +93,7 @@ export default function SandboxDetailScreen() {
             style={[
               styles.statusBadge,
               selectedSandbox.isActive ? styles.statusActive : styles.statusInactive,
-            ]}
-          >
+            ]}>
             <Text style={styles.statusText}>
               {selectedSandbox.isActive ? 'Active' : 'Inactive'}
             </Text>
@@ -175,9 +171,7 @@ export default function SandboxDetailScreen() {
         )}
       </TouchableOpacity>
 
-      <Text style={styles.sectionTitle}>
-        {sandboxSubscriptions.length} Test Subscriptions
-      </Text>
+      <Text style={styles.sectionTitle}>{sandboxSubscriptions.length} Test Subscriptions</Text>
 
       {sandboxSubscriptions.length === 0 ? (
         <View style={styles.emptyState}>
@@ -199,9 +193,7 @@ export default function SandboxDetailScreen() {
             <Text style={styles.dataCategory}>{sub.category}</Text>
             <View style={styles.dataMeta}>
               <Text style={styles.dataMetaItem}>{sub.billingCycle}</Text>
-              <Text style={styles.dataMetaItem}>
-                {sub.isActive ? 'Active' : 'Inactive'}
-              </Text>
+              <Text style={styles.dataMetaItem}>{sub.isActive ? 'Active' : 'Inactive'}</Text>
               {sub.isCryptoEnabled && (
                 <Text style={styles.dataMetaItem}>Crypto: {sub.cryptoToken}</Text>
               )}
@@ -224,9 +216,7 @@ export default function SandboxDetailScreen() {
         <View style={styles.emptyState}>
           <Text style={styles.emptyStateIcon}>📈</Text>
           <Text style={styles.emptyStateTitle}>No Usage Data</Text>
-          <Text style={styles.emptyStateText}>
-            Start making API calls to see usage statistics
-          </Text>
+          <Text style={styles.emptyStateText}>Start making API calls to see usage statistics</Text>
         </View>
       ) : (
         <>
@@ -261,8 +251,7 @@ export default function SandboxDetailScreen() {
                   style={[
                     styles.usageStatus,
                     record.statusCode < 400 ? styles.statusSuccess : styles.statusError,
-                  ]}
-                >
+                  ]}>
                   {record.statusCode}
                 </Text>
                 <Text style={styles.usageTime}>{record.responseTime}ms</Text>
@@ -281,8 +270,7 @@ export default function SandboxDetailScreen() {
     <View>
       <TouchableOpacity
         style={styles.generateButton}
-        onPress={() => navigation.navigate('ApiKeyManagement' as any)}
-      >
+        onPress={() => navigation.navigate('ApiKeyManagement' as any)}>
         <Text style={styles.generateButtonText}>Manage API Keys</Text>
       </TouchableOpacity>
 
@@ -319,35 +307,27 @@ export default function SandboxDetailScreen() {
       <View style={styles.tabContainer}>
         <TouchableOpacity
           style={[styles.tab, activeTab === 'overview' && styles.tabActive]}
-          onPress={() => setActiveTab('overview')}
-        >
+          onPress={() => setActiveTab('overview')}>
           <Text style={[styles.tabText, activeTab === 'overview' && styles.tabTextActive]}>
             Overview
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
           style={[styles.tab, activeTab === 'data' && styles.tabActive]}
-          onPress={() => setActiveTab('data')}
-        >
+          onPress={() => setActiveTab('data')}>
           <Text style={[styles.tabText, activeTab === 'data' && styles.tabTextActive]}>
             Test Data
           </Text>
         </TouchableOpacity>
         <TouchableOpacity
           style={[styles.tab, activeTab === 'usage' && styles.tabActive]}
-          onPress={() => setActiveTab('usage')}
-        >
-          <Text style={[styles.tabText, activeTab === 'usage' && styles.tabTextActive]}>
-            Usage
-          </Text>
+          onPress={() => setActiveTab('usage')}>
+          <Text style={[styles.tabText, activeTab === 'usage' && styles.tabTextActive]}>Usage</Text>
         </TouchableOpacity>
         <TouchableOpacity
           style={[styles.tab, activeTab === 'keys' && styles.tabActive]}
-          onPress={() => setActiveTab('keys')}
-        >
-          <Text style={[styles.tabText, activeTab === 'keys' && styles.tabTextActive]}>
-            Keys
-          </Text>
+          onPress={() => setActiveTab('keys')}>
+          <Text style={[styles.tabText, activeTab === 'keys' && styles.tabTextActive]}>Keys</Text>
         </TouchableOpacity>
       </View>
 
diff --git a/src/screens/SandboxScreen.tsx b/src/screens/SandboxScreen.tsx
index 1103f6e3..e0b47e9c 100644
--- a/src/screens/SandboxScreen.tsx
+++ b/src/screens/SandboxScreen.tsx
@@ -174,10 +174,7 @@ const SandboxScreen: React.FC = () => {
     <View style={styles.section}>
       <View style={styles.sectionHeader}>
         <Text style={styles.sectionTitle}>Your Sandboxes</Text>
-        <TouchableOpacity
-          style={styles.addButton}
-          onPress={() => setShowCreateModal(true)}
-        >
+        <TouchableOpacity style={styles.addButton} onPress={() => setShowCreateModal(true)}>
           <Text style={styles.addButtonText}>+ New</Text>
         </TouchableOpacity>
       </View>
@@ -188,10 +185,7 @@ const SandboxScreen: React.FC = () => {
           <Text style={styles.emptyStateSubtext}>
             Create a sandbox to start testing your integration
           </Text>
-          <TouchableOpacity
-            style={styles.primaryButton}
-            onPress={() => setShowCreateModal(true)}
-          >
+          <TouchableOpacity style={styles.primaryButton} onPress={() => setShowCreateModal(true)}>
             <Text style={styles.primaryButtonText}>Create Sandbox</Text>
           </TouchableOpacity>
         </View>
@@ -203,18 +197,12 @@ const SandboxScreen: React.FC = () => {
               styles.sandboxCard,
               currentSandbox?.id === sandbox.id && styles.sandboxCardActive,
             ]}
-            onPress={() => handleSelectSandbox(sandbox.id)}
-          >
+            onPress={() => handleSelectSandbox(sandbox.id)}>
             <View style={styles.sandboxCardHeader}>
               <View style={styles.sandboxNameContainer}>
                 <Text style={styles.sandboxName}>{sandbox.name}</Text>
                 <View style={styles.badgeContainer}>
-                  <View
-                    style={[
-                      styles.badge,
-                      { backgroundColor: `${colors.primary}20` },
-                    ]}
-                  >
+                  <View style={[styles.badge, { backgroundColor: `${colors.primary}20` }]}>
                     <Text style={[styles.badgeText, { color: colors.primary }]}>
                       {getEnvironmentLabel(sandbox.environment)}
                     </Text>
@@ -223,14 +211,8 @@ const SandboxScreen: React.FC = () => {
                     style={[
                       styles.badge,
                       { backgroundColor: `${getStatusColor(sandbox.status)}20` },
-                    ]}
-                  >
-                    <Text
-                      style={[
-                        styles.badgeText,
-                        { color: getStatusColor(sandbox.status) },
-                      ]}
-                    >
+                    ]}>
+                    <Text style={[styles.badgeText, { color: getStatusColor(sandbox.status) }]}>
                       {sandbox.status}
                     </Text>
                   </View>
@@ -239,21 +221,15 @@ const SandboxScreen: React.FC = () => {
               <View style={styles.sandboxActions}>
                 <TouchableOpacity
                   style={styles.iconButton}
-                  onPress={() =>
-                    handleToggleSandbox(sandbox.id, sandbox.status)
-                  }
-                >
+                  onPress={() => handleToggleSandbox(sandbox.id, sandbox.status)}>
                   <Text style={styles.iconButtonText}>
                     {sandbox.status === SandboxStatus.ACTIVE ? '⏸' : '▶'}
                   </Text>
                 </TouchableOpacity>
                 <TouchableOpacity
                   style={[styles.iconButton, styles.iconButtonDanger]}
-                  onPress={() => handleDeleteSandbox(sandbox.id)}
-                >
-                  <Text style={[styles.iconButtonText, styles.iconButtonTextDanger]}>
-                    ✕
-                  </Text>
+                  onPress={() => handleDeleteSandbox(sandbox.id)}>
+                  <Text style={[styles.iconButtonText, styles.iconButtonTextDanger]}>✕</Text>
                 </TouchableOpacity>
               </View>
             </View>
@@ -285,9 +261,7 @@ const SandboxScreen: React.FC = () => {
             <Text style={styles.metricLabel}>Transactions</Text>
           </View>
           <View style={styles.metricCard}>
-            <Text style={styles.metricValue}>
-              ${metrics.totalVolume.toFixed(2)}
-            </Text>
+            <Text style={styles.metricValue}>${metrics.totalVolume.toFixed(2)}</Text>
             <Text style={styles.metricLabel}>Total Volume</Text>
           </View>
           <View style={styles.metricCard}>
@@ -299,17 +273,13 @@ const SandboxScreen: React.FC = () => {
         <View style={styles.actionRow}>
           <TouchableOpacity
             style={styles.secondaryButton}
-            onPress={() => setShowTestDataModal(true)}
-          >
+            onPress={() => setShowTestDataModal(true)}>
             <Text style={styles.secondaryButtonText}>Generate Data</Text>
           </TouchableOpacity>
           <TouchableOpacity
             style={[styles.secondaryButton, styles.dangerButton]}
-            onPress={handleResetSandbox}
-          >
-            <Text style={[styles.secondaryButtonText, styles.dangerButtonText]}>
-              Reset
-            </Text>
+            onPress={handleResetSandbox}>
+            <Text style={[styles.secondaryButtonText, styles.dangerButtonText]}>Reset</Text>
           </TouchableOpacity>
         </View>
       </View>
@@ -321,9 +291,7 @@ const SandboxScreen: React.FC = () => {
 
     return (
       <View style={styles.section}>
-        <Text style={styles.sectionTitle}>
-          Test Subscriptions ({subscriptions.length})
-        </Text>
+        <Text style={styles.sectionTitle}>Test Subscriptions ({subscriptions.length})</Text>
         {subscriptions.slice(0, 5).map((sub) => (
           <View key={sub.id} style={styles.listItem}>
             <View style={styles.listItemContent}>
@@ -341,9 +309,7 @@ const SandboxScreen: React.FC = () => {
           </View>
         ))}
         {subscriptions.length > 5 && (
-          <Text style={styles.moreText}>
-            +{subscriptions.length - 5} more subscriptions
-          </Text>
+          <Text style={styles.moreText}>+{subscriptions.length - 5} more subscriptions</Text>
         )}
       </View>
     );
@@ -354,8 +320,7 @@ const SandboxScreen: React.FC = () => {
       visible={showCreateModal}
       animationType="slide"
       transparent
-      onRequestClose={() => setShowCreateModal(false)}
-    >
+      onRequestClose={() => setShowCreateModal(false)}>
       <View style={styles.modalOverlay}>
         <View style={styles.modalContent}>
           <Text style={styles.modalTitle}>Create Sandbox</Text>
@@ -378,15 +343,12 @@ const SandboxScreen: React.FC = () => {
                   styles.environmentOption,
                   selectedEnvironment === env && styles.environmentOptionActive,
                 ]}
-                onPress={() => setSelectedEnvironment(env)}
-              >
+                onPress={() => setSelectedEnvironment(env)}>
                 <Text
                   style={[
                     styles.environmentOptionText,
-                    selectedEnvironment === env &&
-                      styles.environmentOptionTextActive,
-                  ]}
-                >
+                    selectedEnvironment === env && styles.environmentOptionTextActive,
+                  ]}>
                   {getEnvironmentLabel(env)}
                 </Text>
               </TouchableOpacity>
@@ -396,14 +358,10 @@ const SandboxScreen: React.FC = () => {
           <View style={styles.modalActions}>
             <TouchableOpacity
               style={styles.secondaryButton}
-              onPress={() => setShowCreateModal(false)}
-            >
+              onPress={() => setShowCreateModal(false)}>
               <Text style={styles.secondaryButtonText}>Cancel</Text>
             </TouchableOpacity>
-            <TouchableOpacity
-              style={styles.primaryButton}
-              onPress={handleCreateSandbox}
-            >
+            <TouchableOpacity style={styles.primaryButton} onPress={handleCreateSandbox}>
               <Text style={styles.primaryButtonText}>Create</Text>
             </TouchableOpacity>
           </View>
@@ -417,8 +375,7 @@ const SandboxScreen: React.FC = () => {
       visible={showTestDataModal}
       animationType="slide"
       transparent
-      onRequestClose={() => setShowTestDataModal(false)}
-    >
+      onRequestClose={() => setShowTestDataModal(false)}>
       <View style={styles.modalOverlay}>
         <View style={styles.modalContent}>
           <Text style={styles.modalTitle}>Generate Test Data</Text>
@@ -436,14 +393,10 @@ const SandboxScreen: React.FC = () => {
           <View style={styles.modalActions}>
             <TouchableOpacity
               style={styles.secondaryButton}
-              onPress={() => setShowTestDataModal(false)}
-            >
+              onPress={() => setShowTestDataModal(false)}>
               <Text style={styles.secondaryButtonText}>Cancel</Text>
             </TouchableOpacity>
-            <TouchableOpacity
-              style={styles.primaryButton}
-              onPress={handleGenerateTestData}
-            >
+            <TouchableOpacity style={styles.primaryButton} onPress={handleGenerateTestData}>
               <Text style={styles.primaryButtonText}>Generate</Text>
             </TouchableOpacity>
           </View>
@@ -462,13 +415,10 @@ const SandboxScreen: React.FC = () => {
             onRefresh={onRefresh}
             tintColor={colors.primary}
           />
-        }
-      >
+        }>
         <View style={styles.header}>
           <Text style={styles.title}>Sandbox</Text>
-          <Text style={styles.subtitle}>
-            Test your integration in an isolated environment
-          </Text>
+          <Text style={styles.subtitle}>Test your integration in an isolated environment</Text>
         </View>
 
         {isLoading && !refreshing ? (
diff --git a/src/screens/SupportDashboardScreen.tsx b/src/screens/SupportDashboardScreen.tsx
index 648dacf8..9fec92e7 100644
--- a/src/screens/SupportDashboardScreen.tsx
+++ b/src/screens/SupportDashboardScreen.tsx
@@ -25,11 +25,22 @@ const SupportDashboardScreen: React.FC = () => {
       <Text style={styles.meta}>Priority: {ticket.priority}</Text>
       <Text style={styles.meta}>Status: {ticket.status}</Text>
       <Text style={styles.meta}>Subscription: {ticket.subscriptionId}</Text>
-      {ticket.externalTicketId ? <Text style={styles.meta}>External: {ticket.externalTicketId}</Text> : null}
+      {ticket.externalTicketId ? (
+        <Text style={styles.meta}>External: {ticket.externalTicketId}</Text>
+      ) : null}
       <View style={styles.actions}>
-        <Button title="Assign" size="small" variant="outline" onPress={() => assignTicket(ticket.id, 'support-team')} />
+        <Button
+          title="Assign"
+          size="small"
+          variant="outline"
+          onPress={() => assignTicket(ticket.id, 'support-team')}
+        />
         <Button title="Sync" size="small" variant="outline" onPress={() => syncTicket(ticket.id)} />
-        <Button title="Resolve" size="small" onPress={() => linkResolution(ticket.id, ticket.subscriptionId)} />
+        <Button
+          title="Resolve"
+          size="small"
+          onPress={() => linkResolution(ticket.id, ticket.subscriptionId)}
+        />
       </View>
     </Card>
   );
diff --git a/src/screens/TaxSettingsScreen.tsx b/src/screens/TaxSettingsScreen.tsx
index ed638108..a5d1c5a1 100644
--- a/src/screens/TaxSettingsScreen.tsx
+++ b/src/screens/TaxSettingsScreen.tsx
@@ -26,7 +26,11 @@ const TaxSettingsScreen: React.FC = () => {
   };
 
   const handleReport = () => {
-    createReport('US-CA', new Date('2026-05-01T00:00:00.000Z'), new Date('2026-05-31T23:59:59.999Z'));
+    createReport(
+      'US-CA',
+      new Date('2026-05-01T00:00:00.000Z'),
+      new Date('2026-05-31T23:59:59.999Z')
+    );
   };
 
   return (
diff --git a/src/services/FEATURE_GATING_README.md b/src/services/FEATURE_GATING_README.md
index 24cb418c..5d91b865 100644
--- a/src/services/FEATURE_GATING_README.md
+++ b/src/services/FEATURE_GATING_README.md
@@ -9,6 +9,7 @@ The Feature Gating System provides subscription-based access control for SubTrac
 ### Core Components
 
 #### 1. **Feature Flags Service** (`featureFlags.ts`)
+
 The main service that handles all feature access logic.
 
 ```typescript
@@ -29,6 +30,7 @@ if (result.hasAccess) {
 ```
 
 **Key Methods:**
+
 - `checkFeatureAccess()` - Check if user can access a feature
 - `getAvailableFeatures()` - Get all features for a tier
 - `getFeature()` - Get feature details
@@ -37,6 +39,7 @@ if (result.hasAccess) {
 - `getRemainingUsage()` - Get remaining usage for a limit
 
 #### 2. **Feature Configuration** (`config/features.ts`)
+
 Defines all features, their tiers, limits, and settings.
 
 ```typescript
@@ -44,10 +47,7 @@ export const FEATURE_CONFIG: FeatureConfig = {
   globalRolloutPercentage: 100,
   abTestEnabled: true,
   plans: {
-    [SubscriptionTier.FREE]: [
-      FeatureId.BASIC_SUBSCRIPTION_TRACKING,
-      FeatureId.BASIC_ANALYTICS,
-    ],
+    [SubscriptionTier.FREE]: [FeatureId.BASIC_SUBSCRIPTION_TRACKING, FeatureId.BASIC_ANALYTICS],
     [SubscriptionTier.PREMIUM]: [
       // ... premium features
     ],
@@ -68,6 +68,7 @@ export const FEATURE_CONFIG: FeatureConfig = {
 ```
 
 #### 3. **React Hooks** (`hooks/useFeatureAccess.ts`)
+
 Custom hooks for easy integration in React components.
 
 ```typescript
@@ -90,10 +91,11 @@ const { hasExceededLimit, getRemainingUsage } = useFeatureLimits();
 #### 4. **UI Components**
 
 ##### FeatureGate Component
+
 Conditionally renders content based on feature access.
 
 ```typescript
-<FeatureGate 
+<FeatureGate
   feature={FeatureId.CRYPTO_INTEGRATION}
   showUpgradePrompt={true}
   upgradeMessage="Upgrade to enable crypto payments"
@@ -103,6 +105,7 @@ Conditionally renders content based on feature access.
 ```
 
 ##### FeatureLimitGate Component
+
 Enforces usage limits on features.
 
 ```typescript
@@ -116,10 +119,11 @@ Enforces usage limits on features.
 ```
 
 ##### FeatureManagement Component
+
 Admin dashboard for managing features.
 
 ```typescript
-<FeatureManagement 
+<FeatureManagement
   onFeatureUpdate={(featureId, updates) => {
     // Handle feature updates
   }}
@@ -127,10 +131,11 @@ Admin dashboard for managing features.
 ```
 
 ##### SubscriptionPlans Component
+
 Display available subscription plans.
 
 ```typescript
-<SubscriptionPlans 
+<SubscriptionPlans
   showCurrentPlan={true}
   onSelectPlan={(plan) => {
     // Handle plan selection
@@ -141,6 +146,7 @@ Display available subscription plans.
 ## Subscription Tiers
 
 ### FREE Tier
+
 - **Price:** $0/month
 - **Max Subscriptions:** 5
 - **Max Categories:** 3
@@ -150,6 +156,7 @@ Display available subscription plans.
   - Push notifications
 
 ### BASIC Tier
+
 - **Price:** $4.99/month
 - **Max Subscriptions:** 25
 - **Max Categories:** 8
@@ -159,6 +166,7 @@ Display available subscription plans.
   - All FREE features
 
 ### PREMIUM Tier
+
 - **Price:** $9.99/month
 - **Max Subscriptions:** 100
 - **Max Categories:** 20
@@ -169,6 +177,7 @@ Display available subscription plans.
   - All BASIC features
 
 ### ENTERPRISE Tier
+
 - **Price:** $29.99/month
 - **Max Subscriptions:** Unlimited
 - **Max Categories:** Unlimited
@@ -183,6 +192,7 @@ Display available subscription plans.
 ## Key Features
 
 ### 1. Tier-Based Access Control
+
 Features are assigned to subscription tiers. Users can only access features their tier includes.
 
 ```typescript
@@ -191,6 +201,7 @@ const feature = FEATURE_CONFIG.features[FeatureId.ADVANCED_ANALYTICS];
 ```
 
 ### 2. Gradual Rollout
+
 Roll out features to a percentage of users within a tier.
 
 ```typescript
@@ -201,11 +212,13 @@ const feature = {
 ```
 
 **How it works:**
+
 - Uses deterministic hashing of user IDs
 - Ensures consistent experience across sessions
 - Prevents flicker when user reloads
 
 ### 3. A/B Testing
+
 Test feature variations with different user groups.
 
 ```typescript
@@ -219,10 +232,12 @@ const { abTestGroup, isInAbTest } = await featureFlagsService.checkFeatureAccess
 ```
 
 **Storage:**
+
 - A/B test assignments are persisted in AsyncStorage
 - Consistent assignment across app restarts
 
 ### 4. Feature Dependencies
+
 Features can depend on other features being available first.
 
 ```typescript
@@ -234,6 +249,7 @@ const feature = {
 ```
 
 ### 5. Usage Limits
+
 Enforce per-tier limits on feature usage.
 
 ```typescript
@@ -250,6 +266,7 @@ const exceeded = featureFlagsService.hasExceededLimit(
 ## Usage Examples
 
 ### Example 1: Gating a Feature in a Screen
+
 ```typescript
 import { useFeatureAccess } from '../hooks/useFeatureAccess';
 import { FeatureGate } from '../components/common/FeatureGate';
@@ -257,7 +274,7 @@ import { FeatureId } from '../types/feature';
 
 export const AnalyticsScreen = () => {
   return (
-    <FeatureGate 
+    <FeatureGate
       feature={FeatureId.ADVANCED_ANALYTICS}
       fallback={<UpgradePrompt feature={FeatureId.ADVANCED_ANALYTICS} />}
     >
@@ -268,6 +285,7 @@ export const AnalyticsScreen = () => {
 ```
 
 ### Example 2: Checking Multiple Features
+
 ```typescript
 import { useMultipleFeatureAccess } from '../hooks/useFeatureAccess';
 
@@ -291,6 +309,7 @@ export const PaymentMethodsScreen = () => {
 ```
 
 ### Example 3: Enforcing Usage Limits
+
 ```typescript
 import { useFeatureLimits } from '../hooks/useFeatureAccess';
 import { FeatureLimitGate } from '../components/common/FeatureGate';
@@ -322,6 +341,7 @@ export const AddSubscriptionButton = () => {
 ```
 
 ### Example 4: Admin Feature Management
+
 ```typescript
 import { FeatureManagement } from '../components/admin/FeatureManagement';
 
@@ -340,6 +360,7 @@ export const AdminPanel = () => {
 ## Best Practices
 
 ### 1. Always Use Feature Gates for New Features
+
 Wrap new features in FeatureGate components, even if all tiers initially have access.
 
 ```typescript
@@ -349,6 +370,7 @@ Wrap new features in FeatureGate components, even if all tiers initially have ac
 ```
 
 ### 2. Provide Clear Upgrade Prompts
+
 When a feature is not accessible, show users what they need to upgrade to.
 
 ```typescript
@@ -359,6 +381,7 @@ When a feature is not accessible, show users what they need to upgrade to.
 ```
 
 ### 3. Test with Different Tiers
+
 During development, test your features with each subscription tier.
 
 ```typescript
@@ -370,20 +393,22 @@ useUserStore.setState({ subscriptionTier: SubscriptionTier.PREMIUM });
 ```
 
 ### 4. Monitor Rollout Percentages
+
 Start with low rollout percentages and gradually increase.
 
 ```typescript
 // Day 1: 10% of premium users
-rolloutPercentage: 10
+rolloutPercentage: 10;
 
 // Day 3: 50% of premium users
-rolloutPercentage: 50
+rolloutPercentage: 50;
 
 // Day 7: 100% rollout
-rolloutPercentage: 100
+rolloutPercentage: 100;
 ```
 
 ### 5. Set Up Dependencies Carefully
+
 Document feature dependencies to prevent access issues.
 
 ```typescript
@@ -396,6 +421,7 @@ const dependencies = {
 ## Adding New Features
 
 ### Step 1: Add Feature ID
+
 ```typescript
 // src/types/feature.ts
 export enum FeatureId {
@@ -405,6 +431,7 @@ export enum FeatureId {
 ```
 
 ### Step 2: Configure Feature
+
 ```typescript
 // src/config/features.ts
 [FeatureId.NEW_FEATURE]: {
@@ -420,6 +447,7 @@ export enum FeatureId {
 ```
 
 ### Step 3: Add to Plans
+
 ```typescript
 // src/config/features.ts
 plans: {
@@ -432,6 +460,7 @@ plans: {
 ```
 
 ### Step 4: Use in Components
+
 ```typescript
 <FeatureGate feature={FeatureId.NEW_FEATURE}>
   <NewFeatureComponent />
@@ -441,18 +470,21 @@ plans: {
 ## Troubleshooting
 
 ### Feature Not Showing Up
+
 1. Check if feature is enabled: `feature.enabled === true`
 2. Verify user tier includes feature: `tierAccess.includes(userTier)`
 3. Check rollout percentage: `rolloutPercentage >= 100` during testing
 4. Check dependencies are met
 
 ### A/B Test Not Working
+
 1. Ensure `abTestEnabled: true` in FEATURE_CONFIG
 2. Verify A/B test groups are defined
 3. Check AsyncStorage permissions
 4. Verify user ID is set: `featureFlagsService.setUserId(userId)`
 
 ### Usage Limits Not Enforcing
+
 1. Check limit key exists in `getFeatureLimits()`
 2. Verify current usage calculation is accurate
 3. Ensure FeatureLimitGate is wrapping the component
@@ -463,12 +495,15 @@ plans: {
 ### FeatureFlagsService
 
 #### `setUserId(userId: string): void`
+
 Set the current user ID for rollout and A/B test calculations.
 
 #### `async checkFeatureAccess(featureId: FeatureId, userTier: SubscriptionTier, userId?: string): Promise<FeatureAccessResult>`
+
 Check if a user has access to a feature.
 
 **Returns:**
+
 ```typescript
 {
   hasAccess: boolean;
@@ -480,21 +515,27 @@ Check if a user has access to a feature.
 ```
 
 #### `getAvailableFeatures(userTier: SubscriptionTier): FeatureId[]`
+
 Get all features available to a tier.
 
 #### `getFeature(featureId: FeatureId): FeatureFlag | null`
+
 Get feature details.
 
 #### `getAllFeatures(): Record<string, FeatureFlag>`
+
 Get all features.
 
 #### `getFeatureLimits(userTier: SubscriptionTier): Record<string, number>`
+
 Get usage limits for a tier. Returns -1 for unlimited.
 
 #### `hasExceededLimit(userTier: SubscriptionTier, limitKey: string, currentUsage: number): boolean`
+
 Check if a usage limit is exceeded.
 
 #### `getRemainingUsage(userTier: SubscriptionTier, limitKey: string, currentUsage: number): number`
+
 Get remaining usage before limit is hit. Returns -1 for unlimited.
 
 ## Related Files
diff --git a/src/services/__tests__/slaService.test.ts b/src/services/__tests__/slaService.test.ts
index 5db39b5d..7346c4e9 100644
--- a/src/services/__tests__/slaService.test.ts
+++ b/src/services/__tests__/slaService.test.ts
@@ -19,12 +19,7 @@ import {
   buildSlaDashboardReport,
   SLA_DEFAULTS,
 } from '../slaService';
-import type {
-  SlaAvailabilityEvent,
-  SlaBreach,
-  SlaConfig,
-  SlaStatus,
-} from '../../types/sla';
+import type { SlaAvailabilityEvent, SlaBreach, SlaConfig, SlaStatus } from '../../types/sla';
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -118,28 +113,36 @@ describe('normalizeSlaConfig', () => {
 
 describe('calculateAvailabilityImpact', () => {
   it('healthy state has zero impact', () => {
-    const impact = calculateAvailabilityImpact(makeEvent({ state: 'healthy', durationSeconds: 3_600 }));
+    const impact = calculateAvailabilityImpact(
+      makeEvent({ state: 'healthy', durationSeconds: 3_600 })
+    );
     expect(impact.downtimeSeconds).toBe(0);
     expect(impact.partialOutageSeconds).toBe(0);
     expect(impact.maintenanceSeconds).toBe(0);
   });
 
   it('full_outage counts 100% of duration as downtime', () => {
-    const impact = calculateAvailabilityImpact(makeEvent({ state: 'full_outage', durationSeconds: 3_600 }));
+    const impact = calculateAvailabilityImpact(
+      makeEvent({ state: 'full_outage', durationSeconds: 3_600 })
+    );
     expect(impact.downtimeSeconds).toBe(3_600 * 1); // weight = 1
     expect(impact.partialOutageSeconds).toBe(0);
     expect(impact.maintenanceSeconds).toBe(0);
   });
 
   it('partial_outage counts 50% of duration as downtime', () => {
-    const impact = calculateAvailabilityImpact(makeEvent({ state: 'partial_outage', durationSeconds: 3_600 }));
+    const impact = calculateAvailabilityImpact(
+      makeEvent({ state: 'partial_outage', durationSeconds: 3_600 })
+    );
     expect(impact.downtimeSeconds).toBe(3_600 * 0.5); // weight = 0.5
     expect(impact.partialOutageSeconds).toBe(3_600);
     expect(impact.maintenanceSeconds).toBe(0);
   });
 
   it('maintenance window has zero downtime impact (SLA exclusion)', () => {
-    const impact = calculateAvailabilityImpact(makeEvent({ state: 'maintenance', durationSeconds: 7_200 }));
+    const impact = calculateAvailabilityImpact(
+      makeEvent({ state: 'maintenance', durationSeconds: 7_200 })
+    );
     expect(impact.downtimeSeconds).toBe(0);
     expect(impact.partialOutageSeconds).toBe(0);
     expect(impact.maintenanceSeconds).toBe(7_200);
diff --git a/src/services/__tests__/walletService.test.ts b/src/services/__tests__/walletService.test.ts
index e7272cad..af274332 100644
--- a/src/services/__tests__/walletService.test.ts
+++ b/src/services/__tests__/walletService.test.ts
@@ -353,7 +353,14 @@ describe('WalletServiceManager', () => {
       });
 
       try {
-        await mgr.createSablierStream('0xToken', '10', Date.now(), Date.now() + 86400000, '0xRecipient', 1);
+        await mgr.createSablierStream(
+          '0xToken',
+          '10',
+          Date.now(),
+          Date.now() + 86400000,
+          '0xRecipient',
+          1
+        );
         fail('expected to throw');
       } catch (e) {
         expect(e).toBeInstanceOf(WalletError);
@@ -377,7 +384,12 @@ describe('WalletServiceManager', () => {
 
     it('preserves cause stack when cause is an Error', () => {
       const cause = new Error('rpc timeout');
-      const err = new WalletError(WalletErrorCode.UNKNOWN, 'Something went wrong.', undefined, cause);
+      const err = new WalletError(
+        WalletErrorCode.UNKNOWN,
+        'Something went wrong.',
+        undefined,
+        cause
+      );
       expect(err.stack).toContain('Caused by:');
     });
   });
diff --git a/src/services/accountingExport.ts b/src/services/accountingExport.ts
index 58ce396b..a6b8c440 100644
--- a/src/services/accountingExport.ts
+++ b/src/services/accountingExport.ts
@@ -304,9 +304,7 @@ function filterSubscriptions(
   subscriptions: Subscription[],
   options: Pick<ExportOptions, 'includeInactive' | 'dateFrom' | 'dateTo' | 'transactionTypes'>
 ): Subscription[] {
-  let result = options.includeInactive
-    ? subscriptions
-    : subscriptions.filter((s) => s.isActive);
+  let result = options.includeInactive ? subscriptions : subscriptions.filter((s) => s.isActive);
 
   if (options.dateFrom !== undefined) {
     result = result.filter(
@@ -354,9 +352,7 @@ export function buildAccountingExportCsv(
   if (options.includeDeferredRevenue) {
     headers.push('DeferredRevenue');
     selected.forEach((s, i) => {
-      rows[i].push(
-        Number(options.deferredRevenueMap?.[s.id] ?? 0).toFixed(2)
-      );
+      rows[i].push(Number(options.deferredRevenueMap?.[s.id] ?? 0).toFixed(2));
     });
   }
 
diff --git a/src/services/adminDashboardService.ts b/src/services/adminDashboardService.ts
index f2ab8a4a..3ff4188f 100644
--- a/src/services/adminDashboardService.ts
+++ b/src/services/adminDashboardService.ts
@@ -1,6 +1,6 @@
-import { MonitoringService } from '../../backend/services/monitoring';
-import type { DashboardSnapshot, TransactionEvent } from '../../backend/services/types';
-import type { AuditEvent } from '../../backend/services/auditTypes';
+import { MonitoringService } from '../../backend/services/shared/monitoring';
+import type { DashboardSnapshot, TransactionEvent } from '../../backend/services/shared/types';
+import type { AuditEvent } from '../../backend/services/shared/auditTypes';
 
 export type DashboardRole = 'admin' | 'analyst' | 'support';
 export type MerchantStatus = 'active' | 'at-risk' | 'suspended';
diff --git a/src/services/analyticsService.ts b/src/services/analyticsService.ts
index 20251048..2786009c 100644
--- a/src/services/analyticsService.ts
+++ b/src/services/analyticsService.ts
@@ -41,9 +41,13 @@ export interface SubscriptionAnalyticsReport {
 const MONTHS_PER_YEAR = 12;
 const WEEKS_PER_MONTH = 4.345;
 
-export const toMonthlyRevenue = (subscription: Pick<Subscription, 'price' | 'billingCycle'>): number => {
-  if (subscription.billingCycle === BillingCycle.YEARLY) return subscription.price / MONTHS_PER_YEAR;
-  if (subscription.billingCycle === BillingCycle.WEEKLY) return subscription.price * WEEKS_PER_MONTH;
+export const toMonthlyRevenue = (
+  subscription: Pick<Subscription, 'price' | 'billingCycle'>
+): number => {
+  if (subscription.billingCycle === BillingCycle.YEARLY)
+    return subscription.price / MONTHS_PER_YEAR;
+  if (subscription.billingCycle === BillingCycle.WEEKLY)
+    return subscription.price * WEEKS_PER_MONTH;
   return subscription.price;
 };
 
@@ -68,9 +72,15 @@ export const calculateSubscriptionAnalytics = (
     (sum, subscription) => sum + toMonthlyRevenue(subscription),
     0
   );
-  const netChurnRate = mrr + churnedRevenue > 0 ? Math.max(0, (churnedRevenue - expansionRevenue) / (mrr + churnedRevenue)) : 0;
+  const netChurnRate =
+    mrr + churnedRevenue > 0
+      ? Math.max(0, (churnedRevenue - expansionRevenue) / (mrr + churnedRevenue))
+      : 0;
   const averageMonthlyRevenue = active.length ? mrr / active.length : 0;
-  const ltv = grossChurnRate > 0 ? averageMonthlyRevenue / grossChurnRate : averageMonthlyRevenue * MONTHS_PER_YEAR;
+  const ltv =
+    grossChurnRate > 0
+      ? averageMonthlyRevenue / grossChurnRate
+      : averageMonthlyRevenue * MONTHS_PER_YEAR;
 
   const cohorts = Array.from(
     subscriptions.reduce((map, subscription) => {
diff --git a/src/services/calendarService.ts b/src/services/calendarService.ts
index d2f4248e..af26dfb9 100644
--- a/src/services/calendarService.ts
+++ b/src/services/calendarService.ts
@@ -258,7 +258,10 @@ function escapeICalText(text: string): string {
 
 function formatICalDate(isoString: string): string {
   const d = new Date(isoString);
-  return d.toISOString().replace(/[-:]/g, '').replace(/\.\d{3}/, '');
+  return d
+    .toISOString()
+    .replace(/[-:]/g, '')
+    .replace(/\.\d{3}/, '');
 }
 
 export function generateICalendarExport(
@@ -362,9 +365,7 @@ export function calculateProratedAdjustment(
   const msPerDay = 24 * 60 * 60 * 1000;
   const daysRemaining = Math.max(0, Math.round((nextBilling.getTime() - now.getTime()) / msPerDay));
 
-  const proratedAmount = Number(
-    ((subscription.price / daysInCycle) * daysRemaining).toFixed(2)
-  );
+  const proratedAmount = Number(((subscription.price / daysInCycle) * daysRemaining).toFixed(2));
 
   return {
     originalAmount: subscription.price,
@@ -464,7 +465,10 @@ export function isDSTTransitionPeriod(date: Date, timezone: string): boolean {
   return currentOffset !== laterOffset;
 }
 
-export function adjustForDST(event: CalendarEventTemplate, timezone: string): CalendarEventTemplate {
+export function adjustForDST(
+  event: CalendarEventTemplate,
+  timezone: string
+): CalendarEventTemplate {
   const startDate = new Date(event.startAt);
   if (isDSTTransitionPeriod(startDate, timezone)) {
     const offset = getTimezoneOffset(startDate, timezone);
diff --git a/src/services/groupService.ts b/src/services/groupService.ts
index e91ed249..81434138 100644
--- a/src/services/groupService.ts
+++ b/src/services/groupService.ts
@@ -80,7 +80,8 @@ export const joinGroupWithInvite = (
   const invite = group.invites.find((entry) => entry.id === inviteId);
   if (!invite || invite.status !== 'pending') throw new Error('Invite is not available');
   if (invite.expiresAt.getTime() < Date.now()) throw new Error('Invite has expired');
-  if (group.members.length >= group.planSharingRules.seatLimit) throw new Error('Member limit reached');
+  if (group.members.length >= group.planSharingRules.seatLimit)
+    throw new Error('Member limit reached');
 
   const member: GroupMember = {
     address: invite.inviteeAddress,
@@ -102,8 +103,12 @@ export const joinGroupWithInvite = (
   };
 };
 
-export const removeGroupMember = (group: SubscriptionGroup, memberAddress: string): SubscriptionGroup => {
-  if (memberAddress === group.owner) throw new Error('Transfer ownership before removing the owner');
+export const removeGroupMember = (
+  group: SubscriptionGroup,
+  memberAddress: string
+): SubscriptionGroup => {
+  if (memberAddress === group.owner)
+    throw new Error('Transfer ownership before removing the owner');
 
   const member = group.members.find((entry) => entry.address === memberAddress);
   if (!member) return group;
diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts
index 3dda8c31..a99f19f2 100644
--- a/src/services/notificationService.ts
+++ b/src/services/notificationService.ts
@@ -295,9 +295,7 @@ export async function presentDunningWarningNotification(
   });
 }
 
-export async function presentDunningSuspendedNotification(
-  sub: Subscription
-): Promise<void> {
+export async function presentDunningSuspendedNotification(sub: Subscription): Promise<void> {
   if (!isNotificationsSupported()) return;
   const status = await getPermissionStatus();
   if (status !== Notifications.PermissionStatus.GRANTED) return;
@@ -317,9 +315,7 @@ export async function presentDunningSuspendedNotification(
   });
 }
 
-export async function presentDunningCancelledNotification(
-  sub: Subscription
-): Promise<void> {
+export async function presentDunningCancelledNotification(sub: Subscription): Promise<void> {
   if (!isNotificationsSupported()) return;
   const status = await getPermissionStatus();
   if (status !== Notifications.PermissionStatus.GRANTED) return;
@@ -339,9 +335,7 @@ export async function presentDunningCancelledNotification(
   });
 }
 
-export async function presentDunningRecoveryNotification(
-  sub: Subscription
-): Promise<void> {
+export async function presentDunningRecoveryNotification(sub: Subscription): Promise<void> {
   if (!isNotificationsSupported()) return;
   const status = await getPermissionStatus();
   if (status !== Notifications.PermissionStatus.GRANTED) return;
diff --git a/src/services/oraclePriceService.ts b/src/services/oraclePriceService.ts
index 4bf2f3ba..135048a8 100644
--- a/src/services/oraclePriceService.ts
+++ b/src/services/oraclePriceService.ts
@@ -28,14 +28,25 @@ export class OraclePriceService {
     const cacheKey = `${token}:${quote}`;
     const cached = this.cache.get(cacheKey);
     if (cached && Date.now() - cached.fetchedAt < cached.ttl) {
-      return { token, quote, price: cached.price, decimals: 7, timestamp: cached.fetchedAt, source: 'primary' };
+      return {
+        token,
+        quote,
+        price: cached.price,
+        decimals: 7,
+        timestamp: cached.fetchedAt,
+        source: 'primary',
+      };
     }
 
     try {
       const response = await fetch(`${this.baseUrl}/price/${token}/${quote}`);
       if (!response.ok) return null;
       const data: OraclePrice = await response.json();
-      this.cache.set(cacheKey, { price: data.price, fetchedAt: Date.now(), ttl: this.defaultTtlMs });
+      this.cache.set(cacheKey, {
+        price: data.price,
+        fetchedAt: Date.now(),
+        ttl: this.defaultTtlMs,
+      });
       return data;
     } catch {
       return null;
@@ -52,9 +63,10 @@ export class OraclePriceService {
 
     const cryptoAmount = subscription.cryptoAmount ?? subscription.price;
     const fiatPrice = (cryptoAmount * oraclePrice.price) / 10 ** oraclePrice.decimals;
-    const deviationBps = subscription.price > 0
-      ? Math.abs(Math.round(((fiatPrice - subscription.price) / subscription.price) * 10000))
-      : 0;
+    const deviationBps =
+      subscription.price > 0
+        ? Math.abs(Math.round(((fiatPrice - subscription.price) / subscription.price) * 10000))
+        : 0;
 
     return {
       ...subscription,
diff --git a/src/services/sandbox/developerOnboardingService.ts b/src/services/sandbox/developerOnboardingService.ts
index 754d10c8..e0e68a99 100644
--- a/src/services/sandbox/developerOnboardingService.ts
+++ b/src/services/sandbox/developerOnboardingService.ts
@@ -1,9 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import {
-  DeveloperProfile,
-  DeveloperOnboardingStep,
-  SandboxEnvironment,
-} from '../../types/sandbox';
+import { DeveloperProfile, DeveloperOnboardingStep, SandboxEnvironment } from '../../types/sandbox';
 import { sandboxService } from './sandboxService';
 import { apiKeyService } from './apiKeyService';
 
diff --git a/src/services/sandbox/developerPortalService.ts b/src/services/sandbox/developerPortalService.ts
index 4aad85a8..31e74844 100644
--- a/src/services/sandbox/developerPortalService.ts
+++ b/src/services/sandbox/developerPortalService.ts
@@ -591,9 +591,7 @@ class DeveloperPortalService {
     return INTEGRATION_GUIDES.find((g) => g.id === id) || null;
   }
 
-  getIntegrationGuidesByDifficulty(
-    difficulty: IntegrationGuide['difficulty']
-  ): IntegrationGuide[] {
+  getIntegrationGuidesByDifficulty(difficulty: IntegrationGuide['difficulty']): IntegrationGuide[] {
     return INTEGRATION_GUIDES.filter((g) => g.difficulty === difficulty);
   }
 
@@ -639,9 +637,7 @@ class DeveloperPortalService {
       }
 
       for (const [id] of this.developers) {
-        const stepsData = await AsyncStorage.getItem(
-          `${DEVELOPER_STORAGE_KEY}-onboarding-${id}`
-        );
+        const stepsData = await AsyncStorage.getItem(`${DEVELOPER_STORAGE_KEY}-onboarding-${id}`);
         if (stepsData) {
           this.onboardingSteps.set(id, JSON.parse(stepsData));
         } else {
diff --git a/src/services/sandbox/documentationService.ts b/src/services/sandbox/documentationService.ts
index 57d21f5d..ba77ac53 100644
--- a/src/services/sandbox/documentationService.ts
+++ b/src/services/sandbox/documentationService.ts
@@ -13,12 +13,14 @@ const INTEGRATION_GUIDES: IntegrationGuide[] = [
       {
         id: 'step-1',
         title: 'Create a Developer Account',
-        content: 'Sign up for a SubTrackr developer account to access the API and sandbox environment.',
+        content:
+          'Sign up for a SubTrackr developer account to access the API and sandbox environment.',
       },
       {
         id: 'step-2',
         title: 'Generate API Keys',
-        content: 'Navigate to the API Keys section in your developer portal and generate a new key pair.',
+        content:
+          'Navigate to the API Keys section in your developer portal and generate a new key pair.',
       },
       {
         id: 'step-3',
diff --git a/src/services/sandbox/sandboxService.ts b/src/services/sandbox/sandboxService.ts
index 59b29f2f..98186ce8 100644
--- a/src/services/sandbox/sandboxService.ts
+++ b/src/services/sandbox/sandboxService.ts
@@ -57,10 +57,7 @@ const ENV_FEATURES: Record<SandboxEnvironment, string[]> = {
     'invoice_generate',
     'export_data',
   ],
-  [SandboxEnvironment.TESTING]: [
-    'subscription_read',
-    'analytics_read',
-  ],
+  [SandboxEnvironment.TESTING]: ['subscription_read', 'analytics_read'],
   [SandboxEnvironment.PRODUCTION]: [
     'subscription_create',
     'subscription_read',
@@ -161,7 +158,10 @@ class SandboxService {
     try {
       const stored = await AsyncStorage.getItem(SANDBOX_DATA_KEY);
       if (stored) {
-        const parsed = JSON.parse(stored) as Record<string, { testSubscriptions: TestSubscription[] }>;
+        const parsed = JSON.parse(stored) as Record<
+          string,
+          { testSubscriptions: TestSubscription[] }
+        >;
         for (const [env, data] of Object.entries(parsed)) {
           const envData = this.environmentData.get(env as SandboxEnvironment);
           if (envData && data.testSubscriptions) {
@@ -246,30 +246,52 @@ class SandboxService {
   private generateTestDataForEnvironment(environment: SandboxEnvironment): TestSubscription[] {
     const testNames: Record<SandboxEnvironment, string[]> = {
       [SandboxEnvironment.DEVELOPMENT]: [
-        'Netflix Premium', 'Spotify Family', 'Adobe Creative Cloud',
-        'GitHub Teams', 'Figma Professional', 'Notion Team',
-        'Slack Business+', 'Zoom Pro', 'Dropbox Business', 'Microsoft 365',
+        'Netflix Premium',
+        'Spotify Family',
+        'Adobe Creative Cloud',
+        'GitHub Teams',
+        'Figma Professional',
+        'Notion Team',
+        'Slack Business+',
+        'Zoom Pro',
+        'Dropbox Business',
+        'Microsoft 365',
       ],
       [SandboxEnvironment.STAGING]: [
-        'Disney+ Bundle', 'Apple One', 'YouTube Premium',
-        'Atlassian Cloud', 'Linear Pro', 'Vercel Pro',
-        'Netlify Pro', 'Heroku Basic', 'DigitalOcean', 'AWS Free Tier',
+        'Disney+ Bundle',
+        'Apple One',
+        'YouTube Premium',
+        'Atlassian Cloud',
+        'Linear Pro',
+        'Vercel Pro',
+        'Netlify Pro',
+        'Heroku Basic',
+        'DigitalOcean',
+        'AWS Free Tier',
       ],
       [SandboxEnvironment.TESTING]: [
-        'Test Service A', 'Test Service B', 'Test Service C',
-        'Test Service D', 'Test Service E',
+        'Test Service A',
+        'Test Service B',
+        'Test Service C',
+        'Test Service D',
+        'Test Service E',
       ],
       [SandboxEnvironment.PRODUCTION]: [
-        'Netflix Premium', 'Spotify Family', 'Adobe Creative Cloud',
-        'GitHub Teams', 'Figma Professional',
+        'Netflix Premium',
+        'Spotify Family',
+        'Adobe Creative Cloud',
+        'GitHub Teams',
+        'Figma Professional',
       ],
     };
 
     const prices: Record<SandboxEnvironment, number[]> = {
-      [SandboxEnvironment.DEVELOPMENT]: [15.99, 14.99, 54.99, 4.00, 12.00, 8.00, 12.50, 13.33, 9.99, 6.00],
-      [SandboxEnvironment.STAGING]: [13.99, 16.95, 11.99, 7.75, 8.00, 20.00, 19.00, 7.00, 5.00, 0.00],
+      [SandboxEnvironment.DEVELOPMENT]: [
+        15.99, 14.99, 54.99, 4.0, 12.0, 8.0, 12.5, 13.33, 9.99, 6.0,
+      ],
+      [SandboxEnvironment.STAGING]: [13.99, 16.95, 11.99, 7.75, 8.0, 20.0, 19.0, 7.0, 5.0, 0.0],
       [SandboxEnvironment.TESTING]: [9.99, 19.99, 29.99, 4.99, 14.99],
-      [SandboxEnvironment.PRODUCTION]: [15.99, 14.99, 54.99, 4.00, 12.00],
+      [SandboxEnvironment.PRODUCTION]: [15.99, 14.99, 54.99, 4.0, 12.0],
     };
 
     const names = testNames[environment];
@@ -367,7 +389,9 @@ class SandboxService {
     this.getCurrentEnvData().isolatedStorage.clear();
   }
 
-  async checkRateLimit(apiKeyId: string): Promise<{ allowed: boolean; remaining: number; retryAfter?: number }> {
+  async checkRateLimit(
+    apiKeyId: string
+  ): Promise<{ allowed: boolean; remaining: number; retryAfter?: number }> {
     const envData = this.getCurrentEnvData();
     const rateLimit = this.config.rateLimit;
     const now = Date.now();
@@ -406,7 +430,10 @@ class SandboxService {
     return { valid: true };
   }
 
-  getEnvironmentStats(): Record<SandboxEnvironment, { subscriptionCount: number; storageKeys: number }> {
+  getEnvironmentStats(): Record<
+    SandboxEnvironment,
+    { subscriptionCount: number; storageKeys: number }
+  > {
     const stats: Record<string, { subscriptionCount: number; storageKeys: number }> = {};
     for (const [env, envData] of this.environmentData.entries()) {
       stats[env] = {
diff --git a/src/services/sandbox/testDataGenerator.ts b/src/services/sandbox/testDataGenerator.ts
index 87d63994..ab506e60 100644
--- a/src/services/sandbox/testDataGenerator.ts
+++ b/src/services/sandbox/testDataGenerator.ts
@@ -1,12 +1,5 @@
-import {
-  TestDataConfig,
-  SandboxEnvironment,
-} from '../../types/sandbox';
-import {
-  Subscription,
-  SubscriptionCategory,
-  BillingCycle,
-} from '../../types/subscription';
+import { TestDataConfig, SandboxEnvironment } from '../../types/sandbox';
+import { Subscription, SubscriptionCategory, BillingCycle } from '../../types/subscription';
 
 const DEFAULT_TEST_CONFIG: TestDataConfig = {
   subscriptions: 10,
@@ -19,14 +12,57 @@ const DEFAULT_TEST_CONFIG: TestDataConfig = {
 };
 
 const SAMPLE_SUBSCRIPTION_NAMES: Record<SubscriptionCategory, string[]> = {
-  [SubscriptionCategory.STREAMING]: ['Netflix', 'Disney+', 'Hulu', 'HBO Max', 'Apple TV+', 'Paramount+'],
-  [SubscriptionCategory.SOFTWARE]: ['Adobe Creative Cloud', 'Microsoft 365', 'Slack', 'Notion', 'Figma'],
-  [SubscriptionCategory.GAMING]: ['Xbox Game Pass', 'PlayStation Plus', 'Nintendo Online', 'EA Play', 'Steam'],
+  [SubscriptionCategory.STREAMING]: [
+    'Netflix',
+    'Disney+',
+    'Hulu',
+    'HBO Max',
+    'Apple TV+',
+    'Paramount+',
+  ],
+  [SubscriptionCategory.SOFTWARE]: [
+    'Adobe Creative Cloud',
+    'Microsoft 365',
+    'Slack',
+    'Notion',
+    'Figma',
+  ],
+  [SubscriptionCategory.GAMING]: [
+    'Xbox Game Pass',
+    'PlayStation Plus',
+    'Nintendo Online',
+    'EA Play',
+    'Steam',
+  ],
   [SubscriptionCategory.PRODUCTIVITY]: ['Todoist', 'Evernote', 'Asana', 'Trello', 'Monday.com'],
-  [SubscriptionCategory.FITNESS]: ['Peloton', 'Fitbit Premium', 'Strava', 'MyFitnessPal', 'Headspace'],
-  [SubscriptionCategory.EDUCATION]: ['Coursera', 'Udemy', 'MasterClass', 'Duolingo Plus', 'Skillshare'],
-  [SubscriptionCategory.FINANCE]: ['Mint Premium', 'YNAB', 'Robinhood Gold', 'Bloomberg', 'TradingView'],
-  [SubscriptionCategory.OTHER]: ['Amazon Prime', 'Costco', 'Sam\'s Club', 'Box Subscription', 'Custom Service'],
+  [SubscriptionCategory.FITNESS]: [
+    'Peloton',
+    'Fitbit Premium',
+    'Strava',
+    'MyFitnessPal',
+    'Headspace',
+  ],
+  [SubscriptionCategory.EDUCATION]: [
+    'Coursera',
+    'Udemy',
+    'MasterClass',
+    'Duolingo Plus',
+    'Skillshare',
+  ],
+  [SubscriptionCategory.FINANCE]: [
+    'Mint Premium',
+    'YNAB',
+    'Robinhood Gold',
+    'Bloomberg',
+    'TradingView',
+  ],
+  [SubscriptionCategory.OTHER]: [
+    'Amazon Prime',
+    'Costco',
+    "Sam's Club",
+    'Box Subscription',
+    'Custom Service',
+  ],
 };
 
 const CRYPTO_TOKENS = ['ETH', 'USDC', 'DAI', 'WBTC', 'MATIC'];
@@ -60,7 +96,9 @@ class TestDataGenerator {
         category,
         price: this.randomPrice(fullConfig.priceRange.min, fullConfig.priceRange.max),
         currency: this.randomFromArray(fullConfig.currencies),
-        billingCycle: this.randomFromArray(fullConfig.billingCycles as BillingCycle[]) as BillingCycle,
+        billingCycle: this.randomFromArray(
+          fullConfig.billingCycles as BillingCycle[]
+        ) as BillingCycle,
         nextBillingDate: this.randomFutureDate(),
         isActive,
         notificationsEnabled: Math.random() > 0.3,
diff --git a/src/services/taxService.ts b/src/services/taxService.ts
index c1feed90..2f7cbd07 100644
--- a/src/services/taxService.ts
+++ b/src/services/taxService.ts
@@ -15,10 +15,7 @@ const isRateActive = (rate: TaxRate, transactionDate: Date): boolean => {
   );
 };
 
-export const calculateTaxAmount = (
-  config: TaxConfig,
-  input: TaxCalculationInput
-): TaxAmount => {
+export const calculateTaxAmount = (config: TaxConfig, input: TaxCalculationInput): TaxAmount => {
   const exemption = config.exemptions.find(
     (entry) =>
       entry.region === input.region &&
@@ -31,7 +28,7 @@ export const calculateTaxAmount = (
   );
 
   const reverseCharge = config.reverseChargeRegions.includes(input.region);
-  const rateBps = exemption || reverseCharge ? 0 : rate?.rateBps ?? 0;
+  const rateBps = exemption || reverseCharge ? 0 : (rate?.rateBps ?? 0);
   const tax = Number(((input.amount * rateBps) / 10_000).toFixed(2));
 
   return {
@@ -40,7 +37,7 @@ export const calculateTaxAmount = (
     subtotal: input.amount,
     tax,
     total: Number((input.amount + tax).toFixed(2)),
-    taxType: reverseCharge ? 'reverse_charge' : rate?.taxType ?? 'sales_tax',
+    taxType: reverseCharge ? 'reverse_charge' : (rate?.taxType ?? 'sales_tax'),
     rateBps,
     exempt: Boolean(exemption),
   };
diff --git a/src/services/walletService.ts b/src/services/walletService.ts
index 54778033..048ae3fc 100644
--- a/src/services/walletService.ts
+++ b/src/services/walletService.ts
@@ -37,12 +37,7 @@ export class WalletError extends Error {
   readonly userMessage: string;
   readonly recovery?: string;
 
-  constructor(
-    code: WalletErrorCode,
-    userMessage: string,
-    recovery?: string,
-    cause?: unknown
-  ) {
+  constructor(code: WalletErrorCode, userMessage: string, recovery?: string, cause?: unknown) {
     super(userMessage);
     this.name = 'WalletError';
     this.code = code;
@@ -756,7 +751,14 @@ const MAX_PAYMENT_METHODS_PER_USER = 10;
 const EXPIRY_WARNING_DAYS = 30;
 const TOKEN_TYPE_TO_NATIVE_SYMBOL: Record<number, Record<TokenType, string>> = {
   [CHAIN_IDS.ETHEREUM]: { XLM: '', USDC: 'USDC', ETH: 'ETH', NATIVE: 'ETH', MATIC: '', ARB: '' },
-  [CHAIN_IDS.POLYGON]: { XLM: '', USDC: 'USDC', ETH: 'ETH', NATIVE: 'MATIC', MATIC: 'MATIC', ARB: '' },
+  [CHAIN_IDS.POLYGON]: {
+    XLM: '',
+    USDC: 'USDC',
+    ETH: 'ETH',
+    NATIVE: 'MATIC',
+    MATIC: 'MATIC',
+    ARB: '',
+  },
   [CHAIN_IDS.ARBITRUM]: { XLM: '', USDC: 'USDC', ETH: 'ETH', NATIVE: 'ETH', MATIC: '', ARB: 'ARB' },
 };
 
@@ -820,7 +822,11 @@ export class PaymentMethodService {
       errors.push('Label is required');
     }
 
-    if (!data.maxSpendPerInterval || isNaN(Number(data.maxSpendPerInterval)) || Number(data.maxSpendPerInterval) <= 0) {
+    if (
+      !data.maxSpendPerInterval ||
+      isNaN(Number(data.maxSpendPerInterval)) ||
+      Number(data.maxSpendPerInterval) <= 0
+    ) {
       errors.push('Max spend per interval must be a positive number');
     }
 
@@ -858,7 +864,10 @@ export class PaymentMethodService {
 
     try {
       const provider = new ethers.providers.JsonRpcProvider(getEvmRpcUrl(method.chainId));
-      const erc20Abi = ['function decimals() view returns (uint8)', 'function symbol() view returns (string)'];
+      const erc20Abi = [
+        'function decimals() view returns (uint8)',
+        'function symbol() view returns (string)',
+      ];
       const contract = new ethers.Contract(method.tokenAddress, erc20Abi, provider);
 
       const decimals = await contract.decimals();
@@ -895,15 +904,21 @@ export class PaymentMethodService {
   }
 
   getPrimaryMethods(methods: PaymentMethod[]): PaymentMethod[] {
-    return methods.filter((m) => m.priority === PaymentPriority.PRIMARY && m.isActive && m.isVerified);
+    return methods.filter(
+      (m) => m.priority === PaymentPriority.PRIMARY && m.isActive && m.isVerified
+    );
   }
 
   getBackupMethods(methods: PaymentMethod[]): PaymentMethod[] {
-    return methods.filter((m) => m.priority === PaymentPriority.BACKUP && m.isActive && m.isVerified);
+    return methods.filter(
+      (m) => m.priority === PaymentPriority.BACKUP && m.isActive && m.isVerified
+    );
   }
 
   getFallbackMethods(methods: PaymentMethod[]): PaymentMethod[] {
-    return methods.filter((m) => m.priority === PaymentPriority.FALLBACK && m.isActive && m.isVerified);
+    return methods.filter(
+      (m) => m.priority === PaymentPriority.FALLBACK && m.isActive && m.isVerified
+    );
   }
 
   getActiveVerifiedMethods(methods: PaymentMethod[]): PaymentMethod[] {
@@ -976,7 +991,10 @@ export class PaymentMethodService {
         balance = await contract.balanceOf(conn.address);
       }
 
-      const required = ethers.utils.parseUnits(requiredAmount, method.tokenType === TokenType.USDC ? 6 : 18);
+      const required = ethers.utils.parseUnits(
+        requiredAmount,
+        method.tokenType === TokenType.USDC ? 6 : 18
+      );
       return {
         sufficient: balance.gte(required),
         balance: balance.toString(),
@@ -1091,7 +1109,10 @@ export class PaymentMethodService {
           continue;
         }
 
-        if (method.maxSpendPerInterval && ethers.BigNumber.from(amount).gt(method.maxSpendPerInterval)) {
+        if (
+          method.maxSpendPerInterval &&
+          ethers.BigNumber.from(amount).gt(method.maxSpendPerInterval)
+        ) {
           attempt.status = 'failed';
           attempt.failureReason = `Amount ${amount} exceeds max spend per interval ${method.maxSpendPerInterval}`;
           attempt.resolvedAt = new Date();
diff --git a/src/store/__tests__/slaStore.test.ts b/src/store/__tests__/slaStore.test.ts
index 0448490a..28e51d66 100644
--- a/src/store/__tests__/slaStore.test.ts
+++ b/src/store/__tests__/slaStore.test.ts
@@ -92,9 +92,8 @@ beforeEach(() => {
   (AsyncStorage.setItem as jest.Mock).mockClear();
   (AsyncStorage.getItem as jest.Mock).mockClear();
   (AsyncStorage.removeItem as jest.Mock).mockClear();
-  const notify = (
-    jest.requireMock('../../services/notificationService') as NotificationServiceMock
-  ).presentSlaBreachNotification;
+  const notify = (jest.requireMock('../../services/notificationService') as NotificationServiceMock)
+    .presentSlaBreachNotification;
   notify.mockClear();
   resetStore();
 });
diff --git a/src/store/affiliateStore.ts b/src/store/affiliateStore.ts
index b7ef2fe6..2f2a1502 100644
--- a/src/store/affiliateStore.ts
+++ b/src/store/affiliateStore.ts
@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import { persist, createJSONStorage, StateStorage } from 'zustand/middleware';
+import { persist, createJSONStorage } from 'zustand/middleware';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import {
   Affiliate,
@@ -10,7 +10,7 @@ import {
   AffiliateStatus,
   CommissionType,
 } from '../types/affiliate';
-import { CACHE_CONSTANTS } from '../utils/constants/values';
+import { AffiliateService } from '../../backend/services/affiliate/AffiliateService';
 
 const STORAGE_KEY = 'subtrackr-affiliate';
 const STORE_VERSION = 1;
@@ -24,31 +24,36 @@ interface AffiliateState {
   error: string | null;
 
   registerAffiliate: (referrerAddress: string, programId: string) => Promise<void>;
-  trackReferral: (affiliateId: string, subscriptionId: string) => Promise<void>;
+  trackReferral: (
+    affiliateId: string,
+    subscriptionId: string,
+    subscriptionAmount: number,
+    ip: string,
+    userAgent: string,
+    cookieReferralCode?: string,
+    attributionModel?: 'first-touch' | 'last-touch' | 'linear'
+  ) => Promise<void>;
+  trackClick: (referralCode: string, ip: string, userAgent: string) => Promise<void>;
   calculateCommission: (affiliateId: string, subscriptionAmount: number) => Promise<number>;
   approveCommission: (commissionId: string) => Promise<void>;
   payoutCommission: (affiliateId: string) => Promise<void>;
   updateAffiliateStatus: (affiliateId: string, status: AffiliateStatus) => Promise<void>;
+  triggerClawback: (subscriptionId: string) => Promise<void>;
   getMetrics: () => AffiliateMetrics;
 }
 
-const generateUniqueId = (): string => {
-  const timestamp = Date.now().toString(36);
-  const randomComponent = Math.random().toString(36).substring(2, 8);
-  return `${timestamp}-${randomComponent}`;
-};
-
 const defaultPrograms: AffiliateProgram[] = [
   {
     id: 'default-basic',
     name: 'Basic Affiliate Program',
-    description: 'Earn 5% commission on all referrals',
+    description: 'Earn 10% commission on all referrals',
     commissionConfig: {
       type: CommissionType.PERCENTAGE,
-      rate: 5,
+      rate: 10,
     },
     attributionWindowDays: 30,
     isActive: true,
+    attributionModel: 'last-touch',
   },
   {
     id: 'default-tiered',
@@ -57,18 +62,16 @@ const defaultPrograms: AffiliateProgram[] = [
     commissionConfig: {
       type: CommissionType.TIERED,
       rate: 10,
-      tierThresholds: [1000, 5000, 10000],
+      tierThresholds: [100, 500, 1000],
       tierRates: [10, 12, 15],
     },
     attributionWindowDays: 60,
     isActive: true,
+    attributionModel: 'last-touch',
   },
 ];
 
-const calculateTieredCommission = (
-  amount: number,
-  config: CommissionConfig
-): number => {
+const calculateTieredCommission = (amount: number, config: CommissionConfig): number => {
   if (config.type !== CommissionType.TIERED || !config.tierThresholds || !config.tierRates) {
     return amount * (config.rate / 100);
   }
@@ -95,6 +98,7 @@ export const useAffiliateStore = create<AffiliateState>()(
         totalEarnings: 0,
         pendingPayout: 0,
         conversionRate: 0,
+        totalClicks: 0,
       },
       isLoading: false,
       error: null,
@@ -105,21 +109,14 @@ export const useAffiliateStore = create<AffiliateState>()(
           const program = get().programs.find((p) => p.id === programId);
           if (!program) throw new Error('Program not found');
 
-          const newAffiliate: Affiliate = {
-            id: generateUniqueId(),
+          // Call backend service
+          const backendAffiliate = await AffiliateService.registerAffiliate(
             referrerAddress,
-            programId,
-            commissionRate: program.commissionConfig.rate,
-            paymentThreshold: 100,
-            status: AffiliateStatus.ACTIVE,
-            totalReferrals: 0,
-            totalEarnings: 0,
-            pendingPayout: 0,
-            createdAt: new Date(),
-          };
+            programId
+          );
 
           set((state) => ({
-            affiliates: [...state.affiliates, newAffiliate],
+            affiliates: [...state.affiliates, backendAffiliate],
             isLoading: false,
           }));
         } catch (error) {
@@ -130,38 +127,78 @@ export const useAffiliateStore = create<AffiliateState>()(
         }
       },
 
-      trackReferral: async (affiliateId: string, subscriptionId: string) => {
+      trackClick: async (referralCode: string, ip: string, userAgent: string) => {
+        try {
+          // Call backend
+          await AffiliateService.trackClick(referralCode, ip, userAgent);
+
+          // Sync frontend state
+          set((state) => ({
+            affiliates: state.affiliates.map((a) =>
+              a.referralCode === referralCode ? { ...a, clicksCount: (a.clicksCount || 0) + 1 } : a
+            ),
+          }));
+        } catch (error) {
+          console.warn('Track click warning:', error);
+        }
+      },
+
+      trackReferral: async (
+        affiliateId: string,
+        subscriptionId: string,
+        subscriptionAmount: number,
+        ip: string,
+        userAgent: string,
+        cookieReferralCode?: string,
+        attributionModel: 'first-touch' | 'last-touch' | 'linear' = 'last-touch'
+      ) => {
         set({ isLoading: true, error: null });
         try {
           const { affiliates } = get();
           const affiliate = affiliates.find((a) => a.id === affiliateId);
           if (!affiliate) throw new Error('Affiliate not found');
 
-          set({
-            affiliates: affiliates.map((a) =>
+          // Trigger conversion on backend (IP self referral check, speed check)
+          const newCommissions = await AffiliateService.convertReferral(
+            subscriptionId,
+            subscriptionAmount,
+            ip,
+            userAgent,
+            cookieReferralCode || affiliate.referralCode,
+            attributionModel
+          );
+
+          // Get updated backend affiliate data for fraud status sync
+          const updatedBackend = AffiliateService.getAffiliate(affiliateId);
+
+          set((state) => ({
+            affiliates: state.affiliates.map((a) =>
               a.id === affiliateId
-                ? { ...a, totalReferrals: a.totalReferrals + 1 }
+                ? {
+                    ...a,
+                    totalReferrals: updatedBackend
+                      ? updatedBackend.totalReferrals
+                      : a.totalReferrals + 1,
+                    pendingPayout: updatedBackend
+                      ? updatedBackend.pendingPayout
+                      : a.pendingPayout + (newCommissions[0]?.amount || 0),
+                    fraudRiskScore: updatedBackend
+                      ? updatedBackend.fraudRiskScore
+                      : a.fraudRiskScore,
+                    fraudStatus: updatedBackend ? updatedBackend.fraudStatus : a.fraudStatus,
+                    status: updatedBackend ? updatedBackend.status : a.status,
+                  }
                 : a
             ),
-            commissions: [
-              ...get().commissions,
-              {
-                id: generateUniqueId(),
-                affiliateId,
-                subscriptionId,
-                amount: 0,
-                currency: 'USD',
-                status: 'pending',
-                createdAt: new Date(),
-              },
-            ],
+            commissions: [...state.commissions, ...newCommissions],
             isLoading: false,
-          });
+          }));
         } catch (error) {
           set({
             error: error instanceof Error ? error.message : 'Failed to track referral',
             isLoading: false,
           });
+          throw error;
         }
       },
 
@@ -197,47 +234,79 @@ export const useAffiliateStore = create<AffiliateState>()(
       },
 
       payoutCommission: async (affiliateId: string) => {
-        const { commissions, affiliates } = get();
-        const affiliate = affiliates.find((a) => a.id === affiliateId);
-        if (!affiliate) return;
-
-        const pendingComms = commissions.filter(
-          (c) => c.affiliateId === affiliateId && c.status === 'approved'
-        );
+        set({ isLoading: true, error: null });
+        try {
+          // Request from backend service
+          const payoutRecord = await AffiliateService.requestPayout(affiliateId);
+          const updatedBackend = AffiliateService.getAffiliate(affiliateId);
 
-        const totalPayout = pendingComms.reduce((sum, c) => sum + c.amount, 0);
+          set((state) => ({
+            commissions: state.commissions.map((c) =>
+              c.affiliateId === affiliateId && c.status === 'pending'
+                ? { ...c, status: 'paid' as const, paidAt: new Date() }
+                : c
+            ),
+            affiliates: state.affiliates.map((a) =>
+              a.id === affiliateId
+                ? {
+                    ...a,
+                    totalEarnings: updatedBackend
+                      ? updatedBackend.totalEarnings
+                      : a.totalEarnings + payoutRecord.amount,
+                    pendingPayout: updatedBackend ? updatedBackend.pendingPayout : 0,
+                    payoutHistory: [...(a.payoutHistory || []), payoutRecord],
+                  }
+                : a
+            ),
+            isLoading: false,
+          }));
+        } catch (error) {
+          set({
+            error: error instanceof Error ? error.message : 'Payout failed',
+            isLoading: false,
+          });
+          throw error;
+        }
+      },
 
-        set({
-          commissions: commissions.map((c) =>
-            c.affiliateId === affiliateId && c.status === 'approved'
-              ? { ...c, status: 'paid' as const, paidAt: new Date() }
-              : c
-          ),
-          affiliates: affiliates.map((a) =>
-            a.id === affiliateId
-              ? {
+      triggerClawback: async (subscriptionId: string) => {
+        try {
+          const clawbackAmount = await AffiliateService.processClawback(subscriptionId);
+          if (clawbackAmount > 0) {
+            // Update frontend store to reflect clawback
+            set((state) => ({
+              commissions: state.commissions.map((c) =>
+                c.subscriptionId === subscriptionId ? { ...c, isClawbacked: true } : c
+              ),
+              affiliates: state.affiliates.map((a) => {
+                const affectedComms = state.commissions.filter(
+                  (c) => c.subscriptionId === subscriptionId && c.affiliateId === a.id
+                );
+                const totalAffAmt = affectedComms.reduce((sum, c) => sum + c.amount, 0);
+                return {
                   ...a,
-                  totalEarnings: a.totalEarnings + totalPayout,
-                  pendingPayout: Math.max(0, a.pendingPayout - totalPayout),
-                }
-              : a
-          ),
-        });
+                  pendingPayout: Math.max(0, a.pendingPayout - totalAffAmt),
+                };
+              }),
+            }));
+          }
+        } catch (error) {
+          console.error('Clawback failed:', error);
+        }
       },
 
       updateAffiliateStatus: async (affiliateId: string, status: AffiliateStatus) => {
         set((state) => ({
-          affiliates: state.affiliates.map((a) =>
-            a.id === affiliateId ? { ...a, status } : a
-          ),
+          affiliates: state.affiliates.map((a) => (a.id === affiliateId ? { ...a, status } : a)),
         }));
       },
 
       getMetrics: () => {
-        const { affiliates, commissions } = get();
+        const { affiliates } = get();
         const totalEarnings = affiliates.reduce((sum, a) => sum + a.totalEarnings, 0);
         const pendingPayout = affiliates.reduce((sum, a) => sum + a.pendingPayout, 0);
         const totalReferrals = affiliates.reduce((sum, a) => sum + a.totalReferrals, 0);
+        const totalClicks = affiliates.reduce((sum, a) => sum + (a.clicksCount || 0), 0);
         const activeReferrals = affiliates.filter(
           (a) => a.status === AffiliateStatus.ACTIVE
         ).length;
@@ -247,7 +316,8 @@ export const useAffiliateStore = create<AffiliateState>()(
           activeReferrals,
           totalEarnings,
           pendingPayout,
-          conversionRate: totalReferrals > 0 ? (activeReferrals / totalReferrals) * 100 : 0,
+          conversionRate: totalClicks > 0 ? (totalReferrals / totalClicks) * 100 : 0,
+          totalClicks,
         };
       },
     }),
@@ -262,4 +332,4 @@ export const useAffiliateStore = create<AffiliateState>()(
       }),
     }
   )
-);
\ No newline at end of file
+);
diff --git a/src/store/calendarStore.ts b/src/store/calendarStore.ts
index ca02acda..ef49ac2a 100644
--- a/src/store/calendarStore.ts
+++ b/src/store/calendarStore.ts
@@ -235,7 +235,13 @@ export const useCalendarStore = create<CalendarState>()(
       },
 
       addOneTimePayment: (subscriptionId, amount, currency, scheduledDate, description) => {
-        const payment = scheduleOneTimePayment(subscriptionId, amount, currency, scheduledDate, description);
+        const payment = scheduleOneTimePayment(
+          subscriptionId,
+          amount,
+          currency,
+          scheduledDate,
+          description
+        );
         set((state) => ({
           oneTimePayments: [...state.oneTimePayments, payment],
         }));
diff --git a/src/store/developerPortalStore.ts b/src/store/developerPortalStore.ts
index 29ebb638..b76905c8 100644
--- a/src/store/developerPortalStore.ts
+++ b/src/store/developerPortalStore.ts
@@ -100,10 +100,7 @@ export const useDeveloperPortalStore = create<DeveloperPortalState>()((set, get)
   fetchDeveloper: async (developerId: string) => {
     set({ isLoading: true, error: null });
     try {
-      await Promise.all([
-        developerPortalService.loadDevelopers(),
-        apiKeyService.loadApiKeys(),
-      ]);
+      await Promise.all([developerPortalService.loadDevelopers(), apiKeyService.loadApiKeys()]);
 
       const developer = await developerPortalService.getDeveloper(developerId);
       if (!developer) {
@@ -137,10 +134,7 @@ export const useDeveloperPortalStore = create<DeveloperPortalState>()((set, get)
 
     set({ isLoading: true, error: null });
     try {
-      const updated = await developerPortalService.updateDeveloper(
-        developer.id,
-        updates
-      );
+      const updated = await developerPortalService.updateDeveloper(developer.id, updates);
       set({ developer: updated, isLoading: false });
     } catch (error) {
       set({
@@ -183,10 +177,7 @@ export const useDeveloperPortalStore = create<DeveloperPortalState>()((set, get)
         isLoading: false,
       }));
 
-      await developerPortalService.completeOnboardingStep(
-        developerId,
-        'generate-api-key'
-      );
+      await developerPortalService.completeOnboardingStep(developerId, 'generate-api-key');
 
       const steps = await developerPortalService.getOnboardingSteps(developerId);
       set({ onboardingSteps: steps });
@@ -278,10 +269,7 @@ export const useDeveloperPortalStore = create<DeveloperPortalState>()((set, get)
   fetchRecentUsage: async (developerId, limit) => {
     set({ isLoading: true, error: null });
     try {
-      const recentUsage = await usageTrackingService.getRecentMetrics(
-        developerId,
-        limit
-      );
+      const recentUsage = await usageTrackingService.getRecentMetrics(developerId, limit);
       set({ recentUsage, isLoading: false });
     } catch (error) {
       set({
@@ -304,10 +292,7 @@ export const useDeveloperPortalStore = create<DeveloperPortalState>()((set, get)
 
   completeOnboardingStep: async (developerId, stepId) => {
     try {
-      const steps = await developerPortalService.completeOnboardingStep(
-        developerId,
-        stepId
-      );
+      const steps = await developerPortalService.completeOnboardingStep(developerId, stepId);
       if (steps) {
         set({ onboardingSteps: steps });
       }
diff --git a/src/store/fraudStore.ts b/src/store/fraudStore.ts
index a4f281a7..1aa5a3d7 100644
--- a/src/store/fraudStore.ts
+++ b/src/store/fraudStore.ts
@@ -64,9 +64,24 @@ const subscriptionSeeds: FraudSubscriptionRecord[] = [
     reason: 'Usage burst and fast creation cadence',
     usagePattern: 'burst',
     signals: [
-      { kind: 'velocity', score: 28, detail: 'Created alongside two other subscriptions', observedAt: nowIso() },
-      { kind: 'usage-anomaly', score: 30, detail: 'Observed usage is 3x the expected baseline', observedAt: nowIso() },
-      { kind: 'chargeback', score: 20, detail: 'Recent dispute behavior is elevated', observedAt: nowIso() },
+      {
+        kind: 'velocity',
+        score: 28,
+        detail: 'Created alongside two other subscriptions',
+        observedAt: nowIso(),
+      },
+      {
+        kind: 'usage-anomaly',
+        score: 30,
+        detail: 'Observed usage is 3x the expected baseline',
+        observedAt: nowIso(),
+      },
+      {
+        kind: 'chargeback',
+        score: 20,
+        detail: 'Recent dispute behavior is elevated',
+        observedAt: nowIso(),
+      },
     ],
     isBlocked: false,
     isFlagged: true,
@@ -88,8 +103,18 @@ const subscriptionSeeds: FraudSubscriptionRecord[] = [
     reason: 'Chargeback history and rapid subscription creation',
     usagePattern: 'erratic',
     signals: [
-      { kind: 'velocity', score: 35, detail: 'Second subscription within the same day', observedAt: nowIso() },
-      { kind: 'chargeback', score: 35, detail: 'Chargeback history predicts blocked outcome', observedAt: nowIso() },
+      {
+        kind: 'velocity',
+        score: 35,
+        detail: 'Second subscription within the same day',
+        observedAt: nowIso(),
+      },
+      {
+        kind: 'chargeback',
+        score: 35,
+        detail: 'Chargeback history predicts blocked outcome',
+        observedAt: nowIso(),
+      },
     ],
     isBlocked: true,
     isFlagged: true,
@@ -110,7 +135,14 @@ const subscriptionSeeds: FraudSubscriptionRecord[] = [
     action: 'approve',
     reason: 'Usage profile is stable',
     usagePattern: 'normal',
-    signals: [{ kind: 'velocity', score: 6, detail: 'Low velocity but within threshold', observedAt: nowIso() }],
+    signals: [
+      {
+        kind: 'velocity',
+        score: 6,
+        detail: 'Low velocity but within threshold',
+        observedAt: nowIso(),
+      },
+    ],
     isBlocked: false,
     isFlagged: false,
   },
@@ -131,9 +163,24 @@ const subscriptionSeeds: FraudSubscriptionRecord[] = [
     reason: 'Chargeback prediction and anomalous usage behavior',
     usagePattern: 'burst',
     signals: [
-      { kind: 'usage-anomaly', score: 30, detail: 'Observed usage is far above baseline', observedAt: nowIso() },
-      { kind: 'chargeback', score: 35, detail: 'Repeated disputes indicate high risk', observedAt: nowIso() },
-      { kind: 'velocity', score: 27, detail: 'Fast subscription creation detected', observedAt: nowIso() },
+      {
+        kind: 'usage-anomaly',
+        score: 30,
+        detail: 'Observed usage is far above baseline',
+        observedAt: nowIso(),
+      },
+      {
+        kind: 'chargeback',
+        score: 35,
+        detail: 'Repeated disputes indicate high risk',
+        observedAt: nowIso(),
+      },
+      {
+        kind: 'velocity',
+        score: 27,
+        detail: 'Fast subscription creation detected',
+        observedAt: nowIso(),
+      },
     ],
     isBlocked: true,
     isFlagged: true,
@@ -189,9 +236,14 @@ const reviewSeeds: FraudCase[] = [
 ];
 
 const averageRisk = (items: FraudSubscriptionRecord[]): number =>
-  items.length ? Math.round(items.reduce((sum, item) => sum + item.riskScore, 0) / items.length) : 0;
+  items.length
+    ? Math.round(items.reduce((sum, item) => sum + item.riskScore, 0) / items.length)
+    : 0;
 
-const computeAnalytics = (subscriptions: FraudSubscriptionRecord[], reviewQueue: FraudCase[]): FraudAnalytics => {
+const computeAnalytics = (
+  subscriptions: FraudSubscriptionRecord[],
+  reviewQueue: FraudCase[]
+): FraudAnalytics => {
   const approved = subscriptions.filter((item) => item.action === 'approve').length;
   const flagged = subscriptions.filter((item) => item.action === 'flag').length;
   const blocked = subscriptions.filter((item) => item.action === 'block').length;
@@ -284,10 +336,18 @@ const buildMerchantReport = (
     blockedSubscriptions: scoped.filter((item) => item.action === 'block').length,
     manualReviewCount: scopedCases.filter((item) => item.status !== 'reviewed').length,
     averageRisk: averageRisk(scoped),
-    velocityAlerts: scoped.filter((item) => item.signals.some((signal) => signal.kind === 'velocity')).length,
-    anomalyAlerts: scoped.filter((item) => item.signals.some((signal) => signal.kind === 'usage-anomaly')).length,
-    chargebackPredictions: scoped.filter((item) => item.signals.some((signal) => signal.kind === 'chargeback')).length,
-    highRiskSubscribers: new Set(scoped.filter((item) => item.riskScore >= 50).map((item) => item.subscriberId)).size,
+    velocityAlerts: scoped.filter((item) =>
+      item.signals.some((signal) => signal.kind === 'velocity')
+    ).length,
+    anomalyAlerts: scoped.filter((item) =>
+      item.signals.some((signal) => signal.kind === 'usage-anomaly')
+    ).length,
+    chargebackPredictions: scoped.filter((item) =>
+      item.signals.some((signal) => signal.kind === 'chargeback')
+    ).length,
+    highRiskSubscribers: new Set(
+      scoped.filter((item) => item.riskScore >= 50).map((item) => item.subscriberId)
+    ).size,
     recentCases: scopedCases.slice(0, 5),
   };
 };
@@ -296,7 +356,10 @@ export const useFraudStore = create<FraudState>()(
   persist(
     (set, get) => ({
       merchants: merchantSeeds.map((merchant) => ({ ...merchant })),
-      subscriptions: subscriptionSeeds.map((item) => ({ ...item, signals: item.signals.map((signal) => ({ ...signal })) })),
+      subscriptions: subscriptionSeeds.map((item) => ({
+        ...item,
+        signals: item.signals.map((signal) => ({ ...signal })),
+      })),
       assessments: hydrateAssessments(subscriptionSeeds),
       reviewQueue: hydrateReviewQueue(reviewSeeds),
       analytics: computeAnalytics(subscriptionSeeds, reviewSeeds),
@@ -310,13 +373,26 @@ export const useFraudStore = create<FraudState>()(
           assessments: hydrateAssessments(subscriptions),
           merchants: merchants.map((merchant) => ({
             ...merchant,
-            averageRisk: buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id).averageRisk,
-            blockedSubscriptions: buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id).blockedSubscriptions,
-            activeSubscriptions: buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id).totalSubscriptions,
+            averageRisk: buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id)
+              .averageRisk,
+            blockedSubscriptions: buildMerchantReport(
+              merchants,
+              subscriptions,
+              reviewQueue,
+              merchant.id
+            ).blockedSubscriptions,
+            activeSubscriptions: buildMerchantReport(
+              merchants,
+              subscriptions,
+              reviewQueue,
+              merchant.id
+            ).totalSubscriptions,
             status:
-              buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id).averageRisk >= 60
+              buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id).averageRisk >=
+              60
                 ? 'high-risk'
-                : buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id).averageRisk >= 35
+                : buildMerchantReport(merchants, subscriptions, reviewQueue, merchant.id)
+                      .averageRisk >= 35
                   ? 'watch'
                   : 'healthy',
           })),
@@ -366,14 +442,20 @@ export const useFraudStore = create<FraudState>()(
             isFlagged: true,
             isBlocked: nextCase.action === 'block',
           }),
-          reviewQueue: [nextCase, ...state.reviewQueue.filter((entry) => entry.subscriptionId !== subscriptionId)],
+          reviewQueue: [
+            nextCase,
+            ...state.reviewQueue.filter((entry) => entry.subscriptionId !== subscriptionId),
+          ],
           analytics: computeAnalytics(
             updateSubscription(state.subscriptions, subscriptionId, {
               action: nextCase.action,
               isFlagged: true,
               isBlocked: nextCase.action === 'block',
             }),
-            [nextCase, ...state.reviewQueue.filter((entry) => entry.subscriptionId !== subscriptionId)]
+            [
+              nextCase,
+              ...state.reviewQueue.filter((entry) => entry.subscriptionId !== subscriptionId),
+            ]
           ),
         }));
       },
@@ -430,7 +512,12 @@ export const useFraudStore = create<FraudState>()(
               ? {
                   ...entry,
                   action,
-                  status: action === 'approve' ? 'reviewed' : action === 'block' ? 'escalated' : 'pending',
+                  status:
+                    action === 'approve'
+                      ? 'reviewed'
+                      : action === 'block'
+                        ? 'escalated'
+                        : 'pending',
                   updatedAt: nowIso(),
                 }
               : entry
diff --git a/src/store/groupStore.ts b/src/store/groupStore.ts
index 8977e84f..fd0a1420 100644
--- a/src/store/groupStore.ts
+++ b/src/store/groupStore.ts
@@ -35,7 +35,8 @@ const updateGroup = (
   groups: SubscriptionGroup[],
   groupId: GroupId,
   updater: (group: SubscriptionGroup) => SubscriptionGroup
-): SubscriptionGroup[] => groups.map((group) => (group.groupId === groupId ? updater(group) : group));
+): SubscriptionGroup[] =>
+  groups.map((group) => (group.groupId === groupId ? updater(group) : group));
 
 export const useGroupStore = create<GroupState>((set, get) => ({
   groups: [],
@@ -78,7 +79,9 @@ export const useGroupStore = create<GroupState>((set, get) => ({
   removeMember: (groupId, memberAddress) => {
     try {
       set((state) => ({
-        groups: updateGroup(state.groups, groupId, (group) => removeGroupMember(group, memberAddress)),
+        groups: updateGroup(state.groups, groupId, (group) =>
+          removeGroupMember(group, memberAddress)
+        ),
         error: null,
       }));
     } catch (error) {
diff --git a/src/store/invoiceStore.ts b/src/store/invoiceStore.ts
index b4278ba6..d360a782 100644
--- a/src/store/invoiceStore.ts
+++ b/src/store/invoiceStore.ts
@@ -461,10 +461,7 @@ export const useInvoiceStore = create<InvoiceState>()(
       calculateTotals: (id) => {
         const invoice = get().invoices.find((entry) => entry.id === id);
         if (!invoice) return null;
-        return calculateInvoiceTotals(
-          invoice.lineItems,
-          invoice.lineItems[0]?.taxRateBps ?? 0
-        );
+        return calculateInvoiceTotals(invoice.lineItems, invoice.lineItems[0]?.taxRateBps ?? 0);
       },
 
       setCustomerTaxStatus: (subscriberId, status) => {
diff --git a/src/store/loyaltyStore.ts b/src/store/loyaltyStore.ts
index a33f7140..c5060793 100644
--- a/src/store/loyaltyStore.ts
+++ b/src/store/loyaltyStore.ts
@@ -276,4 +276,4 @@ export const useLoyaltyStore = create<LoyaltyState>()(
       }),
     }
   )
-);
\ No newline at end of file
+);
diff --git a/src/store/merchantStore.ts b/src/store/merchantStore.ts
index e6253a40..edd5bace 100644
--- a/src/store/merchantStore.ts
+++ b/src/store/merchantStore.ts
@@ -213,4 +213,4 @@ export const useMerchantStore = create<MerchantState>()(
       partialize: (state) => ({ onboarding: state.onboarding }),
     }
   )
-);
\ No newline at end of file
+);
diff --git a/src/store/sandboxStore.ts b/src/store/sandboxStore.ts
index 1fb07ee1..cd515c1e 100644
--- a/src/store/sandboxStore.ts
+++ b/src/store/sandboxStore.ts
@@ -43,12 +43,54 @@ const DEFAULT_RATE_LIMIT = {
 };
 
 const DEFAULT_ONBOARDING_STEPS: OnboardingStepInfo[] = [
-  { id: DeveloperOnboardingStep.WELCOME, title: 'Welcome', description: 'Learn about the developer portal', step: DeveloperOnboardingStep.WELCOME, completed: false, required: true },
-  { id: DeveloperOnboardingStep.CREATE_ACCOUNT, title: 'Create Account', description: 'Set up your developer profile', step: DeveloperOnboardingStep.CREATE_ACCOUNT, completed: false, required: true },
-  { id: DeveloperOnboardingStep.GENERATE_API_KEY, title: 'Generate API Key', description: 'Create your sandbox API key', step: DeveloperOnboardingStep.GENERATE_API_KEY, completed: false, required: true },
-  { id: DeveloperOnboardingStep.EXPLORE_SANDBOX, title: 'Explore Sandbox', description: 'Test the sandbox environment', step: DeveloperOnboardingStep.EXPLORE_SANDBOX, completed: false, required: false },
-  { id: DeveloperOnboardingStep.BUILD_INTEGRATION, title: 'Build Integration', description: 'Build your integration', step: DeveloperOnboardingStep.BUILD_INTEGRATION, completed: false, required: false },
-  { id: DeveloperOnboardingStep.GO_LIVE, title: 'Go Live', description: 'Switch to production', step: DeveloperOnboardingStep.GO_LIVE, completed: false, required: false },
+  {
+    id: DeveloperOnboardingStep.WELCOME,
+    title: 'Welcome',
+    description: 'Learn about the developer portal',
+    step: DeveloperOnboardingStep.WELCOME,
+    completed: false,
+    required: true,
+  },
+  {
+    id: DeveloperOnboardingStep.CREATE_ACCOUNT,
+    title: 'Create Account',
+    description: 'Set up your developer profile',
+    step: DeveloperOnboardingStep.CREATE_ACCOUNT,
+    completed: false,
+    required: true,
+  },
+  {
+    id: DeveloperOnboardingStep.GENERATE_API_KEY,
+    title: 'Generate API Key',
+    description: 'Create your sandbox API key',
+    step: DeveloperOnboardingStep.GENERATE_API_KEY,
+    completed: false,
+    required: true,
+  },
+  {
+    id: DeveloperOnboardingStep.EXPLORE_SANDBOX,
+    title: 'Explore Sandbox',
+    description: 'Test the sandbox environment',
+    step: DeveloperOnboardingStep.EXPLORE_SANDBOX,
+    completed: false,
+    required: false,
+  },
+  {
+    id: DeveloperOnboardingStep.BUILD_INTEGRATION,
+    title: 'Build Integration',
+    description: 'Build your integration',
+    step: DeveloperOnboardingStep.BUILD_INTEGRATION,
+    completed: false,
+    required: false,
+  },
+  {
+    id: DeveloperOnboardingStep.GO_LIVE,
+    title: 'Go Live',
+    description: 'Switch to production',
+    step: DeveloperOnboardingStep.GO_LIVE,
+    completed: false,
+    required: false,
+  },
 ];
 
 const DEFAULT_INTEGRATION_GUIDES: IntegrationGuide[] = [
@@ -60,9 +102,24 @@ const DEFAULT_INTEGRATION_GUIDES: IntegrationGuide[] = [
     difficulty: 'beginner',
     estimatedTime: '15 minutes',
     steps: [
-      { title: 'Install SDK', content: 'npm install @subtrackr/sdk', codeExample: 'npm install @subtrackr/sdk', language: 'bash' },
-      { title: 'Initialize Client', content: 'Create a SubTrackr client with your API key.', codeExample: `const client = new SubTrackr({\n  apiKey: 'sk_sandbox_your_key',\n});`, language: 'typescript' },
-      { title: 'Make First Request', content: 'List subscriptions to verify setup.', codeExample: `const subs = await client.subscriptions.list();\nconsole.log(subs.data);`, language: 'typescript' },
+      {
+        title: 'Install SDK',
+        content: 'npm install @subtrackr/sdk',
+        codeExample: 'npm install @subtrackr/sdk',
+        language: 'bash',
+      },
+      {
+        title: 'Initialize Client',
+        content: 'Create a SubTrackr client with your API key.',
+        codeExample: `const client = new SubTrackr({\n  apiKey: 'sk_sandbox_your_key',\n});`,
+        language: 'typescript',
+      },
+      {
+        title: 'Make First Request',
+        content: 'List subscriptions to verify setup.',
+        codeExample: `const subs = await client.subscriptions.list();\nconsole.log(subs.data);`,
+        language: 'typescript',
+      },
     ],
     tags: ['setup', 'quickstart'],
     isCompleted: false,
@@ -75,7 +132,12 @@ const DEFAULT_INTEGRATION_GUIDES: IntegrationGuide[] = [
     difficulty: 'intermediate',
     estimatedTime: '30 minutes',
     steps: [
-      { title: 'Create Subscription', content: 'Use POST to create subscriptions.', codeExample: `const sub = await client.subscriptions.create({\n  name: 'Pro Plan',\n  price: 29.99,\n  currency: 'USD',\n  billingCycle: 'monthly',\n});`, language: 'typescript' },
+      {
+        title: 'Create Subscription',
+        content: 'Use POST to create subscriptions.',
+        codeExample: `const sub = await client.subscriptions.create({\n  name: 'Pro Plan',\n  price: 29.99,\n  currency: 'USD',\n  billingCycle: 'monthly',\n});`,
+        language: 'typescript',
+      },
       { title: 'Update Status', content: 'Pause, resume, or cancel subscriptions.' },
     ],
     tags: ['subscriptions', 'billing'],
@@ -116,9 +178,7 @@ const DEFAULT_INTEGRATION_GUIDES: IntegrationGuide[] = [
     category: IntegrationGuideCategory.ANALYTICS_REPORTING,
     difficulty: 'intermediate',
     estimatedTime: '20 minutes',
-    steps: [
-      { title: 'Fetch Analytics', content: 'Retrieve subscription metrics via API.' },
-    ],
+    steps: [{ title: 'Fetch Analytics', content: 'Retrieve subscription metrics via API.' }],
     tags: ['analytics', 'reporting'],
     isCompleted: false,
   },
@@ -150,7 +210,13 @@ interface SandboxState {
   testSubscriptions: TestSubscription[];
   subscriptions: TestSubscription[];
   sandboxSubscriptions: TestSubscription[];
-  transactions: Array<{ id: string; type: string; amount: number; status: string; timestamp: Date }>;
+  transactions: Array<{
+    id: string;
+    type: string;
+    amount: number;
+    status: string;
+    timestamp: Date;
+  }>;
   metrics: SandboxMetrics;
   onboardingSteps: OnboardingStepInfo[];
   integrationGuides: IntegrationGuide[];
@@ -159,13 +225,19 @@ interface SandboxState {
   error: AppError | null;
 
   fetchSandboxes: (developerId: string) => Promise<void>;
-  createSandbox: (name: string, description: string, environment: SandboxEnvironment) => Promise<void>;
+  createSandbox: (
+    name: string,
+    description: string,
+    environment: SandboxEnvironment
+  ) => Promise<void>;
   selectSandbox: (sandbox: SandboxConfig | string) => void;
   deleteSandbox: (id: string) => Promise<void>;
   pauseSandbox: (id: string) => Promise<void>;
   resumeSandbox: (id: string) => Promise<void>;
   toggleSandboxStatus: (id: string) => Promise<void>;
-  generateTestData: (sandboxIdOrConfig?: string | { subscriptionCount?: number; transactionCount?: number }) => Promise<void>;
+  generateTestData: (
+    sandboxIdOrConfig?: string | { subscriptionCount?: number; transactionCount?: number }
+  ) => Promise<void>;
   resetSandbox: () => void;
   resetTestData: () => void;
   refreshMetrics: () => Promise<void>;
@@ -177,7 +249,12 @@ interface SandboxState {
   completeOnboardingStep: (stepId: string) => void;
   createDeveloperProfile: (name: string, email: string, company?: string) => Promise<void>;
   generateApiKey: (name: string) => Promise<string>;
-  createApiKey: (input: { name: string; description?: string; sandboxId: string; scopes: ApiKeyScope[] }) => Promise<void>;
+  createApiKey: (input: {
+    name: string;
+    description?: string;
+    sandboxId: string;
+    scopes: ApiKeyScope[];
+  }) => Promise<void>;
   revokeApiKey: (id: string) => Promise<void>;
   reactivateApiKey: (id: string) => Promise<void>;
   deleteApiKey: (id: string) => Promise<void>;
@@ -231,7 +308,10 @@ export const useSandboxStore = create<SandboxState>()(
           set({ isLoading: false });
         } catch (err) {
           set({
-            error: errorHandler.handleError(err as Error, { action: 'fetchSandboxes', timestamp: new Date() }),
+            error: errorHandler.handleError(err as Error, {
+              action: 'fetchSandboxes',
+              timestamp: new Date(),
+            }),
             isLoading: false,
           });
         }
@@ -259,16 +339,20 @@ export const useSandboxStore = create<SandboxState>()(
           }));
         } catch (err) {
           set({
-            error: errorHandler.handleError(err as Error, { action: 'createSandbox', timestamp: new Date() }),
+            error: errorHandler.handleError(err as Error, {
+              action: 'createSandbox',
+              timestamp: new Date(),
+            }),
             isLoading: false,
           });
         }
       },
 
       selectSandbox: (sandboxOrId) => {
-        const sandbox = typeof sandboxOrId === 'string'
-          ? get().sandboxes.find((s) => s.id === sandboxOrId) || null
-          : sandboxOrId;
+        const sandbox =
+          typeof sandboxOrId === 'string'
+            ? get().sandboxes.find((s) => s.id === sandboxOrId) || null
+            : sandboxOrId;
         set({ selectedSandbox: sandbox, currentSandbox: sandbox });
       },
 
@@ -277,7 +361,8 @@ export const useSandboxStore = create<SandboxState>()(
           const remaining = state.sandboxes.filter((s) => s.id !== id);
           return {
             sandboxes: remaining,
-            currentSandbox: state.currentSandbox?.id === id ? remaining[0] || null : state.currentSandbox,
+            currentSandbox:
+              state.currentSandbox?.id === id ? remaining[0] || null : state.currentSandbox,
             selectedSandbox: state.selectedSandbox?.id === id ? null : state.selectedSandbox,
           };
         });
@@ -286,22 +371,28 @@ export const useSandboxStore = create<SandboxState>()(
       pauseSandbox: async (id) => {
         set((state) => ({
           sandboxes: state.sandboxes.map((s) =>
-            s.id === id ? { ...s, isActive: false, status: SandboxStatus.PAUSED, updatedAt: new Date() } : s
+            s.id === id
+              ? { ...s, isActive: false, status: SandboxStatus.PAUSED, updatedAt: new Date() }
+              : s
           ),
-          currentSandbox: state.currentSandbox?.id === id
-            ? { ...state.currentSandbox, isActive: false, status: SandboxStatus.PAUSED }
-            : state.currentSandbox,
+          currentSandbox:
+            state.currentSandbox?.id === id
+              ? { ...state.currentSandbox, isActive: false, status: SandboxStatus.PAUSED }
+              : state.currentSandbox,
         }));
       },
 
       resumeSandbox: async (id) => {
         set((state) => ({
           sandboxes: state.sandboxes.map((s) =>
-            s.id === id ? { ...s, isActive: true, status: SandboxStatus.ACTIVE, updatedAt: new Date() } : s
+            s.id === id
+              ? { ...s, isActive: true, status: SandboxStatus.ACTIVE, updatedAt: new Date() }
+              : s
           ),
-          currentSandbox: state.currentSandbox?.id === id
-            ? { ...state.currentSandbox, isActive: true, status: SandboxStatus.ACTIVE }
-            : state.currentSandbox,
+          currentSandbox:
+            state.currentSandbox?.id === id
+              ? { ...state.currentSandbox, isActive: true, status: SandboxStatus.ACTIVE }
+              : state.currentSandbox,
         }));
       },
 
@@ -315,11 +406,23 @@ export const useSandboxStore = create<SandboxState>()(
         }
       },
 
-      generateTestData: async (sandboxIdOrConfig?: string | { subscriptionCount?: number; transactionCount?: number }) => {
+      generateTestData: async (
+        sandboxIdOrConfig?: string | { subscriptionCount?: number; transactionCount?: number }
+      ) => {
         try {
           set({ isLoading: true, error: null });
-          const count = typeof sandboxIdOrConfig === 'object' ? sandboxIdOrConfig.subscriptionCount || 8 : 8;
-          const names = ['Netflix', 'Spotify', 'Adobe CC', 'Slack Pro', 'GitHub Team', 'Figma Pro', 'Notion Plus', 'Vercel Pro'];
+          const count =
+            typeof sandboxIdOrConfig === 'object' ? sandboxIdOrConfig.subscriptionCount || 8 : 8;
+          const names = [
+            'Netflix',
+            'Spotify',
+            'Adobe CC',
+            'Slack Pro',
+            'GitHub Team',
+            'Figma Pro',
+            'Notion Plus',
+            'Vercel Pro',
+          ];
           const prices = [15.99, 9.99, 54.99, 8.75, 4.0, 12.0, 10.0, 20.0];
           const subCount = Math.min(count, names.length);
 
@@ -357,7 +460,10 @@ export const useSandboxStore = create<SandboxState>()(
           });
         } catch (err) {
           set({
-            error: errorHandler.handleError(err as Error, { action: 'generateTestData', timestamp: new Date() }),
+            error: errorHandler.handleError(err as Error, {
+              action: 'generateTestData',
+              timestamp: new Date(),
+            }),
             isLoading: false,
           });
         }
@@ -369,7 +475,12 @@ export const useSandboxStore = create<SandboxState>()(
           subscriptions: [],
           sandboxSubscriptions: [],
           transactions: [],
-          metrics: { totalSubscriptions: 0, totalTransactions: 0, totalVolume: 0, totalApiCalls: 0 },
+          metrics: {
+            totalSubscriptions: 0,
+            totalTransactions: 0,
+            totalVolume: 0,
+            totalApiCalls: 0,
+          },
           usageRecords: [],
           usageStats: null,
         });
@@ -485,7 +596,10 @@ export const useSandboxStore = create<SandboxState>()(
           }));
         } catch (err) {
           set({
-            error: errorHandler.handleError(err as Error, { action: 'createDeveloperProfile', timestamp: new Date() }),
+            error: errorHandler.handleError(err as Error, {
+              action: 'createDeveloperProfile',
+              timestamp: new Date(),
+            }),
             isLoading: false,
           });
         }
@@ -519,7 +633,10 @@ export const useSandboxStore = create<SandboxState>()(
           return key;
         } catch (err) {
           set({
-            error: errorHandler.handleError(err as Error, { action: 'generateApiKey', timestamp: new Date() }),
+            error: errorHandler.handleError(err as Error, {
+              action: 'generateApiKey',
+              timestamp: new Date(),
+            }),
             isLoading: false,
           });
           throw err;
@@ -551,7 +668,10 @@ export const useSandboxStore = create<SandboxState>()(
           get().completeOnboardingStep(DeveloperOnboardingStep.GENERATE_API_KEY);
         } catch (err) {
           set({
-            error: errorHandler.handleError(err as Error, { action: 'createApiKey', timestamp: new Date() }),
+            error: errorHandler.handleError(err as Error, {
+              action: 'createApiKey',
+              timestamp: new Date(),
+            }),
             isLoading: false,
           });
         }
@@ -582,11 +702,14 @@ export const useSandboxStore = create<SandboxState>()(
       fetchUsageForSandbox: (sandboxId) => {
         const records = get().usageRecords.filter((r) => r.sandboxId === sandboxId);
         const totalRequests = records.length;
-        const successfulRequests = records.filter((r) => r.statusCode >= 200 && r.statusCode < 400).length;
+        const successfulRequests = records.filter(
+          (r) => r.statusCode >= 200 && r.statusCode < 400
+        ).length;
         const failedRequests = totalRequests - successfulRequests;
-        const avgResponseTime = totalRequests > 0
-          ? records.reduce((sum, r) => sum + r.responseTime, 0) / totalRequests
-          : 0;
+        const avgResponseTime =
+          totalRequests > 0
+            ? records.reduce((sum, r) => sum + r.responseTime, 0) / totalRequests
+            : 0;
 
         const requestsByEndpoint: Record<string, number> = {};
         const requestsByDay: Record<string, number> = {};
@@ -614,7 +737,10 @@ export const useSandboxStore = create<SandboxState>()(
             successfulRequests,
             failedRequests,
             averageResponseTime: Math.round(avgResponseTime),
-            totalDataTransferred: records.reduce((sum, r) => sum + (r.requestSize || 0) + (r.responseSize || 0), 0),
+            totalDataTransferred: records.reduce(
+              (sum, r) => sum + (r.requestSize || 0) + (r.responseSize || 0),
+              0
+            ),
             periodStart,
             periodEnd: now,
             requestsByEndpoint,
diff --git a/src/store/settingsStore.ts b/src/store/settingsStore.ts
index 136a1381..b8b01bf2 100644
--- a/src/store/settingsStore.ts
+++ b/src/store/settingsStore.ts
@@ -8,7 +8,7 @@ interface SettingsState {
   notificationsEnabled: boolean;
   exchangeRates: ExchangeRates | null;
   isLoading: boolean;
-  
+
   // Actions
   setPreferredCurrency: (currency: string) => void;
   setNotificationsEnabled: (enabled: boolean) => void;
@@ -26,7 +26,7 @@ export const useSettingsStore = create<SettingsState>()(
 
       setPreferredCurrency: (currency) => {
         set({ preferredCurrency: currency });
-        // Optionally update rates immediately if base changed, 
+        // Optionally update rates immediately if base changed,
         // but here we keep USD as base for rates to simplify conversion
         void get().updateExchangeRates();
       },
diff --git a/src/store/subscriptionStore.ts b/src/store/subscriptionStore.ts
index cd6bb4ae..b87832fd 100644
--- a/src/store/subscriptionStore.ts
+++ b/src/store/subscriptionStore.ts
@@ -169,8 +169,16 @@ interface SubscriptionState {
   deleteSubscription: (id: string) => Promise<void>;
   toggleSubscriptionStatus: (id: string) => Promise<void>;
   // new actions added
-  previewPlanChange: (id: string, newPrice: number, effectiveDate: 'immediate' | 'end_of_period') => ProrationPreview;
-  executePlanChange: (id: string, newPlanData: Partial<Subscription>, effectiveDate: 'immediate' | 'end_of_period') => Promise<void>;
+  previewPlanChange: (
+    id: string,
+    newPrice: number,
+    effectiveDate: 'immediate' | 'end_of_period'
+  ) => ProrationPreview;
+  executePlanChange: (
+    id: string,
+    newPlanData: Partial<Subscription>,
+    effectiveDate: 'immediate' | 'end_of_period'
+  ) => Promise<void>;
   applyCreditToSubscription: (id: string) => Promise<void>;
   /** Simulate or record a billing result (fires local notifications when enabled for this sub). */
   recordBillingOutcome: (id: string, outcome: 'success' | 'failed') => Promise<void>;
@@ -188,57 +196,66 @@ export const useSubscriptionStore = create<SubscriptionState>()(
         totalYearlySpend: 0,
         categoryBreakdown: {} as Record<string, number>,
         prorationPreview: null,
+      },
       creditMemos: {},
-      
-      previewPlanChange: (id: string, newPrice: number, effectiveDate: 'immediate' | 'end_of_period') => {
+
+      previewPlanChange: (
+        id: string,
+        newPrice: number,
+        effectiveDate: 'immediate' | 'end_of_period'
+      ) => {
         const sub = get().subscriptions.find((s) => s.id === id);
         if (!sub) {
           throw new Error('Subscription not found');
-      }
+        }
 
-      const preview = previewProration(sub, newPrice, effectiveDate);
+        const preview = previewProration(sub, newPrice, effectiveDate);
         set({ prorationPreview: preview });
         return preview;
       },
 
-      executePlanChange: async (id: string, newPlanData: Partial<Subscription>, effectiveDate: 'immediate' | 'end_of_period') => {
+      executePlanChange: async (
+        id: string,
+        newPlanData: Partial<Subscription>,
+        effectiveDate: 'immediate' | 'end_of_period'
+      ) => {
         set({ isLoading: true, error: null });
         try {
           const sub = get().subscriptions.find((s) => s.id === id);
           if (!sub) throw new Error('Subscription not found');
-          
+
           const preview = previewProration(sub, newPlanData.price ?? sub.price, effectiveDate);
-        
+
           // Generate credit memo if downgrade
           let updatedCreditMemos = { ...get().creditMemos };
           if (preview.isCredit && preview.amount > 0) {
             const memo = generateCreditMemo(id, preview.amount, preview.description);
             updatedCreditMemos[id] = memo;
           }
-          
+
           // Update subscription
           const updates: Partial<Subscription> = {
             ...newPlanData,
             updatedAt: new Date(),
           };
-          
+
           if (effectiveDate === 'immediate') {
             // Reset billing cycle
-            updates.nextBillingDate = advanceBillingDate(new Date(), newPlanData.billingCycle ?? sub.billingCycle);
+            updates.nextBillingDate = advanceBillingDate(
+              new Date(),
+              newPlanData.billingCycle ?? sub.billingCycle
+            );
           }
-          
+
           set((state) => ({
-            subscriptions: state.subscriptions.map((s) =>
-              s.id === id ? { ...s, ...updates } : s
-            ),
+            subscriptions: state.subscriptions.map((s) => (s.id === id ? { ...s, ...updates } : s)),
             creditMemos: updatedCreditMemos,
             prorationPreview: null,
             isLoading: false,
           }));
-          
+
           get().calculateStats();
           await syncRenewalReminders(get().subscriptions);
-          
         } catch (error) {
           const appError = errorHandler.handleError(error as Error, {
             action: 'executePlanChange',
@@ -247,28 +264,25 @@ export const useSubscriptionStore = create<SubscriptionState>()(
           set({ error: appError, isLoading: false });
         }
       },
-      
+
       applyCreditToSubscription: async (id: string) => {
         const sub = get().subscriptions.find((s) => s.id === id);
         const memo = get().creditMemos[id];
         if (!sub || !memo || memo.applied) return;
-        
+
         const { finalCharge, updatedMemo } = applyCreditMemo(sub.price, memo);
-        
+
         set((state) => ({
           creditMemos: {
             ...state.creditMemos,
             [id]: updatedMemo,
           },
         }));
-        
+
         // Could trigger a reduced charge here
         console.log(`Applied credit: final charge ${finalCharge}`);
       },
-    }),
-    // ... persist config ...
-  )
-);
+
       // Hydration state: keep loading true until persisted state is read.
       isLoading: true,
       error: null,
@@ -409,7 +423,8 @@ export const useSubscriptionStore = create<SubscriptionState>()(
           dunningEntries[id] = {
             failedAttempts: attempt,
             lastFailureAt: new Date().toISOString(),
-            currentStage: attempt <= 3 ? 'retry' : attempt <= 5 ? 'warn' : attempt <= 7 ? 'suspend' : 'cancel',
+            currentStage:
+              attempt <= 3 ? 'retry' : attempt <= 5 ? 'warn' : attempt <= 7 ? 'suspend' : 'cancel',
           };
           await AsyncStorage.setItem('subtrackr-dunning-entries', JSON.stringify(dunningEntries));
 
@@ -546,7 +561,6 @@ export const useSubscriptionStore = create<SubscriptionState>()(
           return total + priceInPreferred * BILLING_CONVERSIONS.MONTHS_PER_YEAR;
         }, 0);
 
-
         const categoryBreakdown = activeSubs.reduce(
           (acc, sub) => {
             acc[sub.category] = (acc[sub.category] || 0) + 1;
@@ -581,36 +595,6 @@ export const useSubscriptionStore = create<SubscriptionState>()(
         ...currentState,
         ...migratePersistedState(persistedState, STORE_VERSION),
       }),
-      onRehydrateStorage: () => (state, error) => {
-        if (error) {
-          useSubscriptionStore.setState({
-            error: errorHandler.createError(
-              new Error('Stored subscription data is corrupted. Loaded fallback data.'),
-              { action: 'rehydrateSubscriptions' },
-              true
-            ),
-            subscriptions: [...dummySubscriptions],
-            isLoading: false,
-          });
-          useSubscriptionStore.getState().calculateStats();
-          void syncRenewalReminders(useSubscriptionStore.getState().subscriptions);
-          return;
-        }
-
-        const subscriptions = Array.isArray(state?.subscriptions)
-          ? state.subscriptions
-          : [...dummySubscriptions];
-        useSubscriptionStore.setState({
-          subscriptions,
-          isLoading: false,
-          error: null,
-        });
-        useSubscriptionStore.getState().calculateStats();
-        void syncRenewalReminders(useSubscriptionStore.getState().subscriptions);
-        void useCalendarStore
-          .getState()
-          .syncSubscriptions(useSubscriptionStore.getState().subscriptions);
-      },
     }
   )
 );
diff --git a/src/store/supportStore.ts b/src/store/supportStore.ts
index 706c4510..a8466d4d 100644
--- a/src/store/supportStore.ts
+++ b/src/store/supportStore.ts
@@ -35,7 +35,9 @@ export const useSupportStore = create<SupportState>((set, get) => ({
 
   createTicket: (event) => {
     const relatedTicketIds = get()
-      .tickets.filter((ticket) => ticket.subscriptionId === event.subscriptionId && ticket.status !== 'closed')
+      .tickets.filter(
+        (ticket) => ticket.subscriptionId === event.subscriptionId && ticket.status !== 'closed'
+      )
       .map((ticket) => ticket.id);
     const ticket = createTicketFromEvent(event, relatedTicketIds);
     set((state) => ({ tickets: [...state.tickets, ticket] }));
@@ -43,7 +45,9 @@ export const useSupportStore = create<SupportState>((set, get) => ({
   },
 
   assignTicket: (ticketId, assignee) =>
-    set((state) => ({ tickets: mapTicket(state.tickets, ticketId, (ticket) => assignTicket(ticket, assignee)) })),
+    set((state) => ({
+      tickets: mapTicket(state.tickets, ticketId, (ticket) => assignTicket(ticket, assignee)),
+    })),
 
   updateTicketStatus: (ticketId, status) =>
     set((state) => ({
diff --git a/src/store/taxStore.ts b/src/store/taxStore.ts
index 8c18733c..995301fb 100644
--- a/src/store/taxStore.ts
+++ b/src/store/taxStore.ts
@@ -47,10 +47,14 @@ export const useTaxStore = create<TaxState>((set, get) => ({
   remittances: [],
 
   addRate: (rate) =>
-    set((state) => ({ config: { ...state.config, ratesByRegion: [...state.config.ratesByRegion, rate] } })),
+    set((state) => ({
+      config: { ...state.config, ratesByRegion: [...state.config.ratesByRegion, rate] },
+    })),
 
   addExemption: (exemption) =>
-    set((state) => ({ config: { ...state.config, exemptions: [...state.config.exemptions, exemption] } })),
+    set((state) => ({
+      config: { ...state.config, exemptions: [...state.config.exemptions, exemption] },
+    })),
 
   calculateTax: (input) => {
     const result = calculateTaxAmount(get().config, input);
diff --git a/src/types/affiliate.ts b/src/types/affiliate.ts
index a74323aa..dcc4f1c8 100644
--- a/src/types/affiliate.ts
+++ b/src/types/affiliate.ts
@@ -26,6 +26,16 @@ export interface Commission {
   status: 'pending' | 'approved' | 'paid';
   createdAt: Date;
   paidAt?: Date;
+  isClawbacked?: boolean;
+}
+
+export interface PayoutRecord {
+  id: string;
+  amount: number;
+  currency: string;
+  status: 'pending' | 'paid' | 'failed';
+  requestedAt: Date;
+  paidAt?: Date;
 }
 
 export interface Affiliate {
@@ -39,6 +49,13 @@ export interface Affiliate {
   totalEarnings: number;
   pendingPayout: number;
   createdAt: Date;
+  // Extended fields
+  referralCode?: string;
+  referralLink?: string;
+  clicksCount?: number;
+  fraudRiskScore?: number; // 0 to 100
+  fraudStatus?: 'safe' | 'suspicious' | 'flagged';
+  payoutHistory?: PayoutRecord[];
 }
 
 export interface AffiliateProgram {
@@ -48,6 +65,7 @@ export interface AffiliateProgram {
   commissionConfig: CommissionConfig;
   attributionWindowDays: number;
   isActive: boolean;
+  attributionModel?: 'first-touch' | 'last-touch' | 'linear';
 }
 
 export interface AffiliateMetrics {
@@ -56,4 +74,6 @@ export interface AffiliateMetrics {
   totalEarnings: number;
   pendingPayout: number;
   conversionRate: number;
-}
\ No newline at end of file
+  // Extended fields
+  totalClicks?: number;
+}
diff --git a/src/types/calendar.ts b/src/types/calendar.ts
index f2158f91..607d24ae 100644
--- a/src/types/calendar.ts
+++ b/src/types/calendar.ts
@@ -86,7 +86,7 @@ export const SUBSCRIPTION_TIMEZONES = [
   'Pacific/Auckland',
 ] as const;
 
-export type SubscriptionTimezone = typeof SUBSCRIPTION_TIMEZONES[number];
+export type SubscriptionTimezone = (typeof SUBSCRIPTION_TIMEZONES)[number];
 
 export interface CalendarSyncedEvent extends CalendarEventTemplate {
   id: string;
diff --git a/src/types/developerPortal.ts b/src/types/developerPortal.ts
index 6653f2ac..6dbc092c 100644
--- a/src/types/developerPortal.ts
+++ b/src/types/developerPortal.ts
@@ -77,10 +77,12 @@ export const UsageStatsSchema = z.object({
   averageResponseTime: z.number(),
   callsByEndpoint: z.record(z.number()),
   callsByStatus: z.record(z.number()),
-  callsByDay: z.array(z.object({
-    date: z.string(),
-    count: z.number(),
-  })),
+  callsByDay: z.array(
+    z.object({
+      date: z.string(),
+      count: z.number(),
+    })
+  ),
   rateLimitHits: z.number(),
   quotaUsed: z.number(),
   quotaLimit: z.number(),
@@ -115,12 +117,14 @@ export const IntegrationGuideSchema = z.object({
   difficulty: z.enum(['beginner', 'intermediate', 'advanced']),
   estimatedTime: z.string(),
   prerequisites: z.array(z.string()),
-  steps: z.array(z.object({
-    title: z.string(),
-    content: z.string(),
-    code: z.string().optional(),
-    language: z.string().optional(),
-  })),
+  steps: z.array(
+    z.object({
+      title: z.string(),
+      content: z.string(),
+      code: z.string().optional(),
+      language: z.string().optional(),
+    })
+  ),
   tags: z.array(z.string()),
   order: z.number(),
 });
diff --git a/src/types/fraud.ts b/src/types/fraud.ts
index 818042e1..fa67e55f 100644
--- a/src/types/fraud.ts
+++ b/src/types/fraud.ts
@@ -1,6 +1,11 @@
 export type FraudAction = 'approve' | 'flag' | 'block';
 export type FraudReviewStatus = 'pending' | 'reviewed' | 'dismissed' | 'escalated';
-export type FraudSignalType = 'velocity' | 'usage-anomaly' | 'chargeback' | 'pattern-shift' | 'device-mismatch';
+export type FraudSignalType =
+  | 'velocity'
+  | 'usage-anomaly'
+  | 'chargeback'
+  | 'pattern-shift'
+  | 'device-mismatch';
 
 export interface FraudSignal {
   kind: FraudSignalType;
diff --git a/src/types/loyalty.ts b/src/types/loyalty.ts
index bc9235ad..3bbc924d 100644
--- a/src/types/loyalty.ts
+++ b/src/types/loyalty.ts
@@ -64,4 +64,4 @@ export interface LoyaltyProgram {
   pointsPerDollar: number;
   pointsExpirationDays: number;
   isActive: boolean;
-}
\ No newline at end of file
+}
diff --git a/src/types/merchant.ts b/src/types/merchant.ts
index d532604a..07975b3e 100644
--- a/src/types/merchant.ts
+++ b/src/types/merchant.ts
@@ -63,4 +63,4 @@ export interface MerchantOnboardingFormData {
   country: string;
   phoneNumber: string;
   email: string;
-}
\ No newline at end of file
+}
diff --git a/src/types/rateLimiting.ts b/src/types/rateLimiting.ts
index 645ef2e9..3d0449f0 100644
--- a/src/types/rateLimiting.ts
+++ b/src/types/rateLimiting.ts
@@ -112,7 +112,10 @@ export const TIER_RATE_LIMITS: Record<SubscriptionTier, TierRateLimit> = {
 
 export const SOFT_LIMIT_WARNINGS = [0.8, 0.95] as const;
 
-export const TIER_UPGRADE_THRESHOLDS: Record<SubscriptionTier, { usagePercent: number; sustainedHours: number }> = {
+export const TIER_UPGRADE_THRESHOLDS: Record<
+  SubscriptionTier,
+  { usagePercent: number; sustainedHours: number }
+> = {
   [SubscriptionTier.FREE]: { usagePercent: 0.8, sustainedHours: 48 },
   [SubscriptionTier.BASIC]: { usagePercent: 0.8, sustainedHours: 48 },
   [SubscriptionTier.PREMIUM]: { usagePercent: 0.9, sustainedHours: 72 },
diff --git a/src/utils/formatting.ts b/src/utils/formatting.ts
index 9978a0f1..bc797234 100644
--- a/src/utils/formatting.ts
+++ b/src/utils/formatting.ts
@@ -115,4 +115,3 @@ export const getCurrencySymbol = (currency: string): string => {
   };
   return symbols[currency] || currency;
 };
-
diff --git a/src/utils/invoice.ts b/src/utils/invoice.ts
index 4396f91f..a65663dc 100644
--- a/src/utils/invoice.ts
+++ b/src/utils/invoice.ts
@@ -169,21 +169,21 @@ export const buildProratedInvoice = (
   notes?: string
 ): Invoice => {
   const lineItems: InvoiceLineItem[] = [];
-  
+
   // Base subscription line item
   const baseLineItem = buildInvoiceLineItem(subscription, config, exchangeRate, taxRateBps);
   lineItems.push(baseLineItem);
-  
+
   // Add proration line item if applicable
   if (prorationPreview && prorationPreview.amount > 0) {
     const prorationLineItem = buildProrationLineItem(prorationPreview, config.defaultCurrency);
     lineItems.push(prorationLineItem);
   }
-  
+
   const totals = calculateInvoiceTotals(lineItems, taxRateBps);
   const createdAt = new Date();
   const dueDate = new Date(period.end.getTime() + config.paymentTermsDays * DAY);
-  
+
   return {
     id: `${subscription.id}-${sequence}`,
     invoiceNumber: formatInvoiceNumber(sequence, config),
@@ -203,6 +203,6 @@ export const buildProratedInvoice = (
     createdAt,
     updatedAt: createdAt,
     recipientEmail,
-    notes: notes ?? (prorationPreview?.description),
+    notes: notes ?? prorationPreview?.description,
   };
 };
diff --git a/src/utils/proration.ts b/src/utils/proration.ts
index 0b4eaa32..46602672 100644
--- a/src/utils/proration.ts
+++ b/src/utils/proration.ts
@@ -52,7 +52,7 @@ export function getRemainingDays(subscription: Subscription): number {
 
 /**
  * Preview proration before confirming plan change
- * 
+ *
  * Formula: (newRate - oldRate) * remainingDays / periodDays
  */
 export function previewProration(
@@ -61,20 +61,20 @@ export function previewProration(
   effectiveDate: 'immediate' | 'end_of_period' = 'immediate'
 ): ProrationPreview {
   const periodDays = getPeriodDays(currentSubscription.billingCycle);
-  const remainingDays = effectiveDate === 'end_of_period' ? 0 : getRemainingDays(currentSubscription);
-  
+  const remainingDays =
+    effectiveDate === 'end_of_period' ? 0 : getRemainingDays(currentSubscription);
+
   const oldRate = currentSubscription.price;
   const oldDailyRate = oldRate / periodDays;
   const newDailyRate = newPrice / periodDays;
-  
-  const rawAmount = effectiveDate === 'end_of_period' 
-    ? 0 
-    : (newPrice - oldRate) * remainingDays / periodDays;
-  
+
+  const rawAmount =
+    effectiveDate === 'end_of_period' ? 0 : ((newPrice - oldRate) * remainingDays) / periodDays;
+
   // Round to 2 decimal places for currency
   const amount = Math.round(Math.abs(rawAmount) * 100) / 100;
   const isCredit = rawAmount < 0;
-  
+
   let description: string;
   if (amount === 0) {
     description = 'No proration required';
@@ -83,7 +83,7 @@ export function previewProration(
   } else {
     description = `Prorated charge of ${amount} for plan upgrade (${remainingDays} days remaining)`;
   }
-  
+
   return {
     amount,
     isCredit,
@@ -154,10 +154,10 @@ export function applyCreditMemo(
   if (creditMemo.applied || creditMemo.remainingBalance <= 0) {
     return { finalCharge: chargeAmount, updatedMemo: creditMemo };
   }
-  
+
   const creditToApply = Math.min(chargeAmount, creditMemo.remainingBalance);
   const newRemaining = creditMemo.remainingBalance - creditToApply;
-  
+
   return {
     finalCharge: Math.round((chargeAmount - creditToApply) * 100) / 100,
     updatedMemo: {
@@ -173,10 +173,14 @@ export function applyCreditMemo(
  */
 export function calculateNetProration(
   currentSubscription: Subscription,
-  priceChanges: Array<{ oldPrice: number; newPrice: number; effectiveDate: 'immediate' | 'end_of_period' }>
+  priceChanges: Array<{
+    oldPrice: number;
+    newPrice: number;
+    effectiveDate: 'immediate' | 'end_of_period';
+  }>
 ): ProrationPreview {
   let netAmount = 0;
-  
+
   for (const change of priceChanges) {
     const result = previewProration(
       { ...currentSubscription, price: change.oldPrice },
@@ -185,10 +189,10 @@ export function calculateNetProration(
     );
     netAmount += result.isCredit ? -result.amount : result.amount;
   }
-  
+
   const isCredit = netAmount < 0;
   const amount = Math.round(Math.abs(netAmount) * 100) / 100;
-  
+
   return {
     amount,
     isCredit,
@@ -196,9 +200,10 @@ export function calculateNetProration(
     periodDays: getPeriodDays(currentSubscription.billingCycle),
     oldDailyRate: 0,
     newDailyRate: 0,
-    description: amount === 0 
-      ? 'No net proration for multiple plan changes'
-      : `Net ${isCredit ? 'credit' : 'charge'} of ${amount} for multiple plan changes`,
+    description:
+      amount === 0
+        ? 'No net proration for multiple plan changes'
+        : `Net ${isCredit ? 'credit' : 'charge'} of ${amount} for multiple plan changes`,
     effectiveDate: 'immediate',
   };
 }
@@ -226,4 +231,4 @@ export function buildProrationLineItem(
     taxRateBps: 0, // Prorations typically not taxed separately
     lineTotal: preview.isCredit ? -preview.amount : preview.amount,
   };
-}
\ No newline at end of file
+}