Reorganize mobile app /src and /tests folders

app/.eslintrc.cjs

@@ -194,8 +194,8 @@ module.exports = {
         'src/components/NavBar/BaseNavBar.tsx',
         'src/navigation/index.tsx',
         'src/providers/passportDataProvider.tsx',
-        'src/utils/cloudBackup/helpers.ts',
-        'src/utils/haptic/index.ts',
+        'src/services/cloud-backup/helpers.ts',
+        'src/integrations/haptics/index.ts',
       ],
       rules: {
         'sort-exports/sort-exports': 'off',
@@ -228,7 +228,7 @@ module.exports = {
     },
     {
       // Allow require imports for dynamic imports in proving machine
-      files: ['src/utils/proving/provingMachine.ts'],
+      files: ['src/features/proving/provingMachine.ts'],
       rules: {
         '@typescript-eslint/no-require-imports': 'off',
       },

app/index.js

@@ -19,7 +19,7 @@ import App from './App';
 import { name as appName } from './app.json';
 import tamaguiConfig from './tamagui.config';
 
-import './src/utils/ethers';
+import './src/lib/crypto/ethers';
 import 'react-native-gesture-handler';
 
 // Set global Buffer before any other imports

app/jest.setup.js

@@ -637,8 +637,8 @@ NativeModules.PassportReader = {
   reset: jest.fn(),
 };
 
-// Mock @/utils/passportReader to properly expose the interface expected by tests
-jest.mock('./src/utils/passportReader', () => {
+// Mock @/integrations/nfc/passportReader to properly expose the interface expected by tests
+jest.mock('./src/integrations/nfc/passportReader', () => {
   const mockScanPassport = jest.fn();
   // Mock the parameter count for scanPassport (iOS native method takes 9 parameters)
   Object.defineProperty(mockScanPassport, 'length', { value: 9 });
@@ -776,7 +776,7 @@ jest.mock('react-native-localize', () => ({
   }),
 }));
 
-jest.mock('./src/utils/notifications/notificationService', () =>
+jest.mock('./src/services/notifications/notificationService', () =>
   require('./tests/__setup__/notificationServiceMock.js'),
 );
 

app/scripts/tests/aliasImports.test.cjs

@@ -179,14 +179,14 @@ describe('alias-imports transform', () => {
     const appRoot = tempRoot;
     const srcDir = join(appRoot, 'src');
     const testsSrcDir = join(appRoot, 'tests', 'src');
-    const fileHaptic = join(srcDir, 'utils', 'haptic.ts');
+    const fileHaptic = join(srcDir, 'integrations', 'haptics.ts');
     const deepSpecDir = join(testsSrcDir, 'deep');
     const deepSpecFile = join(deepSpecDir, 'spec.ts');
 
     writeFileEnsured(fileHaptic, 'export const h = 1;\n');
     writeFileEnsured(
       deepSpecFile,
-      "import { h } from '../../../src/utils/haptic';\nexport const v = h;\n",
+      "import { h } from '../../../src/integrations/haptics';\nexport const v = h;\n",
     );
 
     const project = new Project({
@@ -203,21 +203,24 @@ describe('alias-imports transform', () => {
     const specFile = project.getSourceFileOrThrow(deepSpecFile);
     const imports = specFile.getImportDeclarations();
     assert.strictEqual(imports.length, 1);
-    assert.strictEqual(imports[0].getModuleSpecifierValue(), '@/utils/haptic');
+    assert.strictEqual(
+      imports[0].getModuleSpecifierValue(),
+      '@/integrations/haptics',
+    );
   });
 
   it("transforms deep relative require '../../../src/...' to @src alias from tests", () => {
     const appRoot = tempRoot;
     const srcDir = join(appRoot, 'src');
     const testsSrcDir = join(appRoot, 'tests', 'src');
-    const fileHaptic = join(srcDir, 'utils', 'haptic.ts');
+    const fileHaptic = join(srcDir, 'integrations', 'haptics.ts');
     const deepSpecDir = join(testsSrcDir, 'deep');
     const deepSpecFile = join(deepSpecDir, 'req.ts');
 
     writeFileEnsured(fileHaptic, 'module.exports = { h: 1 };\n');
     writeFileEnsured(
       deepSpecFile,
-      "const h = require('../../../src/utils/haptic');\nexport const v = h;\n",
+      "const h = require('../../../src/integrations/haptics');\nexport const v = h;\n",
     );
 
     const project = new Project({
@@ -232,7 +235,7 @@ describe('alias-imports transform', () => {
     transformProjectToAliasImports(project, appRoot);
 
     const specFile = project.getSourceFileOrThrow(deepSpecFile);
-    assert.ok(specFile.getText().includes("require('@/utils/haptic')"));
+    assert.ok(specFile.getText().includes("require('@/integrations/haptics')"));
   });
 
   it('aliases export star re-exports with ../ from sibling directory', () => {

app/src/components/Disclosures.tsx

@@ -11,7 +11,7 @@ import type { SelfAppDisclosureConfig } from '@selfxyz/common/utils';
 import { BodyText } from '@selfxyz/mobile-sdk-alpha/components';
 
 import CheckMark from '@/images/icons/checkmark.svg';
-import { slate200, slate500 } from '@/utils/colors';
+import { slate200, slate500 } from '@/lib/colors';
 
 interface DisclosureProps {
   disclosures: SelfAppDisclosureConfig;

app/src/components/ErrorBoundary.tsx

@@ -7,7 +7,7 @@ import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 
 import { captureException } from '@/Sentry';
-import { flushAllAnalytics, trackNfcEvent } from '@/utils/analytics';
+import { flushAllAnalytics, trackNfcEvent } from '@/services/analytics';
 
 interface Props {
   children: React.ReactNode;

app/src/components/FeedbackModal.tsx

@@ -8,8 +8,8 @@ import { Button, XStack, YStack } from 'tamagui';
 
 import { Caption } from '@selfxyz/mobile-sdk-alpha/components';
 
-import { black, slate400, white, zinc800, zinc900 } from '@/utils/colors';
-import { advercase, dinot } from '@/utils/fonts';
+import { black, slate400, white, zinc800, zinc900 } from '@/lib/colors';
+import { advercase, dinot } from '@/lib/fonts';
 
 interface FeedbackModalProps {
   visible: boolean;

app/src/components/FeedbackModalScreen.tsx

@@ -15,8 +15,8 @@ import {
 
 import ModalClose from '@/images/icons/modal_close.svg';
 import LogoInversed from '@/images/logo_inversed.svg';
-import { white } from '@/utils/colors';
-import { confirmTap, impactLight } from '@/utils/haptic';
+import { confirmTap, impactLight } from '@/integrations/haptics';
+import { white } from '@/lib/colors';
 
 const ModalBackDrop = styled(View, {
   display: 'flex',

app/src/components/Mnemonic.tsx

@@ -6,7 +6,7 @@ import React, { useCallback, useState } from 'react';
 import { Button, Text, XStack, YStack } from 'tamagui';
 import Clipboard from '@react-native-clipboard/clipboard';
 
-import { useSettingStore } from '@/stores/settingStore';
+import { confirmTap } from '@/integrations/haptics';
 import {
   black,
   slate50,
@@ -15,8 +15,8 @@ import {
   slate500,
   teal500,
   white,
-} from '@/utils/colors';
-import { confirmTap } from '@/utils/haptic';
+} from '@/lib/colors';
+import { useSettingStore } from '@/stores/settingStore';
 
 interface MnemonicProps {
   words?: string[];

app/src/components/NavBar/AadhaarNavBar.tsx

@@ -10,10 +10,10 @@ import { ChevronLeft, HelpCircle } from '@tamagui/lucide-icons';
 import { Button, XStack, YStack } from '@selfxyz/mobile-sdk-alpha/components';
 
 import { NavBar } from '@/components/NavBar/BaseNavBar';
-import { black, slate100, slate300 } from '@/utils/colors';
-import { extraYPadding } from '@/utils/constants';
-import { dinot } from '@/utils/fonts';
-import { buttonTap } from '@/utils/haptic';
+import { buttonTap } from '@/integrations/haptics';
+import { black, slate100, slate300 } from '@/lib/colors';
+import { extraYPadding } from '@/lib/constants';
+import { dinot } from '@/lib/fonts';
 
 export const AadhaarNavBar = (props: NativeStackHeaderProps) => {
   const insets = useSafeAreaInsets();

app/src/components/NavBar/DefaultNavBar.tsx

@@ -8,9 +8,9 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import type { NativeStackHeaderProps } from '@react-navigation/native-stack';
 
 import { NavBar } from '@/components/NavBar/BaseNavBar';
-import { white } from '@/utils/colors';
-import { extraYPadding } from '@/utils/constants';
-import { buttonTap } from '@/utils/haptic';
+import { buttonTap } from '@/integrations/haptics';
+import { white } from '@/lib/colors';
+import { extraYPadding } from '@/lib/constants';
 
 export const DefaultNavBar = (props: NativeStackHeaderProps) => {
   const { goBack, canGoBack } = props.navigation;

app/src/components/NavBar/DocumentFlowNavBar.tsx

@@ -8,8 +8,8 @@ import { useNavigation } from '@react-navigation/native';
 import { HelpCircle } from '@tamagui/lucide-icons';
 
 import { NavBar } from '@/components/NavBar/BaseNavBar';
-import { slate100 } from '@/utils/colors';
-import { dinot } from '@/utils/fonts';
+import { slate100 } from '@/lib/colors';
+import { dinot } from '@/lib/fonts';
 
 export const DocumentFlowNavBar = ({
   title,

app/src/components/NavBar/HomeNavBar.tsx

@@ -16,9 +16,9 @@ import { NavBar } from '@/components/NavBar/BaseNavBar';
 import ActivityIcon from '@/images/icons/activity.svg';
 import ScanIcon from '@/images/icons/qr_scan.svg';
 import SettingsIcon from '@/images/icons/settings.svg';
-import { black, charcoal, slate50 } from '@/utils/colors';
-import { extraYPadding } from '@/utils/constants';
-import { buttonTap } from '@/utils/haptic';
+import { buttonTap } from '@/integrations/haptics';
+import { black, charcoal, slate50 } from '@/lib/colors';
+import { extraYPadding } from '@/lib/constants';
 
 export const HomeNavBar = (props: NativeStackHeaderProps) => {
   const selfClient = useSelfClient();

app/src/components/NavBar/IdDetailsNavBar.tsx

@@ -9,9 +9,9 @@ import type { NativeStackHeaderProps } from '@react-navigation/native-stack';
 import { Button, Text, View } from '@selfxyz/mobile-sdk-alpha/components';
 
 import { NavBar } from '@/components/NavBar/BaseNavBar';
-import { black, charcoal, slate50 } from '@/utils/colors';
-import { extraYPadding } from '@/utils/constants';
-import { buttonTap } from '@/utils/haptic';
+import { buttonTap } from '@/integrations/haptics';
+import { black, charcoal, slate50 } from '@/lib/colors';
+import { extraYPadding } from '@/lib/constants';
 
 export const IdDetailsNavBar = (props: NativeStackHeaderProps) => {
   const insets = useSafeAreaInsets();

app/src/components/NavBar/WebViewNavBar.tsx

@@ -9,9 +9,9 @@ import { ExternalLink, X } from '@tamagui/lucide-icons';
 
 import { Button, XStack } from '@selfxyz/mobile-sdk-alpha/components';
 
-import { black } from '@/utils/colors';
-import { dinot } from '@/utils/fonts';
-import { buttonTap } from '@/utils/haptic';
+import { buttonTap } from '@/integrations/haptics';
+import { black } from '@/lib/colors';
+import { dinot } from '@/lib/fonts';
 
 export interface WebViewNavBarProps {
   title?: string;

app/src/components/Tips.tsx

@@ -7,7 +7,7 @@ import { Text, View } from 'tamagui';
 
 import { Caption } from '@selfxyz/mobile-sdk-alpha/components';
 
-import { slate500 } from '@/utils/colors';
+import { slate500 } from '@/lib/colors';
 
 export interface TipProps {
   title: string;

app/src/components/WebViewFooter.tsx

@@ -7,8 +7,8 @@ import { ArrowLeft, ArrowRight, RotateCcw } from '@tamagui/lucide-icons';
 
 import { Button, XStack, YStack } from '@selfxyz/mobile-sdk-alpha/components';
 
-import { black, slate50, slate400 } from '@/utils/colors';
-import { buttonTap } from '@/utils/haptic';
+import { buttonTap } from '@/integrations/haptics';
+import { black, slate50, slate400 } from '@/lib/colors';
 
 export interface WebViewFooterProps {
   canGoBack: boolean;

app/src/components/homeScreen/idCard.tsx

@@ -26,8 +26,8 @@ import {
   slate400,
   slate500,
   white,
-} from '@/utils/colors';
-import { dinot, plexMono } from '@/utils/fonts';
+} from '@/lib/colors';
+import { dinot, plexMono } from '@/lib/fonts';
 
 // Import the logo SVG as a string
 const logoSvg = `<svg width="47" height="46" viewBox="0 0 47 46" fill="none" xmlns="http://www.w3.org/2000/svg">

app/src/components/loading/LoadingUI.tsx

@@ -19,9 +19,9 @@ import {
   white,
   zinc500,
   zinc900,
-} from '@/utils/colors';
-import { extraYPadding } from '@/utils/constants';
-import { advercase, dinot } from '@/utils/fonts';
+} from '@/lib/colors';
+import { extraYPadding } from '@/lib/constants';
+import { advercase, dinot } from '@/lib/fonts';
 
 interface LoadingUIProps {
   animationSource: LottieView['props']['source'];

app/src/devtools/index.ts

@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
+
+// Re-export all devtools modules
+export * from '@/devtools/mocks';
+export * from '@/devtools/testing';

app/src/devtools/mocks/index.ts

@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
+
+// Re-export all mocks for easier imports
+export * from '@/devtools/mocks/nfcScanner';

app/src/devtools/testing/index.ts

@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
+
+// Re-export all testing utilities for easier imports
+export * from '@/devtools/testing/utils';

app/src/hooks/useAppUpdates.ts

@@ -11,8 +11,8 @@ import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useSelfClient } from '@selfxyz/mobile-sdk-alpha';
 import { AppEvents } from '@selfxyz/mobile-sdk-alpha/constants/analytics';
 
+import { registerModalCallbacks } from '@/lib/ui/modalCallbackRegistry';
 import type { RootStackParamList } from '@/navigation';
-import { registerModalCallbacks } from '@/utils/modalCallbackRegistry';
 
 export const useAppUpdates = (): [boolean, () => void, boolean] => {
   const navigation =

app/src/hooks/useAppUpdates.web.ts

@@ -9,8 +9,8 @@ import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useSelfClient } from '@selfxyz/mobile-sdk-alpha';
 import { AppEvents } from '@selfxyz/mobile-sdk-alpha/constants/analytics';
 
+import { registerModalCallbacks } from '@/lib/ui/modalCallbackRegistry';
 import type { RootStackParamList } from '@/navigation';
-import { registerModalCallbacks } from '@/utils/modalCallbackRegistry';
 
 export const useAppUpdates = (): [boolean, () => void, boolean] => {
   const navigation =

app/src/hooks/useConnectionModal.ts

@@ -10,8 +10,8 @@ import { SettingsEvents } from '@selfxyz/mobile-sdk-alpha/constants/analytics';
 import { useModal } from '@/hooks/useModal';
 import { useNetInfo } from '@/hooks/useNetInfo';
 import { navigationRef } from '@/navigation';
+import analytics from '@/services/analytics';
 import { useSettingStore } from '@/stores/settingStore';
-import analytics from '@/utils/analytics';
 
 const { trackEvent } = analytics();
 

app/src/hooks/useHapticNavigation.ts

@@ -6,8 +6,12 @@ import { useCallback } from 'react';
 import type { NavigationProp } from '@react-navigation/native';
 import { useNavigation } from '@react-navigation/native';
 
+import {
+  impactLight,
+  impactMedium,
+  selectionChange,
+} from '@/integrations/haptics';
 import type { RootStackParamList } from '@/navigation/index';
-import { impactLight, impactMedium, selectionChange } from '@/utils/haptic';
 
 type NavigationAction = 'default' | 'cancel' | 'confirm';
 

app/src/hooks/useModal.ts

@@ -6,13 +6,13 @@ import { useCallback, useRef, useState } from 'react';
 import { useNavigation } from '@react-navigation/native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
-import type { RootStackParamList } from '@/navigation';
-import type { ModalParams } from '@/screens/app/ModalScreen';
 import {
   getModalCallbacks,
   registerModalCallbacks,
   unregisterModalCallbacks,
-} from '@/utils/modalCallbackRegistry';
+} from '@/lib/ui/modalCallbackRegistry';
+import type { RootStackParamList } from '@/navigation';
+import type { ModalParams } from '@/screens/app/ModalScreen';
 
 export const useModal = (params: ModalParams) => {
   const [visible, setVisible] = useState(false);

app/src/utils/haptic/index.ts → app/src/integrations/haptics/index.ts

@@ -3,6 +3,7 @@
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 // Re-export all haptic functionality from the mobile SDK
+export type { HapticOptions, HapticType } from '@selfxyz/mobile-sdk-alpha';
 export {
   buttonTap,
   cancelTap,
@@ -19,4 +20,3 @@ export {
   selectionChange,
   triggerFeedback,
 } from '@selfxyz/mobile-sdk-alpha';
-export type { HapticOptions, HapticType } from '@selfxyz/mobile-sdk-alpha';

app/src/utils/nfcScanner.ts → app/src/integrations/nfc/nfcScanner.ts

@@ -8,13 +8,13 @@ import { Platform } from 'react-native';
 import type { PassportData } from '@selfxyz/common/types';
 import type { NFCScanContext } from '@selfxyz/mobile-sdk-alpha';
 
-import { logNFCEvent } from '@/Sentry';
 import {
   type AndroidScanResponse,
   reset,
   scan as scanDocument,
-} from '@/utils/passportReader';
-import { PassportReader } from '@/utils/passportReader';
+} from '@/integrations/nfc/passportReader';
+import { PassportReader } from '@/integrations/nfc/passportReader';
+import { logNFCEvent } from '@/Sentry';
 
 interface Inputs {
   passportNumber: string;