Merge main into 284

Author: Smartdevs17

.prettierrc

@@ -8,5 +8,5 @@
   "tabWidth": 2,
   "useTabs": false,
   "printWidth": 100,
-  "endOfLine": "lf"
+  "endOfLine": "auto"
 }

app/tests/integration/contract-store.integration.test.ts

@@ -8,6 +8,7 @@
 import { act } from 'react';
 import { describe, it, expect, beforeEach, afterEach, jest } from '@jest/globals';
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import * as notificationService from '../../../src/services/notificationService';
 import { useSubscriptionStore } from '../../../src/store/subscriptionStore';
 import { SubscriptionCategory, BillingCycle } from '../../../src/types/subscription';
 import { makeSubscription, makeSubscriptionFormData, resetIdCounter } from './factories';
@@ -32,16 +33,17 @@ jest.mock('@react-native-async-storage/async-storage', () => ({
 }));
 
 // ── Notification service mock (the "contract" side) ───────────────────────────
-const mockSyncRenewalReminders = jest.fn(() => Promise.resolve());
-const mockPresentChargeSuccess = jest.fn(() => Promise.resolve());
-const mockPresentChargeFailed = jest.fn(() => Promise.resolve());
-
 jest.mock('../../../src/services/notificationService', () => ({
-  syncRenewalReminders: (...args: unknown[]) => mockSyncRenewalReminders(...args),
-  presentChargeSuccessNotification: (...args: unknown[]) => mockPresentChargeSuccess(...args),
-  presentChargeFailedNotification: (...args: unknown[]) => mockPresentChargeFailed(...args),
+  syncRenewalReminders: jest.fn(() => Promise.resolve()),
+  presentChargeSuccessNotification: jest.fn(() => Promise.resolve()),
+  presentChargeFailedNotification: jest.fn(() => Promise.resolve()),
+  presentLocalNotification: jest.fn(() => Promise.resolve()),
 }));
 
+const mockSyncRenewalReminders = notificationService.syncRenewalReminders as jest.Mock;
+const mockPresentChargeSuccess = notificationService.presentChargeSuccessNotification as jest.Mock;
+const mockPresentChargeFailed = notificationService.presentChargeFailedNotification as jest.Mock;
+
 // ── Helpers ───────────────────────────────────────────────────────────────────
 function resetStore() {
   useSubscriptionStore.setState({
@@ -83,7 +85,7 @@ describe('contract-store integration', () => {
     });
 
     expect(mockSyncRenewalReminders).toHaveBeenCalledTimes(1);
-    const [subs] = mockSyncRenewalReminders.mock.calls[0] as [unknown[]];
+    const [subs] = mockSyncRenewalReminders.mock.calls[0] as unknown as [unknown[]];
     expect(Array.isArray(subs)).toBe(true);
     expect((subs as { name: string }[]).some((s) => s.name === 'GitHub Copilot')).toBe(true);
   });
@@ -101,7 +103,7 @@ describe('contract-store integration', () => {
     });
 
     expect(mockSyncRenewalReminders).toHaveBeenCalledTimes(1);
-    const [subs] = mockSyncRenewalReminders.mock.calls[0] as [{ price: number }[]];
+    const [subs] = mockSyncRenewalReminders.mock.calls[0] as unknown as [{ price: number }[]];
     expect(subs[0].price).toBe(19.99);
   });
 
@@ -116,7 +118,7 @@ describe('contract-store integration', () => {
     });
 
     expect(mockSyncRenewalReminders).toHaveBeenCalledTimes(1);
-    const [subs] = mockSyncRenewalReminders.mock.calls[0] as [{ name: string }[]];
+    const [subs] = mockSyncRenewalReminders.mock.calls[0] as unknown as [{ name: string }[]];
     expect(subs.every((s) => s.name !== 'Remove Me')).toBe(true);
   });
 

app/tests/integration/notification-delivery.integration.test.ts

@@ -25,32 +25,28 @@ jest.mock('react-native', () => ({
 }));
 
 // ── expo-notifications mock ───────────────────────────────────────────────────
