flatten inefficient paths

transphorm · transphorm · commit a15d84b33f9b · 2025-11-08T12:23:35.000-08:00
diff --git a/app/src/components/LoadingUI.tsx b/app/src/components/LoadingUI.tsx
diff --git a/app/src/hooks/useAppUpdates.ts b/app/src/hooks/useAppUpdates.ts
@@ -11,7 +11,7 @@ import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useSelfClient } from '@selfxyz/mobile-sdk-alpha';
 import { AppEvents } from '@selfxyz/mobile-sdk-alpha/constants/analytics';
 
-import { registerModalCallbacks } from '@/lib/ui/modalCallbackRegistry';
+import { registerModalCallbacks } from '@/lib/modalCallbackRegistry';
 import type { RootStackParamList } from '@/navigation';
 
 export const useAppUpdates = (): [boolean, () => void, boolean] => {
diff --git a/app/src/hooks/useAppUpdates.web.ts b/app/src/hooks/useAppUpdates.web.ts
@@ -9,7 +9,7 @@ import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useSelfClient } from '@selfxyz/mobile-sdk-alpha';
 import { AppEvents } from '@selfxyz/mobile-sdk-alpha/constants/analytics';
 
-import { registerModalCallbacks } from '@/lib/ui/modalCallbackRegistry';
+import { registerModalCallbacks } from '@/lib/modalCallbackRegistry';
 import type { RootStackParamList } from '@/navigation';
 
 export const useAppUpdates = (): [boolean, () => void, boolean] => {
diff --git a/app/src/hooks/useModal.ts b/app/src/hooks/useModal.ts
@@ -10,7 +10,7 @@ import {
   getModalCallbacks,
   registerModalCallbacks,
   unregisterModalCallbacks,
-} from '@/lib/ui/modalCallbackRegistry';
+} from '@/lib/modalCallbackRegistry';
 import type { RootStackParamList } from '@/navigation';
 import type { ModalParams } from '@/screens/app/ModalScreen';
 
diff --git a/app/src/integrations/qrScanner.ts b/app/src/integrations/qrScanner.ts
diff --git a/app/src/lib/keychainSecurity.ts b/app/src/lib/keychainSecurity.ts
diff --git a/app/src/lib/modalCallbackRegistry.ts b/app/src/lib/modalCallbackRegistry.ts
diff --git a/app/src/lib/retry.ts b/app/src/lib/retry.ts
diff --git a/app/src/providers/authProvider.tsx b/app/src/providers/authProvider.tsx
@@ -17,11 +17,11 @@ import Keychain from 'react-native-keychain';
 
 import { AuthEvents } from '@selfxyz/mobile-sdk-alpha/constants/analytics';
 
-import type { GetSecureOptions } from '@/lib/security/keychainSecurity';
+import type { GetSecureOptions } from '@/lib/keychainSecurity';
 import {
   createKeychainOptions,
   detectSecurityCapabilities,
-} from '@/lib/security/keychainSecurity';
+} from '@/lib/keychainSecurity';
 import analytics from '@/services/analytics';
 import { useSettingStore } from '@/stores/settingStore';
 import type { Mnemonic } from '@/types/mnemonic';
diff --git a/app/src/providers/passportDataProvider.tsx b/app/src/providers/passportDataProvider.tsx
@@ -65,7 +65,7 @@ import { isMRZDocument } from '@selfxyz/common/utils/types';
 import type { DocumentsAdapter, SelfClient } from '@selfxyz/mobile-sdk-alpha';
 import { getAllDocuments, useSelfClient } from '@selfxyz/mobile-sdk-alpha';
 
-import { createKeychainOptions } from '@/lib/security/keychainSecurity';
+import { createKeychainOptions } from '@/lib/keychainSecurity';
 import { unsafe_getPrivateKey, useAuth } from '@/providers/authProvider';
 
 // Create safe wrapper functions to prevent undefined errors during early initialization
