From 2ebf7918c7a90f86a74c7588121e4cde29b6a36d Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@self.xyz>
Date: Tue, 3 Feb 2026 12:44:34 +0100
Subject: [PATCH] chore: self UUID namespace as a const (#1685)

---
 app/env.ts                                            | 1 -
 app/src/screens/kyc/KycSuccessScreen.tsx              | 4 ++--
 app/src/services/notifications/notificationService.ts | 7 ++-----
 app/tests/src/screens/kyc/KycSuccessScreen.test.tsx   | 6 ++----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/env.ts b/app/env.ts
index 52eacf506..5ee1d7dad 100644
--- a/app/env.ts
+++ b/app/env.ts
@@ -27,7 +27,6 @@ export const IS_TEST_BUILD = process.env.IS_TEST_BUILD === 'true';
 
 export const MIXPANEL_NFC_PROJECT_TOKEN = undefined;
 export const SEGMENT_KEY = process.env.SEGMENT_KEY;
-export const SELF_UUID_NAMESPACE = process.env.SELF_UUID_NAMESPACE;
 export const SENTRY_DSN = process.env.SENTRY_DSN;
 export const SUMSUB_TEE_URL =
   process.env.SUMSUB_TEE_URL || 'http://localhost:8080';
diff --git a/app/src/screens/kyc/KycSuccessScreen.tsx b/app/src/screens/kyc/KycSuccessScreen.tsx
index 3269da141..97c55f5a2 100644
--- a/app/src/screens/kyc/KycSuccessScreen.tsx
+++ b/app/src/screens/kyc/KycSuccessScreen.tsx
@@ -25,9 +25,9 @@ import { buttonTap } from '@/integrations/haptics';
 import type { RootStackParamList } from '@/navigation';
 import {
   getFCMToken,
-  getSelfUuidNamespace,
   registerDeviceToken,
   requestNotificationPermission,
+  SELF_UUID_NAMESPACE,
 } from '@/services/notifications/notificationService';
 import { useSettingStore } from '@/stores/settingStore';
 
@@ -58,7 +58,7 @@ const KycSuccessScreen: React.FC<KycSuccessRouteParams> = ({
         setFcmToken(token);
         trackEvent(ProofEvents.FCM_TOKEN_STORED);
 
-        const sessionId = uuidv5(userId, getSelfUuidNamespace());
+        const sessionId = uuidv5(userId, SELF_UUID_NAMESPACE);
         await registerDeviceToken(sessionId, token);
       }
     }
diff --git a/app/src/services/notifications/notificationService.ts b/app/src/services/notifications/notificationService.ts
index 159201e34..a743c7fcb 100644
--- a/app/src/services/notifications/notificationService.ts
+++ b/app/src/services/notifications/notificationService.ts
@@ -3,7 +3,6 @@
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 import { PermissionsAndroid, Platform } from 'react-native';
-import { SELF_UUID_NAMESPACE } from '@env';
 import type { FirebaseMessagingTypes } from '@react-native-firebase/messaging';
 import messaging from '@react-native-firebase/messaging';
 
@@ -15,6 +14,8 @@ import {
 } from '@/services/notifications/notificationService.shared';
 import { useSettingStore } from '@/stores/settingStore';
 
+export const SELF_UUID_NAMESPACE = '00000000-0000-8000-8000-531f00000000';
+
 export async function getFCMToken(): Promise<string | null> {
   try {
     const token = await messaging().getToken();
@@ -37,10 +38,6 @@ const error = (...args: unknown[]) => {
   if (!isTestEnv) console.error(...args);
 };
 
-export function getSelfUuidNamespace(): string {
-  return SELF_UUID_NAMESPACE ?? '';
-}
-
 export { getStateMessage };
 
 export async function isNotificationSystemReady(): Promise<{
diff --git a/app/tests/src/screens/kyc/KycSuccessScreen.test.tsx b/app/tests/src/screens/kyc/KycSuccessScreen.test.tsx
index 48d37a7d7..14baedc09 100644
--- a/app/tests/src/screens/kyc/KycSuccessScreen.test.tsx
+++ b/app/tests/src/screens/kyc/KycSuccessScreen.test.tsx
@@ -87,10 +87,10 @@ jest.mock('@/integrations/haptics', () => ({
 }));
 
 jest.mock('@/services/notifications/notificationService', () => ({
+  ...jest.requireActual('@/services/notifications/notificationService'),
   requestNotificationPermission: jest.fn(),
   getFCMToken: jest.fn(),
   registerDeviceToken: jest.fn(),
-  getSelfUuidNamespace: jest.fn(() => '1eebc0f5-eee9-45a4-9474-a0d103b9f20c'),
 }));
 
 jest.mock('@/config/sentry', () => ({
@@ -119,8 +119,6 @@ const mockUseNavigation = useNavigation as jest.MockedFunction<
 const { useSelfClient } = jest.requireMock('@selfxyz/mobile-sdk-alpha');
 const { useSettingStore } = jest.requireMock('@/stores/settingStore');
 
-const MOCK_SELF_UUID_NAMESPACE = '1eebc0f5-eee9-45a4-9474-a0d103b9f20c';
-
 describe('KycSuccessScreen', () => {
   const mockNavigate = jest.fn();
   const mockTrackEvent = jest.fn();
@@ -204,7 +202,7 @@ describe('KycSuccessScreen', () => {
     await waitFor(() => {
       // Verify device token was registered with deterministic session ID
       expect(notificationService.registerDeviceToken).toHaveBeenCalledWith(
-        uuidv5(mockUserId, MOCK_SELF_UUID_NAMESPACE),
+        uuidv5(mockUserId, notificationService.SELF_UUID_NAMESPACE),
         mockFcmToken,
       );
     });