Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/components/NavBar/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: BUSL-1.1
// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.

export { AadhaarNavBar } from '@/components/NavBar/AadhaarNavBar';
export { DefaultNavBar } from '@/components/NavBar/DefaultNavBar';
export { HomeNavBar } from '@/components/NavBar/HomeNavBar';
export { IdDetailsNavBar } from '@/components/NavBar/IdDetailsNavBar';
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/homeScreen/idCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: BUSL-1.1
// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.

import type { FC } from 'react';
import React, { type FC } from 'react';
import { Dimensions } from 'react-native';
import { Separator, Text, XStack, YStack } from 'tamagui';

Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { useCallback, useRef, useState } from 'react';
import { useNavigation } from '@react-navigation/native';

import type { ModalParams } from '@/screens/system/ModalScreen';
import type { ModalParams } from '@/screens/app/ModalScreen';
import {
getModalCallbacks,
registerModalCallbacks,
Expand Down
90 changes: 90 additions & 0 deletions app/src/navigation/account.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
// SPDX-License-Identifier: BUSL-1.1
// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.

import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';

import AccountRecoveryChoiceScreen from '@/screens/account/recovery/AccountRecoveryChoiceScreen';
import AccountRecoveryScreen from '@/screens/account/recovery/AccountRecoveryScreen';
import DocumentDataNotFoundScreen from '@/screens/account/recovery/DocumentDataNotFoundScreen';
import RecoverWithPhraseScreen from '@/screens/account/recovery/RecoverWithPhraseScreen';
import CloudBackupScreen from '@/screens/account/settings/CloudBackupScreen';
import SettingsScreen from '@/screens/account/settings/SettingsScreen';
import ShowRecoveryPhraseScreen from '@/screens/account/settings/ShowRecoveryPhraseScreen';
import { black, slate300, white } from '@/utils/colors';

const accountScreens = {
AccountRecovery: {
screen: AccountRecoveryScreen,
options: {
headerShown: false,
} as NativeStackNavigationOptions,
},
AccountRecoveryChoice: {
screen: AccountRecoveryChoiceScreen,
options: {
headerShown: false,
} as NativeStackNavigationOptions,
},
DocumentDataNotFound: {
screen: DocumentDataNotFoundScreen,
options: {
headerShown: false,
gestureEnabled: false,
animation: 'slide_from_bottom',
} as NativeStackNavigationOptions,
},
RecoverWithPhrase: {
screen: RecoverWithPhraseScreen,
options: {
headerTintColor: black,
title: 'Enter Recovery Phrase',
headerStyle: {
backgroundColor: black,
},
headerTitleStyle: {
color: slate300,
},
headerBackTitle: 'close',
} as NativeStackNavigationOptions,
},
CloudBackupSettings: {
screen: CloudBackupScreen,
options: {
title: 'Cloud backup',
headerStyle: {
backgroundColor: black,
},
headerTitleStyle: {
color: slate300,
},
} as NativeStackNavigationOptions,
},
Settings: {
screen: SettingsScreen,
options: {
animation: 'slide_from_bottom',
title: 'Settings',
headerStyle: {
backgroundColor: white,
},
headerTitleStyle: {
color: black,
},
} as NativeStackNavigationOptions,
config: {
screens: {},
},
},
ShowRecoveryPhrase: {
screen: ShowRecoveryPhraseScreen,
options: {
title: 'Recovery Phrase',
headerStyle: {
backgroundColor: white,
},
} as NativeStackNavigationOptions,
},
};

export default accountScreens;
38 changes: 38 additions & 0 deletions app/src/navigation/account.web.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
// SPDX-License-Identifier: BUSL-1.1
// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.

import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';

import DocumentDataNotFoundScreen from '@/screens/account/recovery/DocumentDataNotFoundScreen';
import SettingsScreen from '@/screens/account/settings/SettingsScreen';
import { black, white } from '@/utils/colors';

const accountScreens = {
DocumentDataNotFound: {
screen: DocumentDataNotFoundScreen,
options: {
headerShown: false,
gestureEnabled: false,
animation: 'slide_from_bottom',
} as NativeStackNavigationOptions,
},
Settings: {
screen: SettingsScreen,
options: {
animation: 'slide_from_bottom',
title: 'Settings',
headerStyle: {
backgroundColor: white,
},
headerTitleStyle: {
color: black,
},
} as NativeStackNavigationOptions,
config: {
screens: {},
},
},
};

export default accountScreens;
14 changes: 7 additions & 7 deletions app/src/navigation/system.tsx → app/src/navigation/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import type { NativeStackNavigationOptions } from '@react-navigation/native-stac

import type { DocumentCategory } from '@selfxyz/common/utils/types';

import DeferredLinkingInfoScreen from '@/screens/system/DeferredLinkingInfoScreen';
import LaunchScreen from '@/screens/system/LaunchScreen';
import LoadingScreen from '@/screens/system/Loading';
import ModalScreen from '@/screens/system/ModalScreen';
import SplashScreen from '@/screens/system/SplashScreen';
import DeferredLinkingInfoScreen from '@/screens/app/DeferredLinkingInfoScreen';
import LaunchScreen from '@/screens/app/LaunchScreen';
import LoadingScreen from '@/screens/app/LoadingScreen';
import ModalScreen from '@/screens/app/ModalScreen';
import SplashScreen from '@/screens/app/SplashScreen';

const systemScreens = {
const appScreens = {
Launch: {
screen: LaunchScreen,
options: {
Expand Down Expand Up @@ -56,4 +56,4 @@ const systemScreens = {
},
};

export default systemScreens;
export default appScreens;
103 changes: 0 additions & 103 deletions app/src/navigation/document.ts

This file was deleted.

Loading
Loading