diff --git a/app/src/screens/app/LoadingScreen.tsx b/app/src/screens/app/LoadingScreen.tsx
@@ -14,7 +14,7 @@ import failAnimation from '@selfxyz/mobile-sdk-alpha/animations/loading/fail.jso
 import proveLoadingAnimation from '@selfxyz/mobile-sdk-alpha/animations/loading/prove.json';
 import type { ProvingStateType } from '@selfxyz/mobile-sdk-alpha/browser';
 
-import LoadingUI from '@/components/loading/LoadingUI';
+import LoadingUI from '@/components/LoadingUI';
 import { loadingScreenProgress } from '@/integrations/haptics';
 import { black, slate400, white, zinc900 } from '@/lib/colors';
 import { advercase, dinot } from '@/lib/fonts';
diff --git a/app/src/screens/app/ModalScreen.tsx b/app/src/screens/app/ModalScreen.tsx
@@ -21,7 +21,7 @@ import { white } from '@/lib/colors';
 import {
   getModalCallbacks,
   unregisterModalCallbacks,
-} from '@/lib/ui/modalCallbackRegistry';
+} from '@/lib/modalCallbackRegistry';
 
 const ModalBackDrop = styled(View, {
   display: 'flex',
diff --git a/app/src/screens/dev/DevLoadingScreen.tsx b/app/src/screens/dev/DevLoadingScreen.tsx
@@ -14,7 +14,7 @@ import type {
 import failAnimation from '@selfxyz/mobile-sdk-alpha/animations/loading/fail.json';
 import proveLoadingAnimation from '@selfxyz/mobile-sdk-alpha/animations/loading/prove.json';
 
-import LoadingUI from '@/components/loading/LoadingUI';
+import LoadingUI from '@/components/LoadingUI';
 import { slate200, slate500 } from '@/lib/colors';
 import { dinot } from '@/lib/fonts';
 import { getLoadingScreenText } from '@/proving/loadingScreenStateText';
diff --git a/app/src/screens/documents/aadhaar/AadhaarUploadScreen.tsx b/app/src/screens/documents/aadhaar/AadhaarUploadScreen.tsx
@@ -20,7 +20,7 @@ import AadhaarImage from '@/images/512w.png';
 import {
   isQRScannerPhotoLibraryAvailable,
   scanQRCodeFromPhotoLibrary,
-} from '@/integrations/qr/qrScanner';
+} from '@/integrations/qrScanner';
 import { slate100, slate200, slate400, slate500, white } from '@/lib/colors';
 import { extraYPadding } from '@/lib/constants';
 import type { RootStackParamList } from '@/navigation';
diff --git a/app/src/screens/documents/scanning/DocumentNFCScanScreen.tsx b/app/src/screens/documents/scanning/DocumentNFCScanScreen.tsx
@@ -71,7 +71,7 @@ import {
   setNfcScanningActive,
   trackNfcEvent,
 } from '@/services/analytics';
-import { sendFeedbackEmail } from '@/services/support/email';
+import { sendFeedbackEmail } from '@/services/email';
 
 const emitter =
   Platform.OS === 'android'
diff --git a/app/src/screens/documents/scanning/DocumentNFCTroubleScreen.tsx b/app/src/screens/documents/scanning/DocumentNFCTroubleScreen.tsx
@@ -16,7 +16,7 @@ import useHapticNavigation from '@/hooks/useHapticNavigation';
 import SimpleScrolledTitleLayout from '@/layouts/SimpleScrolledTitleLayout';
 import { slate500 } from '@/lib/colors';
 import { flushAllAnalytics } from '@/services/analytics';
-import { sendFeedbackEmail } from '@/services/support/email';
+import { sendFeedbackEmail } from '@/services/email';
 
 const tips: TipProps[] = [
   {
diff --git a/app/src/screens/shared/ComingSoonScreen.tsx b/app/src/screens/shared/ComingSoonScreen.tsx
@@ -26,7 +26,7 @@ import { ExpandableBottomLayout } from '@/layouts/ExpandableBottomLayout';
 import { black, slate500, white } from '@/lib/colors';
 import type { SharedRoutesParamList } from '@/navigation/types';
 import analytics from '@/services/analytics';
-import { sendCountrySupportNotification } from '@/services/support/email';
+import { sendCountrySupportNotification } from '@/services/email';
 
 const { flush: flushAnalytics } = analytics();
 
diff --git a/app/src/services/analytics.ts b/app/src/services/analytics.ts
diff --git a/app/src/services/cloud-backup/index.ts b/app/src/services/cloud-backup/index.ts
@@ -9,8 +9,8 @@ import {
   MIME_TYPES,
 } from '@robinbobin/react-native-google-drive-api-wrapper';
 
-import { withRetries } from '@/lib/async/retry';
 import { parseMnemonic } from '@/lib/crypto/mnemonic';
+import { withRetries } from '@/lib/retry';
 import { createGDrive } from '@/services/cloud-backup/google';
 import { FILE_NAME } from '@/services/cloud-backup/helpers';
 import {
diff --git a/app/src/services/cloud-backup/ios.ts b/app/src/services/cloud-backup/ios.ts
@@ -4,8 +4,8 @@
 
 import { CloudStorage } from 'react-native-cloud-storage';
 
-import { withRetries } from '@/lib/async/retry';
 import { parseMnemonic } from '@/lib/crypto/mnemonic';
+import { withRetries } from '@/lib/retry';
 import { ENCRYPTED_FILE_PATH, FOLDER } from '@/services/cloud-backup/helpers';
 import type { Mnemonic } from '@/types/mnemonic';
 
diff --git a/app/src/services/email.ts b/app/src/services/email.ts
@@ -7,7 +7,7 @@ import { getCountry, getLocales, getTimeZone } from 'react-native-localize';
 
 import { sanitizeErrorMessage } from '@selfxyz/mobile-sdk-alpha';
 
-import { version } from '../../../package.json';
+import { version } from '../../package.json';
 
 interface SendFeedbackEmailOptions {
   message: string;
diff --git a/app/tests/src/hooks/useAppUpdates.test.tsx b/app/tests/src/hooks/useAppUpdates.test.tsx
@@ -8,7 +8,7 @@ import { useNavigation } from '@react-navigation/native';
 import { act, renderHook, waitFor } from '@testing-library/react-native';
 
 import { useAppUpdates } from '@/hooks/useAppUpdates';
-import { registerModalCallbacks } from '@/lib/ui/modalCallbackRegistry';
+import { registerModalCallbacks } from '@/lib/modalCallbackRegistry';
 import { SelfClientProvider } from '@/providers/selfClientProvider';
 
 jest.mock('@react-navigation/native', () => ({
@@ -27,7 +27,7 @@ jest.mock('react-native-check-version', () => ({
   checkVersion: jest.fn(),
 }));
 
-jest.mock('@/lib/ui/modalCallbackRegistry', () => ({
+jest.mock('@/lib/modalCallbackRegistry', () => ({
   registerModalCallbacks: jest.fn().mockReturnValue(1),
 }));
 
diff --git a/app/tests/src/hooks/useModal.test.ts b/app/tests/src/hooks/useModal.test.ts
@@ -6,7 +6,7 @@ import { useNavigation } from '@react-navigation/native';
 import { act, renderHook } from '@testing-library/react-native';
 
 import { useModal } from '@/hooks/useModal';
-import { getModalCallbacks } from '@/lib/ui/modalCallbackRegistry';
+import { getModalCallbacks } from '@/lib/modalCallbackRegistry';
 
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
diff --git a/app/tests/utils/modalCallbackRegistry.test.ts b/app/tests/utils/modalCallbackRegistry.test.ts
@@ -6,7 +6,7 @@ import {
   getModalCallbacks,
   registerModalCallbacks,
   unregisterModalCallbacks,
-} from '@/lib/ui/modalCallbackRegistry';
+} from '@/lib/modalCallbackRegistry';
 
 describe('modalCallbackRegistry', () => {
   const registeredIds: number[] = [];
