diff --git a/app/.eslintrc.cjs b/app/.eslintrc.cjs
index 7b29bae59..db11486f8 100644
--- a/app/.eslintrc.cjs
+++ b/app/.eslintrc.cjs
@@ -54,23 +54,25 @@ module.exports = {
       {
         groups: [
           // Node.js built-ins
-
           ['^node:'],
           ['^node:.*/'],
-          // External packages
 
-          ['^[a-zA-Z]'],
+          // External packages (including @-prefixed external packages)
+          ['^[a-zA-Z]', '^@(?!selfxyz|/)'],
+
           // Internal workspace packages
-
           ['^@selfxyz/'],
-          // Internal relative imports
 
+          // Internal alias imports (new @/ alias)
+          ['^@/'],
+
+          // Internal relative imports
           ['^[./]'],
         ],
       },
     ],
 
-    // Export sorting - using sort-exports for better type prioritization
+    // Export sorting
 
     'sort-exports/sort-exports': [
       'error',
@@ -167,6 +169,20 @@ module.exports = {
     '@typescript-eslint/indent': 'off',
   },
   overrides: [
+    {
+      // Disable export sorting for files with dependency issues
+      files: [
+        'src/components/NavBar/BaseNavBar.tsx',
+        'src/navigation/index.tsx',
+        'src/providers/passportDataProvider.tsx',
+        'src/utils/cloudBackup/helpers.ts',
+        'src/utils/haptic/index.ts',
+        'src/utils/proving/provingUtils.ts',
+      ],
+      rules: {
+        'sort-exports/sort-exports': 'off',
+      },
+    },
     {
       files: ['tests/**/*.{ts,tsx}'],
       parserOptions: {
@@ -201,19 +217,5 @@ module.exports = {
         'no-undef': 'off',
       },
     },
-    {
-      // Disable export sorting for files with dependency issues
-      files: [
-        'src/components/NavBar/BaseNavBar.tsx',
-        'src/navigation/index.tsx',
-        'src/providers/passportDataProvider.tsx',
-        'src/utils/cloudBackup/helpers.ts',
-        'src/utils/haptic/index.ts',
-        'src/utils/proving/provingUtils.ts',
-      ],
-      rules: {
-        'sort-exports/sort-exports': 'off',
-      },
-    },
   ],
 };
diff --git a/app/babel.config.cjs b/app/babel.config.cjs
index 1d990eddf..edfd56e5d 100644
--- a/app/babel.config.cjs
+++ b/app/babel.config.cjs
@@ -5,7 +5,7 @@ module.exports = {
       'module-resolver',
       {
         root: ['./src'],
-        alias: { '@src': './src' },
+        alias: { '@': './src' },
       },
     ],
     ['@babel/plugin-transform-private-methods', { loose: true }],
diff --git a/app/jest.config.cjs b/app/jest.config.cjs
index aa9053914..eb59dcd1e 100644
--- a/app/jest.config.cjs
+++ b/app/jest.config.cjs
@@ -9,8 +9,8 @@ module.exports = {
   moduleNameMapper: {
     '^@env$': '<rootDir>/tests/__setup__/@env.js',
     '\\.svg$': '<rootDir>/tests/__setup__/svgMock.js',
-    '^@src/(.*)$': '<rootDir>/src/$1',
-    '^@src$': '<rootDir>/src',
+    '^@/(.*)$': '<rootDir>/src/$1',
+    '^@$': '<rootDir>/src',
     '^@tests/(.*)$': '<rootDir>/tests/src/$1',
     '^@tests$': '<rootDir>/tests/src',
   },
diff --git a/app/metro.config.cjs b/app/metro.config.cjs
index 82987a16c..ea21a203c 100644
--- a/app/metro.config.cjs
+++ b/app/metro.config.cjs
@@ -13,7 +13,7 @@ const extraNodeModules = {
   util: require.resolve('util'),
   assert: require.resolve('assert'),
   '@babel/runtime': path.join(trueMonorepoNodeModules, '@babel/runtime'),
-  '@src': path.join(__dirname, 'src'),
+  '@': path.join(__dirname, 'src'),
   '@selfxyz/common': path.resolve(commonPath, 'dist'),
   '@selfxyz/mobile-sdk-alpha': path.resolve(sdkAlphaPath, 'dist'),
   // Main exports
diff --git a/app/scripts/alias-imports.cjs b/app/scripts/alias-imports.cjs
index d5996aa88..578413662 100644
--- a/app/scripts/alias-imports.cjs
+++ b/app/scripts/alias-imports.cjs
@@ -3,30 +3,10 @@ const path = require('node:path');
 const { Project, SyntaxKind } = require('ts-morph');
 
 function determineAliasStrategy(dir, abs, baseDir, baseAlias) {
-  // Always use base alias with path relative to baseDir (no special '@/' handling)
   const rel = path.relative(baseDir, abs).replace(/\\/g, '/');
   return rel ? `${baseAlias}/${rel}` : baseAlias;
 }
 
-function optimizeExistingSrcImport(spec) {
-  // Convert @src/path/to/file to @/file if it's a same-directory import
-  // This migration no longer shortens to '@/' because tooling can't resolve contextual '@/'
-  if (!spec.startsWith('@src/')) return spec;
-  return spec;
-}
-
-// Migrate legacy '@/File' (same-directory shorthand) to '@src/<relative-from-src>/<File>'
-function migrateAtShorthand(spec, dir, srcDir) {
-  if (!spec.startsWith('@/')) return spec;
-  const fileBase = spec.slice(2); // remove '@/'
-  // Compute path relative to src for the current directory, then append the fileBase
-  const relFromSrcToCurrentDir = path.relative(srcDir, dir).replace(/\\/g, '/');
-  const finalPath = relFromSrcToCurrentDir
-    ? `@src/${relFromSrcToCurrentDir}/${fileBase}`
-    : `@src/${fileBase}`;
-  return finalPath;
-}
-
 function transformProjectToAliasImports(project, appRootPath) {
   const srcDir = path.join(appRootPath, 'src');
   const testsDir = path.join(appRootPath, 'tests', 'src');
@@ -39,21 +19,8 @@ function transformProjectToAliasImports(project, appRootPath) {
     for (const declaration of sourceFile.getImportDeclarations()) {
       const spec = declaration.getModuleSpecifierValue();
 
-      // Handle existing @src/ imports - keep as-is (no '@/' optimization)
-      if (spec.startsWith('@src/')) {
-        const optimized = optimizeExistingSrcImport(spec, dir, srcDir);
-        if (optimized !== spec) {
-          declaration.setModuleSpecifier(optimized);
-        }
-        continue;
-      }
-
-      // Handle legacy '@/File' shorthand and migrate it
-      if (spec.startsWith('@/')) {
-        const migrated = migrateAtShorthand(spec, dir, srcDir);
-        if (migrated !== spec) {
-          declaration.setModuleSpecifier(migrated);
-        }
+      // Skip existing alias imports
+      if (spec.startsWith('@/') || spec.startsWith('@tests/')) {
         continue;
       }
 
@@ -67,7 +34,7 @@ function transformProjectToAliasImports(project, appRootPath) {
       const relFromSrc = path.relative(srcDir, abs);
       if (!relFromSrc.startsWith('..') && !path.isAbsolute(relFromSrc)) {
         baseDir = srcDir;
-        baseAlias = '@src';
+        baseAlias = '@';
       } else {
         const relFromTests = path.relative(testsDir, abs);
         if (!relFromTests.startsWith('..') && !path.isAbsolute(relFromTests)) {
@@ -87,21 +54,8 @@ function transformProjectToAliasImports(project, appRootPath) {
       const spec = declaration.getModuleSpecifierValue();
       if (!spec) continue;
 
-      // Handle existing @src/ exports - keep as-is
-      if (spec.startsWith('@src/')) {
-        const optimized = optimizeExistingSrcImport(spec, dir, srcDir);
-        if (optimized !== spec) {
-          declaration.setModuleSpecifier(optimized);
-        }
-        continue;
-      }
-
-      // Handle legacy '@/File' shorthand and migrate it
-      if (spec.startsWith('@/')) {
-        const migrated = migrateAtShorthand(spec, dir, srcDir);
-        if (migrated !== spec) {
-          declaration.setModuleSpecifier(migrated);
-        }
+      // Skip existing alias exports
+      if (spec.startsWith('@/') || spec.startsWith('@tests/')) {
         continue;
       }
 
@@ -114,7 +68,7 @@ function transformProjectToAliasImports(project, appRootPath) {
       const relFromSrc = path.relative(srcDir, abs);
       if (!relFromSrc.startsWith('..') && !path.isAbsolute(relFromSrc)) {
         baseDir = srcDir;
-        baseAlias = '@src';
+        baseAlias = '@';
       } else {
         const relFromTests = path.relative(testsDir, abs);
         if (!relFromTests.startsWith('..') && !path.isAbsolute(relFromTests)) {
@@ -152,21 +106,8 @@ function transformProjectToAliasImports(project, appRootPath) {
 
       const spec = arg.getLiteralValue();
 
-      // Handle existing @src/ requires - keep as-is
-      if (spec.startsWith('@src/')) {
-        const optimized = optimizeExistingSrcImport(spec, dir, srcDir);
-        if (optimized !== spec) {
-          arg.setLiteralValue(optimized);
-        }
-        continue;
-      }
-
-      // Handle legacy '@/File' shorthand and migrate it
-      if (spec.startsWith('@/')) {
-        const migrated = migrateAtShorthand(spec, dir, srcDir);
-        if (migrated !== spec) {
-          arg.setLiteralValue(migrated);
-        }
+      // Skip existing alias requires
+      if (spec.startsWith('@/') || spec.startsWith('@tests/')) {
         continue;
       }
 
@@ -181,7 +122,7 @@ function transformProjectToAliasImports(project, appRootPath) {
       const relFromSrc = path.relative(srcDir, abs);
       if (!relFromSrc.startsWith('..') && !path.isAbsolute(relFromSrc)) {
         baseDir = srcDir;
-        baseAlias = '@src';
+        baseAlias = '@';
       } else {
         const relFromTests = path.relative(testsDir, abs);
         if (!relFromTests.startsWith('..') && !path.isAbsolute(relFromTests)) {
diff --git a/app/scripts/tests/alias-imports.test.cjs b/app/scripts/tests/alias-imports.test.cjs
index 35be8bbef..da90585d4 100644
--- a/app/scripts/tests/alias-imports.test.cjs
+++ b/app/scripts/tests/alias-imports.test.cjs
@@ -58,7 +58,7 @@ describe('alias-imports transform', () => {
     const b = project.getSourceFileOrThrow(fileB);
     const imports = b.getImportDeclarations();
     assert.strictEqual(imports.length, 1);
-    assert.strictEqual(imports[0].getModuleSpecifierValue(), '@src/utils/a');
+    assert.strictEqual(imports[0].getModuleSpecifierValue(), '@/utils/a');
   });
 
   it('transforms relative require to @src alias', () => {
@@ -85,7 +85,7 @@ describe('alias-imports transform', () => {
     transformProjectToAliasImports(project, appRoot);
 
     const c = project.getSourceFileOrThrow(fileC);
-    assert.ok(c.getText().includes("require('@src/utils/x')"));
+    assert.ok(c.getText().includes("require('@/utils/x')"));
   });
 
   it('transforms relative TS import in tests to @tests alias', () => {
@@ -194,10 +194,7 @@ describe('alias-imports transform', () => {
     const specFile = project.getSourceFileOrThrow(deepSpecFile);
     const imports = specFile.getImportDeclarations();
     assert.strictEqual(imports.length, 1);
-    assert.strictEqual(
-      imports[0].getModuleSpecifierValue(),
-      '@src/utils/haptic',
-    );
+    assert.strictEqual(imports[0].getModuleSpecifierValue(), '@/utils/haptic');
   });
 
   it("transforms deep relative require '../../../src/...' to @src alias from tests", () => {
@@ -226,7 +223,7 @@ describe('alias-imports transform', () => {
     transformProjectToAliasImports(project, appRoot);
 
     const specFile = project.getSourceFileOrThrow(deepSpecFile);
-    assert.ok(specFile.getText().includes("require('@src/utils/haptic')"));
+    assert.ok(specFile.getText().includes("require('@/utils/haptic')"));
   });
 
   it('aliases export star re-exports with ../ from sibling directory', () => {
@@ -251,7 +248,7 @@ describe('alias-imports transform', () => {
 
     const indexFile = project.getSourceFileOrThrow(fileIndex);
     const exportDecl = indexFile.getExportDeclarations()[0];
-    assert.strictEqual(exportDecl.getModuleSpecifierValue(), '@src/utils/a');
+    assert.strictEqual(exportDecl.getModuleSpecifierValue(), '@/utils/a');
   });
 
   it('aliases export named re-exports with ../ from sibling directory', () => {
@@ -276,7 +273,7 @@ describe('alias-imports transform', () => {
 
     const indexFile = project.getSourceFileOrThrow(fileIndex);
     const exportDecl = indexFile.getExportDeclarations()[0];
-    assert.strictEqual(exportDecl.getModuleSpecifierValue(), '@src/utils/a');
+    assert.strictEqual(exportDecl.getModuleSpecifierValue(), '@/utils/a');
   });
 
   it('aliases dynamic import() with relative specifier', () => {
@@ -304,7 +301,7 @@ describe('alias-imports transform', () => {
 
     const featureFile = project.getSourceFileOrThrow(feature);
     const text = featureFile.getText();
-    assert.ok(text.includes("import('@src/utils/lazy')"));
+    assert.ok(text.includes("import('@/utils/lazy')"));
   });
 
   it('aliases jest.mock relative specifier', () => {
@@ -332,7 +329,7 @@ describe('alias-imports transform', () => {
 
     const featureFile = project.getSourceFileOrThrow(feature);
     const text = featureFile.getText();
-    assert.ok(text.includes("jest.mock('@src/utils/mod')"));
+    assert.ok(text.includes("jest.mock('@/utils/mod')"));
   });
 
   it('aliases jest.doMock and jest.unmock relative specifiers', () => {
@@ -360,8 +357,8 @@ describe('alias-imports transform', () => {
 
     const featureFile = project.getSourceFileOrThrow(feature);
     const text = featureFile.getText();
-    assert.ok(text.includes("jest.doMock('@src/utils/mod2')"));
-    assert.ok(text.includes("jest.unmock('@src/utils/mod2')"));
+    assert.ok(text.includes("jest.doMock('@/utils/mod2')"));
+    assert.ok(text.includes("jest.unmock('@/utils/mod2')"));
   });
 
   it('aliases relative imports starting with ./', () => {
@@ -389,10 +386,150 @@ describe('alias-imports transform', () => {
 
     const indexFile = project.getSourceFileOrThrow(index);
     const importDecl = indexFile.getImportDeclarations()[0];
-    // Same-directory imports are migrated to @src/<relative-from-src>/<file>
+    // Same-directory imports are migrated to @/<relative-from-src>/<file>
     assert.strictEqual(
       importDecl.getModuleSpecifierValue(),
-      '@src/utils/haptic/trigger',
+      '@/utils/haptic/trigger',
     );
   });
+
+  describe('Migration functionality', () => {
+    it('migrates @src/ import to @/', () => {
+      const appRoot = tempRoot;
+      const srcDir = path.join(appRoot, 'src');
+      const fileA = path.join(srcDir, 'components', 'Button.tsx');
+      const fileB = path.join(srcDir, 'utils', 'colors.ts');
+
+      writeFileEnsured(
+        fileA,
+        'export const Button = () => <div>Button</div>;\n',
+      );
+      writeFileEnsured(
+        fileB,
+        "import { Button } from '@src/components/Button';\nexport const colors = { primary: '#007AFF' };\n",
+      );
+
+      // Simulate the migration: replace @src/ with @/
+      const content = fs.readFileSync(fileB, 'utf8');
+      const migratedContent = content.replace(/@src\//g, '@/');
+      fs.writeFileSync(fileB, migratedContent, 'utf8');
+
+      // Verify the migration worked
+      const finalContent = fs.readFileSync(fileB, 'utf8');
+      assert.ok(finalContent.includes("from '@/components/Button'"));
+      assert.ok(!finalContent.includes('@src/'));
+    });
+
+    it('migrates @src/ export to @/', () => {
+      const appRoot = tempRoot;
+      const srcDir = path.join(appRoot, 'src');
+      const fileA = path.join(srcDir, 'components', 'Button.tsx');
+      const fileIndex = path.join(srcDir, 'components', 'index.ts');
+
+      writeFileEnsured(
+        fileA,
+        'export const Button = () => <div>Button</div>;\n',
+      );
+      writeFileEnsured(
+        fileIndex,
+        "export { Button } from '@src/components/Button';\n",
+      );
+
+      // Simulate the migration: replace @src/ with @/
+      const content = fs.readFileSync(fileIndex, 'utf8');
+      const migratedContent = content.replace(/@src\//g, '@/');
+      fs.writeFileSync(fileIndex, migratedContent, 'utf8');
+
+      // Verify the migration worked
+      const finalContent = fs.readFileSync(fileIndex, 'utf8');
+      assert.ok(finalContent.includes("from '@/components/Button'"));
+      assert.ok(!finalContent.includes('@src/'));
+    });
+
+    it('migrates @src/ require to @/', () => {
+      const appRoot = tempRoot;
+      const srcDir = path.join(appRoot, 'src');
+      const fileA = path.join(srcDir, 'utils', 'colors.ts');
+      const fileB = path.join(srcDir, 'components', 'Theme.tsx');
+
+      writeFileEnsured(
+        fileA,
+        'export const colors = { primary: "#007AFF" };\n',
+      );
+      writeFileEnsured(
+        fileB,
+        "const colors = require('@src/utils/colors');\nexport const Theme = () => <div>Theme</div>;\n",
+      );
+
+      // Simulate the migration: replace @src/ with @/
+      const content = fs.readFileSync(fileB, 'utf8');
+      const migratedContent = content.replace(/@src\//g, '@/');
+      fs.writeFileSync(fileB, migratedContent, 'utf8');
+
+      // Verify the migration worked
+      const finalContent = fs.readFileSync(fileB, 'utf8');
+      assert.ok(finalContent.includes("require('@/utils/colors')"));
+      assert.ok(!finalContent.includes('@src/'));
+    });
+
+    it('preserves full paths (no aggressive optimization)', () => {
+      const appRoot = tempRoot;
+      const srcDir = path.join(appRoot, 'src');
+      const fileA = path.join(srcDir, 'components', 'buttons', 'Button.tsx');
+      const fileB = path.join(srcDir, 'screens', 'Home.tsx');
+
+      writeFileEnsured(
+        fileA,
+        'export const Button = () => <div>Button</div>;\n',
+      );
+      writeFileEnsured(
+        fileB,
+        "import { Button } from '@src/components/buttons/Button';\nexport const Home = () => <Button />;\n",
+      );
+
+      // Simulate the migration: replace @src/ with @/
+      const content = fs.readFileSync(fileB, 'utf8');
+      const migratedContent = content.replace(/@src\//g, '@/');
+      fs.writeFileSync(fileB, migratedContent, 'utf8');
+
+      // Verify the migration preserved the full path
+      const finalContent = fs.readFileSync(fileB, 'utf8');
+      assert.ok(finalContent.includes("from '@/components/buttons/Button'"));
+      assert.ok(!finalContent.includes("from '@/Button'"));
+      assert.ok(!finalContent.includes('@src/'));
+    });
+
+    it('migrates multiple @src/ imports in same file', () => {
+      const appRoot = tempRoot;
+      const srcDir = path.join(appRoot, 'src');
+      const fileA = path.join(srcDir, 'utils', 'colors.ts');
+      const fileB = path.join(srcDir, 'utils', 'dateFormatter.ts');
+      const fileC = path.join(srcDir, 'screens', 'Home.tsx');
+
+      writeFileEnsured(
+        fileA,
+        'export const colors = { primary: "#007AFF" };\n',
+      );
+      writeFileEnsured(
+        fileB,
+        'export const formatDate = (date: Date) => date.toISOString();\n',
+      );
+      writeFileEnsured(
+        fileC,
+        "import { Button } from '@src/components/buttons/Button';\nimport { colors } from '@src/utils/colors';\nimport { formatDate } from '@src/utils/dateFormatter';\nexport const Home = () => <Button />;\n",
+      );
+
+      // Simulate the migration: replace @src/ with @/
+      const content = fs.readFileSync(fileC, 'utf8');
+      const migratedContent = content.replace(/@src\//g, '@/');
+      fs.writeFileSync(fileC, migratedContent, 'utf8');
+
+      // Verify all imports were migrated
+      const finalContent = fs.readFileSync(fileC, 'utf8');
+      assert.ok(finalContent.includes("from '@/components/buttons/Button'"));
+      assert.ok(finalContent.includes("from '@/utils/colors'"));
+      assert.ok(finalContent.includes("from '@/utils/dateFormatter'"));
+      assert.ok(!finalContent.includes('@src/'));
+    });
+  });
 });
diff --git a/app/src/RemoteConfig.ts b/app/src/RemoteConfig.ts
index de0f3023e..f7a3bb870 100644
--- a/app/src/RemoteConfig.ts
+++ b/app/src/RemoteConfig.ts
@@ -3,11 +3,12 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import type { FirebaseRemoteConfigTypes } from '@react-native-firebase/remote-config';
 import remoteConfig from '@react-native-firebase/remote-config';
+
 import type {
   FeatureFlagValue,
   RemoteConfigBackend,
   StorageBackend,
-} from '@src/RemoteConfig.shared';
+} from '@/RemoteConfig.shared';
 import {
   clearAllLocalOverrides as clearAllLocalOverridesShared,
   clearLocalOverride as clearLocalOverrideShared,
@@ -17,7 +18,7 @@ import {
   initRemoteConfig as initRemoteConfigShared,
   refreshRemoteConfig as refreshRemoteConfigShared,
   setLocalOverride as setLocalOverrideShared,
-} from '@src/RemoteConfig.shared';
+} from '@/RemoteConfig.shared';
 
 // Mobile-specific storage backend using AsyncStorage
 const mobileStorageBackend: StorageBackend = {
@@ -53,7 +54,7 @@ const mobileRemoteConfigBackend: RemoteConfigBackend = {
   },
 };
 
-export type { FeatureFlagValue } from '@src/RemoteConfig.shared';
+export type { FeatureFlagValue } from '@/RemoteConfig.shared';
 
 export const clearAllLocalOverrides = () =>
   clearAllLocalOverridesShared(mobileStorageBackend);
diff --git a/app/src/RemoteConfig.web.ts b/app/src/RemoteConfig.web.ts
index 60d5a3916..f0ccebee0 100644
--- a/app/src/RemoteConfig.web.ts
+++ b/app/src/RemoteConfig.web.ts
@@ -7,7 +7,7 @@ import type {
   FeatureFlagValue,
   RemoteConfigBackend,
   StorageBackend,
-} from '@src/RemoteConfig.shared';
+} from '@/RemoteConfig.shared';
 import {
   clearAllLocalOverrides as clearAllLocalOverridesShared,
   clearLocalOverride as clearLocalOverrideShared,
@@ -17,7 +17,7 @@ import {
   initRemoteConfig as initRemoteConfigShared,
   refreshRemoteConfig as refreshRemoteConfigShared,
   setLocalOverride as setLocalOverrideShared,
-} from '@src/RemoteConfig.shared';
+} from '@/RemoteConfig.shared';
 
 // Web-specific storage backend using LocalStorage
 const webStorageBackend: StorageBackend = {
@@ -87,7 +87,7 @@ class MockFirebaseRemoteConfig implements RemoteConfigBackend {
 const webRemoteConfigBackend: RemoteConfigBackend =
   new MockFirebaseRemoteConfig();
 
-export type { FeatureFlagValue } from '@src/RemoteConfig.shared';
+export type { FeatureFlagValue } from '@/RemoteConfig.shared';
 
 export const clearAllLocalOverrides = () =>
   clearAllLocalOverridesShared(webStorageBackend);
diff --git a/app/src/Segment.ts b/app/src/Segment.ts
index cca906432..ed6e1c0be 100644
--- a/app/src/Segment.ts
+++ b/app/src/Segment.ts
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import '@ethersproject/shims';
 import { SEGMENT_KEY } from '@env';
 import type { SegmentEvent } from '@segment/analytics-react-native';
 import {
@@ -10,6 +9,8 @@ import {
   PluginType,
 } from '@segment/analytics-react-native';
 
+import '@ethersproject/shims';
+
 let segmentClient: ReturnType<typeof createClient> | null = null;
 
 class DisableTrackingPlugin extends EventPlugin {
diff --git a/app/src/assets/animations/loader.ts b/app/src/assets/animations/loader.ts
index 780236c2e..083bd8742 100644
--- a/app/src/assets/animations/loader.ts
+++ b/app/src/assets/animations/loader.ts
@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-export const loadMiscAnimation = () => import('@src/assets/animations/loading/misc.json');
-export const loadPassportAnimation = () => import('@src/assets/animations/passport_verify.json');
+export const loadMiscAnimation = () => import('@/assets/animations/loading/misc.json');
+export const loadPassportAnimation = () => import('@/assets/animations/passport_verify.json');
diff --git a/app/src/components/ButtonsContainer.tsx b/app/src/components/ButtonsContainer.tsx
index 2a4ee74b6..3c52b6b0c 100644
--- a/app/src/components/ButtonsContainer.tsx
+++ b/app/src/components/ButtonsContainer.tsx
@@ -3,7 +3,7 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import { shouldShowAesopRedesign } from '@src/hooks/useAesopRedesign';
+import { shouldShowAesopRedesign } from '@/hooks/useAesopRedesign';
 
 interface ButtonsContainerProps {
   children: React.ReactNode;
diff --git a/app/src/components/Disclosures.tsx b/app/src/components/Disclosures.tsx
index bfdaafddd..82be9ef94 100644
--- a/app/src/components/Disclosures.tsx
+++ b/app/src/components/Disclosures.tsx
@@ -7,9 +7,9 @@ import type { Country3LetterCode } from '@selfxyz/common/constants';
 import { countryCodes } from '@selfxyz/common/constants';
 import type { SelfAppDisclosureConfig } from '@selfxyz/common/utils';
 
-import { BodyText } from '@src/components/typography/BodyText';
-import CheckMark from '@src/images/icons/checkmark.svg';
-import { slate200, slate500 } from '@src/utils/colors';
+import { BodyText } from '@/components/typography/BodyText';
+import CheckMark from '@/images/icons/checkmark.svg';
+import { slate200, slate500 } from '@/utils/colors';
 
 interface DisclosureProps {
   disclosures: SelfAppDisclosureConfig;
diff --git a/app/src/components/ErrorBoundary.tsx b/app/src/components/ErrorBoundary.tsx
index ff81d390f..0c2bced82 100644
--- a/app/src/components/ErrorBoundary.tsx
+++ b/app/src/components/ErrorBoundary.tsx
@@ -4,8 +4,8 @@ import type { ErrorInfo } from 'react';
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 
-import { captureException } from '@src/Sentry';
-import analytics from '@src/utils/analytics';
+import { captureException } from '@/Sentry';
+import analytics from '@/utils/analytics';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/components/Mnemonic.tsx b/app/src/components/Mnemonic.tsx
index 390f6aa43..748e23be3 100644
--- a/app/src/components/Mnemonic.tsx
+++ b/app/src/components/Mnemonic.tsx
@@ -2,9 +2,9 @@
 
 import React, { useCallback, useState } from 'react';
 import { Button, Text, XStack, YStack } from 'tamagui';
-
 import Clipboard from '@react-native-clipboard/clipboard';
-import { useSettingStore } from '@src/stores/settingStore';
+
+import { useSettingStore } from '@/stores/settingStore';
 import {
   black,
   slate50,
@@ -13,8 +13,8 @@ import {
   slate500,
   teal500,
   white,
-} from '@src/utils/colors';
-import { confirmTap } from '@src/utils/haptic';
+} from '@/utils/colors';
+import { confirmTap } from '@/utils/haptic';
 
 interface MnemonicProps {
   words?: string[];
diff --git a/app/src/components/NavBar/BaseNavBar.tsx b/app/src/components/NavBar/BaseNavBar.tsx
index cf7c928d1..eb5a682ee 100644
--- a/app/src/components/NavBar/BaseNavBar.tsx
+++ b/app/src/components/NavBar/BaseNavBar.tsx
@@ -5,10 +5,10 @@ import type { SystemBarStyle } from 'react-native-edge-to-edge';
 import { SystemBars } from 'react-native-edge-to-edge';
 import type { TextProps, ViewProps, XStackProps } from 'tamagui';
 import { Button, View, XStack } from 'tamagui';
-
-import { Title } from '@src/components/typography/Title';
 import { ChevronLeft, X } from '@tamagui/lucide-icons';
 
+import { Title } from '@/components/typography/Title';
+
 interface NavBarProps extends XStackProps {
   children: React.ReactNode;
   backgroundColor?: string;
diff --git a/app/src/components/NavBar/DefaultNavBar.tsx b/app/src/components/NavBar/DefaultNavBar.tsx
index 1eec21e0b..bd6e01011 100644
--- a/app/src/components/NavBar/DefaultNavBar.tsx
+++ b/app/src/components/NavBar/DefaultNavBar.tsx
@@ -3,12 +3,12 @@
 import React from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import type { TextStyle, ViewStyle } from 'tamagui';
-
 import type { NativeStackHeaderProps } from '@react-navigation/native-stack';
-import { NavBar } from '@src/components/NavBar/BaseNavBar';
-import { white } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { buttonTap } from '@src/utils/haptic';
+
+import { NavBar } from '@/components/NavBar/BaseNavBar';
+import { white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { buttonTap } from '@/utils/haptic';
 
 export const DefaultNavBar = (props: NativeStackHeaderProps) => {
   const { goBack, canGoBack } = props.navigation;
diff --git a/app/src/components/NavBar/HomeNavBar.tsx b/app/src/components/NavBar/HomeNavBar.tsx
index 68378268c..921706c91 100644
--- a/app/src/components/NavBar/HomeNavBar.tsx
+++ b/app/src/components/NavBar/HomeNavBar.tsx
@@ -3,14 +3,14 @@
 import React from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Button } from 'tamagui';
-
 import type { NativeStackHeaderProps } from '@react-navigation/native-stack';
-import { NavBar } from '@src/components/NavBar/BaseNavBar';
-import ActivityIcon from '@src/images/icons/activity.svg';
-import SettingsIcon from '@src/images/icons/settings.svg';
-import { black, neutral400, white } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { buttonTap } from '@src/utils/haptic';
+
+import { NavBar } from '@/components/NavBar/BaseNavBar';
+import ActivityIcon from '@/images/icons/activity.svg';
+import SettingsIcon from '@/images/icons/settings.svg';
+import { black, neutral400, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { buttonTap } from '@/utils/haptic';
 
 export const HomeNavBar = (props: NativeStackHeaderProps) => {
   const insets = useSafeAreaInsets();
diff --git a/app/src/components/NavBar/ProgressNavBar.tsx b/app/src/components/NavBar/ProgressNavBar.tsx
index fd78fe1da..547419d68 100644
--- a/app/src/components/NavBar/ProgressNavBar.tsx
+++ b/app/src/components/NavBar/ProgressNavBar.tsx
@@ -4,14 +4,14 @@ import React from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import type { TextStyle, ViewStyle } from 'tamagui';
 import { XStack, YStack } from 'tamagui';
-
 import type {
   NativeStackHeaderProps,
   NativeStackNavigationOptions,
 } from '@react-navigation/native-stack';
-import { NavBar } from '@src/components/NavBar/BaseNavBar';
-import { cyan300, slate200, white } from '@src/utils/colors';
-import { buttonTap } from '@src/utils/haptic';
+
+import { NavBar } from '@/components/NavBar/BaseNavBar';
+import { cyan300, slate200, white } from '@/utils/colors';
+import { buttonTap } from '@/utils/haptic';
 
 interface ProgressNavBarProps extends NativeStackHeaderProps {
   currentStep?: number;
diff --git a/app/src/components/NavBar/index.ts b/app/src/components/NavBar/index.ts
index ef4ae2537..25ca61272 100644
--- a/app/src/components/NavBar/index.ts
+++ b/app/src/components/NavBar/index.ts
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-export { DefaultNavBar } from '@src/components/NavBar/DefaultNavBar';
-export { HomeNavBar } from '@src/components/NavBar/HomeNavBar';
-export { ProgressNavBar } from '@src/components/NavBar/ProgressNavBar';
+export { DefaultNavBar } from '@/components/NavBar/DefaultNavBar';
+export { HomeNavBar } from '@/components/NavBar/HomeNavBar';
+export { ProgressNavBar } from '@/components/NavBar/ProgressNavBar';
diff --git a/app/src/components/Tips.tsx b/app/src/components/Tips.tsx
index 7923f4689..315998b7a 100644
--- a/app/src/components/Tips.tsx
+++ b/app/src/components/Tips.tsx
@@ -3,8 +3,8 @@
 import React from 'react';
 import { Text, View } from 'tamagui';
 
-import { Caption } from '@src/components/typography/Caption';
-import { slate500 } from '@src/utils/colors';
+import { Caption } from '@/components/typography/Caption';
+import { slate500 } from '@/utils/colors';
 
 export interface TipProps {
   title: string;
diff --git a/app/src/components/buttons/AbstractButton.tsx b/app/src/components/buttons/AbstractButton.tsx
index 57f67999f..a38c5225e 100644
--- a/app/src/components/buttons/AbstractButton.tsx
+++ b/app/src/components/buttons/AbstractButton.tsx
@@ -6,10 +6,10 @@ import { Platform, StyleSheet } from 'react-native';
 import type { ViewProps } from 'tamagui';
 import { Button, Text } from 'tamagui';
 
-import { pressedStyle } from '@src/components/buttons/pressedStyle';
-import { shouldShowAesopRedesign } from '@src/hooks/useAesopRedesign';
-import analytics from '@src/utils/analytics';
-import { dinot } from '@src/utils/fonts';
+import { pressedStyle } from '@/components/buttons/pressedStyle';
+import { shouldShowAesopRedesign } from '@/hooks/useAesopRedesign';
+import analytics from '@/utils/analytics';
+import { dinot } from '@/utils/fonts';
 
 export interface ButtonProps extends ViewProps {
   children: React.ReactNode;
diff --git a/app/src/components/buttons/HeldPrimaryButtonProveScreen.tsx b/app/src/components/buttons/HeldPrimaryButtonProveScreen.tsx
index d6104b4a8..debf5dfe0 100644
--- a/app/src/components/buttons/HeldPrimaryButtonProveScreen.tsx
+++ b/app/src/components/buttons/HeldPrimaryButtonProveScreen.tsx
@@ -3,13 +3,13 @@
 import React, { useEffect } from 'react';
 import { ActivityIndicator, View } from 'react-native';
 import { assign, createMachine } from 'xstate';
-
-import { HeldPrimaryButton } from '@src/components/buttons/PrimaryButtonLongHold';
-import Description from '@src/components/typography/Description';
-import { ProofEvents } from '@src/consts/analytics';
-import { black } from '@src/utils/colors';
 import { useMachine } from '@xstate/react';
 
+import { HeldPrimaryButton } from '@/components/buttons/PrimaryButtonLongHold';
+import Description from '@/components/typography/Description';
+import { ProofEvents } from '@/consts/analytics';
+import { black } from '@/utils/colors';
+
 interface HeldPrimaryButtonProveScreenProps {
   onVerify: () => void;
   selectedAppSessionId: string | undefined | null;
diff --git a/app/src/components/buttons/PrimaryButton.tsx b/app/src/components/buttons/PrimaryButton.tsx
index c661f6386..d65560843 100644
--- a/app/src/components/buttons/PrimaryButton.tsx
+++ b/app/src/components/buttons/PrimaryButton.tsx
@@ -2,10 +2,10 @@
 
 import React from 'react';
 
-import type { ButtonProps } from '@src/components/buttons/AbstractButton';
-import AbstractButton from '@src/components/buttons/AbstractButton';
-import { amber50, black, slate300, white } from '@src/utils/colors';
-import { normalizeBorderWidth } from '@src/utils/styleUtils';
+import type { ButtonProps } from '@/components/buttons/AbstractButton';
+import AbstractButton from '@/components/buttons/AbstractButton';
+import { amber50, black, slate300, white } from '@/utils/colors';
+import { normalizeBorderWidth } from '@/utils/styleUtils';
 
 export function PrimaryButton({ children, ...props }: ButtonProps) {
   const { borderWidth, ...restProps } = props;
diff --git a/app/src/components/buttons/PrimaryButtonLongHold.shared.ts b/app/src/components/buttons/PrimaryButtonLongHold.shared.ts
index 052597a51..7f303c32f 100644
--- a/app/src/components/buttons/PrimaryButtonLongHold.shared.ts
+++ b/app/src/components/buttons/PrimaryButtonLongHold.shared.ts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import type { ButtonProps } from '@src/components/buttons/AbstractButton';
+import type { ButtonProps } from '@/components/buttons/AbstractButton';
 
 export interface HeldPrimaryButtonProps extends ButtonProps {
   onLongPress: () => void;
diff --git a/app/src/components/buttons/PrimaryButtonLongHold.tsx b/app/src/components/buttons/PrimaryButtonLongHold.tsx
index ecbd6756f..ba8c58ee1 100644
--- a/app/src/components/buttons/PrimaryButtonLongHold.tsx
+++ b/app/src/components/buttons/PrimaryButtonLongHold.tsx
@@ -4,12 +4,12 @@ import React, { useEffect, useState } from 'react';
 import type { LayoutChangeEvent } from 'react-native';
 import { Animated, StyleSheet, useAnimatedValue } from 'react-native';
 
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import type { HeldPrimaryButtonProps } from '@src/components/buttons/PrimaryButtonLongHold.shared';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import type { HeldPrimaryButtonProps } from '@/components/buttons/PrimaryButtonLongHold.shared';
 import {
   ACTION_TIMER,
   COLORS,
-} from '@src/components/buttons/PrimaryButtonLongHold.shared';
+} from '@/components/buttons/PrimaryButtonLongHold.shared';
 
 export function HeldPrimaryButton({
   children,
diff --git a/app/src/components/buttons/PrimaryButtonLongHold.web.tsx b/app/src/components/buttons/PrimaryButtonLongHold.web.tsx
index 9c553b1ab..45495d3b7 100644
--- a/app/src/components/buttons/PrimaryButtonLongHold.web.tsx
+++ b/app/src/components/buttons/PrimaryButtonLongHold.web.tsx
@@ -5,12 +5,12 @@ import type { LayoutChangeEvent } from 'react-native';
 // Tamagui imports for web
 import { AnimatePresence, YStack } from 'tamagui';
 
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import type { HeldPrimaryButtonProps } from '@src/components/buttons/PrimaryButtonLongHold.shared';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import type { HeldPrimaryButtonProps } from '@/components/buttons/PrimaryButtonLongHold.shared';
 import {
   ACTION_TIMER,
   COLORS,
-} from '@src/components/buttons/PrimaryButtonLongHold.shared';
+} from '@/components/buttons/PrimaryButtonLongHold.shared';
 
 export function HeldPrimaryButton({
   children,
diff --git a/app/src/components/buttons/SecondaryButton.tsx b/app/src/components/buttons/SecondaryButton.tsx
index 300bdf08c..4ce424b58 100644
--- a/app/src/components/buttons/SecondaryButton.tsx
+++ b/app/src/components/buttons/SecondaryButton.tsx
@@ -2,10 +2,10 @@
 
 import React from 'react';
 
-import type { ButtonProps } from '@src/components/buttons/AbstractButton';
-import AbstractButton from '@src/components/buttons/AbstractButton';
-import { slate200, slate300, slate500, white } from '@src/utils/colors';
-import { normalizeBorderWidth } from '@src/utils/styleUtils';
+import type { ButtonProps } from '@/components/buttons/AbstractButton';
+import AbstractButton from '@/components/buttons/AbstractButton';
+import { slate200, slate300, slate500, white } from '@/utils/colors';
+import { normalizeBorderWidth } from '@/utils/styleUtils';
 
 export function SecondaryButton({ children, ...props }: ButtonProps) {
   const { borderWidth, ...restProps } = props;
diff --git a/app/src/components/native/PassportCamera.tsx b/app/src/components/native/PassportCamera.tsx
index 97afde405..6c0e00d63 100644
--- a/app/src/components/native/PassportCamera.tsx
+++ b/app/src/components/native/PassportCamera.tsx
@@ -12,7 +12,7 @@ import {
 
 import { extractMRZInfo } from '@selfxyz/mobile-sdk-alpha';
 
-import { RCTFragment } from '@src/components/native/RCTFragment';
+import { RCTFragment } from '@/components/native/RCTFragment';
 
 interface NativePassportOCRViewProps {
   onPassportRead: (
diff --git a/app/src/components/native/QRCodeScanner.tsx b/app/src/components/native/QRCodeScanner.tsx
index 4aae1f8c1..8a973b8d9 100644
--- a/app/src/components/native/QRCodeScanner.tsx
+++ b/app/src/components/native/QRCodeScanner.tsx
@@ -4,7 +4,7 @@ import React, { useCallback } from 'react';
 import type { NativeSyntheticEvent, StyleProp, ViewStyle } from 'react-native';
 import { PixelRatio, Platform, requireNativeComponent } from 'react-native';
 
-import { RCTFragment } from '@src/components/native/RCTFragment';
+import { RCTFragment } from '@/components/native/RCTFragment';
 
 interface NativeQRCodeScannerViewProps {
   onQRData: (event: NativeSyntheticEvent<{ data: string }>) => void;
diff --git a/app/src/components/typography/Additional.tsx b/app/src/components/typography/Additional.tsx
index 138831939..b3c25b657 100644
--- a/app/src/components/typography/Additional.tsx
+++ b/app/src/components/typography/Additional.tsx
@@ -4,9 +4,9 @@ import React from 'react';
 import type { TextProps } from 'react-native';
 import { StyleSheet, Text } from 'react-native';
 
-import { shouldShowAesopRedesign } from '@src/hooks/useAesopRedesign';
-import { slate400 } from '@src/utils/colors';
-import { dinot } from '@src/utils/fonts';
+import { shouldShowAesopRedesign } from '@/hooks/useAesopRedesign';
+import { slate400 } from '@/utils/colors';
+import { dinot } from '@/utils/fonts';
 
 interface AdditionalProps extends TextProps {}
 
diff --git a/app/src/components/typography/BodyText.ts b/app/src/components/typography/BodyText.ts
index 150c02426..ff1c7fecd 100644
--- a/app/src/components/typography/BodyText.ts
+++ b/app/src/components/typography/BodyText.ts
@@ -2,7 +2,7 @@
 
 import { styled, Text } from 'tamagui';
 
-import { dinot } from '@src/utils/fonts';
+import { dinot } from '@/utils/fonts';
 
 export const BodyText = styled(Text, {
   fontFamily: dinot,
diff --git a/app/src/components/typography/Caption.tsx b/app/src/components/typography/Caption.tsx
index 973d76d6f..d8bfc2436 100644
--- a/app/src/components/typography/Caption.tsx
+++ b/app/src/components/typography/Caption.tsx
@@ -2,8 +2,8 @@
 
 import { styled } from 'tamagui';
 
-import { BodyText } from '@src/components/typography/BodyText';
-import { slate400 } from '@src/utils/colors';
+import { BodyText } from '@/components/typography/BodyText';
+import { slate400 } from '@/utils/colors';
 
 export const Caption = styled(BodyText, {
   fontSize: 15,
diff --git a/app/src/components/typography/Caution.tsx b/app/src/components/typography/Caution.tsx
index 0dc422fbb..2573e4b85 100644
--- a/app/src/components/typography/Caution.tsx
+++ b/app/src/components/typography/Caution.tsx
@@ -4,8 +4,8 @@ import React from 'react';
 import type { TextProps } from 'react-native';
 import { StyleSheet, Text } from 'react-native';
 
-import { slate700 } from '@src/utils/colors';
-import { dinot } from '@src/utils/fonts';
+import { slate700 } from '@/utils/colors';
+import { dinot } from '@/utils/fonts';
 
 interface CautionProps extends TextProps {}
 
diff --git a/app/src/components/typography/Description.tsx b/app/src/components/typography/Description.tsx
index 559cf875f..253de3109 100644
--- a/app/src/components/typography/Description.tsx
+++ b/app/src/components/typography/Description.tsx
@@ -5,9 +5,9 @@ import { StyleSheet } from 'react-native';
 import type { TextProps } from 'tamagui';
 import { Text } from 'tamagui';
 
-import { shouldShowAesopRedesign } from '@src/hooks/useAesopRedesign';
-import { slate500 } from '@src/utils/colors';
-import { dinot } from '@src/utils/fonts';
+import { shouldShowAesopRedesign } from '@/hooks/useAesopRedesign';
+import { slate500 } from '@/utils/colors';
+import { dinot } from '@/utils/fonts';
 
 interface DescriptionProps extends TextProps {}
 
diff --git a/app/src/components/typography/DescriptionTitle.tsx b/app/src/components/typography/DescriptionTitle.tsx
index be50574ea..cd837fbac 100644
--- a/app/src/components/typography/DescriptionTitle.tsx
+++ b/app/src/components/typography/DescriptionTitle.tsx
@@ -2,7 +2,7 @@
 
 import { styled, Text } from 'tamagui';
 
-import { dinot } from '@src/utils/fonts';
+import { dinot } from '@/utils/fonts';
 
 export const DescriptionTitle = styled(Text, {
   fontSize: 18,
diff --git a/app/src/components/typography/SubHeader.tsx b/app/src/components/typography/SubHeader.tsx
index 3bfd97533..bba211ecc 100644
--- a/app/src/components/typography/SubHeader.tsx
+++ b/app/src/components/typography/SubHeader.tsx
@@ -2,7 +2,7 @@
 
 import { styled, Text } from 'tamagui';
 
-import { dinot } from '@src/utils/fonts';
+import { dinot } from '@/utils/fonts';
 
 export const SubHeader = styled(Text, {
   fontFamily: dinot,
diff --git a/app/src/components/typography/Title.tsx b/app/src/components/typography/Title.tsx
index f2c0edf19..ac46dcd22 100644
--- a/app/src/components/typography/Title.tsx
+++ b/app/src/components/typography/Title.tsx
@@ -3,7 +3,7 @@
 import type { StyleProp, TextStyle } from 'react-native';
 import { styled, Text } from 'tamagui';
 
-import { advercase } from '@src/utils/fonts';
+import { advercase } from '@/utils/fonts';
 
 export const Title = styled(
   Text,
diff --git a/app/src/components/typography/styles.ts b/app/src/components/typography/styles.ts
index 8d6e7ac23..a3ffce946 100644
--- a/app/src/components/typography/styles.ts
+++ b/app/src/components/typography/styles.ts
@@ -2,7 +2,7 @@
 
 import { StyleSheet } from 'react-native';
 
-import { black } from '@src/utils/colors';
+import { black } from '@/utils/colors';
 
 export const typography = StyleSheet.create({
   strong: {
diff --git a/app/src/hooks/useAppUpdates.ts b/app/src/hooks/useAppUpdates.ts
index 7e1f70bd7..068572536 100644
--- a/app/src/hooks/useAppUpdates.ts
+++ b/app/src/hooks/useAppUpdates.ts
@@ -3,11 +3,11 @@
 import { useEffect, useState } from 'react';
 import { Linking } from 'react-native';
 import { checkVersion } from 'react-native-check-version';
-
 import { useNavigation } from '@react-navigation/native';
-import { AppEvents } from '@src/consts/analytics';
-import analytics from '@src/utils/analytics';
-import { registerModalCallbacks } from '@src/utils/modalCallbackRegistry';
+
+import { AppEvents } from '@/consts/analytics';
+import analytics from '@/utils/analytics';
+import { registerModalCallbacks } from '@/utils/modalCallbackRegistry';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/hooks/useAppUpdates.web.ts b/app/src/hooks/useAppUpdates.web.ts
index 7dcf4ed6f..e23ffaf79 100644
--- a/app/src/hooks/useAppUpdates.web.ts
+++ b/app/src/hooks/useAppUpdates.web.ts
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { useState } from 'react';
-
 import { useNavigation } from '@react-navigation/native';
-import { AppEvents } from '@src/consts/analytics';
-import analytics from '@src/utils/analytics';
-import { registerModalCallbacks } from '@src/utils/modalCallbackRegistry';
+
+import { AppEvents } from '@/consts/analytics';
+import analytics from '@/utils/analytics';
+import { registerModalCallbacks } from '@/utils/modalCallbackRegistry';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/hooks/useConnectionModal.ts b/app/src/hooks/useConnectionModal.ts
index 4c57df1c6..bbc727fa2 100644
--- a/app/src/hooks/useConnectionModal.ts
+++ b/app/src/hooks/useConnectionModal.ts
@@ -3,12 +3,12 @@
 import { useEffect } from 'react';
 import { Linking, Platform } from 'react-native';
 
-import { SettingsEvents } from '@src/consts/analytics';
-import { useModal } from '@src/hooks/useModal';
-import { useNetInfo } from '@src/hooks/useNetInfo';
-import { navigationRef } from '@src/navigation';
-import { useSettingStore } from '@src/stores/settingStore';
-import analytics from '@src/utils/analytics';
+import { SettingsEvents } from '@/consts/analytics';
+import { useModal } from '@/hooks/useModal';
+import { useNetInfo } from '@/hooks/useNetInfo';
+import { navigationRef } from '@/navigation';
+import { useSettingStore } from '@/stores/settingStore';
+import analytics from '@/utils/analytics';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/hooks/useHapticNavigation.ts b/app/src/hooks/useHapticNavigation.ts
index 0d7afc304..1f315dd68 100644
--- a/app/src/hooks/useHapticNavigation.ts
+++ b/app/src/hooks/useHapticNavigation.ts
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { useCallback } from 'react';
-
 import type { NavigationProp } from '@react-navigation/native';
 import { useNavigation } from '@react-navigation/native';
-import type { RootStackParamList } from '@src/navigation/index';
-import { impactLight, impactMedium, selectionChange } from '@src/utils/haptic';
+
+import type { RootStackParamList } from '@/navigation/index';
+import { impactLight, impactMedium, selectionChange } from '@/utils/haptic';
 
 type NavigationAction = 'default' | 'cancel' | 'confirm';
 
diff --git a/app/src/hooks/useMnemonic.ts b/app/src/hooks/useMnemonic.ts
index 4594937d4..8a454296f 100644
--- a/app/src/hooks/useMnemonic.ts
+++ b/app/src/hooks/useMnemonic.ts
@@ -3,7 +3,7 @@
 import { ethers } from 'ethers';
 import { useCallback, useState } from 'react';
 
-import { useAuth } from '@src/providers/authProvider';
+import { useAuth } from '@/providers/authProvider';
 
 export default function useMnemonic() {
   const { getOrCreateMnemonic } = useAuth();
diff --git a/app/src/hooks/useModal.ts b/app/src/hooks/useModal.ts
index 81bc12058..c7cf5844b 100644
--- a/app/src/hooks/useModal.ts
+++ b/app/src/hooks/useModal.ts
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { useCallback, useRef, useState } from 'react';
-
 import { useNavigation } from '@react-navigation/native';
-import type { ModalParams } from '@src/screens/misc/ModalScreen';
+
+import type { ModalParams } from '@/screens/misc/ModalScreen';
 import {
   getModalCallbacks,
   registerModalCallbacks,
   unregisterModalCallbacks,
-} from '@src/utils/modalCallbackRegistry';
+} from '@/utils/modalCallbackRegistry';
 
 export const useModal = (params: ModalParams) => {
   const [visible, setVisible] = useState(false);
diff --git a/app/src/hooks/useRecoveryPrompts.ts b/app/src/hooks/useRecoveryPrompts.ts
index 3c369f8b1..85b81d75d 100644
--- a/app/src/hooks/useRecoveryPrompts.ts
+++ b/app/src/hooks/useRecoveryPrompts.ts
@@ -2,10 +2,10 @@
 
 import { useEffect } from 'react';
 
-import { useModal } from '@src/hooks/useModal';
-import { navigationRef } from '@src/navigation';
-import { usePassport } from '@src/providers/passportDataProvider';
-import { useSettingStore } from '@src/stores/settingStore';
+import { useModal } from '@/hooks/useModal';
+import { navigationRef } from '@/navigation';
+import { usePassport } from '@/providers/passportDataProvider';
+import { useSettingStore } from '@/stores/settingStore';
 
 // TODO: need to debug and test the logic. it pops up too often.
 export default function useRecoveryPrompts() {
diff --git a/app/src/layouts/ExpandableBottomLayout.tsx b/app/src/layouts/ExpandableBottomLayout.tsx
index c79f2c18d..72ef1b1fa 100644
--- a/app/src/layouts/ExpandableBottomLayout.tsx
+++ b/app/src/layouts/ExpandableBottomLayout.tsx
@@ -13,8 +13,8 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import type { ViewProps } from 'tamagui';
 import { View } from 'tamagui';
 
-import { black, white } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
+import { black, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
 
 // Get the current font scale factor
 const fontScale = PixelRatio.getFontScale();
diff --git a/app/src/layouts/SimpleScrolledTitleLayout.tsx b/app/src/layouts/SimpleScrolledTitleLayout.tsx
index 8cd43c178..9e1c87ed4 100644
--- a/app/src/layouts/SimpleScrolledTitleLayout.tsx
+++ b/app/src/layouts/SimpleScrolledTitleLayout.tsx
@@ -5,11 +5,11 @@ import React from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ScrollView, YStack } from 'tamagui';
 
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import { Title } from '@src/components/typography/Title';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { white } from '@src/utils/colors';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import { Title } from '@/components/typography/Title';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { white } from '@/utils/colors';
 
 interface DetailListProps
   extends PropsWithChildren<{
diff --git a/app/src/navigation/aesop.ts b/app/src/navigation/aesop.ts
index 405034d14..ddb652c10 100644
--- a/app/src/navigation/aesop.ts
+++ b/app/src/navigation/aesop.ts
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { ProgressNavBar } from '@src/components/NavBar';
-import { shouldShowAesopRedesign } from '@src/hooks/useAesopRedesign';
-import { white } from '@src/utils/colors';
+
+import { ProgressNavBar } from '@/components/NavBar';
+import { shouldShowAesopRedesign } from '@/hooks/useAesopRedesign';
+import { white } from '@/utils/colors';
 
 const PassportOnboardingScreen = lazy(
-  () => import('@src/screens/aesop/PassportOnboardingScreen'),
+  () => import('@/screens/aesop/PassportOnboardingScreen'),
 );
 
 const aesopScreens = {
diff --git a/app/src/navigation/dev.ts b/app/src/navigation/dev.ts
index ec739e340..6da109438 100644
--- a/app/src/navigation/dev.ts
+++ b/app/src/navigation/dev.ts
@@ -1,23 +1,21 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import DevPrivateKeyScreen from '@src/screens/dev/DevPrivateKeyScreen';
-import { black, white } from '@src/utils/colors';
+
+import DevPrivateKeyScreen from '@/screens/dev/DevPrivateKeyScreen';
+import { black, white } from '@/utils/colors';
 
 const DevFeatureFlagsScreen = lazy(
-  () => import('@src/screens/dev/DevFeatureFlagsScreen'),
+  () => import('@/screens/dev/DevFeatureFlagsScreen'),
 );
 const DevHapticFeedbackScreen = lazy(
-  () => import('@src/screens/dev/DevHapticFeedback'),
+  () => import('@/screens/dev/DevHapticFeedback'),
 );
-const DevSettingsScreen = lazy(
-  () => import('@src/screens/dev/DevSettingsScreen'),
-);
-const MockDataScreen = lazy(() => import('@src/screens/dev/MockDataScreen'));
+const DevSettingsScreen = lazy(() => import('@/screens/dev/DevSettingsScreen'));
+const MockDataScreen = lazy(() => import('@/screens/dev/MockDataScreen'));
 const MockDataScreenDeepLink = lazy(
-  () => import('@src/screens/dev/MockDataScreenDeepLink'),
+  () => import('@/screens/dev/MockDataScreenDeepLink'),
 );
 
 const devScreens = {
diff --git a/app/src/navigation/home.ts b/app/src/navigation/home.ts
index 6a708eda5..ef6b1f812 100644
--- a/app/src/navigation/home.ts
+++ b/app/src/navigation/home.ts
@@ -1,20 +1,18 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { HomeNavBar } from '@src/components/NavBar';
-import { black } from '@src/utils/colors';
 
-const DisclaimerScreen = lazy(
-  () => import('@src/screens/home/DisclaimerScreen'),
-);
-const HomeScreen = lazy(() => import('@src/screens/home/HomeScreen'));
+import { HomeNavBar } from '@/components/NavBar';
+import { black } from '@/utils/colors';
+
+const DisclaimerScreen = lazy(() => import('@/screens/home/DisclaimerScreen'));
+const HomeScreen = lazy(() => import('@/screens/home/HomeScreen'));
 const ProofHistoryDetailScreen = lazy(
-  () => import('@src/screens/home/ProofHistoryDetailScreen'),
+  () => import('@/screens/home/ProofHistoryDetailScreen'),
 );
 const ProofHistoryScreen = lazy(
-  () => import('@src/screens/home/ProofHistoryScreen'),
+  () => import('@/screens/home/ProofHistoryScreen'),
 );
 const homeScreens = {
   Disclaimer: {
diff --git a/app/src/navigation/index.tsx b/app/src/navigation/index.tsx
index a4f8473c8..b03432711 100644
--- a/app/src/navigation/index.tsx
+++ b/app/src/navigation/index.tsx
@@ -4,26 +4,26 @@ import React, { Suspense, useEffect } from 'react';
 import { Platform, View } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { Text } from 'tamagui';
-
 import type { StaticParamList } from '@react-navigation/native';
 import {
   createNavigationContainerRef,
   createStaticNavigation,
 } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { DefaultNavBar } from '@src/components/NavBar';
-import AppLayout from '@src/layouts/AppLayout';
-import { getAesopScreens } from '@src/navigation/aesop';
-import devScreens from '@src/navigation/dev';
-import homeScreens from '@src/navigation/home';
-import miscScreens from '@src/navigation/misc';
-import passportScreens from '@src/navigation/passport';
-import proveScreens from '@src/navigation/prove';
-import recoveryScreens from '@src/navigation/recovery';
-import settingsScreens from '@src/navigation/settings';
-import analytics from '@src/utils/analytics';
-import { white } from '@src/utils/colors';
-import { setupUniversalLinkListenerInNavigation } from '@src/utils/deeplinks';
+
+import { DefaultNavBar } from '@/components/NavBar';
+import AppLayout from '@/layouts/AppLayout';
+import { getAesopScreens } from '@/navigation/aesop';
+import devScreens from '@/navigation/dev';
+import homeScreens from '@/navigation/home';
+import miscScreens from '@/navigation/misc';
+import passportScreens from '@/navigation/passport';
+import proveScreens from '@/navigation/prove';
+import recoveryScreens from '@/navigation/recovery';
+import settingsScreens from '@/navigation/settings';
+import analytics from '@/utils/analytics';
+import { white } from '@/utils/colors';
+import { setupUniversalLinkListenerInNavigation } from '@/utils/deeplinks';
 
 export const navigationScreens = {
   ...miscScreens,
diff --git a/app/src/navigation/misc.tsx b/app/src/navigation/misc.tsx
index 6dc1498b3..87557a0ce 100644
--- a/app/src/navigation/misc.tsx
+++ b/app/src/navigation/misc.tsx
@@ -2,17 +2,17 @@
 
 import React, { lazy } from 'react';
 import { SystemBars } from 'react-native-edge-to-edge';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
+
 // Important: SplashScreen is imported directly and not lazy-loaded.
 // This is because it's used as a fallback for the Suspense boundary in the root navigator,
 // ensuring it's immediately available at startup.
-import SplashScreen from '@src/screens/misc/SplashScreen';
-import { black } from '@src/utils/colors';
+import SplashScreen from '@/screens/misc/SplashScreen';
+import { black } from '@/utils/colors';
 
-const LaunchScreen = lazy(() => import('@src/screens/misc/LaunchScreen'));
-const LoadingScreen = lazy(() => import('@src/screens/misc/LoadingScreen'));
-const ModalScreen = lazy(() => import('@src/screens/misc/ModalScreen'));
+const LaunchScreen = lazy(() => import('@/screens/misc/LaunchScreen'));
+const LoadingScreen = lazy(() => import('@/screens/misc/LoadingScreen'));
+const ModalScreen = lazy(() => import('@/screens/misc/ModalScreen'));
 
 const miscScreens = {
   Launch: {
diff --git a/app/src/navigation/passport.ts b/app/src/navigation/passport.ts
index 7d837bd5d..085710c60 100644
--- a/app/src/navigation/passport.ts
+++ b/app/src/navigation/passport.ts
@@ -1,29 +1,28 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 
 const PassportCameraScreen = lazy(
-  () => import('@src/screens/passport/PassportCameraScreen'),
+  () => import('@/screens/passport/PassportCameraScreen'),
 );
 const PassportCameraTrouble = lazy(
-  () => import('@src/screens/passport/PassportCameraTroubleScreen'),
+  () => import('@/screens/passport/PassportCameraTroubleScreen'),
 );
 const PassportNFCScanScreen = lazy(
-  () => import('@src/screens/passport/PassportNFCScanScreen'),
+  () => import('@/screens/passport/PassportNFCScanScreen'),
 );
 const PassportNFCTrouble = lazy(
-  () => import('@src/screens/passport/PassportNFCTroubleScreen'),
+  () => import('@/screens/passport/PassportNFCTroubleScreen'),
 );
 const PassportOnboardingScreen = lazy(
-  () => import('@src/screens/passport/PassportOnboardingScreen'),
+  () => import('@/screens/passport/PassportOnboardingScreen'),
 );
 const UnsupportedPassportScreen = lazy(
-  () => import('@src/screens/passport/UnsupportedPassportScreen'),
+  () => import('@/screens/passport/UnsupportedPassportScreen'),
 );
 const NFCMethodSelectionScreen = lazy(
-  () => import('@src/screens/passport/NFCMethodSelectionScreen'),
+  () => import('@/screens/passport/NFCMethodSelectionScreen'),
 );
 
 const passportScreens = {
diff --git a/app/src/navigation/prove.ts b/app/src/navigation/prove.ts
index ada80e112..ccc15c2b3 100644
--- a/app/src/navigation/prove.ts
+++ b/app/src/navigation/prove.ts
@@ -1,22 +1,22 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { black, white } from '@src/utils/colors';
+
+import { black, white } from '@/utils/colors';
 
 const ConfirmBelongingScreen = lazy(
-  () => import('@src/screens/prove/ConfirmBelongingScreen'),
+  () => import('@/screens/prove/ConfirmBelongingScreen'),
 );
 const ProofRequestStatusScreen = lazy(
-  () => import('@src/screens/prove/ProofRequestStatusScreen'),
+  () => import('@/screens/prove/ProofRequestStatusScreen'),
 );
-const ProveScreen = lazy(() => import('@src/screens/prove/ProveScreen'));
+const ProveScreen = lazy(() => import('@/screens/prove/ProveScreen'));
 const QRCodeTroubleScreen = lazy(
-  () => import('@src/screens/prove/QRCodeTroubleScreen'),
+  () => import('@/screens/prove/QRCodeTroubleScreen'),
 );
 const QRCodeViewFinderScreen = lazy(
-  () => import('@src/screens/prove/ViewFinderScreen'),
+  () => import('@/screens/prove/ViewFinderScreen'),
 );
 
 const proveScreens = {
diff --git a/app/src/navigation/recovery.ts b/app/src/navigation/recovery.ts
index 991070df1..649b40166 100644
--- a/app/src/navigation/recovery.ts
+++ b/app/src/navigation/recovery.ts
@@ -1,27 +1,27 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { black, slate300 } from '@src/utils/colors';
+
+import { black, slate300 } from '@/utils/colors';
 
 const AccountRecoveryChoiceScreen = lazy(
-  () => import('@src/screens/recovery/AccountRecoveryChoiceScreen'),
+  () => import('@/screens/recovery/AccountRecoveryChoiceScreen'),
 );
 const AccountRecoveryScreen = lazy(
-  () => import('@src/screens/recovery/AccountRecoveryScreen'),
+  () => import('@/screens/recovery/AccountRecoveryScreen'),
 );
 const AccountVerifiedSuccessScreen = lazy(
-  () => import('@src/screens/recovery/AccountVerifiedSuccessScreen'),
+  () => import('@/screens/recovery/AccountVerifiedSuccessScreen'),
 );
 const PassportDataNotFound = lazy(
-  () => import('@src/screens/recovery/PassportDataNotFoundScreen'),
+  () => import('@/screens/recovery/PassportDataNotFoundScreen'),
 );
 const RecoverWithPhraseScreen = lazy(
-  () => import('@src/screens/recovery/RecoverWithPhraseScreen'),
+  () => import('@/screens/recovery/RecoverWithPhraseScreen'),
 );
 const SaveRecoveryPhraseScreen = lazy(
-  () => import('@src/screens/recovery/SaveRecoveryPhraseScreen'),
+  () => import('@/screens/recovery/SaveRecoveryPhraseScreen'),
 );
 
 const recoveryScreens = {
diff --git a/app/src/navigation/recovery.web.ts b/app/src/navigation/recovery.web.ts
index 6482f364d..bbfe96637 100644
--- a/app/src/navigation/recovery.web.ts
+++ b/app/src/navigation/recovery.web.ts
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 
 const PassportDataNotFound = lazy(
-  () => import('@src/screens/recovery/PassportDataNotFoundScreen'),
+  () => import('@/screens/recovery/PassportDataNotFoundScreen'),
 );
 
 const recoveryScreens = {
diff --git a/app/src/navigation/settings.ts b/app/src/navigation/settings.ts
index d3c320e04..a9df85ab4 100644
--- a/app/src/navigation/settings.ts
+++ b/app/src/navigation/settings.ts
@@ -1,24 +1,22 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { black, slate300, white } from '@src/utils/colors';
+
+import { black, slate300, white } from '@/utils/colors';
 
 const CloudBackupScreen = lazy(
-  () => import('@src/screens/settings/CloudBackupScreen'),
+  () => import('@/screens/settings/CloudBackupScreen'),
 );
 const ManageDocumentsScreen = lazy(
-  () => import('@src/screens/settings/ManageDocumentsScreen'),
+  () => import('@/screens/settings/ManageDocumentsScreen'),
 );
 const PassportDataInfoScreen = lazy(
-  () => import('@src/screens/settings/PassportDataInfoScreen'),
-);
-const SettingsScreen = lazy(
-  () => import('@src/screens/settings/SettingsScreen'),
+  () => import('@/screens/settings/PassportDataInfoScreen'),
 );
+const SettingsScreen = lazy(() => import('@/screens/settings/SettingsScreen'));
 const ShowRecoveryPhraseScreen = lazy(
-  () => import('@src/screens/settings/ShowRecoveryPhraseScreen'),
+  () => import('@/screens/settings/ShowRecoveryPhraseScreen'),
 );
 
 const settingsScreens = {
diff --git a/app/src/navigation/settings.web.ts b/app/src/navigation/settings.web.ts
index 1927f7dfd..8691120ac 100644
--- a/app/src/navigation/settings.web.ts
+++ b/app/src/navigation/settings.web.ts
@@ -1,19 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { lazy } from 'react';
-
 import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { black, white } from '@src/utils/colors';
+
+import { black, white } from '@/utils/colors';
 
 const ManageDocumentsScreen = lazy(
-  () => import('@src/screens/settings/ManageDocumentsScreen'),
+  () => import('@/screens/settings/ManageDocumentsScreen'),
 );
 const PassportDataInfoScreen = lazy(
-  () => import('@src/screens/settings/PassportDataInfoScreen'),
-);
-const SettingsScreen = lazy(
-  () => import('@src/screens/settings/SettingsScreen'),
+  () => import('@/screens/settings/PassportDataInfoScreen'),
 );
+const SettingsScreen = lazy(() => import('@/screens/settings/SettingsScreen'));
 
 const settingsScreens = {
   ManageDocuments: {
diff --git a/app/src/providers/authProvider.tsx b/app/src/providers/authProvider.tsx
index ebb50363f..da31d2707 100644
--- a/app/src/providers/authProvider.tsx
+++ b/app/src/providers/authProvider.tsx
@@ -12,10 +12,10 @@ import React, {
 import ReactNativeBiometrics from 'react-native-biometrics';
 import Keychain from 'react-native-keychain';
 
-import { AuthEvents } from '@src/consts/analytics';
-import { useSettingStore } from '@src/stores/settingStore';
-import type { Mnemonic } from '@src/types/mnemonic';
-import analytics from '@src/utils/analytics';
+import { AuthEvents } from '@/consts/analytics';
+import { useSettingStore } from '@/stores/settingStore';
+import type { Mnemonic } from '@/types/mnemonic';
+import analytics from '@/utils/analytics';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/providers/authProvider.web.tsx b/app/src/providers/authProvider.web.tsx
index 9b9ad7dd8..e73d13e92 100644
--- a/app/src/providers/authProvider.web.tsx
+++ b/app/src/providers/authProvider.web.tsx
@@ -14,9 +14,9 @@ import React, {
   useState,
 } from 'react';
 
-import { AuthEvents } from '@src/consts/analytics';
-import type { Mnemonic } from '@src/types/mnemonic';
-import analytics from '@src/utils/analytics';
+import { AuthEvents } from '@/consts/analytics';
+import type { Mnemonic } from '@/types/mnemonic';
+import analytics from '@/utils/analytics';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/providers/databaseProvider.tsx b/app/src/providers/databaseProvider.tsx
index 25afc7ac2..20fdca276 100644
--- a/app/src/providers/databaseProvider.tsx
+++ b/app/src/providers/databaseProvider.tsx
@@ -2,7 +2,7 @@
 
 import React, { createContext, useEffect } from 'react';
 
-import { useProofHistoryStore } from '@src/stores/proofHistoryStore';
+import { useProofHistoryStore } from '@/stores/proofHistoryStore';
 
 export const DatabaseContext = createContext(null);
 
diff --git a/app/src/providers/notificationTrackingProvider.tsx b/app/src/providers/notificationTrackingProvider.tsx
index e4dd6bd3e..25bdb57df 100644
--- a/app/src/providers/notificationTrackingProvider.tsx
+++ b/app/src/providers/notificationTrackingProvider.tsx
@@ -2,10 +2,10 @@
 
 import type { PropsWithChildren } from 'react';
 import React, { useEffect } from 'react';
-
 import messaging from '@react-native-firebase/messaging';
-import { NotificationEvents } from '@src/consts/analytics';
-import analytics from '@src/utils/analytics';
+
+import { NotificationEvents } from '@/consts/analytics';
+import analytics from '@/utils/analytics';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/providers/passportDataProvider.tsx b/app/src/providers/passportDataProvider.tsx
index 27f42a3fd..c1c861c27 100644
--- a/app/src/providers/passportDataProvider.tsx
+++ b/app/src/providers/passportDataProvider.tsx
@@ -53,7 +53,7 @@ import {
   parseCertificateSimple,
 } from '@selfxyz/common/utils';
 
-import { unsafe_getPrivateKey, useAuth } from '@src/providers/authProvider';
+import { unsafe_getPrivateKey, useAuth } from '@/providers/authProvider';
 
 // Create safe wrapper functions to prevent undefined errors during early initialization
 // These need to be declared early to avoid dependency issues
@@ -234,7 +234,7 @@ export const PassportProvider = ({ children }: PassportProviderProps) => {
 export async function checkAndUpdateRegistrationStates(): Promise<void> {
   // Lazy import to avoid circular dependency
   const { checkAndUpdateRegistrationStates: validateDocCheckAndUpdate } =
-    await import('@src/utils/proving/validateDocument');
+    await import('@/utils/proving/validateDocument');
   return validateDocCheckAndUpdate();
 }
 
diff --git a/app/src/providers/remoteConfigProvider.tsx b/app/src/providers/remoteConfigProvider.tsx
index 62f3bfc5d..dbbdaa920 100644
--- a/app/src/providers/remoteConfigProvider.tsx
+++ b/app/src/providers/remoteConfigProvider.tsx
@@ -2,7 +2,7 @@
 
 import React, { createContext, useContext, useEffect, useState } from 'react';
 
-import { initRemoteConfig } from '@src/RemoteConfig';
+import { initRemoteConfig } from '@/RemoteConfig';
 
 interface RemoteConfigContextValue {
   isInitialized: boolean;
diff --git a/app/src/screens/aesop/PassportOnboardingScreen.tsx b/app/src/screens/aesop/PassportOnboardingScreen.tsx
index e53f327c0..f11d88942 100644
--- a/app/src/screens/aesop/PassportOnboardingScreen.tsx
+++ b/app/src/screens/aesop/PassportOnboardingScreen.tsx
@@ -5,20 +5,20 @@ import React, { useEffect, useRef } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { SystemBars } from 'react-native-edge-to-edge';
 
-import passportOnboardingAnimation from '@src/assets/animations/passport_onboarding.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import TextsContainer from '@src/components/TextsContainer';
-import Additional from '@src/components/typography/Additional';
-import Description from '@src/components/typography/Description';
-import { DescriptionTitle } from '@src/components/typography/DescriptionTitle';
-import { PassportEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import Scan from '@src/images/icons/passport_camera_scan.svg';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { black, slate100, white } from '@src/utils/colors';
-import { hasAnyValidRegisteredDocument } from '@src/utils/proving/validateDocument';
+import passportOnboardingAnimation from '@/assets/animations/passport_onboarding.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import TextsContainer from '@/components/TextsContainer';
+import Additional from '@/components/typography/Additional';
+import Description from '@/components/typography/Description';
+import { DescriptionTitle } from '@/components/typography/DescriptionTitle';
+import { PassportEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import Scan from '@/images/icons/passport_camera_scan.svg';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { black, slate100, white } from '@/utils/colors';
+import { hasAnyValidRegisteredDocument } from '@/utils/proving/validateDocument';
 
 interface PassportOnboardingScreenProps {}
 
diff --git a/app/src/screens/dev/DevFeatureFlagsScreen.tsx b/app/src/screens/dev/DevFeatureFlagsScreen.tsx
index 27dc62fa5..b22a771d9 100644
--- a/app/src/screens/dev/DevFeatureFlagsScreen.tsx
+++ b/app/src/screens/dev/DevFeatureFlagsScreen.tsx
@@ -11,14 +11,14 @@ import {
   YStack,
 } from 'tamagui';
 
-import type { FeatureFlagValue } from '@src/RemoteConfig';
+import type { FeatureFlagValue } from '@/RemoteConfig';
 import {
   clearAllLocalOverrides,
   getAllFeatureFlags,
   refreshRemoteConfig,
   setLocalOverride,
-} from '@src/RemoteConfig';
-import { textBlack } from '@src/utils/colors';
+} from '@/RemoteConfig';
+import { textBlack } from '@/utils/colors';
 
 interface FeatureFlag {
   key: string;
diff --git a/app/src/screens/dev/DevHapticFeedback.tsx b/app/src/screens/dev/DevHapticFeedback.tsx
index 3d0542364..722b65ac1 100644
--- a/app/src/screens/dev/DevHapticFeedback.tsx
+++ b/app/src/screens/dev/DevHapticFeedback.tsx
@@ -15,7 +15,7 @@ import {
   notificationSuccess,
   notificationWarning,
   selectionChange,
-} from '@src/utils/haptic';
+} from '@/utils/haptic';
 
 const StyledButton = styled(Button, {
   width: '75%',
diff --git a/app/src/screens/dev/DevPrivateKeyScreen.tsx b/app/src/screens/dev/DevPrivateKeyScreen.tsx
index 934972fbc..1aa06ba37 100644
--- a/app/src/screens/dev/DevPrivateKeyScreen.tsx
+++ b/app/src/screens/dev/DevPrivateKeyScreen.tsx
@@ -2,11 +2,11 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { Button, Text, XStack, YStack } from 'tamagui';
-
 import Clipboard from '@react-native-clipboard/clipboard';
-import { unsafe_getPrivateKey } from '@src/providers/authProvider';
-import { black, slate50, slate200, teal500, white } from '@src/utils/colors';
-import { confirmTap } from '@src/utils/haptic';
+
+import { unsafe_getPrivateKey } from '@/providers/authProvider';
+import { black, slate50, slate200, teal500, white } from '@/utils/colors';
+import { confirmTap } from '@/utils/haptic';
 
 interface DevPrivateKeyScreen {}
 
diff --git a/app/src/screens/dev/DevSettingsScreen.tsx b/app/src/screens/dev/DevSettingsScreen.tsx
index f3534d944..19824562b 100644
--- a/app/src/screens/dev/DevSettingsScreen.tsx
+++ b/app/src/screens/dev/DevSettingsScreen.tsx
@@ -5,15 +5,16 @@ import React, { useMemo, useState } from 'react';
 import type { StyleProp, TextStyle, ViewStyle } from 'react-native';
 import { Alert, ScrollView } from 'react-native';
 import { Adapt, Button, Select, Sheet, Text, XStack, YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
-import BugIcon from '@src/images/icons/bug_icon.svg';
-import IdIcon from '@src/images/icons/id_icon.svg';
-import WarningIcon from '@src/images/icons/warning.svg';
-import type { RootStackParamList } from '@src/navigation';
-import { unsafe_clearSecrets } from '@src/providers/authProvider';
-import { usePassport } from '@src/providers/passportDataProvider';
+import { Check, ChevronDown, ChevronRight } from '@tamagui/lucide-icons';
+
+import BugIcon from '@/images/icons/bug_icon.svg';
+import IdIcon from '@/images/icons/id_icon.svg';
+import WarningIcon from '@/images/icons/warning.svg';
+import type { RootStackParamList } from '@/navigation';
+import { unsafe_clearSecrets } from '@/providers/authProvider';
+import { usePassport } from '@/providers/passportDataProvider';
 import {
   red500,
   slate100,
@@ -25,9 +26,8 @@ import {
   slate900,
   white,
   yellow500,
-} from '@src/utils/colors';
-import { dinot } from '@src/utils/fonts';
-import { Check, ChevronDown, ChevronRight } from '@tamagui/lucide-icons';
+} from '@/utils/colors';
+import { dinot } from '@/utils/fonts';
 
 interface DevSettingsScreenProps extends PropsWithChildren {
   color?: string;
diff --git a/app/src/screens/dev/MockDataScreen.tsx b/app/src/screens/dev/MockDataScreen.tsx
index ae1872463..e53336246 100644
--- a/app/src/screens/dev/MockDataScreen.tsx
+++ b/app/src/screens/dev/MockDataScreen.tsx
@@ -17,6 +17,8 @@ import {
   XStack,
   YStack,
 } from 'tamagui';
+import { useNavigation } from '@react-navigation/native';
+import { ChevronDown, Minus, Plus, X } from '@tamagui/lucide-icons';
 
 import { countryCodes } from '@selfxyz/common/constants';
 import type { IdDocInput } from '@selfxyz/common/utils';
@@ -27,16 +29,15 @@ import {
   initPassportDataParsing,
 } from '@selfxyz/common/utils/passports';
 
-import { useNavigation } from '@react-navigation/native';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import { Caption } from '@src/components/typography/Caption';
-import { MockDataEvents } from '@src/consts/analytics';
-import SelfDevCard from '@src/images/card-dev.svg';
-import IdIcon from '@src/images/icons/id_icon.svg';
-import NoteIcon from '@src/images/icons/note.svg';
-import { storePassportData } from '@src/providers/passportDataProvider';
-import analytics from '@src/utils/analytics';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import { Caption } from '@/components/typography/Caption';
+import { MockDataEvents } from '@/consts/analytics';
+import SelfDevCard from '@/images/card-dev.svg';
+import IdIcon from '@/images/icons/id_icon.svg';
+import NoteIcon from '@/images/icons/note.svg';
+import { storePassportData } from '@/providers/passportDataProvider';
+import analytics from '@/utils/analytics';
 import {
   black,
   borderColor,
@@ -48,11 +49,10 @@ import {
   textBlack,
   white,
   zinc400,
-} from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { dinot, plexMono } from '@src/utils/fonts';
-import { buttonTap, selectionChange } from '@src/utils/haptic';
-import { ChevronDown, Minus, Plus, X } from '@tamagui/lucide-icons';
+} from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { dinot, plexMono } from '@/utils/fonts';
+import { buttonTap, selectionChange } from '@/utils/haptic';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/dev/MockDataScreenDeepLink.tsx b/app/src/screens/dev/MockDataScreenDeepLink.tsx
index 60201082d..6d35a606a 100644
--- a/app/src/screens/dev/MockDataScreenDeepLink.tsx
+++ b/app/src/screens/dev/MockDataScreenDeepLink.tsx
@@ -6,22 +6,22 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { ActivityIndicator, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ScrollView, Text, XStack, YStack } from 'tamagui';
+import { useNavigation } from '@react-navigation/native';
 
 import { countryCodes } from '@selfxyz/common/constants';
 import type { IdDocInput } from '@selfxyz/common/utils';
 import { genMockIdDocAndInitDataParsing } from '@selfxyz/common/utils/passports';
 
-import { useNavigation } from '@react-navigation/native';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import { BodyText } from '@src/components/typography/BodyText';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { MockDataEvents } from '@src/consts/analytics';
-import { storePassportData } from '@src/providers/passportDataProvider';
-import useUserStore from '@src/stores/userStore';
-import { black, borderColor, white } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import { BodyText } from '@/components/typography/BodyText';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { MockDataEvents } from '@/consts/analytics';
+import { storePassportData } from '@/providers/passportDataProvider';
+import useUserStore from '@/stores/userStore';
+import { black, borderColor, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
 
 const MockDataScreenDeepLink: React.FC = () => {
   const navigation = useNavigation();
diff --git a/app/src/screens/home/DisclaimerScreen.tsx b/app/src/screens/home/DisclaimerScreen.tsx
index dd14210b4..9e770e88c 100644
--- a/app/src/screens/home/DisclaimerScreen.tsx
+++ b/app/src/screens/home/DisclaimerScreen.tsx
@@ -4,17 +4,17 @@ import LottieView from 'lottie-react-native';
 import React, { useEffect } from 'react';
 import { StyleSheet } from 'react-native';
 import { YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
-import warningAnimation from '@src/assets/animations/warning.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import Caution from '@src/components/typography/Caution';
-import { SubHeader } from '@src/components/typography/SubHeader';
-import { AppEvents } from '@src/consts/analytics';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { useSettingStore } from '@src/stores/settingStore';
-import { black, white } from '@src/utils/colors';
-import { confirmTap, notificationWarning } from '@src/utils/haptic';
+
+import warningAnimation from '@/assets/animations/warning.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import Caution from '@/components/typography/Caution';
+import { SubHeader } from '@/components/typography/SubHeader';
+import { AppEvents } from '@/consts/analytics';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { useSettingStore } from '@/stores/settingStore';
+import { black, white } from '@/utils/colors';
+import { confirmTap, notificationWarning } from '@/utils/haptic';
 
 const DisclaimerScreen: React.FC = () => {
   const navigation = useNavigation();
diff --git a/app/src/screens/home/HomeScreen.tsx b/app/src/screens/home/HomeScreen.tsx
index 6b13a1322..5910960fe 100644
--- a/app/src/screens/home/HomeScreen.tsx
+++ b/app/src/screens/home/HomeScreen.tsx
@@ -3,33 +3,27 @@
 import React, { useCallback } from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Button, styled, YStack } from 'tamagui';
-
 import {
   useFocusEffect,
   useNavigation,
   usePreventRemove,
 } from '@react-navigation/native';
-import { pressedStyle } from '@src/components/buttons/pressedStyle';
-import { BodyText } from '@src/components/typography/BodyText';
-import { Caption } from '@src/components/typography/Caption';
-import { ProofEvents } from '@src/consts/analytics';
-import { useAppUpdates } from '@src/hooks/useAppUpdates';
-import useConnectionModal from '@src/hooks/useConnectionModal';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import SelfCard from '@src/images/card-style-1.svg';
-import ScanIcon from '@src/images/icons/qr_scan.svg';
-import WarnIcon from '@src/images/icons/warning.svg';
-import { usePassport } from '@src/providers/passportDataProvider';
-import { useSettingStore } from '@src/stores/settingStore';
-import analytics from '@src/utils/analytics';
-import {
-  amber500,
-  black,
-  neutral700,
-  slate800,
-  white,
-} from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
+
+import { pressedStyle } from '@/components/buttons/pressedStyle';
+import { BodyText } from '@/components/typography/BodyText';
+import { Caption } from '@/components/typography/Caption';
+import { ProofEvents } from '@/consts/analytics';
+import { useAppUpdates } from '@/hooks/useAppUpdates';
+import useConnectionModal from '@/hooks/useConnectionModal';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import SelfCard from '@/images/card-style-1.svg';
+import ScanIcon from '@/images/icons/qr_scan.svg';
+import WarnIcon from '@/images/icons/warning.svg';
+import { usePassport } from '@/providers/passportDataProvider';
+import { useSettingStore } from '@/stores/settingStore';
+import analytics from '@/utils/analytics';
+import { amber500, black, neutral700, slate800, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
 
 const ScanButton = styled(Button, {
   borderRadius: 20,
diff --git a/app/src/screens/home/ProofHistoryDetailScreen.tsx b/app/src/screens/home/ProofHistoryDetailScreen.tsx
index 608675338..fa29ac5a6 100644
--- a/app/src/screens/home/ProofHistoryDetailScreen.tsx
+++ b/app/src/screens/home/ProofHistoryDetailScreen.tsx
@@ -3,9 +3,10 @@
 import React, { useMemo } from 'react';
 import { ScrollView, StyleSheet } from 'react-native';
 import { Card, Image, Text, XStack, YStack } from 'tamagui';
+import { CheckSquare2, Info, Wallet } from '@tamagui/lucide-icons';
 
-import type { ProofHistory } from '@src/stores/proof-types';
-import { ProofStatus } from '@src/stores/proof-types';
+import type { ProofHistory } from '@/stores/proof-types';
+import { ProofStatus } from '@/stores/proof-types';
 import {
   black,
   blue100,
@@ -18,9 +19,8 @@ import {
   white,
   zinc400,
   zinc500,
-} from '@src/utils/colors';
-import { advercase, dinot, plexMono } from '@src/utils/fonts';
-import { CheckSquare2, Info, Wallet } from '@tamagui/lucide-icons';
+} from '@/utils/colors';
+import { advercase, dinot, plexMono } from '@/utils/fonts';
 
 type ProofHistoryDetailScreenProps = {
   route: {
diff --git a/app/src/screens/home/ProofHistoryScreen.tsx b/app/src/screens/home/ProofHistoryScreen.tsx
index 86771c104..68053b0f8 100644
--- a/app/src/screens/home/ProofHistoryScreen.tsx
+++ b/app/src/screens/home/ProofHistoryScreen.tsx
@@ -9,12 +9,13 @@ import {
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Card, Image, Text, View, XStack, YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
-import { BodyText } from '@src/components/typography/BodyText';
-import type { ProofHistory } from '@src/stores/proof-types';
-import { ProofStatus } from '@src/stores/proof-types';
-import { useProofHistoryStore } from '@src/stores/proofHistoryStore';
+import { CheckSquare2, Wallet, XCircle } from '@tamagui/lucide-icons';
+
+import { BodyText } from '@/components/typography/BodyText';
+import type { ProofHistory } from '@/stores/proof-types';
+import { ProofStatus } from '@/stores/proof-types';
+import { useProofHistoryStore } from '@/stores/proofHistoryStore';
 import {
   black,
   blue100,
@@ -25,10 +26,9 @@ import {
   slate300,
   slate500,
   white,
-} from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { dinot } from '@src/utils/fonts';
-import { CheckSquare2, Wallet, XCircle } from '@tamagui/lucide-icons';
+} from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { dinot } from '@/utils/fonts';
 
 type Section = {
   title: string;
diff --git a/app/src/screens/misc/LaunchScreen.tsx b/app/src/screens/misc/LaunchScreen.tsx
index 05f58f3b6..8c2b01fee 100644
--- a/app/src/screens/misc/LaunchScreen.tsx
+++ b/app/src/screens/misc/LaunchScreen.tsx
@@ -6,21 +6,17 @@ import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Anchor, Text, YStack } from 'tamagui';
 
-import AbstractButton from '@src/components/buttons/AbstractButton';
-import { BodyText } from '@src/components/typography/BodyText';
-import { Caption } from '@src/components/typography/Caption';
-import { AppEvents } from '@src/consts/analytics';
-import {
-  privacyUrl,
-  supportedBiometricIdsUrl,
-  termsUrl,
-} from '@src/consts/links';
-import useConnectionModal from '@src/hooks/useConnectionModal';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import Logo from '@src/images/logo.svg';
-import { black, slate400, white, zinc800, zinc900 } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { advercase, dinot } from '@src/utils/fonts';
+import AbstractButton from '@/components/buttons/AbstractButton';
+import { BodyText } from '@/components/typography/BodyText';
+import { Caption } from '@/components/typography/Caption';
+import { AppEvents } from '@/consts/analytics';
+import { privacyUrl, supportedBiometricIdsUrl, termsUrl } from '@/consts/links';
+import useConnectionModal from '@/hooks/useConnectionModal';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import Logo from '@/images/logo.svg';
+import { black, slate400, white, zinc800, zinc900 } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { advercase, dinot } from '@/utils/fonts';
 
 const LaunchScreen: React.FC = () => {
   useConnectionModal();
diff --git a/app/src/screens/misc/LoadingScreen.tsx b/app/src/screens/misc/LoadingScreen.tsx
index 022c2ba96..93160bde6 100644
--- a/app/src/screens/misc/LoadingScreen.tsx
+++ b/app/src/screens/misc/LoadingScreen.tsx
@@ -5,24 +5,24 @@ import React, { useEffect, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Text, YStack } from 'tamagui';
+import type { StaticScreenProps } from '@react-navigation/native';
+import { useIsFocused } from '@react-navigation/native';
 
 import type { PassportData } from '@selfxyz/common/types';
 
-import type { StaticScreenProps } from '@react-navigation/native';
-import { useIsFocused } from '@react-navigation/native';
-import failAnimation from '@src/assets/animations/loading/fail.json';
-import proveLoadingAnimation from '@src/assets/animations/loading/prove.json';
-import successAnimation from '@src/assets/animations/loading/success.json';
-import CloseWarningIcon from '@src/images/icons/close-warning.svg';
-import { loadPassportDataAndSecret } from '@src/providers/passportDataProvider';
-import { black, slate400, white, zinc500, zinc900 } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { advercase, dinot } from '@src/utils/fonts';
-import { loadingScreenProgress } from '@src/utils/haptic';
-import { setupNotifications } from '@src/utils/notifications/notificationService';
-import { getLoadingScreenText } from '@src/utils/proving/loadingScreenStateText';
-import type { ProvingStateType } from '@src/utils/proving/provingMachine';
-import { useProvingStore } from '@src/utils/proving/provingMachine';
+import failAnimation from '@/assets/animations/loading/fail.json';
+import proveLoadingAnimation from '@/assets/animations/loading/prove.json';
+import successAnimation from '@/assets/animations/loading/success.json';
+import CloseWarningIcon from '@/images/icons/close-warning.svg';
+import { loadPassportDataAndSecret } from '@/providers/passportDataProvider';
+import { black, slate400, white, zinc500, zinc900 } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { advercase, dinot } from '@/utils/fonts';
+import { loadingScreenProgress } from '@/utils/haptic';
+import { setupNotifications } from '@/utils/notifications/notificationService';
+import { getLoadingScreenText } from '@/utils/proving/loadingScreenStateText';
+import type { ProvingStateType } from '@/utils/proving/provingMachine';
+import { useProvingStore } from '@/utils/proving/provingMachine';
 
 type LoadingScreenProps = StaticScreenProps<{}>;
 
diff --git a/app/src/screens/misc/ModalScreen.tsx b/app/src/screens/misc/ModalScreen.tsx
index 57fe7135c..403102222 100644
--- a/app/src/screens/misc/ModalScreen.tsx
+++ b/app/src/screens/misc/ModalScreen.tsx
@@ -2,21 +2,21 @@
 
 import React, { useCallback } from 'react';
 import { styled, View, XStack, YStack } from 'tamagui';
-
 import type { StaticScreenProps } from '@react-navigation/native';
 import { useNavigation } from '@react-navigation/native';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import ModalClose from '@src/images/icons/modal_close.svg';
-import LogoInversed from '@src/images/logo_inversed.svg';
-import { white } from '@src/utils/colors';
-import { confirmTap, impactLight } from '@src/utils/haptic';
+
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+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 {
   getModalCallbacks,
   unregisterModalCallbacks,
-} from '@src/utils/modalCallbackRegistry';
+} from '@/utils/modalCallbackRegistry';
 
 const ModalBackDrop = styled(View, {
   display: 'flex',
diff --git a/app/src/screens/misc/SplashScreen.tsx b/app/src/screens/misc/SplashScreen.tsx
index d31b34d2e..78f26558f 100644
--- a/app/src/screens/misc/SplashScreen.tsx
+++ b/app/src/screens/misc/SplashScreen.tsx
@@ -3,22 +3,22 @@
 import LottieView from 'lottie-react-native';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { StyleSheet } from 'react-native';
-
 import { useNavigation } from '@react-navigation/native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import splashAnimation from '@src/assets/animations/splash.json';
-import type { RootStackParamList } from '@src/navigation';
-import { useAuth } from '@src/providers/authProvider';
+
+import splashAnimation from '@/assets/animations/splash.json';
+import type { RootStackParamList } from '@/navigation';
+import { useAuth } from '@/providers/authProvider';
 import {
   checkAndUpdateRegistrationStates,
   checkIfAnyDocumentsNeedMigration,
   hasAnyValidRegisteredDocument,
   initializeNativeModules,
   migrateFromLegacyStorage,
-} from '@src/providers/passportDataProvider';
-import { useSettingStore } from '@src/stores/settingStore';
-import { black } from '@src/utils/colors';
-import { impactLight } from '@src/utils/haptic';
+} from '@/providers/passportDataProvider';
+import { useSettingStore } from '@/stores/settingStore';
+import { black } from '@/utils/colors';
+import { impactLight } from '@/utils/haptic';
 
 const SplashScreen: React.FC = ({}) => {
   const navigation =
diff --git a/app/src/screens/passport/NFCMethodSelectionScreen.tsx b/app/src/screens/passport/NFCMethodSelectionScreen.tsx
index 709889fc3..a04a1aea4 100644
--- a/app/src/screens/passport/NFCMethodSelectionScreen.tsx
+++ b/app/src/screens/passport/NFCMethodSelectionScreen.tsx
@@ -3,17 +3,17 @@
 import React, { useState } from 'react';
 import { Platform, ScrollView } from 'react-native';
 import { Input, YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import { BodyText } from '@src/components/typography/BodyText';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import useUserStore from '@src/stores/userStore';
-import { white } from '@src/utils/colors';
+
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import { BodyText } from '@/components/typography/BodyText';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import useUserStore from '@/stores/userStore';
+import { white } from '@/utils/colors';
 
 type NFCParams = {
   skipPACE?: boolean;
diff --git a/app/src/screens/passport/PassportCameraScreen.tsx b/app/src/screens/passport/PassportCameraScreen.tsx
index c4c741de1..e5e21104d 100644
--- a/app/src/screens/passport/PassportCameraScreen.tsx
+++ b/app/src/screens/passport/PassportCameraScreen.tsx
@@ -4,27 +4,27 @@ import LottieView from 'lottie-react-native';
 import React, { useCallback, useRef } from 'react';
 import { Platform, StyleSheet } from 'react-native';
 import { View, XStack, YStack } from 'tamagui';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
 
 import { formatDateToYYMMDD } from '@selfxyz/mobile-sdk-alpha';
 
-import { useIsFocused, useNavigation } from '@react-navigation/native';
-import passportScanAnimation from '@src/assets/animations/passport_scan.json';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import type { PassportCameraProps } from '@src/components/native/PassportCamera';
-import { PassportCamera } from '@src/components/native/PassportCamera';
-import Additional from '@src/components/typography/Additional';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { PassportEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import Scan from '@src/images/icons/passport_camera_scan.svg';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import useUserStore from '@src/stores/userStore';
-import analytics from '@src/utils/analytics';
-import { black, slate400, slate800, white } from '@src/utils/colors';
-import { dinot } from '@src/utils/fonts';
-import { hasAnyValidRegisteredDocument } from '@src/utils/proving/validateDocument';
-import { checkScannedInfo } from '@src/utils/utils';
+import passportScanAnimation from '@/assets/animations/passport_scan.json';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import type { PassportCameraProps } from '@/components/native/PassportCamera';
+import { PassportCamera } from '@/components/native/PassportCamera';
+import Additional from '@/components/typography/Additional';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { PassportEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import Scan from '@/images/icons/passport_camera_scan.svg';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import useUserStore from '@/stores/userStore';
+import analytics from '@/utils/analytics';
+import { black, slate400, slate800, white } from '@/utils/colors';
+import { dinot } from '@/utils/fonts';
+import { hasAnyValidRegisteredDocument } from '@/utils/proving/validateDocument';
+import { checkScannedInfo } from '@/utils/utils';
 
 interface PassportNFCScanScreen {}
 
diff --git a/app/src/screens/passport/PassportCameraTroubleScreen.tsx b/app/src/screens/passport/PassportCameraTroubleScreen.tsx
index 43d04ec88..b732f8383 100644
--- a/app/src/screens/passport/PassportCameraTroubleScreen.tsx
+++ b/app/src/screens/passport/PassportCameraTroubleScreen.tsx
@@ -2,18 +2,18 @@
 
 import React, { useEffect } from 'react';
 
-import type { TipProps } from '@src/components/Tips';
-import Tips from '@src/components/Tips';
-import { Caption } from '@src/components/typography/Caption';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import Activity from '@src/images/icons/activity.svg';
-import PassportCameraBulb from '@src/images/icons/passport_camera_bulb.svg';
-import PassportCameraScan from '@src/images/icons/passport_camera_scan.svg';
-import QrScan from '@src/images/icons/qr_scan.svg';
-import Star from '@src/images/icons/star.svg';
-import SimpleScrolledTitleLayout from '@src/layouts/SimpleScrolledTitleLayout';
-import analytics from '@src/utils/analytics';
-import { slate500 } from '@src/utils/colors';
+import type { TipProps } from '@/components/Tips';
+import Tips from '@/components/Tips';
+import { Caption } from '@/components/typography/Caption';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import Activity from '@/images/icons/activity.svg';
+import PassportCameraBulb from '@/images/icons/passport_camera_bulb.svg';
+import PassportCameraScan from '@/images/icons/passport_camera_scan.svg';
+import QrScan from '@/images/icons/qr_scan.svg';
+import Star from '@/images/icons/star.svg';
+import SimpleScrolledTitleLayout from '@/layouts/SimpleScrolledTitleLayout';
+import analytics from '@/utils/analytics';
+import { slate500 } from '@/utils/colors';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/screens/passport/PassportNFCScanScreen.tsx b/app/src/screens/passport/PassportNFCScanScreen.tsx
index abc19eb0e..6ebb20c0c 100644
--- a/app/src/screens/passport/PassportNFCScanScreen.tsx
+++ b/app/src/screens/passport/PassportNFCScanScreen.tsx
@@ -12,43 +12,43 @@ import {
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import NfcManager from 'react-native-nfc-manager';
 import { Button, Image, XStack } from 'tamagui';
-
-import type { PassportData } from '@selfxyz/common/types';
-import { getSKIPEM } from '@selfxyz/common/utils/csca';
-import { initPassportDataParsing } from '@selfxyz/common/utils/passports';
-
 import type { RouteProp } from '@react-navigation/native';
 import {
   useFocusEffect,
   useNavigation,
   useRoute,
 } from '@react-navigation/native';
-import passportVerifyAnimation from '@src/assets/animations/passport_verify.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import TextsContainer from '@src/components/TextsContainer';
-import { BodyText } from '@src/components/typography/BodyText';
-import { Title } from '@src/components/typography/Title';
-import { PassportEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import NFC_IMAGE from '@src/images/nfc.png';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { storePassportData } from '@src/providers/passportDataProvider';
-import useUserStore from '@src/stores/userStore';
-import analytics from '@src/utils/analytics';
-import { black, slate100, slate400, slate500, white } from '@src/utils/colors';
-import { dinot } from '@src/utils/fonts';
+import { CircleHelp } from '@tamagui/lucide-icons';
+
+import type { PassportData } from '@selfxyz/common/types';
+import { getSKIPEM } from '@selfxyz/common/utils/csca';
+import { initPassportDataParsing } from '@selfxyz/common/utils/passports';
+
+import passportVerifyAnimation from '@/assets/animations/passport_verify.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import TextsContainer from '@/components/TextsContainer';
+import { BodyText } from '@/components/typography/BodyText';
+import { Title } from '@/components/typography/Title';
+import { PassportEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import NFC_IMAGE from '@/images/nfc.png';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { storePassportData } from '@/providers/passportDataProvider';
+import useUserStore from '@/stores/userStore';
+import analytics from '@/utils/analytics';
+import { black, slate100, slate400, slate500, white } from '@/utils/colors';
+import { dinot } from '@/utils/fonts';
 import {
   buttonTap,
   feedbackSuccess,
   feedbackUnsuccessful,
   impactLight,
-} from '@src/utils/haptic';
-import { registerModalCallbacks } from '@src/utils/modalCallbackRegistry';
-import { parseScanResponse, scan } from '@src/utils/nfcScanner';
-import { hasAnyValidRegisteredDocument } from '@src/utils/proving/validateDocument';
-import { CircleHelp } from '@tamagui/lucide-icons';
+} from '@/utils/haptic';
+import { registerModalCallbacks } from '@/utils/modalCallbackRegistry';
+import { parseScanResponse, scan } from '@/utils/nfcScanner';
+import { hasAnyValidRegisteredDocument } from '@/utils/proving/validateDocument';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/passport/PassportNFCScanScreen.web.tsx b/app/src/screens/passport/PassportNFCScanScreen.web.tsx
index 6dbca45b8..00414c57f 100644
--- a/app/src/screens/passport/PassportNFCScanScreen.web.tsx
+++ b/app/src/screens/passport/PassportNFCScanScreen.web.tsx
@@ -3,17 +3,17 @@
 import React from 'react';
 import { Image } from 'tamagui';
 
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import TextsContainer from '@src/components/TextsContainer';
-import { BodyText } from '@src/components/typography/BodyText';
-import { Title } from '@src/components/typography/Title';
-import { PassportEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import NFC_IMAGE from '@src/images/nfc.png';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { black, slate100, white } from '@src/utils/colors';
-import { hasAnyValidRegisteredDocument } from '@src/utils/proving/validateDocument';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import TextsContainer from '@/components/TextsContainer';
+import { BodyText } from '@/components/typography/BodyText';
+import { Title } from '@/components/typography/Title';
+import { PassportEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import NFC_IMAGE from '@/images/nfc.png';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { black, slate100, white } from '@/utils/colors';
+import { hasAnyValidRegisteredDocument } from '@/utils/proving/validateDocument';
 
 interface PassportNFCScanScreenProps {}
 
diff --git a/app/src/screens/passport/PassportNFCTroubleScreen.tsx b/app/src/screens/passport/PassportNFCTroubleScreen.tsx
index 0fb85a795..bc193d0c5 100644
--- a/app/src/screens/passport/PassportNFCTroubleScreen.tsx
+++ b/app/src/screens/passport/PassportNFCTroubleScreen.tsx
@@ -4,13 +4,13 @@ import React, { useEffect } from 'react';
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { YStack } from 'tamagui';
 
-import type { TipProps } from '@src/components/Tips';
-import Tips from '@src/components/Tips';
-import { Caption } from '@src/components/typography/Caption';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import SimpleScrolledTitleLayout from '@src/layouts/SimpleScrolledTitleLayout';
-import analytics from '@src/utils/analytics';
-import { slate500 } from '@src/utils/colors';
+import type { TipProps } from '@/components/Tips';
+import Tips from '@/components/Tips';
+import { Caption } from '@/components/typography/Caption';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import SimpleScrolledTitleLayout from '@/layouts/SimpleScrolledTitleLayout';
+import analytics from '@/utils/analytics';
+import { slate500 } from '@/utils/colors';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/screens/passport/PassportOnboardingScreen.tsx b/app/src/screens/passport/PassportOnboardingScreen.tsx
index e64e737ae..404382d1e 100644
--- a/app/src/screens/passport/PassportOnboardingScreen.tsx
+++ b/app/src/screens/passport/PassportOnboardingScreen.tsx
@@ -4,21 +4,21 @@ import LottieView from 'lottie-react-native';
 import React, { useEffect, useRef } from 'react';
 import { StyleSheet } from 'react-native';
 import { SystemBars } from 'react-native-edge-to-edge';
-
 import { useNavigation } from '@react-navigation/native';
-import passportOnboardingAnimation from '@src/assets/animations/passport_onboarding.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import TextsContainer from '@src/components/TextsContainer';
-import Additional from '@src/components/typography/Additional';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { PassportEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { black, slate100, white } from '@src/utils/colors';
-import { impactLight } from '@src/utils/haptic';
+
+import passportOnboardingAnimation from '@/assets/animations/passport_onboarding.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import TextsContainer from '@/components/TextsContainer';
+import Additional from '@/components/typography/Additional';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { PassportEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { black, slate100, white } from '@/utils/colors';
+import { impactLight } from '@/utils/haptic';
 
 interface PassportOnboardingScreenProps {}
 
diff --git a/app/src/screens/passport/UnsupportedPassportScreen.tsx b/app/src/screens/passport/UnsupportedPassportScreen.tsx
index ab777f4bd..b1f84cdae 100644
--- a/app/src/screens/passport/UnsupportedPassportScreen.tsx
+++ b/app/src/screens/passport/UnsupportedPassportScreen.tsx
@@ -3,19 +3,19 @@
 import LottieView from 'lottie-react-native';
 import React, { useEffect } from 'react';
 
-import warnAnimation from '@src/assets/animations/warning.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { Caption } from '@src/components/typography/Caption';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { PassportEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { styles } from '@src/screens/prove/ProofRequestStatusScreen';
-import analytics from '@src/utils/analytics';
-import { black, white } from '@src/utils/colors';
-import { notificationError } from '@src/utils/haptic';
-import { hasAnyValidRegisteredDocument } from '@src/utils/proving/validateDocument';
+import warnAnimation from '@/assets/animations/warning.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { Caption } from '@/components/typography/Caption';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { PassportEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { styles } from '@/screens/prove/ProofRequestStatusScreen';
+import analytics from '@/utils/analytics';
+import { black, white } from '@/utils/colors';
+import { notificationError } from '@/utils/haptic';
+import { hasAnyValidRegisteredDocument } from '@/utils/proving/validateDocument';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/screens/prove/ConfirmBelongingScreen.tsx b/app/src/screens/prove/ConfirmBelongingScreen.tsx
index 3961d9538..fdd5ddbed 100644
--- a/app/src/screens/prove/ConfirmBelongingScreen.tsx
+++ b/app/src/screens/prove/ConfirmBelongingScreen.tsx
@@ -3,25 +3,25 @@
 import LottieView from 'lottie-react-native';
 import React, { useEffect, useState } from 'react';
 import { ActivityIndicator, View } from 'react-native';
-
 import type { StaticScreenProps } from '@react-navigation/native';
 import { usePreventRemove } from '@react-navigation/native';
-import successAnimation from '@src/assets/animations/loading/success.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { PassportEvents, ProofEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { styles } from '@src/screens/prove/ProofRequestStatusScreen';
-import analytics from '@src/utils/analytics';
-import { black, white } from '@src/utils/colors';
-import { notificationSuccess } from '@src/utils/haptic';
+
+import successAnimation from '@/assets/animations/loading/success.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { PassportEvents, ProofEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { styles } from '@/screens/prove/ProofRequestStatusScreen';
+import analytics from '@/utils/analytics';
+import { black, white } from '@/utils/colors';
+import { notificationSuccess } from '@/utils/haptic';
 import {
   getFCMToken,
   requestNotificationPermission,
-} from '@src/utils/notifications/notificationService';
-import { useProvingStore } from '@src/utils/proving/provingMachine';
+} from '@/utils/notifications/notificationService';
+import { useProvingStore } from '@/utils/proving/provingMachine';
 
 type ConfirmBelongingScreenProps = StaticScreenProps<{}>;
 
diff --git a/app/src/screens/prove/ProofRequestStatusScreen.tsx b/app/src/screens/prove/ProofRequestStatusScreen.tsx
index 5dff06c2e..4f1393ad7 100644
--- a/app/src/screens/prove/ProofRequestStatusScreen.tsx
+++ b/app/src/screens/prove/ProofRequestStatusScreen.tsx
@@ -5,30 +5,30 @@ import React, { useEffect, useRef, useState } from 'react';
 import { Linking, StyleSheet, View } from 'react-native';
 import { SystemBars } from 'react-native-edge-to-edge';
 import { ScrollView, Spinner } from 'tamagui';
-
 import { useIsFocused } from '@react-navigation/native';
-import loadingAnimation from '@src/assets/animations/loading/misc.json';
-import failAnimation from '@src/assets/animations/proof_failed.json';
-import succesAnimation from '@src/assets/animations/proof_success.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { BodyText } from '@src/components/typography/BodyText';
-import Description from '@src/components/typography/Description';
-import { typography } from '@src/components/typography/styles';
-import { Title } from '@src/components/typography/Title';
-import { ProofEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { ProofStatus } from '@src/stores/proof-types';
-import { useProofHistoryStore } from '@src/stores/proofHistoryStore';
-import { useSelfAppStore } from '@src/stores/selfAppStore';
-import analytics from '@src/utils/analytics';
-import { black, white } from '@src/utils/colors';
+
+import loadingAnimation from '@/assets/animations/loading/misc.json';
+import failAnimation from '@/assets/animations/proof_failed.json';
+import succesAnimation from '@/assets/animations/proof_success.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { BodyText } from '@/components/typography/BodyText';
+import Description from '@/components/typography/Description';
+import { typography } from '@/components/typography/styles';
+import { Title } from '@/components/typography/Title';
+import { ProofEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { ProofStatus } from '@/stores/proof-types';
+import { useProofHistoryStore } from '@/stores/proofHistoryStore';
+import { useSelfAppStore } from '@/stores/selfAppStore';
+import analytics from '@/utils/analytics';
+import { black, white } from '@/utils/colors';
 import {
   buttonTap,
   notificationError,
   notificationSuccess,
-} from '@src/utils/haptic';
-import { useProvingStore } from '@src/utils/proving/provingMachine';
+} from '@/utils/haptic';
+import { useProvingStore } from '@/utils/proving/provingMachine';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/prove/ProveScreen.tsx b/app/src/screens/prove/ProveScreen.tsx
index fbc14d3f4..8259162fe 100644
--- a/app/src/screens/prove/ProveScreen.tsx
+++ b/app/src/screens/prove/ProveScreen.tsx
@@ -15,28 +15,28 @@ import type {
 } from 'react-native';
 import { ScrollView, StyleSheet, TouchableOpacity } from 'react-native';
 import { Image, Text, View, XStack, YStack } from 'tamagui';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
+import { Eye, EyeOff } from '@tamagui/lucide-icons';
 
 import type { SelfAppDisclosureConfig } from '@selfxyz/common/utils/appType';
 import { formatEndpoint } from '@selfxyz/common/utils/scope';
 
-import { useIsFocused, useNavigation } from '@react-navigation/native';
-import miscAnimation from '@src/assets/animations/loading/misc.json';
-import { HeldPrimaryButtonProveScreen } from '@src/components/buttons/HeldPrimaryButtonProveScreen';
-import Disclosures from '@src/components/Disclosures';
-import { BodyText } from '@src/components/typography/BodyText';
-import { Caption } from '@src/components/typography/Caption';
-import { ProofEvents } from '@src/consts/analytics';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { setDefaultDocumentTypeIfNeeded } from '@src/providers/passportDataProvider';
-import { ProofStatus } from '@src/stores/proof-types';
-import { useProofHistoryStore } from '@src/stores/proofHistoryStore';
-import { useSelfAppStore } from '@src/stores/selfAppStore';
-import analytics from '@src/utils/analytics';
-import { black, slate300, white } from '@src/utils/colors';
-import { formatUserId } from '@src/utils/formatUserId';
-import { buttonTap } from '@src/utils/haptic';
-import { useProvingStore } from '@src/utils/proving/provingMachine';
-import { Eye, EyeOff } from '@tamagui/lucide-icons';
+import miscAnimation from '@/assets/animations/loading/misc.json';
+import { HeldPrimaryButtonProveScreen } from '@/components/buttons/HeldPrimaryButtonProveScreen';
+import Disclosures from '@/components/Disclosures';
+import { BodyText } from '@/components/typography/BodyText';
+import { Caption } from '@/components/typography/Caption';
+import { ProofEvents } from '@/consts/analytics';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { setDefaultDocumentTypeIfNeeded } from '@/providers/passportDataProvider';
+import { ProofStatus } from '@/stores/proof-types';
+import { useProofHistoryStore } from '@/stores/proofHistoryStore';
+import { useSelfAppStore } from '@/stores/selfAppStore';
+import analytics from '@/utils/analytics';
+import { black, slate300, white } from '@/utils/colors';
+import { formatUserId } from '@/utils/formatUserId';
+import { buttonTap } from '@/utils/haptic';
+import { useProvingStore } from '@/utils/proving/provingMachine';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/prove/QRCodeTroubleScreen.tsx b/app/src/screens/prove/QRCodeTroubleScreen.tsx
index 1c90208ba..55668d940 100644
--- a/app/src/screens/prove/QRCodeTroubleScreen.tsx
+++ b/app/src/screens/prove/QRCodeTroubleScreen.tsx
@@ -2,13 +2,13 @@
 
 import React, { useEffect } from 'react';
 
-import type { TipProps } from '@src/components/Tips';
-import Tips from '@src/components/Tips';
-import { Caption } from '@src/components/typography/Caption';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import SimpleScrolledTitleLayout from '@src/layouts/SimpleScrolledTitleLayout';
-import analytics from '@src/utils/analytics';
-import { slate500 } from '@src/utils/colors';
+import type { TipProps } from '@/components/Tips';
+import Tips from '@/components/Tips';
+import { Caption } from '@/components/typography/Caption';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import SimpleScrolledTitleLayout from '@/layouts/SimpleScrolledTitleLayout';
+import analytics from '@/utils/analytics';
+import { slate500 } from '@/utils/colors';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/screens/prove/ViewFinderScreen.tsx b/app/src/screens/prove/ViewFinderScreen.tsx
index 4424df454..4e58d33c2 100644
--- a/app/src/screens/prove/ViewFinderScreen.tsx
+++ b/app/src/screens/prove/ViewFinderScreen.tsx
@@ -4,28 +4,28 @@ import LottieView from 'lottie-react-native';
 import React, { useCallback, useState } from 'react';
 import { StyleSheet } from 'react-native';
 import { View, XStack, YStack } from 'tamagui';
-
 import {
   useFocusEffect,
   useIsFocused,
   useNavigation,
 } from '@react-navigation/native';
-import qrScanAnimation from '@src/assets/animations/qr_scan.json';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import type { QRCodeScannerViewProps } from '@src/components/native/QRCodeScanner';
-import { QRCodeScannerView } from '@src/components/native/QRCodeScanner';
-import Additional from '@src/components/typography/Additional';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { ProofEvents } from '@src/consts/analytics';
-import useConnectionModal from '@src/hooks/useConnectionModal';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import QRScan from '@src/images/icons/qr_code.svg';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { useSelfAppStore } from '@src/stores/selfAppStore';
-import analytics from '@src/utils/analytics';
-import { black, slate800, white } from '@src/utils/colors';
-import { parseAndValidateUrlParams } from '@src/utils/deeplinks';
+
+import qrScanAnimation from '@/assets/animations/qr_scan.json';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import type { QRCodeScannerViewProps } from '@/components/native/QRCodeScanner';
+import { QRCodeScannerView } from '@/components/native/QRCodeScanner';
+import Additional from '@/components/typography/Additional';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { ProofEvents } from '@/consts/analytics';
+import useConnectionModal from '@/hooks/useConnectionModal';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import QRScan from '@/images/icons/qr_code.svg';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { useSelfAppStore } from '@/stores/selfAppStore';
+import analytics from '@/utils/analytics';
+import { black, slate800, white } from '@/utils/colors';
+import { parseAndValidateUrlParams } from '@/utils/deeplinks';
 
 interface QRCodeViewFinderScreenProps {}
 
diff --git a/app/src/screens/recovery/AccountRecoveryChoiceScreen.tsx b/app/src/screens/recovery/AccountRecoveryChoiceScreen.tsx
index 15f7f28d0..bb043d412 100644
--- a/app/src/screens/recovery/AccountRecoveryChoiceScreen.tsx
+++ b/app/src/screens/recovery/AccountRecoveryChoiceScreen.tsx
@@ -2,28 +2,28 @@
 
 import React, { useCallback, useState } from 'react';
 import { Separator, View, XStack, YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import { Caption } from '@src/components/typography/Caption';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { BackupEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import Keyboard from '@src/images/icons/keyboard.svg';
-import RestoreAccountSvg from '@src/images/icons/restore_account.svg';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { useAuth } from '@src/providers/authProvider';
+
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import { Caption } from '@/components/typography/Caption';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { BackupEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import Keyboard from '@/images/icons/keyboard.svg';
+import RestoreAccountSvg from '@/images/icons/restore_account.svg';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { useAuth } from '@/providers/authProvider';
 import {
   loadPassportDataAndSecret,
   reStorePassportDataWithRightCSCA,
-} from '@src/providers/passportDataProvider';
-import { useSettingStore } from '@src/stores/settingStore';
-import analytics from '@src/utils/analytics';
-import { STORAGE_NAME, useBackupMnemonic } from '@src/utils/cloudBackup';
-import { black, slate500, slate600, white } from '@src/utils/colors';
-import { isUserRegisteredWithAlternativeCSCA } from '@src/utils/proving/validateDocument';
+} from '@/providers/passportDataProvider';
+import { useSettingStore } from '@/stores/settingStore';
+import analytics from '@/utils/analytics';
+import { STORAGE_NAME, useBackupMnemonic } from '@/utils/cloudBackup';
+import { black, slate500, slate600, white } from '@/utils/colors';
+import { isUserRegisteredWithAlternativeCSCA } from '@/utils/proving/validateDocument';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/recovery/AccountRecoveryScreen.tsx b/app/src/screens/recovery/AccountRecoveryScreen.tsx
index ac827e424..972194e92 100644
--- a/app/src/screens/recovery/AccountRecoveryScreen.tsx
+++ b/app/src/screens/recovery/AccountRecoveryScreen.tsx
@@ -3,15 +3,15 @@
 import React from 'react';
 import { View, YStack } from 'tamagui';
 
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { BackupEvents } from '@src/consts/analytics';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import RestoreAccountSvg from '@src/images/icons/restore_account.svg';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { black, slate600, white } from '@src/utils/colors';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { BackupEvents } from '@/consts/analytics';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import RestoreAccountSvg from '@/images/icons/restore_account.svg';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { black, slate600, white } from '@/utils/colors';
 
 interface AccountRecoveryScreenProps {}
 
diff --git a/app/src/screens/recovery/AccountVerifiedSuccessScreen.tsx b/app/src/screens/recovery/AccountVerifiedSuccessScreen.tsx
index 329354038..4c1896723 100644
--- a/app/src/screens/recovery/AccountVerifiedSuccessScreen.tsx
+++ b/app/src/screens/recovery/AccountVerifiedSuccessScreen.tsx
@@ -3,17 +3,17 @@
 import LottieView from 'lottie-react-native';
 import React from 'react';
 import { YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
-import proofSuccessAnimation from '@src/assets/animations/proof_success.json';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { BackupEvents } from '@src/consts/analytics';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { styles } from '@src/screens/prove/ProofRequestStatusScreen';
-import { black, white } from '@src/utils/colors';
-import { buttonTap } from '@src/utils/haptic';
+
+import proofSuccessAnimation from '@/assets/animations/proof_success.json';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { BackupEvents } from '@/consts/analytics';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { styles } from '@/screens/prove/ProofRequestStatusScreen';
+import { black, white } from '@/utils/colors';
+import { buttonTap } from '@/utils/haptic';
 
 const AccountVerifiedSuccessScreen: React.FC = ({}) => {
   const navigation = useNavigation();
diff --git a/app/src/screens/recovery/PassportDataNotFoundScreen.tsx b/app/src/screens/recovery/PassportDataNotFoundScreen.tsx
index 5b5367597..ef141ae3e 100644
--- a/app/src/screens/recovery/PassportDataNotFoundScreen.tsx
+++ b/app/src/screens/recovery/PassportDataNotFoundScreen.tsx
@@ -2,14 +2,14 @@
 
 import React, { useEffect } from 'react';
 
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import analytics from '@src/utils/analytics';
-import { black, slate200, white } from '@src/utils/colors';
-import { hasAnyValidRegisteredDocument } from '@src/utils/proving/validateDocument';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import analytics from '@/utils/analytics';
+import { black, slate200, white } from '@/utils/colors';
+import { hasAnyValidRegisteredDocument } from '@/utils/proving/validateDocument';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/screens/recovery/RecoverWithPhraseScreen.tsx b/app/src/screens/recovery/RecoverWithPhraseScreen.tsx
index 2657f6760..8dafdea0a 100644
--- a/app/src/screens/recovery/RecoverWithPhraseScreen.tsx
+++ b/app/src/screens/recovery/RecoverWithPhraseScreen.tsx
@@ -4,19 +4,19 @@ import { ethers } from 'ethers';
 import React, { useCallback, useState } from 'react';
 import { Keyboard, StyleSheet } from 'react-native';
 import { Text, TextArea, View, XStack, YStack } from 'tamagui';
-
 import Clipboard from '@react-native-clipboard/clipboard';
 import { useNavigation } from '@react-navigation/native';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import Description from '@src/components/typography/Description';
-import { BackupEvents } from '@src/consts/analytics';
-import Paste from '@src/images/icons/paste.svg';
-import { useAuth } from '@src/providers/authProvider';
+
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import Description from '@/components/typography/Description';
+import { BackupEvents } from '@/consts/analytics';
+import Paste from '@/images/icons/paste.svg';
+import { useAuth } from '@/providers/authProvider';
 import {
   loadPassportDataAndSecret,
   reStorePassportDataWithRightCSCA,
-} from '@src/providers/passportDataProvider';
-import analytics from '@src/utils/analytics';
+} from '@/providers/passportDataProvider';
+import analytics from '@/utils/analytics';
 import {
   black,
   slate300,
@@ -24,8 +24,8 @@ import {
   slate600,
   slate700,
   white,
-} from '@src/utils/colors';
-import { isUserRegisteredWithAlternativeCSCA } from '@src/utils/proving/validateDocument';
+} from '@/utils/colors';
+import { isUserRegisteredWithAlternativeCSCA } from '@/utils/proving/validateDocument';
 
 interface RecoverWithPhraseScreenProps {}
 
diff --git a/app/src/screens/recovery/SaveRecoveryPhraseScreen.tsx b/app/src/screens/recovery/SaveRecoveryPhraseScreen.tsx
index c35166c29..23ba67ea8 100644
--- a/app/src/screens/recovery/SaveRecoveryPhraseScreen.tsx
+++ b/app/src/screens/recovery/SaveRecoveryPhraseScreen.tsx
@@ -2,18 +2,18 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import Mnemonic from '@src/components/Mnemonic';
-import { Caption } from '@src/components/typography/Caption';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import useMnemonic from '@src/hooks/useMnemonic';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import { useSettingStore } from '@src/stores/settingStore';
-import { STORAGE_NAME } from '@src/utils/cloudBackup';
-import { black, slate400, white } from '@src/utils/colors';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import Mnemonic from '@/components/Mnemonic';
+import { Caption } from '@/components/typography/Caption';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import useMnemonic from '@/hooks/useMnemonic';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import { useSettingStore } from '@/stores/settingStore';
+import { STORAGE_NAME } from '@/utils/cloudBackup';
+import { black, slate400, white } from '@/utils/colors';
 
 interface SaveRecoveryPhraseScreenProps {}
 
diff --git a/app/src/screens/settings/CloudBackupScreen.tsx b/app/src/screens/settings/CloudBackupScreen.tsx
index e7417f99a..4c0547d99 100644
--- a/app/src/screens/settings/CloudBackupScreen.tsx
+++ b/app/src/screens/settings/CloudBackupScreen.tsx
@@ -2,26 +2,26 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 import { YStack } from 'tamagui';
-
 import type { StaticScreenProps } from '@react-navigation/native';
 import { useNavigation } from '@react-navigation/native';
-import BackupDocumentationLink from '@src/components/BackupDocumentationLink';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import { Caption } from '@src/components/typography/Caption';
-import Description from '@src/components/typography/Description';
-import { Title } from '@src/components/typography/Title';
-import { BackupEvents } from '@src/consts/analytics';
-import { useModal } from '@src/hooks/useModal';
-import Cloud from '@src/images/icons/logo_cloud_backup.svg';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
-import type { RootStackParamList } from '@src/navigation';
-import { useAuth } from '@src/providers/authProvider';
-import { useSettingStore } from '@src/stores/settingStore';
-import analytics from '@src/utils/analytics';
-import { STORAGE_NAME, useBackupMnemonic } from '@src/utils/cloudBackup';
-import { black, white } from '@src/utils/colors';
-import { buttonTap, confirmTap } from '@src/utils/haptic';
+
+import BackupDocumentationLink from '@/components/BackupDocumentationLink';
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import { Caption } from '@/components/typography/Caption';
+import Description from '@/components/typography/Description';
+import { Title } from '@/components/typography/Title';
+import { BackupEvents } from '@/consts/analytics';
+import { useModal } from '@/hooks/useModal';
+import Cloud from '@/images/icons/logo_cloud_backup.svg';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
+import type { RootStackParamList } from '@/navigation';
+import { useAuth } from '@/providers/authProvider';
+import { useSettingStore } from '@/stores/settingStore';
+import analytics from '@/utils/analytics';
+import { STORAGE_NAME, useBackupMnemonic } from '@/utils/cloudBackup';
+import { black, white } from '@/utils/colors';
+import { buttonTap, confirmTap } from '@/utils/haptic';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/settings/ManageDocumentsScreen.tsx b/app/src/screens/settings/ManageDocumentsScreen.tsx
index bf83fdc28..285a8f5ac 100644
--- a/app/src/screens/settings/ManageDocumentsScreen.tsx
+++ b/app/src/screens/settings/ManageDocumentsScreen.tsx
@@ -4,24 +4,24 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { Alert } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Button, ScrollView, Spinner, Text, XStack, YStack } from 'tamagui';
-
 import { useNavigation } from '@react-navigation/native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import { PrimaryButton } from '@src/components/buttons/PrimaryButton';
-import { SecondaryButton } from '@src/components/buttons/SecondaryButton';
-import ButtonsContainer from '@src/components/ButtonsContainer';
-import { DocumentEvents } from '@src/consts/analytics';
-import type { RootStackParamList } from '@src/navigation';
+import { Check, Eraser } from '@tamagui/lucide-icons';
+
+import { PrimaryButton } from '@/components/buttons/PrimaryButton';
+import { SecondaryButton } from '@/components/buttons/SecondaryButton';
+import ButtonsContainer from '@/components/ButtonsContainer';
+import { DocumentEvents } from '@/consts/analytics';
+import type { RootStackParamList } from '@/navigation';
 import {
   type DocumentCatalog,
   type DocumentMetadata,
   usePassport,
-} from '@src/providers/passportDataProvider';
-import analytics from '@src/utils/analytics';
-import { borderColor, textBlack, white } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { impactLight } from '@src/utils/haptic';
-import { Check, Eraser } from '@tamagui/lucide-icons';
+} from '@/providers/passportDataProvider';
+import analytics from '@/utils/analytics';
+import { borderColor, textBlack, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { impactLight } from '@/utils/haptic';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/settings/PassportDataInfoScreen.tsx b/app/src/screens/settings/PassportDataInfoScreen.tsx
index 4b8ccdf50..b474bccdc 100644
--- a/app/src/screens/settings/PassportDataInfoScreen.tsx
+++ b/app/src/screens/settings/PassportDataInfoScreen.tsx
@@ -3,16 +3,16 @@
 import React, { useCallback, useState } from 'react';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ScrollView, Separator, XStack, YStack } from 'tamagui';
+import { useFocusEffect } from '@react-navigation/native';
 
 import type { PassportMetadata } from '@selfxyz/common/types';
 
-import { useFocusEffect } from '@react-navigation/native';
-import { Caption } from '@src/components/typography/Caption';
-import { DocumentEvents } from '@src/consts/analytics';
-import { usePassport } from '@src/providers/passportDataProvider';
-import analytics from '@src/utils/analytics';
-import { black, slate200, white } from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
+import { Caption } from '@/components/typography/Caption';
+import { DocumentEvents } from '@/consts/analytics';
+import { usePassport } from '@/providers/passportDataProvider';
+import analytics from '@/utils/analytics';
+import { black, slate200, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/screens/settings/SettingsScreen.tsx b/app/src/screens/settings/SettingsScreen.tsx
index 436a8ecfc..fbfc51d22 100644
--- a/app/src/screens/settings/SettingsScreen.tsx
+++ b/app/src/screens/settings/SettingsScreen.tsx
@@ -7,13 +7,12 @@ import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import type { SvgProps } from 'react-native-svg';
 import { Button, ScrollView, View, XStack, YStack } from 'tamagui';
-
-import { version } from '../../../package.json';
-
 import { useNavigation } from '@react-navigation/native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import { pressedStyle } from '@src/components/buttons/pressedStyle';
-import { BodyText } from '@src/components/typography/BodyText';
+import { Bug, FileText } from '@tamagui/lucide-icons';
+
+import { pressedStyle } from '@/components/buttons/pressedStyle';
+import { BodyText } from '@/components/typography/BodyText';
 import {
   appStoreUrl,
   gitHubUrl,
@@ -21,30 +20,25 @@ import {
   selfUrl,
   telegramUrl,
   xUrl,
-} from '@src/consts/links';
-import Github from '@src/images/icons/github.svg';
-import Cloud from '@src/images/icons/settings_cloud_backup.svg';
-import Data from '@src/images/icons/settings_data.svg';
-import Feedback from '@src/images/icons/settings_feedback.svg';
-import Lock from '@src/images/icons/settings_lock.svg';
-import ShareIcon from '@src/images/icons/share.svg';
-import Star from '@src/images/icons/star.svg';
-import Telegram from '@src/images/icons/telegram.svg';
-import Web from '@src/images/icons/webpage.svg';
-import X from '@src/images/icons/x.svg';
-import type { RootStackParamList } from '@src/navigation';
-import { useSettingStore } from '@src/stores/settingStore';
-import {
-  amber500,
-  black,
-  neutral700,
-  slate800,
-  white,
-} from '@src/utils/colors';
-import { extraYPadding } from '@src/utils/constants';
-import { impactLight } from '@src/utils/haptic';
-import { getCountry, getLocales, getTimeZone } from '@src/utils/locale';
-import { Bug, FileText } from '@tamagui/lucide-icons';
+} from '@/consts/links';
+import Github from '@/images/icons/github.svg';
+import Cloud from '@/images/icons/settings_cloud_backup.svg';
+import Data from '@/images/icons/settings_data.svg';
+import Feedback from '@/images/icons/settings_feedback.svg';
+import Lock from '@/images/icons/settings_lock.svg';
+import ShareIcon from '@/images/icons/share.svg';
+import Star from '@/images/icons/star.svg';
+import Telegram from '@/images/icons/telegram.svg';
+import Web from '@/images/icons/webpage.svg';
+import X from '@/images/icons/x.svg';
+import type { RootStackParamList } from '@/navigation';
+import { useSettingStore } from '@/stores/settingStore';
+import { amber500, black, neutral700, slate800, white } from '@/utils/colors';
+import { extraYPadding } from '@/utils/constants';
+import { impactLight } from '@/utils/haptic';
+import { getCountry, getLocales, getTimeZone } from '@/utils/locale';
+
+import { version } from '../../../package.json';
 
 interface SettingsScreenProps {}
 interface MenuButtonProps extends PropsWithChildren {
diff --git a/app/src/screens/settings/ShowRecoveryPhraseScreen.tsx b/app/src/screens/settings/ShowRecoveryPhraseScreen.tsx
index d40055649..d40c30aec 100644
--- a/app/src/screens/settings/ShowRecoveryPhraseScreen.tsx
+++ b/app/src/screens/settings/ShowRecoveryPhraseScreen.tsx
@@ -2,10 +2,10 @@
 
 import React, { useCallback } from 'react';
 
-import Mnemonic from '@src/components/Mnemonic';
-import Description from '@src/components/typography/Description';
-import useMnemonic from '@src/hooks/useMnemonic';
-import { ExpandableBottomLayout } from '@src/layouts/ExpandableBottomLayout';
+import Mnemonic from '@/components/Mnemonic';
+import Description from '@/components/typography/Description';
+import useMnemonic from '@/hooks/useMnemonic';
+import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
 
 interface ShowRecoveryPhraseScreenProps {}
 
diff --git a/app/src/stores/database.ts b/app/src/stores/database.ts
index d58894510..37d146fc7 100644
--- a/app/src/stores/database.ts
+++ b/app/src/stores/database.ts
@@ -6,8 +6,8 @@ import type {
   ProofDB,
   ProofDBResult,
   ProofHistory,
-} from '@src/stores/proof-types';
-import { ProofStatus } from '@src/stores/proof-types';
+} from '@/stores/proof-types';
+import { ProofStatus } from '@/stores/proof-types';
 
 const PAGE_SIZE = 20;
 const DB_NAME = 'proof_history.db';
diff --git a/app/src/stores/database.web.ts b/app/src/stores/database.web.ts
index 375e10e44..ac914ba67 100644
--- a/app/src/stores/database.web.ts
+++ b/app/src/stores/database.web.ts
@@ -4,8 +4,8 @@ import type {
   ProofDB,
   ProofDBResult,
   ProofHistory,
-} from '@src/stores/proof-types';
-import { ProofStatus } from '@src/stores/proof-types';
+} from '@/stores/proof-types';
+import { ProofStatus } from '@/stores/proof-types';
 
 export const DB_NAME = 'proof_history_db';
 const STORE_NAME = 'proof_history';
diff --git a/app/src/stores/proofHistoryStore.ts b/app/src/stores/proofHistoryStore.ts
index 31720b2e3..3bbd72019 100644
--- a/app/src/stores/proofHistoryStore.ts
+++ b/app/src/stores/proofHistoryStore.ts
@@ -5,9 +5,9 @@ import { create } from 'zustand';
 
 import { WS_DB_RELAYER } from '@selfxyz/common/constants';
 
-import { database } from '@src/stores/database';
-import type { ProofHistory } from '@src/stores/proof-types';
-import { ProofStatus } from '@src/stores/proof-types';
+import { database } from '@/stores/database';
+import type { ProofHistory } from '@/stores/proof-types';
+import { ProofStatus } from '@/stores/proof-types';
 
 interface ProofHistoryState {
   proofHistory: ProofHistory[];
diff --git a/app/src/stores/protocolStore.ts b/app/src/stores/protocolStore.ts
index 65770c2e4..99597a17e 100644
--- a/app/src/stores/protocolStore.ts
+++ b/app/src/stores/protocolStore.ts
@@ -19,7 +19,7 @@ import {
   IDENTITY_TREE_URL_STAGING_ID_CARD,
 } from '@selfxyz/common/constants';
 
-import { fetchOfacTrees } from '@src/utils/ofac';
+import { fetchOfacTrees } from '@/utils/ofac';
 
 interface ProtocolState {
   passport: {
diff --git a/app/src/stores/settingStore.ts b/app/src/stores/settingStore.ts
index 81dc1b481..42ce6d1f6 100644
--- a/app/src/stores/settingStore.ts
+++ b/app/src/stores/settingStore.ts
@@ -2,7 +2,6 @@
 
 import { create } from 'zustand';
 import { createJSONStorage, persist } from 'zustand/middleware';
-
 import AsyncStorage from '@react-native-async-storage/async-storage';
 
 interface PersistedSettingsState {
diff --git a/app/src/stores/userStore.ts b/app/src/stores/userStore.ts
index 46a245491..ac36a8bf3 100644
--- a/app/src/stores/userStore.ts
+++ b/app/src/stores/userStore.ts
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { create } from 'zustand';
+import { DEFAULT_DOB, DEFAULT_DOE, DEFAULT_PNUMBER } from '@env';
 
 import type { IdDocInput } from '@selfxyz/common/utils';
 
-import { DEFAULT_DOB, DEFAULT_DOE, DEFAULT_PNUMBER } from '@env';
-
 interface UserState {
   documentType: string;
   countryCode: string;
diff --git a/app/src/utils/analytics.ts b/app/src/utils/analytics.ts
index 53703e130..35e3139e5 100644
--- a/app/src/utils/analytics.ts
+++ b/app/src/utils/analytics.ts
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import type { JsonMap, JsonValue } from '@segment/analytics-react-native';
-import { createSegmentClient } from '@src/Segment';
+
+import { createSegmentClient } from '@/Segment';
 
 /**
  * Generic reasons:
diff --git a/app/src/utils/cloudBackup/google.ts b/app/src/utils/cloudBackup/google.ts
index b19321d66..3a50f04c4 100644
--- a/app/src/utils/cloudBackup/google.ts
+++ b/app/src/utils/cloudBackup/google.ts
@@ -2,7 +2,6 @@
 
 import type { AuthConfiguration, AuthorizeResult } from 'react-native-app-auth';
 import { authorize } from 'react-native-app-auth';
-
 import { GOOGLE_SIGNIN_ANDROID_CLIENT_ID } from '@env';
 import { GDrive } from '@robinbobin/react-native-google-drive-api-wrapper';
 
diff --git a/app/src/utils/cloudBackup/helpers.ts b/app/src/utils/cloudBackup/helpers.ts
index 4aa832ecd..e87146a1c 100644
--- a/app/src/utils/cloudBackup/helpers.ts
+++ b/app/src/utils/cloudBackup/helpers.ts
@@ -4,9 +4,9 @@ import { ethers } from 'ethers';
 import { Platform } from 'react-native';
 import { CloudStorage, CloudStorageScope } from 'react-native-cloud-storage';
 
-import { name } from '../../../package.json';
+import type { Mnemonic } from '@/types/mnemonic';
 
-import type { Mnemonic } from '@src/types/mnemonic';
+import { name } from '../../../package.json';
 
 export const FOLDER = `/${name}`;
 export const ENCRYPTED_FILE_PATH = `/${FOLDER}/encrypted-private-key`;
diff --git a/app/src/utils/cloudBackup/index.ts b/app/src/utils/cloudBackup/index.ts
index b305f98f0..e471f7aba 100644
--- a/app/src/utils/cloudBackup/index.ts
+++ b/app/src/utils/cloudBackup/index.ts
@@ -2,19 +2,19 @@
 
 import { useMemo } from 'react';
 import { Platform } from 'react-native';
-
 import {
   APP_DATA_FOLDER_ID,
   MIME_TYPES,
 } from '@robinbobin/react-native-google-drive-api-wrapper';
-import type { Mnemonic } from '@src/types/mnemonic';
-import { createGDrive } from '@src/utils/cloudBackup/google';
+
+import type { Mnemonic } from '@/types/mnemonic';
+import { createGDrive } from '@/utils/cloudBackup/google';
 import {
   FILE_NAME,
   parseMnemonic,
   withRetries,
-} from '@src/utils/cloudBackup/helpers';
-import * as ios from '@src/utils/cloudBackup/ios';
+} from '@/utils/cloudBackup/helpers';
+import * as ios from '@/utils/cloudBackup/ios';
 
 export const STORAGE_NAME = Platform.OS === 'ios' ? 'iCloud' : 'Google Drive';
 
diff --git a/app/src/utils/cloudBackup/ios.ts b/app/src/utils/cloudBackup/ios.ts
index 82552a420..29bf3128c 100644
--- a/app/src/utils/cloudBackup/ios.ts
+++ b/app/src/utils/cloudBackup/ios.ts
@@ -2,13 +2,13 @@
 
 import { CloudStorage } from 'react-native-cloud-storage';
 
-import type { Mnemonic } from '@src/types/mnemonic';
+import type { Mnemonic } from '@/types/mnemonic';
 import {
   ENCRYPTED_FILE_PATH,
   FOLDER,
   parseMnemonic,
   withRetries,
-} from '@src/utils/cloudBackup/helpers';
+} from '@/utils/cloudBackup/helpers';
 
 export async function disableBackup() {
   await withRetries(() => CloudStorage.rmdir(FOLDER, { recursive: true }));
diff --git a/app/src/utils/cryptoLoader.ts b/app/src/utils/cryptoLoader.ts
index bf6970539..c19a42fc7 100644
--- a/app/src/utils/cryptoLoader.ts
+++ b/app/src/utils/cryptoLoader.ts
@@ -11,8 +11,8 @@ export const loadCryptoUtils = async () => {
 
 export const loadProvingUtils = async () => {
   return Promise.all([
-    import('@src/utils/proving/provingMachine'),
-    import('@src/utils/proving/attest'),
-    import('@src/utils/proving/validateDocument'),
+    import('@/utils/proving/provingMachine'),
+    import('@/utils/proving/attest'),
+    import('@/utils/proving/validateDocument'),
   ]);
 };
diff --git a/app/src/utils/deeplinks.ts b/app/src/utils/deeplinks.ts
index 19d35b71d..c96d81741 100644
--- a/app/src/utils/deeplinks.ts
+++ b/app/src/utils/deeplinks.ts
@@ -6,9 +6,9 @@ import { Linking, Platform } from 'react-native';
 import { countries } from '@selfxyz/common/constants/countries';
 import type { IdDocInput } from '@selfxyz/common/utils';
 
-import { navigationRef } from '@src/navigation';
-import { useSelfAppStore } from '@src/stores/selfAppStore';
-import useUserStore from '@src/stores/userStore';
+import { navigationRef } from '@/navigation';
+import { useSelfAppStore } from '@/stores/selfAppStore';
+import useUserStore from '@/stores/userStore';
 
 // Validation patterns for each expected parameter
 const VALIDATION_PATTERNS = {
diff --git a/app/src/utils/ethers.ts b/app/src/utils/ethers.ts
index 0d06651d7..404abfe17 100644
--- a/app/src/utils/ethers.ts
+++ b/app/src/utils/ethers.ts
@@ -2,7 +2,6 @@
 
 // https://docs.ethers.org/v6/cookbook/react-native/
 import { ethers } from 'ethers';
-
 import { hmac } from '@noble/hashes/hmac';
 import { pbkdf2 as noblePbkdf2 } from '@noble/hashes/pbkdf2';
 import { sha256 as nobleSha256 } from '@noble/hashes/sha256';
diff --git a/app/src/utils/haptic/index.ts b/app/src/utils/haptic/index.ts
index 806a5e285..7df89e8b1 100644
--- a/app/src/utils/haptic/index.ts
+++ b/app/src/utils/haptic/index.ts
@@ -2,7 +2,7 @@
 
 import { Platform, Vibration } from 'react-native';
 
-import { triggerFeedback } from '@src/utils/haptic/trigger';
+import { triggerFeedback } from '@/utils/haptic/trigger';
 
 // Keep track of the loading screen interval
 let loadingScreenInterval: ReturnType<typeof setInterval> | null = null;
@@ -165,4 +165,4 @@ export const notificationSuccess = () => triggerFeedback('notificationSuccess');
 
 export const notificationWarning = () => triggerFeedback('notificationWarning');
 
-export { triggerFeedback } from '@src/utils/haptic/trigger';
+export { triggerFeedback } from '@/utils/haptic/trigger';
diff --git a/app/src/utils/haptic/trigger.ts b/app/src/utils/haptic/trigger.ts
index d5582f79a..94dfa5c9f 100644
--- a/app/src/utils/haptic/trigger.ts
+++ b/app/src/utils/haptic/trigger.ts
@@ -3,8 +3,8 @@
 import { Platform, Vibration } from 'react-native';
 import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
 
-import type { HapticOptions, HapticType } from '@src/utils/haptic/shared';
-import { defaultOptions } from '@src/utils/haptic/shared';
+import type { HapticOptions, HapticType } from '@/utils/haptic/shared';
+import { defaultOptions } from '@/utils/haptic/shared';
 /**
  * Triggers haptic feedback or vibration based on platform.
  * @param type - The haptic feedback type.
diff --git a/app/src/utils/haptic/trigger.web.ts b/app/src/utils/haptic/trigger.web.ts
index 9ded1122d..237b98d11 100644
--- a/app/src/utils/haptic/trigger.web.ts
+++ b/app/src/utils/haptic/trigger.web.ts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import type { HapticOptions, HapticType } from '@src/utils/haptic/shared';
-import { defaultOptions } from '@src/utils/haptic/shared';
+import type { HapticOptions, HapticType } from '@/utils/haptic/shared';
+import { defaultOptions } from '@/utils/haptic/shared';
 
 /**
  * Triggers haptic feedback or vibration based on platform.
diff --git a/app/src/utils/nfcScanner.ts b/app/src/utils/nfcScanner.ts
index d3226facb..b0d3f575e 100644
--- a/app/src/utils/nfcScanner.ts
+++ b/app/src/utils/nfcScanner.ts
@@ -4,11 +4,10 @@
 import { Buffer } from 'buffer';
 import { NativeModules, Platform } from 'react-native';
 import PassportReader from 'react-native-passport-reader';
+import { ENABLE_DEBUG_LOGS, MIXPANEL_NFC_PROJECT_TOKEN } from '@env';
 
 import type { PassportData } from '@selfxyz/common/types';
 
-import { ENABLE_DEBUG_LOGS, MIXPANEL_NFC_PROJECT_TOKEN } from '@env';
-
 interface AndroidScanResponse {
   mrz: string;
   eContent: string;
diff --git a/app/src/utils/notifications/notificationService.ts b/app/src/utils/notifications/notificationService.ts
index 16b4dc554..9d360e4f0 100644
--- a/app/src/utils/notifications/notificationService.ts
+++ b/app/src/utils/notifications/notificationService.ts
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { PermissionsAndroid, Platform } from 'react-native';
-
 import messaging from '@react-native-firebase/messaging';
+
 import type {
   DeviceTokenRegistration,
   RemoteMessage,
-} from '@src/utils/notifications/notificationService.shared';
+} from '@/utils/notifications/notificationService.shared';
 import {
   API_URL,
   API_URL_STAGING,
   getStateMessage,
-} from '@src/utils/notifications/notificationService.shared';
+} from '@/utils/notifications/notificationService.shared';
 
 export async function getFCMToken(): Promise<string | null> {
   try {
diff --git a/app/src/utils/notifications/notificationService.web.ts b/app/src/utils/notifications/notificationService.web.ts
index 904019bf2..b5a198c19 100644
--- a/app/src/utils/notifications/notificationService.web.ts
+++ b/app/src/utils/notifications/notificationService.web.ts
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import type { DeviceTokenRegistration } from '@src/utils/notifications/notificationService.shared';
+import type { DeviceTokenRegistration } from '@/utils/notifications/notificationService.shared';
 import {
   API_URL,
   API_URL_STAGING,
   getStateMessage,
-} from '@src/utils/notifications/notificationService.shared';
+} from '@/utils/notifications/notificationService.shared';
 
 export async function getFCMToken(): Promise<string | null> {
   try {
diff --git a/app/src/utils/proving/attest.ts b/app/src/utils/proving/attest.ts
index e1cab1fe9..3c8ac1249 100644
--- a/app/src/utils/proving/attest.ts
+++ b/app/src/utils/proving/attest.ts
@@ -6,13 +6,13 @@ import { ec as ellipticEc } from 'elliptic';
 import { ethers } from 'ethers';
 import { sha384 } from 'js-sha512';
 import { Certificate } from 'pkijs';
+import { X509Certificate } from '@peculiar/x509';
+import { decode } from '@stablelib/cbor';
 
 import { PCR0_MANAGER_ADDRESS, RPC_URL } from '@selfxyz/common/constants';
 
-import { X509Certificate } from '@peculiar/x509';
-import { AWS_ROOT_PEM } from '@src/utils/proving/awsRootPem';
-import cose from '@src/utils/proving/cose';
-import { decode } from '@stablelib/cbor';
+import { AWS_ROOT_PEM } from '@/utils/proving/awsRootPem';
+import cose from '@/utils/proving/cose';
 
 /**
  * @notice An array specifying the required fields for a valid attestation.
diff --git a/app/src/utils/proving/cose.ts b/app/src/utils/proving/cose.ts
index 0b72ef362..a78dcd5f9 100644
--- a/app/src/utils/proving/cose.ts
+++ b/app/src/utils/proving/cose.ts
@@ -3,7 +3,6 @@
 import { Buffer } from 'buffer';
 import { ec as EC } from 'elliptic';
 import { sha384 } from 'js-sha512';
-
 import { decode, encode } from '@stablelib/cbor';
 
 /**
diff --git a/app/src/utils/proving/index.ts b/app/src/utils/proving/index.ts
index 24991bd7c..768cb98f3 100644
--- a/app/src/utils/proving/index.ts
+++ b/app/src/utils/proving/index.ts
@@ -6,20 +6,20 @@
 export {
   type ProvingStateType,
   useProvingStore,
-} from '@src/utils/proving/provingMachine';
+} from '@/utils/proving/provingMachine';
 
 // From provingUtils - used in tests (keeping these for testing purposes)
 export {
   encryptAES256GCM,
   getPayload,
   getWSDbRelayerUrl,
-} from '@src/utils/proving/provingUtils';
+} from '@/utils/proving/provingUtils';
 
 // From loadingScreenStateText - used in loading screen
-export { getLoadingScreenText } from '@src/utils/proving/loadingScreenStateText';
+export { getLoadingScreenText } from '@/utils/proving/loadingScreenStateText';
 
 // From validateDocument - used in recovery and splash screens
 export {
   hasAnyValidRegisteredDocument,
   isUserRegisteredWithAlternativeCSCA,
-} from '@src/utils/proving/validateDocument';
+} from '@/utils/proving/validateDocument';
diff --git a/app/src/utils/proving/loadingScreenStateText.ts b/app/src/utils/proving/loadingScreenStateText.ts
index f9f84ccf3..18bdc64e7 100644
--- a/app/src/utils/proving/loadingScreenStateText.ts
+++ b/app/src/utils/proving/loadingScreenStateText.ts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import type { ProvingStateType } from '@src/utils/proving/provingMachine';
+import type { ProvingStateType } from '@/utils/proving/provingMachine';
 
 interface LoadingScreenText {
   actionText: string;
diff --git a/app/src/utils/proving/provingInputs.ts b/app/src/utils/proving/provingInputs.ts
index 0fddc184c..4b79ccd08 100644
--- a/app/src/utils/proving/provingInputs.ts
+++ b/app/src/utils/proving/provingInputs.ts
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { poseidon2 } from 'poseidon-lite';
+import { LeanIMT } from '@openpassport/zk-kit-lean-imt';
+import { SMT } from '@openpassport/zk-kit-smt';
 
 import {
   attributeToPosition,
@@ -20,9 +22,7 @@ import {
   hashEndpointWithScope,
 } from '@selfxyz/common/utils';
 
-import { LeanIMT } from '@openpassport/zk-kit-lean-imt';
-import { SMT } from '@openpassport/zk-kit-smt';
-import { useProtocolStore } from '@src/stores/protocolStore';
+import { useProtocolStore } from '@/stores/protocolStore';
 
 export function generateTEEInputsDSC(
   passportData: PassportData,
diff --git a/app/src/utils/proving/provingMachine.ts b/app/src/utils/proving/provingMachine.ts
index 491d5de7e..14af867fd 100644
--- a/app/src/utils/proving/provingMachine.ts
+++ b/app/src/utils/proving/provingMachine.ts
@@ -15,24 +15,24 @@ import {
   getSolidityPackedUserContextData,
 } from '@selfxyz/common/utils';
 
-import { PassportEvents, ProofEvents } from '@src/consts/analytics';
-import { navigationRef } from '@src/navigation';
-import { unsafe_getPrivateKey } from '@src/providers/authProvider';
+import { PassportEvents, ProofEvents } from '@/consts/analytics';
+import { navigationRef } from '@/navigation';
+import { unsafe_getPrivateKey } from '@/providers/authProvider';
 import {
   clearPassportData,
   loadSelectedDocument,
   markCurrentDocumentAsRegistered,
   reStorePassportDataWithRightCSCA,
-} from '@src/providers/passportDataProvider';
-import { useProtocolStore } from '@src/stores/protocolStore';
-import { useSelfAppStore } from '@src/stores/selfAppStore';
-import analytics from '@src/utils/analytics';
-import { getPublicKey, verifyAttestation } from '@src/utils/proving/attest';
+} from '@/providers/passportDataProvider';
+import { useProtocolStore } from '@/stores/protocolStore';
+import { useSelfAppStore } from '@/stores/selfAppStore';
+import analytics from '@/utils/analytics';
+import { getPublicKey, verifyAttestation } from '@/utils/proving/attest';
 import {
   generateTEEInputsDisclose,
   generateTEEInputsDSC,
   generateTEEInputsRegister,
-} from '@src/utils/proving/provingInputs';
+} from '@/utils/proving/provingInputs';
 import {
   clientKey,
   clientPublicKeyHex,
@@ -40,7 +40,7 @@ import {
   encryptAES256GCM,
   getPayload,
   getWSDbRelayerUrl,
-} from '@src/utils/proving/provingUtils';
+} from '@/utils/proving/provingUtils';
 import {
   checkIfPassportDscIsInTree,
   checkPassportSupported,
@@ -48,7 +48,7 @@ import {
   isDocumentNullified,
   isUserRegistered,
   isUserRegisteredWithAlternativeCSCA,
-} from '@src/utils/proving/validateDocument';
+} from '@/utils/proving/validateDocument';
 
 const { trackEvent } = analytics();
 
@@ -879,7 +879,7 @@ export const useProvingStore = create<ProvingState>((set, get) => {
           try {
             const {
               registerDeviceToken,
-            } = require('@src/utils/notifications/notificationService');
+            } = require('@/utils/notifications/notificationService');
             const isMockPassport = passportData?.mock;
             trackEvent(ProofEvents.DEVICE_TOKEN_REG_STARTED);
             await registerDeviceToken(uuid, fcmToken, isMockPassport);
diff --git a/app/src/utils/proving/validateDocument.ts b/app/src/utils/proving/validateDocument.ts
index b8c419a07..302bf9f33 100644
--- a/app/src/utils/proving/validateDocument.ts
+++ b/app/src/utils/proving/validateDocument.ts
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { poseidon2, poseidon5 } from 'poseidon-lite';
+import { LeanIMT } from '@openpassport/zk-kit-lean-imt';
 
 import {
   API_URL,
@@ -20,8 +21,7 @@ import {
 } from '@selfxyz/common/utils/passports';
 import { getLeafDscTree } from '@selfxyz/common/utils/trees';
 
-import { LeanIMT } from '@openpassport/zk-kit-lean-imt';
-import { DocumentEvents } from '@src/consts/analytics';
+import { DocumentEvents } from '@/consts/analytics';
 import {
   getAllDocuments,
   loadDocumentCatalog,
@@ -30,9 +30,9 @@ import {
   setSelectedDocument,
   storePassportData,
   updateDocumentRegistrationState,
-} from '@src/providers/passportDataProvider';
-import { useProtocolStore } from '@src/stores/protocolStore';
-import analytics from '@src/utils/analytics';
+} from '@/providers/passportDataProvider';
+import { useProtocolStore } from '@/stores/protocolStore';
+import analytics from '@/utils/analytics';
 
 const { trackEvent } = analytics();
 
diff --git a/app/src/utils/testingUtils.ts b/app/src/utils/testingUtils.ts
index 1063ce707..5b5c3cce8 100644
--- a/app/src/utils/testingUtils.ts
+++ b/app/src/utils/testingUtils.ts
@@ -2,7 +2,7 @@
 
 import Keychain from 'react-native-keychain';
 
-import { loadDocumentCatalog } from '@src/providers/passportDataProvider';
+import { loadDocumentCatalog } from '@/providers/passportDataProvider';
 
 /**
  * Testing utility function to clear the document catalog for migration testing.
diff --git a/app/tamagui.config.ts b/app/tamagui.config.ts
index 01a050bec..d9aece3e4 100644
--- a/app/tamagui.config.ts
+++ b/app/tamagui.config.ts
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { createFont, createTamagui } from 'tamagui';
-
 import { config } from '@tamagui/config/v3';
 
 const commonSizes = {
diff --git a/app/tests/src/RemoteConfig.test.ts b/app/tests/src/RemoteConfig.test.ts
index fd45bd153..d39efbcc0 100644
--- a/app/tests/src/RemoteConfig.test.ts
+++ b/app/tests/src/RemoteConfig.test.ts
@@ -3,6 +3,7 @@
 // Now import the module under test
 // Import the mocked AsyncStorage for test controls
 import AsyncStorage from '@react-native-async-storage/async-storage';
+
 import {
   clearAllLocalOverrides,
   clearLocalOverride,
@@ -10,7 +11,7 @@ import {
   getFeatureFlag,
   getLocalOverrides,
   setLocalOverride,
-} from '@src/RemoteConfig';
+} from '@/RemoteConfig';
 
 // Mock AsyncStorage with a default export
 jest.mock('@react-native-async-storage/async-storage', () => ({
diff --git a/app/tests/src/components/ErrorBoundary.test.tsx b/app/tests/src/components/ErrorBoundary.test.tsx
index 6ab15b69a..82bd4eaa7 100644
--- a/app/tests/src/components/ErrorBoundary.test.tsx
+++ b/app/tests/src/components/ErrorBoundary.test.tsx
@@ -2,7 +2,6 @@
 
 import React from 'react';
 import { Text } from 'react-native';
-
 import { render } from '@testing-library/react-native';
 
 const mockFlush = jest.fn();
@@ -10,14 +9,14 @@ const mockAnalytics = jest.fn(() => ({
   flush: mockFlush,
 }));
 
-jest.doMock('@src/utils/analytics', () => mockAnalytics);
-jest.mock('@src/Sentry', () => ({
+jest.doMock('@/utils/analytics', () => mockAnalytics);
+jest.mock('@/Sentry', () => ({
   captureException: jest.fn(),
 }));
 
 // Import after mocks are set up
-const ErrorBoundary = require('@src/components/ErrorBoundary').default;
-const { captureException } = require('@src/Sentry');
+const ErrorBoundary = require('@/components/ErrorBoundary').default;
+const { captureException } = require('@/Sentry');
 
 const ProblemChild = () => {
   throw new Error('boom');
diff --git a/app/tests/src/hooks/useAesopRedesign.test.ts b/app/tests/src/hooks/useAesopRedesign.test.ts
index c3c578a09..2bd7142b4 100644
--- a/app/tests/src/hooks/useAesopRedesign.test.ts
+++ b/app/tests/src/hooks/useAesopRedesign.test.ts
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
+import { renderHook } from '@testing-library/react-native';
+
 import {
   shouldShowAesopRedesign,
   useAesopRedesign,
-} from '@src/hooks/useAesopRedesign';
-import { renderHook } from '@testing-library/react-native';
+} from '@/hooks/useAesopRedesign';
 
 describe('useAesopRedesign', () => {
   describe('shouldShowAesopRedesign', () => {
diff --git a/app/tests/src/hooks/useAppUpdates.test.ts b/app/tests/src/hooks/useAppUpdates.test.ts
index 30ace7f52..91d9781a3 100644
--- a/app/tests/src/hooks/useAppUpdates.test.ts
+++ b/app/tests/src/hooks/useAppUpdates.test.ts
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { checkVersion } from 'react-native-check-version';
-
 import { useNavigation } from '@react-navigation/native';
-import { useAppUpdates } from '@src/hooks/useAppUpdates';
-import { registerModalCallbacks } from '@src/utils/modalCallbackRegistry';
 import { act, renderHook, waitFor } from '@testing-library/react-native';
 
+import { useAppUpdates } from '@/hooks/useAppUpdates';
+import { registerModalCallbacks } from '@/utils/modalCallbackRegistry';
+
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
 }));
@@ -15,11 +15,11 @@ jest.mock('react-native-check-version', () => ({
   checkVersion: jest.fn(),
 }));
 
-jest.mock('@src/utils/modalCallbackRegistry', () => ({
+jest.mock('@/utils/modalCallbackRegistry', () => ({
   registerModalCallbacks: jest.fn().mockReturnValue(1),
 }));
 
-jest.mock('@src/utils/analytics', () => () => ({
+jest.mock('@/utils/analytics', () => () => ({
   trackEvent: jest.fn(),
 }));
 
diff --git a/app/tests/src/hooks/useConnectionModal.test.ts b/app/tests/src/hooks/useConnectionModal.test.ts
index 8ab08f81c..b5d24ec1d 100644
--- a/app/tests/src/hooks/useConnectionModal.test.ts
+++ b/app/tests/src/hooks/useConnectionModal.test.ts
@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import useConnectionModal from '@src/hooks/useConnectionModal';
-import { useModal } from '@src/hooks/useModal';
 import { act, renderHook } from '@testing-library/react-native';
 
+import useConnectionModal from '@/hooks/useConnectionModal';
+import { useModal } from '@/hooks/useModal';
+
 jest.useFakeTimers();
 
-jest.mock('@src/navigation', () => ({
+jest.mock('@/navigation', () => ({
   navigationRef: { isReady: jest.fn(() => true), navigate: jest.fn() },
 }));
 
-jest.mock('@src/hooks/useModal');
+jest.mock('@/hooks/useModal');
 jest.mock('@react-native-community/netinfo', () => ({
   useNetInfo: jest
     .fn()
@@ -60,7 +61,7 @@ describe('useConnectionModal', () => {
   });
 
   it('does not show modal when hideNetworkModal is true', () => {
-    jest.doMock('@src/stores/settingStore', () => ({
+    jest.doMock('@/stores/settingStore', () => ({
       useSettingStore: jest.fn(() => true),
     }));
 
@@ -72,7 +73,7 @@ describe('useConnectionModal', () => {
   });
 
   it('does not show modal when navigation is not ready', () => {
-    const { navigationRef } = require('@src/navigation');
+    const { navigationRef } = require('@/navigation');
     navigationRef.isReady.mockReturnValue(false);
 
     renderHook(() => useConnectionModal());
diff --git a/app/tests/src/hooks/useHapticNavigation.test.ts b/app/tests/src/hooks/useHapticNavigation.test.ts
index 6d505fdae..76b7591c9 100644
--- a/app/tests/src/hooks/useHapticNavigation.test.ts
+++ b/app/tests/src/hooks/useHapticNavigation.test.ts
@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { useNavigation } from '@react-navigation/native';
-import useHapticNavigation from '@src/hooks/useHapticNavigation';
-import { impactLight, impactMedium, selectionChange } from '@src/utils/haptic';
 import { act, renderHook } from '@testing-library/react-native';
 
+import useHapticNavigation from '@/hooks/useHapticNavigation';
+import { impactLight, impactMedium, selectionChange } from '@/utils/haptic';
+
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
 }));
 
-jest.mock('@src/utils/haptic', () => ({
+jest.mock('@/utils/haptic', () => ({
   impactLight: jest.fn(),
   impactMedium: jest.fn(),
   selectionChange: jest.fn(),
diff --git a/app/tests/src/hooks/useMnemonic.test.ts b/app/tests/src/hooks/useMnemonic.test.ts
index baa37d668..3b4cda7bf 100644
--- a/app/tests/src/hooks/useMnemonic.test.ts
+++ b/app/tests/src/hooks/useMnemonic.test.ts
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import useMnemonic from '@src/hooks/useMnemonic';
-import { useAuth } from '@src/providers/authProvider';
 import { act, renderHook } from '@testing-library/react-native';
 
-jest.mock('@src/providers/authProvider', () => ({
+import useMnemonic from '@/hooks/useMnemonic';
+import { useAuth } from '@/providers/authProvider';
+
+jest.mock('@/providers/authProvider', () => ({
   useAuth: jest.fn(),
 }));
 
diff --git a/app/tests/src/hooks/useModal.test.ts b/app/tests/src/hooks/useModal.test.ts
index 221f73bd2..1c5d78042 100644
--- a/app/tests/src/hooks/useModal.test.ts
+++ b/app/tests/src/hooks/useModal.test.ts
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { useNavigation } from '@react-navigation/native';
-import { useModal } from '@src/hooks/useModal';
-import { getModalCallbacks } from '@src/utils/modalCallbackRegistry';
 import { act, renderHook } from '@testing-library/react-native';
 
+import { useModal } from '@/hooks/useModal';
+import { getModalCallbacks } from '@/utils/modalCallbackRegistry';
+
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
 }));
diff --git a/app/tests/src/hooks/useRecoveryPrompts.test.ts b/app/tests/src/hooks/useRecoveryPrompts.test.ts
index 15eb5329b..0bda01244 100644
--- a/app/tests/src/hooks/useRecoveryPrompts.test.ts
+++ b/app/tests/src/hooks/useRecoveryPrompts.test.ts
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import { useModal } from '@src/hooks/useModal';
-import useRecoveryPrompts from '@src/hooks/useRecoveryPrompts';
-import { usePassport } from '@src/providers/passportDataProvider';
-import { useSettingStore } from '@src/stores/settingStore';
 import { act, renderHook, waitFor } from '@testing-library/react-native';
 
-jest.mock('@src/hooks/useModal');
-jest.mock('@src/providers/passportDataProvider');
-jest.mock('@src/navigation', () => ({
+import { useModal } from '@/hooks/useModal';
+import useRecoveryPrompts from '@/hooks/useRecoveryPrompts';
+import { usePassport } from '@/providers/passportDataProvider';
+import { useSettingStore } from '@/stores/settingStore';
+
+jest.mock('@/hooks/useModal');
+jest.mock('@/providers/passportDataProvider');
+jest.mock('@/navigation', () => ({
   navigationRef: {
     isReady: jest.fn(() => true),
     navigate: jest.fn(),
@@ -74,7 +75,7 @@ describe('useRecoveryPrompts', () => {
   });
 
   it('does not show modal when navigation is not ready', async () => {
-    const navigationRef = require('@src/navigation').navigationRef;
+    const navigationRef = require('@/navigation').navigationRef;
     navigationRef.isReady.mockReturnValueOnce(false);
     act(() => {
       useSettingStore.setState({ loginCount: 1 });
diff --git a/app/tests/src/navigation.test.ts b/app/tests/src/navigation.test.ts
index 5d4af8007..4ed53e10b 100644
--- a/app/tests/src/navigation.test.ts
+++ b/app/tests/src/navigation.test.ts
@@ -2,7 +2,7 @@
 
 describe('navigation', () => {
   it('should have the correct navigation screens', () => {
-    const navigationScreens = require('@src/navigation').navigationScreens;
+    const navigationScreens = require('@/navigation').navigationScreens;
     const listOfScreens = Object.keys(navigationScreens).sort();
     expect(listOfScreens).toEqual([
       'AccountRecovery',
@@ -51,18 +51,18 @@ describe('navigation', () => {
     });
 
     it('should use regular passport screens when shouldShowAesopRedesign is false', () => {
-      const navigationScreens = require('@src/navigation').navigationScreens;
+      const navigationScreens = require('@/navigation').navigationScreens;
       expect(
         navigationScreens.PassportOnboarding.options.title,
       ).toBeUndefined();
     });
 
     it('should use aesop design passport screens when shouldShowAesopRedesign is true', () => {
-      jest.mock('@src/hooks/useAesopRedesign', () => ({
+      jest.mock('@/hooks/useAesopRedesign', () => ({
         shouldShowAesopRedesign: jest.fn().mockReturnValue(true),
       }));
 
-      const navigationScreens = require('@src/navigation').navigationScreens;
+      const navigationScreens = require('@/navigation').navigationScreens;
       expect(navigationScreens.PassportOnboarding.options.title).toBeDefined();
     });
   });
diff --git a/app/tests/src/providers/passportDataProvider.test.tsx b/app/tests/src/providers/passportDataProvider.test.tsx
index db1238db5..915cc0a1a 100644
--- a/app/tests/src/providers/passportDataProvider.test.tsx
+++ b/app/tests/src/providers/passportDataProvider.test.tsx
@@ -2,13 +2,13 @@
 
 import React, { useEffect, useState } from 'react';
 import { Text } from 'react-native';
+import { render, waitFor } from '@testing-library/react-native';
 
 // Import after mocking
 import {
   PassportProvider,
   usePassport,
-} from '@src/providers/passportDataProvider';
-import { render, waitFor } from '@testing-library/react-native';
+} from '@/providers/passportDataProvider';
 
 // Mock react-native-keychain before importing the module
 const mockKeychain = {
@@ -24,7 +24,7 @@ const mockAuthProvider = {
   _getSecurely: jest.fn(),
 };
 
-jest.mock('@src/providers/authProvider', () => ({
+jest.mock('@/providers/authProvider', () => ({
   useAuth: () => mockAuthProvider,
 }));
 
@@ -262,7 +262,7 @@ describe('PassportDataProvider', () => {
       jest.resetModules();
       jest.doMock('react-native-keychain', () => mockKeychain);
 
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       initializeNativeModulesLocal = passportModule.initializeNativeModules;
     });
 
@@ -338,13 +338,13 @@ describe('PassportDataProvider', () => {
       jest.resetModules();
       jest.doMock('react-native-keychain', () => mockKeychain);
 
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       migrateFromLegacyStorageLocal = passportModule.migrateFromLegacyStorage;
     });
 
     it('should skip migration if catalog already has documents', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -367,7 +367,7 @@ describe('PassportDataProvider', () => {
 
     it('should migrate legacy documents when catalog is empty', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -397,7 +397,7 @@ describe('PassportDataProvider', () => {
 
     it('should handle errors during migration gracefully', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -431,7 +431,7 @@ describe('PassportDataProvider', () => {
       jest.resetModules();
       jest.doMock('react-native-keychain', () => mockKeychain);
 
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       loadDocumentCatalogLocal = passportModule.loadDocumentCatalog;
     });
 
@@ -442,7 +442,7 @@ describe('PassportDataProvider', () => {
       jest.doMock('react-native-keychain', () => undefined);
 
       // Re-import the module after mocking to ensure mock is applied
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       const loadDocumentCatalogLocal = passportModule.loadDocumentCatalog;
 
       const result = await loadDocumentCatalogLocal();
@@ -473,7 +473,7 @@ describe('PassportDataProvider', () => {
 
     it('should return parsed catalog when it exists and native modules are ready', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -492,7 +492,7 @@ describe('PassportDataProvider', () => {
 
     it('should handle malformed JSON and return empty documents array', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -518,7 +518,7 @@ describe('PassportDataProvider', () => {
 
     it('should handle invalid catalog structure and return the parsed structure', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -537,7 +537,7 @@ describe('PassportDataProvider', () => {
 
     it('should handle JSON parsing exceptions and return empty documents array', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -563,7 +563,7 @@ describe('PassportDataProvider', () => {
 
     it('should handle null/undefined password and return empty documents array', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
@@ -598,7 +598,7 @@ describe('PassportDataProvider', () => {
 
     it('should handle empty string password and return empty documents array', async () => {
       // First initialize native modules to set the flag
-      const passportModule = require('@src/providers/passportDataProvider');
+      const passportModule = require('@/providers/passportDataProvider');
       mockKeychain.getGenericPassword = jest
         .fn()
         .mockResolvedValueOnce({ password: 'test' }) // For initializeNativeModules
diff --git a/app/tests/src/providers/remoteConfigProvider.test.tsx b/app/tests/src/providers/remoteConfigProvider.test.tsx
index f070416a9..49f05aaf4 100644
--- a/app/tests/src/providers/remoteConfigProvider.test.tsx
+++ b/app/tests/src/providers/remoteConfigProvider.test.tsx
@@ -2,16 +2,16 @@
 
 import React from 'react';
 import { Text } from 'react-native';
+import { render, waitFor } from '@testing-library/react-native';
 
 import {
   RemoteConfigProvider,
   useRemoteConfig,
-} from '@src/providers/remoteConfigProvider';
-import { initRemoteConfig } from '@src/RemoteConfig';
-import { render, waitFor } from '@testing-library/react-native';
+} from '@/providers/remoteConfigProvider';
+import { initRemoteConfig } from '@/RemoteConfig';
 
 // Mock the RemoteConfig module
-jest.mock('@src/RemoteConfig', () => ({
+jest.mock('@/RemoteConfig', () => ({
   initRemoteConfig: jest.fn(),
 }));
 
diff --git a/app/tests/src/stores/database.test.ts b/app/tests/src/stores/database.test.ts
index 930b5792a..6fed6aa9b 100644
--- a/app/tests/src/stores/database.test.ts
+++ b/app/tests/src/stores/database.test.ts
@@ -2,8 +2,8 @@
 
 import SQLite from 'react-native-sqlite-storage';
 
-import { database } from '@src/stores/database';
-import { ProofStatus } from '@src/stores/proof-types';
+import { database } from '@/stores/database';
+import { ProofStatus } from '@/stores/proof-types';
 
 // Mock react-native-sqlite-storage
 jest.mock('react-native-sqlite-storage', () => ({
diff --git a/app/tests/src/stores/proofHistoryStore.test.ts b/app/tests/src/stores/proofHistoryStore.test.ts
index 094df8f5e..9c564e135 100644
--- a/app/tests/src/stores/proofHistoryStore.test.ts
+++ b/app/tests/src/stores/proofHistoryStore.test.ts
@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { io } from 'socket.io-client';
-
-import { database } from '@src/stores/database';
-import { ProofStatus } from '@src/stores/proof-types';
-import { useProofHistoryStore } from '@src/stores/proofHistoryStore';
 import { act } from '@testing-library/react-native';
 
+import { database } from '@/stores/database';
+import { ProofStatus } from '@/stores/proof-types';
+import { useProofHistoryStore } from '@/stores/proofHistoryStore';
+
 // Mock socket.io-client
 jest.mock('socket.io-client', () => ({
   io: jest.fn(),
 }));
 
 // Mock database
-jest.mock('@src/stores/database', () => ({
+jest.mock('@/stores/database', () => ({
   database: {
     init: jest.fn(),
     insertProof: jest.fn(),
diff --git a/app/tests/src/stores/settingStore.test.ts b/app/tests/src/stores/settingStore.test.ts
index 242ad9987..f1d5b8f2a 100644
--- a/app/tests/src/stores/settingStore.test.ts
+++ b/app/tests/src/stores/settingStore.test.ts
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import { useSettingStore } from '@src/stores/settingStore';
 import { act } from '@testing-library/react-native';
 
+import { useSettingStore } from '@/stores/settingStore';
+
 describe('settingStore', () => {
   beforeEach(() => {
     act(() => {
diff --git a/app/tests/src/utils/formatUserId.test.ts b/app/tests/src/utils/formatUserId.test.ts
index 888c9a3fe..2960559de 100644
--- a/app/tests/src/utils/formatUserId.test.ts
+++ b/app/tests/src/utils/formatUserId.test.ts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import { formatUserId } from '@src/utils/formatUserId';
+import { formatUserId } from '@/utils/formatUserId';
 
 describe('formatUserId', () => {
   // Test data constants for better maintainability
diff --git a/app/tests/src/utils/jsonUtils.test.ts b/app/tests/src/utils/jsonUtils.test.ts
index b4e3a80cf..f81868dc1 100644
--- a/app/tests/src/utils/jsonUtils.test.ts
+++ b/app/tests/src/utils/jsonUtils.test.ts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import { safeJsonParse, safeJsonStringify } from '@src/utils/jsonUtils';
+import { safeJsonParse, safeJsonStringify } from '@/utils/jsonUtils';
 
 describe('JSON Utils', () => {
   describe('safeJsonParse', () => {
diff --git a/app/tests/utils/analytics.test.ts b/app/tests/utils/analytics.test.ts
index 2eb8bd1d6..507b9d432 100644
--- a/app/tests/utils/analytics.test.ts
+++ b/app/tests/utils/analytics.test.ts
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import analytics from '@src/utils/analytics';
+import analytics from '@/utils/analytics';
 
 // Mock the Segment client
-jest.mock('@src/Segment', () => ({
+jest.mock('@/Segment', () => ({
   createSegmentClient: jest.fn(() => ({
     track: jest.fn(),
     screen: jest.fn(),
diff --git a/app/tests/utils/cloudBackup.test.ts b/app/tests/utils/cloudBackup.test.ts
index 434cabd78..8e60f7ca6 100644
--- a/app/tests/utils/cloudBackup.test.ts
+++ b/app/tests/utils/cloudBackup.test.ts
@@ -3,13 +3,13 @@
 import { ethers } from 'ethers';
 import { Platform } from 'react-native';
 import { CloudStorage } from 'react-native-cloud-storage';
-
 // Import after mocks
 import { GDrive } from '@robinbobin/react-native-google-drive-api-wrapper';
-import { useBackupMnemonic } from '@src/utils/cloudBackup';
-import { createGDrive } from '@src/utils/cloudBackup/google';
 import { renderHook } from '@testing-library/react-native';
 
+import { useBackupMnemonic } from '@/utils/cloudBackup';
+import { createGDrive } from '@/utils/cloudBackup/google';
+
 // Mock dependencies
 jest.mock('react-native-cloud-storage', () => ({
   CloudStorage: {
@@ -35,8 +35,8 @@ jest.mock('@robinbobin/react-native-google-drive-api-wrapper', () => ({
   },
 }));
 
-jest.mock('@src/utils/cloudBackup/google', () => {
-  const originalModule = jest.requireActual('@src/utils/cloudBackup/google');
+jest.mock('@/utils/cloudBackup/google', () => {
+  const originalModule = jest.requireActual('@/utils/cloudBackup/google');
   return {
     ...originalModule,
     createGDrive: jest.fn(),
diff --git a/app/tests/utils/deeplinks.test.ts b/app/tests/utils/deeplinks.test.ts
index 8c1300bf1..262642ff5 100644
--- a/app/tests/utils/deeplinks.test.ts
+++ b/app/tests/utils/deeplinks.test.ts
@@ -2,15 +2,15 @@
 
 import { Linking } from 'react-native';
 
-jest.mock('@src/navigation', () => ({
+jest.mock('@/navigation', () => ({
   navigationRef: { navigate: jest.fn(), isReady: jest.fn(() => true) },
 }));
 
 const mockSelfAppStore = { useSelfAppStore: { getState: jest.fn() } };
-jest.mock('@src/stores/selfAppStore', () => mockSelfAppStore);
+jest.mock('@/stores/selfAppStore', () => mockSelfAppStore);
 
 const mockUserStore = { default: { getState: jest.fn() } };
-jest.mock('@src/stores/userStore', () => ({
+jest.mock('@/stores/userStore', () => ({
   __esModule: true,
   ...mockUserStore,
 }));
@@ -30,7 +30,7 @@ describe('deeplinks', () => {
       handleUrl,
       parseAndValidateUrlParams,
       setupUniversalLinkListenerInNavigation,
-    } = require('@src/utils/deeplinks'));
+    } = require('@/utils/deeplinks'));
     setSelfApp = jest.fn();
     startAppListener = jest.fn();
     cleanSelfApp = jest.fn();
@@ -57,7 +57,7 @@ describe('deeplinks', () => {
 
       expect(setSelfApp).toHaveBeenCalledWith(selfApp);
       expect(startAppListener).toHaveBeenCalledWith('abc');
-      const { navigationRef } = require('@src/navigation');
+      const { navigationRef } = require('@/navigation');
       expect(navigationRef.navigate).toHaveBeenCalledWith('ProveScreen');
     });
 
@@ -67,7 +67,7 @@ describe('deeplinks', () => {
 
       expect(cleanSelfApp).toHaveBeenCalled();
       expect(startAppListener).toHaveBeenCalledWith('123');
-      const { navigationRef } = require('@src/navigation');
+      const { navigationRef } = require('@/navigation');
       expect(navigationRef.navigate).toHaveBeenCalledWith('ProveScreen');
     });
 
@@ -83,7 +83,7 @@ describe('deeplinks', () => {
         birthDate: undefined,
         gender: undefined,
       });
-      const { navigationRef } = require('@src/navigation');
+      const { navigationRef } = require('@/navigation');
       expect(navigationRef.navigate).toHaveBeenCalledWith('MockDataDeepLink');
     });
 
@@ -95,7 +95,7 @@ describe('deeplinks', () => {
       const url = 'scheme://open?selfApp=%7Binvalid';
       handleUrl(url);
 
-      const { navigationRef } = require('@src/navigation');
+      const { navigationRef } = require('@/navigation');
       expect(navigationRef.navigate).toHaveBeenCalledWith('QRCodeTrouble');
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         'Error parsing selfApp:',
@@ -116,7 +116,7 @@ describe('deeplinks', () => {
       const url = 'scheme://open?sessionId=abc<script>alert("xss")</script>';
       handleUrl(url);
 
-      const { navigationRef } = require('@src/navigation');
+      const { navigationRef } = require('@/navigation');
       expect(navigationRef.navigate).toHaveBeenCalledWith('QRCodeTrouble');
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         'No sessionId or selfApp found in the data',
@@ -134,7 +134,7 @@ describe('deeplinks', () => {
       const url = 'scheme://open?sessionId=%ZZ'; // Invalid URL encoding
       handleUrl(url);
 
-      const { navigationRef } = require('@src/navigation');
+      const { navigationRef } = require('@/navigation');
       expect(navigationRef.navigate).toHaveBeenCalledWith('QRCodeTrouble');
 
       consoleErrorSpy.mockRestore();
@@ -330,7 +330,7 @@ describe('deeplinks', () => {
       jest.resetModules();
       const {
         parseAndValidateUrlParams: mockedParser,
-      } = require('@src/utils/deeplinks');
+      } = require('@/utils/deeplinks');
 
       const url = 'scheme://open?sessionId=duplicate&sessionId=values';
       const result = mockedParser(url);
diff --git a/app/tests/utils/ethers.test.ts b/app/tests/utils/ethers.test.ts
index 190f86e68..7eb369410 100644
--- a/app/tests/utils/ethers.test.ts
+++ b/app/tests/utils/ethers.test.ts
@@ -3,7 +3,7 @@
 // Register crypto polyfills
 import { ethers } from 'ethers';
 
-import '@src/utils/ethers';
+import '@/utils/ethers';
 
 describe('ethers crypto polyfills', () => {
   it('randomBytes returns requested length and unique values', () => {
diff --git a/app/tests/utils/modalCallbackRegistry.test.ts b/app/tests/utils/modalCallbackRegistry.test.ts
index 99092d1b6..131c32e96 100644
--- a/app/tests/utils/modalCallbackRegistry.test.ts
+++ b/app/tests/utils/modalCallbackRegistry.test.ts
@@ -4,7 +4,7 @@ import {
   getModalCallbacks,
   registerModalCallbacks,
   unregisterModalCallbacks,
-} from '@src/utils/modalCallbackRegistry';
+} from '@/utils/modalCallbackRegistry';
 
 describe('modalCallbackRegistry', () => {
   const registeredIds: number[] = [];
diff --git a/app/tests/utils/nfcScanner.test.ts b/app/tests/utils/nfcScanner.test.ts
index 72e786220..70a19c165 100644
--- a/app/tests/utils/nfcScanner.test.ts
+++ b/app/tests/utils/nfcScanner.test.ts
@@ -2,7 +2,7 @@
 
 import { Platform } from 'react-native';
 
-import { parseScanResponse } from '@src/utils/nfcScanner';
+import { parseScanResponse } from '@/utils/nfcScanner';
 
 describe('parseScanResponse', () => {
   beforeEach(() => {
diff --git a/app/tests/utils/notificationService.test.ts b/app/tests/utils/notificationService.test.ts
index d5b8225f9..3945a37ea 100644
--- a/app/tests/utils/notificationService.test.ts
+++ b/app/tests/utils/notificationService.test.ts
@@ -2,7 +2,7 @@
 
 import { PermissionsAndroid, Platform } from 'react-native';
 
-jest.unmock('@src/utils/notifications/notificationService');
+jest.unmock('@/utils/notifications/notificationService');
 
 jest.mock('@react-native-firebase/messaging', () => {
   const instance = {
@@ -28,7 +28,7 @@ describe('notificationService', () => {
       ._instance;
     messagingMock.requestPermission.mockReset();
     messagingMock.getToken.mockReset();
-    service = require('@src/utils/notifications/notificationService');
+    service = require('@/utils/notifications/notificationService');
     (fetch as jest.Mock).mockResolvedValue({ ok: true, text: jest.fn() });
     messagingMock.requestPermission.mockResolvedValue(1);
     messagingMock.getToken.mockResolvedValue('token');
diff --git a/app/tests/utils/proving/coseVerify.test.ts b/app/tests/utils/proving/coseVerify.test.ts
index 64b440b48..2843b9343 100644
--- a/app/tests/utils/proving/coseVerify.test.ts
+++ b/app/tests/utils/proving/coseVerify.test.ts
@@ -4,7 +4,7 @@ import { Buffer } from 'buffer';
 
 const { decode, encode } = require('@stablelib/cbor');
 
-const cose = require('@src/utils/proving/cose').default;
+const cose = require('@/utils/proving/cose').default;
 
 // Simplified mock for better test control
 const mockVerifyFn = jest.fn();
diff --git a/app/tests/utils/proving/loadingScreenStateText.test.ts b/app/tests/utils/proving/loadingScreenStateText.test.ts
index 6a9b15cef..50204be58 100644
--- a/app/tests/utils/proving/loadingScreenStateText.test.ts
+++ b/app/tests/utils/proving/loadingScreenStateText.test.ts
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import type { PassportMetadata } from '@src/utils/proving/loadingScreenStateText';
+import type { PassportMetadata } from '@/utils/proving/loadingScreenStateText';
 import {
   getLoadingScreenText,
   getProvingTimeEstimate,
-} from '@src/utils/proving/loadingScreenStateText';
-import type { ProvingStateType } from '@src/utils/proving/provingMachine';
+} from '@/utils/proving/loadingScreenStateText';
+import type { ProvingStateType } from '@/utils/proving/provingMachine';
 
 describe('stateLoadingScreenText', () => {
   // Default metadata for basic tests
diff --git a/app/tests/utils/proving/provingMachine.generatePayload.test.ts b/app/tests/utils/proving/provingMachine.generatePayload.test.ts
index 4ee0a7494..031cec1d4 100644
--- a/app/tests/utils/proving/provingMachine.generatePayload.test.ts
+++ b/app/tests/utils/proving/provingMachine.generatePayload.test.ts
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-import { useProtocolStore } from '@src/stores/protocolStore';
-import { useSelfAppStore } from '@src/stores/selfAppStore';
-import { useProvingStore } from '@src/utils/proving/provingMachine';
+import { useProtocolStore } from '@/stores/protocolStore';
+import { useSelfAppStore } from '@/stores/selfAppStore';
+import { useProvingStore } from '@/utils/proving/provingMachine';
 
 jest.mock('xstate', () => {
   const actual = jest.requireActual('xstate') as any;
@@ -10,12 +10,12 @@ jest.mock('xstate', () => {
   return { ...actual, createActor: jest.fn(() => actorMock) };
 });
 
-jest.mock('@src/utils/analytics', () => () => ({
+jest.mock('@/utils/analytics', () => () => ({
   trackEvent: jest.fn(),
 }));
 
 // Mock the proving inputs to return predictable data
-jest.mock('@src/utils/proving/provingInputs', () => ({
+jest.mock('@/utils/proving/provingInputs', () => ({
   generateTEEInputsRegister: jest.fn(() => ({
     inputs: { r: 1 },
     circuitName: 'reg',
@@ -37,8 +37,8 @@ jest.mock('@src/utils/proving/provingInputs', () => ({
 }));
 
 // Mock the proving utils
-jest.mock('@src/utils/proving/provingUtils', () => {
-  const actual = jest.requireActual('@src/utils/proving/provingUtils') as any;
+jest.mock('@/utils/proving/provingUtils', () => {
+  const actual = jest.requireActual('@/utils/proving/provingUtils') as any;
   return {
     ...actual,
     getPayload: jest.fn(() => ({ mocked: true })),
@@ -53,12 +53,12 @@ jest.mock('@src/utils/proving/provingUtils', () => {
 const {
   getPayload,
   encryptAES256GCM,
-} = require('@src/utils/proving/provingUtils');
+} = require('@/utils/proving/provingUtils');
 const {
   generateTEEInputsRegister,
   generateTEEInputsDSC,
   generateTEEInputsDisclose,
-} = require('@src/utils/proving/provingInputs');
+} = require('@/utils/proving/provingInputs');
 
 describe('_generatePayload', () => {
   beforeEach(() => {
diff --git a/app/tests/utils/proving/provingUtils.test.ts b/app/tests/utils/proving/provingUtils.test.ts
index cbbbf3065..8588443bb 100644
--- a/app/tests/utils/proving/provingUtils.test.ts
+++ b/app/tests/utils/proving/provingUtils.test.ts
@@ -6,7 +6,7 @@ import {
   encryptAES256GCM,
   getPayload,
   getWSDbRelayerUrl,
-} from '@src/utils/proving/provingUtils';
+} from '@/utils/proving/provingUtils';
 
 describe('provingUtils', () => {
   it('encryptAES256GCM encrypts and decrypts correctly', () => {
diff --git a/app/tests/web-build-render.test.ts b/app/tests/web-build-render.test.ts
index 3a8d45b4e..86e814440 100644
--- a/app/tests/web-build-render.test.ts
+++ b/app/tests/web-build-render.test.ts
@@ -5,7 +5,6 @@
  */
 
 import { execSync, spawn } from 'child_process';
-
 import { afterAll, beforeAll, describe, expect, test } from '@jest/globals';
 
 // Ensure fetch is available (Node.js 18+ has built-in fetch)
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 33adae612..cdd778df1 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -13,8 +13,7 @@
         "../packages/mobile-sdk-alpha/src",
         "../packages/mobile-sdk-alpha/dist"
       ],
-      "@src": ["./src"],
-      "@src/*": ["./src/*"]
+      "@/*": ["./src/*"]
     }
   },
   "include": ["src/**/*"],
diff --git a/app/tsconfig.test.json b/app/tsconfig.test.json
index d5ac7dfc2..157087ce3 100644
--- a/app/tsconfig.test.json
+++ b/app/tsconfig.test.json
@@ -5,8 +5,8 @@
       "@env": ["./env.ts"],
       "@selfxyz/common": ["../common"],
       "@selfxyz/common/*": ["../common/*"],
-      "@src": ["./src"],
-      "@src/*": ["./src/*"],
+      "@": ["./src"],
+      "@/*": ["./src/*"],
       "@tests": ["./tests/src"],
       "@tests/*": ["./tests/src/*"]
     }
diff --git a/app/vite.config.ts b/app/vite.config.ts
index 3bec072a1..d4c4e1c4a 100644
--- a/app/vite.config.ts
+++ b/app/vite.config.ts
@@ -5,7 +5,6 @@ import { visualizer } from 'rollup-plugin-visualizer';
 import { fileURLToPath } from 'url';
 import { defineConfig } from 'vite';
 import svgr from 'vite-plugin-svgr';
-
 import { tamaguiPlugin } from '@tamagui/vite-plugin';
 import react from '@vitejs/plugin-react-swc';
 
@@ -30,7 +29,7 @@ export default defineConfig({
     alias: {
       '@env': path.resolve(__dirname, 'env.ts'),
       '/src': path.resolve(__dirname, 'src'),
-      '@src': path.resolve(__dirname, 'src'),
+      '@': path.resolve(__dirname, 'src'),
       'react-native-svg': 'react-native-svg-web',
       'lottie-react-native': 'lottie-react',
       'react-native-safe-area-context': path.resolve(
diff --git a/packages/mobile-sdk-alpha/src/browser.ts b/packages/mobile-sdk-alpha/src/browser.ts
index 5b473a15b..92da5366c 100644
--- a/packages/mobile-sdk-alpha/src/browser.ts
+++ b/packages/mobile-sdk-alpha/src/browser.ts
@@ -18,6 +18,7 @@ export type {
   RegistrationInput,
   RegistrationStatus,
   SDKEvent,
+  SDKEventMap,
   ScanMode,
   ScanOpts,
   ScanResult,
diff --git a/packages/mobile-sdk-alpha/src/client.ts b/packages/mobile-sdk-alpha/src/client.ts
index 0d3febae3..61f4f43ea 100644
--- a/packages/mobile-sdk-alpha/src/client.ts
+++ b/packages/mobile-sdk-alpha/src/client.ts
@@ -12,6 +12,7 @@ import type {
   ScanOpts,
   ScanResult,
   SDKEvent,
+  SDKEventMap,
   SelfClient,
   Unsubscribe,
   ValidationInput,
@@ -43,14 +44,25 @@ export function createSelfClient({ config, adapters }: { config: Config; adapter
   }
 
   const _adapters = { ...optionalDefaults, ...adapters } as Adapters;
-  const _cfg = { ...defaultConfig, ...config };
   const listeners = new Map<SDKEvent, Set<(p: any) => void>>();
 
-  function on(event: SDKEvent, cb: (payload: any) => void): Unsubscribe {
+  function on<E extends SDKEvent>(event: E, cb: (payload: SDKEventMap[E]) => void): Unsubscribe {
     const set = listeners.get(event) ?? new Set();
-    set.add(cb);
+    set.add(cb as any);
     listeners.set(event, set);
-    return () => set.delete(cb);
+    return () => set.delete(cb as any);
+  }
+
+  function emit<E extends SDKEvent>(event: E, payload: SDKEventMap[E]): void {
+    const set = listeners.get(event);
+    if (!set) return;
+    for (const cb of Array.from(set)) {
+      try {
+        (cb as (p: SDKEventMap[E]) => void)(payload);
+      } catch (err) {
+        _adapters.logger.log('error', `event-listener error for event '${event}'`, { event, error: err });
+      }
+    }
   }
 
   async function scanDocument(opts: ScanOpts & { signal?: AbortSignal }): Promise<ScanResult> {
@@ -76,7 +88,7 @@ export function createSelfClient({ config, adapters }: { config: Config; adapter
     if (!adapters.network) throw notImplemented('network');
     if (!adapters.crypto) throw notImplemented('crypto');
     const timeoutMs = opts.timeoutMs ?? cfg.timeouts?.proofMs ?? defaultConfig.timeouts.proofMs;
-    void timeoutMs;
+    void _adapters.clock.sleep(timeoutMs!, opts.signal).then(() => emit('error', new Error('timeout')));
     return {
       id: 'stub',
       status: 'pending',
@@ -91,5 +103,6 @@ export function createSelfClient({ config, adapters }: { config: Config; adapter
     checkRegistration,
     generateProof,
     on,
+    emit,
   };
 }
diff --git a/packages/mobile-sdk-alpha/src/index.ts b/packages/mobile-sdk-alpha/src/index.ts
index 63d9616f5..3a94174f8 100644
--- a/packages/mobile-sdk-alpha/src/index.ts
+++ b/packages/mobile-sdk-alpha/src/index.ts
@@ -16,6 +16,7 @@ export type {
   RegistrationInput,
   RegistrationStatus,
   SDKEvent,
+  SDKEventMap,
   ScanMode,
   ScanOpts,
   ScanResult,
diff --git a/packages/mobile-sdk-alpha/src/types/public.ts b/packages/mobile-sdk-alpha/src/types/public.ts
index 4805e86ce..e1989de27 100644
--- a/packages/mobile-sdk-alpha/src/types/public.ts
+++ b/packages/mobile-sdk-alpha/src/types/public.ts
@@ -88,7 +88,12 @@ export interface RegistrationStatus {
   reason?: string;
 }
 
-export type SDKEvent = 'progress' | 'state' | 'error';
+export interface SDKEventMap {
+  progress: Progress;
+  state: string;
+  error: Error;
+}
+export type SDKEvent = keyof SDKEventMap;
 
 export type ScanMode = 'mrz' | 'nfc' | 'qr';
 export interface ScanOpts {
@@ -121,7 +126,8 @@ export interface SelfClient {
       timeoutMs?: number;
     },
   ): Promise<ProofHandle>;
-  on(event: SDKEvent, cb: (payload: any) => void): Unsubscribe;
+  on<E extends SDKEvent>(event: E, cb: (payload: SDKEventMap[E]) => void): Unsubscribe;
+  emit<E extends SDKEvent>(event: E, payload: SDKEventMap[E]): void;
 }
 export type Unsubscribe = () => void;
 export interface StorageAdapter {