-const mockSchedule = jest.fn(() => Promise.resolve('notif-id'));
-const mockGetScheduled = jest.fn(() => Promise.resolve([]));
-const mockCancel = jest.fn(() => Promise.resolve());
-const mockGetPermissions = jest.fn(() =>
-  Promise.resolve({ status: Notifications.PermissionStatus.GRANTED })
-);
-const mockRequestPermissions = jest.fn(() =>
-  Promise.resolve({ status: Notifications.PermissionStatus.GRANTED })
-);
-const mockSetHandler = jest.fn();
-const mockSetChannel = jest.fn(() => Promise.resolve());
-
 jest.mock('expo-notifications', () => ({
   PermissionStatus: { GRANTED: 'granted', DENIED: 'denied', UNDETERMINED: 'undetermined' },
   AndroidImportance: { HIGH: 4 },
   AndroidNotificationVisibility: { PUBLIC: 1 },
   SchedulableTriggerInputTypes: { DATE: 'date' },
-  setNotificationHandler: (...args: unknown[]) => mockSetHandler(...args),
-  setNotificationChannelAsync: (...args: unknown[]) => mockSetChannel(...args),
-  getPermissionsAsync: () => mockGetPermissions(),
-  requestPermissionsAsync: () => mockRequestPermissions(),
-  scheduleNotificationAsync: (...args: unknown[]) => mockSchedule(...args),
-  getAllScheduledNotificationsAsync: () => mockGetScheduled(),
-  cancelScheduledNotificationAsync: (...args: unknown[]) => mockCancel(...args),
+  setNotificationHandler: jest.fn(),
+  setNotificationChannelAsync: jest.fn(() => Promise.resolve()),
+  getPermissionsAsync: jest.fn(() => Promise.resolve({ status: 'granted' })),
+  requestPermissionsAsync: jest.fn(() => Promise.resolve({ status: 'granted' })),
+  scheduleNotificationAsync: jest.fn(() => Promise.resolve('notif-id')),
+  getAllScheduledNotificationsAsync: jest.fn(() => Promise.resolve([])),
+  cancelScheduledNotificationAsync: jest.fn(() => Promise.resolve()),
 }));
 
+const mockSchedule = Notifications.scheduleNotificationAsync as jest.Mock;
+const mockGetScheduled = Notifications.getAllScheduledNotificationsAsync as jest.Mock;
+const mockCancel = Notifications.cancelScheduledNotificationAsync as jest.Mock;
+const mockGetPermissions = Notifications.getPermissionsAsync as jest.Mock;
+const mockRequestPermissions = Notifications.requestPermissionsAsync as jest.Mock;
+const mockSetHandler = Notifications.setNotificationHandler as jest.Mock;
+const mockSetChannel = Notifications.setNotificationChannelAsync as jest.Mock;
+
 beforeEach(() => {
   mockSchedule.mockClear();
   mockGetScheduled.mockClear();
@@ -77,7 +73,7 @@ describe('notification delivery integration', () => {
     await presentChargeSuccessNotification(sub);
 
     expect(mockSchedule).toHaveBeenCalledTimes(1);
-    const [payload] = mockSchedule.mock.calls[0] as [
+    const [payload] = mockSchedule.mock.calls[0] as unknown as [
       { content: { title: string; data: { type: string } }; trigger: null },
     ];
     expect(payload.content.title).toContain('Linear');
@@ -90,7 +86,7 @@ describe('notification delivery integration', () => {
     await presentChargeFailedNotification(sub);
 
     expect(mockSchedule).toHaveBeenCalledTimes(1);
-    const [payload] = mockSchedule.mock.calls[0] as [
+    const [payload] = mockSchedule.mock.calls[0] as unknown as [
       { content: { title: string; data: { type: string } }; trigger: null },
     ];
     expect(payload.content.title).toContain('Figma');
@@ -102,15 +98,15 @@ describe('notification delivery integration', () => {
     const sub = makeSubscription();
     await presentChargeFailedNotification(sub, 'Insufficient balance');
 
-    const [payload] = mockSchedule.mock.calls[0] as [{ content: { body: string } }];
+    const [payload] = mockSchedule.mock.calls[0] as unknown as [{ content: { body: string } }];
     expect(payload.content.body).toBe('Insufficient balance');
   });
 
   it('presentTransactionQueueNotification schedules with correct type', async () => {
     await presentTransactionQueueNotification('Queue update', 'Your transaction was processed');
 
     expect(mockSchedule).toHaveBeenCalledTimes(1);
-    const [payload] = mockSchedule.mock.calls[0] as [
+    const [payload] = mockSchedule.mock.calls[0] as unknown as [
       { content: { title: string; body: string; data: { type: string } } },
     ];
     expect(payload.content.title).toBe('Queue update');
@@ -128,7 +124,7 @@ describe('notification delivery integration', () => {
       },
       trigger: null,
     };
-    mockGetScheduled.mockResolvedValueOnce([existingNotif]);
+    mockGetScheduled.mockResolvedValueOnce([existingNotif] as never);
 
     const sub = makeSubscription({
       nextBillingDate: new Date(Date.now() + 48 * 60 * 60 * 1000), // 2 days from now
@@ -142,7 +138,7 @@ describe('notification delivery integration', () => {
   });
 
   it('syncRenewalReminders does not schedule for inactive subscriptions', async () => {
-    mockGetScheduled.mockResolvedValueOnce([]);
+    mockGetScheduled.mockResolvedValueOnce([] as unknown as never);
 
     const sub = makeSubscription({ isActive: false, notificationsEnabled: true });
     await syncRenewalReminders([sub]);
@@ -151,7 +147,7 @@ describe('notification delivery integration', () => {
   });
 
   it('syncRenewalReminders does not schedule when notificationsEnabled is false', async () => {
-    mockGetScheduled.mockResolvedValueOnce([]);
+    mockGetScheduled.mockResolvedValueOnce([] as unknown as never);
 
     const sub = makeSubscription({
       isActive: true,
@@ -164,7 +160,7 @@ describe('notification delivery integration', () => {
   });
 
   it('syncRenewalReminders schedules a reminder for an active sub with future billing date', async () => {
-    mockGetScheduled.mockResolvedValueOnce([]);
+    mockGetScheduled.mockResolvedValueOnce([] as unknown as never);
 
     const sub = makeSubscription({
       isActive: true,
@@ -176,7 +172,9 @@ describe('notification delivery integration', () => {
     await syncRenewalReminders([sub]);
 
     expect(mockSchedule).toHaveBeenCalledTimes(1);
-    const [payload] = mockSchedule.mock.calls[0] as [{ content: { data: { type: string } } }];
+    const [payload] = mockSchedule.mock.calls[0] as unknown as [
+      { content: { data: { type: string } } },
+    ];
     expect(payload.content.data.type).toBe(NOTIFICATION_DATA_TYPE.RENEWAL_REMINDER);
   });
 

backend/services/auditService.ts

@@ -145,7 +145,7 @@ export class AuditService {
   applyRetention(): number {
     const cutoff = Date.now() - this.retention.maxAgeMs;
     const before = this.log.length;
-    this.log = this.log.filter((e) => e.timestamp >= cutoff);
+    this.log = this.log.filter((e) => e.timestamp > cutoff);
     return before - this.log.length; // number of events pruned
   }
 

backend/services/gdpr.ts

@@ -13,19 +13,13 @@ export interface UserConsent {
 
 export const exportUserData = async (userId: string) => {
   console.log(`Exporting data for user: ${userId}`);
-  
+
   // In a real scenario, this would query multiple tables/collections
   const userData = {
     profile: { id: userId, email: 'user@example.com', registeredAt: '2026-01-01' },
-    subscriptions: [
-      { id: 'sub_1', name: 'Netflix', amount: 15.99, status: 'active' }
-    ],
-    billingHistory: [
-      { id: 'tx_1', date: '2026-04-20', amount: 15.99, status: 'completed' }
-    ],
-    consentLogs: [
-      { type: 'analytics', status: 'granted', date: '2026-01-01' }
-    ],
+    subscriptions: [{ id: 'sub_1', name: 'Netflix', amount: 15.99, status: 'active' }],
+    billingHistory: [{ id: 'tx_1', date: '2026-04-20', amount: 15.99, status: 'completed' }],
+    consentLogs: [{ type: 'analytics', status: 'granted', date: '2026-01-01' }],
   };
 
   return JSON.stringify(userData, null, 2);
@@ -42,23 +36,15 @@ export const deleteUserData = async (userId: string, permanent: boolean = false)
   // Hard delete logic across all services
   // await SubscriptionModel.deleteMany({ userId });
   // await ProfileModel.deleteOne({ userId });
-  
+
   return { success: true, message: 'User data permanently deleted' };
 };
 
 export const anonymizeUserData = async (userId: string) => {
   console.log(`Anonymizing data for user: ${userId}`);
 
-  // Replace sensitive identifiers with null/dummy values
-  const updates = {
-    email: `deleted-${Date.now()}@anonymized.invalid`,
-    name: 'Anonymized User',
-    address: null,
-    phone: null,
-  };
-
   // await ProfileModel.updateOne({ userId }, updates);
-  
+
   return { success: true, message: 'User data has been anonymized' };
 };
 
@@ -70,8 +56,8 @@ export const updateConsent = async (userId: string, preferences: Partial<UserCon
 
   // Log consent change for audit trail
   console.log(`Consent updated for ${userId}:`, newConsent);
-  
+
   // await ConsentAuditModel.create({ userId, ...newConsent });
-  
+
   return newConsent;
 };

contracts/Cargo.toml

@@ -1,20 +1,3 @@
-[package]
-name = "subtrackr-subscription"
-version = "0.2.0"
-edition = "2021"
-authors = ["SubTrackr Team"]
-description = "SubTrackr subscription implementation contract (Soroban)"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-soroban-sdk = "21.0.0"
-subtrackr-types = { path = "../types" }
-
-[dev-dependencies]
-soroban-sdk = { version = "21.0.0", features = ["testutils"] }
-arbitrary = { version = "1.3", features = ["derive"] }
 [workspace]
 resolver = "2"
 members = [

contracts/proxy/src/lib.rs

@@ -1,4 +1,5 @@
 #![no_std]
+#![allow(clippy::too_many_arguments)]
 
 mod storage;
 
@@ -13,11 +14,7 @@ fn current_proxy_address(env: &Env) -> Address {
     env.current_contract_address()
 }
 
-fn invoke_impl<T: TryFromVal<Env, Val>>(
-    env: &Env,
-    func: &str,
-    args: Vec<Val>,
-) -> T {
+fn invoke_impl<T: TryFromVal<Env, Val>>(env: &Env, func: &str, args: Vec<Val>) -> T {
     let impl_addr = proxy_storage::implementation(env);
     env.invoke_contract(&impl_addr, &soroban_sdk::Symbol::new(env, func), args)
 }
@@ -92,11 +89,7 @@ impl UpgradeableProxy {
         let target_version: u32 = env.invoke_contract(
             &implementation,
             &soroban_sdk::Symbol::new(&env, "get_version"),
-            soroban_sdk::vec![
-                &env,
-                proxy_addr.into_val(&env),
-                storage.into_val(&env)
-            ],
+            soroban_sdk::vec![&env, proxy_addr.into_val(&env), storage.into_val(&env)],
         );
         proxy_storage::set_version(&env, target_version);
     }
@@ -133,13 +126,13 @@ impl UpgradeableProxy {
         // Basic interface validation: ensure new implementation supports expected interface.
         let proxy_addr = current_proxy_address(&env);
         let storage_addr = proxy_storage::storage_address(&env);
-        let args: Vec<Val> = soroban_sdk::vec![
-            &env,
-            proxy_addr.into_val(&env),
-            storage_addr.into_val(&env)
-        ];
-        let _target_version: u32 =
-            env.invoke_contract(&implementation, &soroban_sdk::Symbol::new(&env, "get_version"), args);
+        let args: Vec<Val> =
+            soroban_sdk::vec![&env, proxy_addr.into_val(&env), storage_addr.into_val(&env)];
+        let _target_version: u32 = env.invoke_contract(
+            &implementation,
+            &soroban_sdk::Symbol::new(&env, "get_version"),
+            args,
+        );
 
         proxy_storage::set_scheduled_upgrade(
             &env,
@@ -194,7 +187,10 @@ impl UpgradeableProxy {
         );
 
         let now = env.ledger().timestamp();
-        assert!(now >= scheduled.execute_after, "Upgrade timelock not expired");
+        assert!(
+            now >= scheduled.execute_after,
+            "Upgrade timelock not expired"
+        );
 
         let proxy_addr = current_proxy_address(&env);
         let storage_addr = proxy_storage::storage_address(&env);
@@ -471,12 +467,7 @@ impl UpgradeableProxy {
         );
     }
 
-    pub fn pause_by_subscriber(
-        env: Env,
-        subscriber: Address,
-        subscription_id: u64,
-        duration: u64,
-    ) {
+    pub fn pause_by_subscriber(env: Env, subscriber: Address, subscription_id: u64, duration: u64) {
         let proxy_addr = current_proxy_address(&env);
         let storage_addr = proxy_storage::storage_address(&env);
         invoke_impl::<()>(