diff --git a/apps/mobile/src/app/wallet/(tabs)/_layout.tsx b/apps/mobile/src/app/(home)/(tabs)/_layout.tsx similarity index 90% rename from apps/mobile/src/app/wallet/(tabs)/_layout.tsx rename to apps/mobile/src/app/(home)/(tabs)/_layout.tsx index 7fd865b2..94bc1ce3 100644 --- a/apps/mobile/src/app/wallet/(tabs)/_layout.tsx +++ b/apps/mobile/src/app/(home)/(tabs)/_layout.tsx @@ -60,24 +60,24 @@ function HeaderBottom() { tabs={[ { onPress() { - router.navigate(AppRoutes.WalletAllAssets); + router.navigate(AppRoutes.AllAssets); }, title: t`All assets`, - isActive: pathname === AppRoutes.WalletAllAssets, + isActive: pathname === AppRoutes.AllAssets, }, { onPress() { - router.navigate(AppRoutes.WalletTokens); + router.navigate(AppRoutes.Tokens); }, title: t`Tokens`, - isActive: pathname === AppRoutes.WalletTokens, + isActive: pathname === AppRoutes.Tokens, }, { onPress() { - router.navigate(AppRoutes.WalletCollectibles); + router.navigate(AppRoutes.Collectibles); }, title: t`Collectibles`, - isActive: pathname === AppRoutes.WalletCollectibles, + isActive: pathname === AppRoutes.Collectibles, }, ]} /> diff --git a/apps/mobile/src/app/wallet/(tabs)/all-assets.tsx b/apps/mobile/src/app/(home)/(tabs)/all-assets.tsx similarity index 100% rename from apps/mobile/src/app/wallet/(tabs)/all-assets.tsx rename to apps/mobile/src/app/(home)/(tabs)/all-assets.tsx diff --git a/apps/mobile/src/app/wallet/(tabs)/collectibles.tsx b/apps/mobile/src/app/(home)/(tabs)/collectibles.tsx similarity index 91% rename from apps/mobile/src/app/wallet/(tabs)/collectibles.tsx rename to apps/mobile/src/app/(home)/(tabs)/collectibles.tsx index f4bd4b5d..1e250372 100644 --- a/apps/mobile/src/app/wallet/(tabs)/collectibles.tsx +++ b/apps/mobile/src/app/(home)/(tabs)/collectibles.tsx @@ -12,7 +12,7 @@ export default function SwapScreen() { {t`Collectibles 🖼️`} router.navigate(AppRoutes.WalletBrowser)} + onPress={() => router.navigate(AppRoutes.Browser)} p="4" bg="ink.background-primary" borderRadius="sm" diff --git a/apps/mobile/src/app/wallet/(tabs)/tokens.tsx b/apps/mobile/src/app/(home)/(tabs)/tokens.tsx similarity index 100% rename from apps/mobile/src/app/wallet/(tabs)/tokens.tsx rename to apps/mobile/src/app/(home)/(tabs)/tokens.tsx diff --git a/apps/mobile/src/app/wallet/_layout.tsx b/apps/mobile/src/app/(home)/_layout.tsx similarity index 87% rename from apps/mobile/src/app/wallet/_layout.tsx rename to apps/mobile/src/app/(home)/_layout.tsx index 53832faf..22370e0b 100644 --- a/apps/mobile/src/app/wallet/_layout.tsx +++ b/apps/mobile/src/app/(home)/_layout.tsx @@ -53,7 +53,7 @@ export default function StackLayout() { ); } - function NavigationWalletSettings(title: string = t`Settings`) { + function WalletNavigationSettings(title: string = t`Settings`) { return ( NavigationHeader }} /> NavigationHeader }} /> - NavigationHeaderHome }} /> + NavigationHeaderHome }} /> NavigationBackSimple }} /> NavigationBackSimple }} /> NavigationBackSimple }} /> @@ -125,29 +125,29 @@ export default function StackLayout() { options={{ header: () => NavigationSettings(t`Help`) }} /> NavigationWalletSettings() }} + name="settings/wallet/index" + options={{ header: () => WalletNavigationSettings() }} /> NavigationWalletSettings() }} + name="settings/wallet/hidden-accounts" + options={{ header: () => WalletNavigationSettings() }} /> NavigationWalletSettings(props.options.title) }} + name="settings/wallet/configure/[wallet]/[account]/index" + options={{ header: props => WalletNavigationSettings(props.options.title) }} /> NavigationBackSimple }} /> NavigationWalletSettings(props.options.title), + header: props => WalletNavigationSettings(props.options.title), }} /> NavigationBackSimple }} /> router.navigate(AppRoutes.WalletDeveloperConsoleWalletManager)} + onPress={() => router.navigate(AppRoutes.DeveloperConsoleWalletManager)} /> router.navigate(AppRoutes.WalletDeveloperBitcoinScratchPad)} + onPress={() => router.navigate(AppRoutes.DeveloperBitcoinScratchPad)} /> ; +export default function HomeScreen() { + return ; } diff --git a/apps/mobile/src/app/wallet/receive.tsx b/apps/mobile/src/app/(home)/receive.tsx similarity index 100% rename from apps/mobile/src/app/wallet/receive.tsx rename to apps/mobile/src/app/(home)/receive.tsx diff --git a/apps/mobile/src/app/wallet/recover-wallet.tsx b/apps/mobile/src/app/(home)/recover-wallet.tsx similarity index 100% rename from apps/mobile/src/app/wallet/recover-wallet.tsx rename to apps/mobile/src/app/(home)/recover-wallet.tsx diff --git a/apps/mobile/src/app/wallet/secure-your-wallet.tsx b/apps/mobile/src/app/(home)/secure-your-wallet.tsx similarity index 100% rename from apps/mobile/src/app/wallet/secure-your-wallet.tsx rename to apps/mobile/src/app/(home)/secure-your-wallet.tsx diff --git a/apps/mobile/src/app/wallet/send.tsx b/apps/mobile/src/app/(home)/send.tsx similarity index 100% rename from apps/mobile/src/app/wallet/send.tsx rename to apps/mobile/src/app/(home)/send.tsx diff --git a/apps/mobile/src/app/wallet/settings/display/display-cell.tsx b/apps/mobile/src/app/(home)/settings/display/display-cell.tsx similarity index 100% rename from apps/mobile/src/app/wallet/settings/display/display-cell.tsx rename to apps/mobile/src/app/(home)/settings/display/display-cell.tsx diff --git a/apps/mobile/src/app/wallet/settings/display/index.tsx b/apps/mobile/src/app/(home)/settings/display/index.tsx similarity index 100% rename from apps/mobile/src/app/wallet/settings/display/index.tsx rename to apps/mobile/src/app/(home)/settings/display/index.tsx diff --git a/apps/mobile/src/app/wallet/settings/help/index.tsx b/apps/mobile/src/app/(home)/settings/help/index.tsx similarity index 100% rename from apps/mobile/src/app/wallet/settings/help/index.tsx rename to apps/mobile/src/app/(home)/settings/help/index.tsx diff --git a/apps/mobile/src/app/wallet/settings/index.tsx b/apps/mobile/src/app/(home)/settings/index.tsx similarity index 88% rename from apps/mobile/src/app/wallet/settings/index.tsx rename to apps/mobile/src/app/(home)/settings/index.tsx index 0ec0a8f6..b5f51453 100644 --- a/apps/mobile/src/app/wallet/settings/index.tsx +++ b/apps/mobile/src/app/(home)/settings/index.tsx @@ -43,7 +43,7 @@ export default function SettingsScreen() { subtitle={t`Add, configure and remove`} Icon={WalletIcon} onPress={() => { - router.navigate(AppRoutes.WalletWalletsSettings); + router.navigate(AppRoutes.SettingsWallet); }} /> @@ -52,7 +52,7 @@ export default function SettingsScreen() { subtitle={t`Theme, bitcoin unit and more`} Icon={SunIcon} onPress={() => { - router.navigate(AppRoutes.WalletSettingsDisplay); + router.navigate(AppRoutes.SettingsDisplay); }} /> { - router.navigate(AppRoutes.WalletSettingsSecurity); + router.navigate(AppRoutes.SettingsSecurity); }} /> { - router.navigate(AppRoutes.WalletSettingsNetworks); + router.navigate(AppRoutes.SettingsNetworks); }} /> { - router.navigate(AppRoutes.WalletSettingsNotifications); + router.navigate(AppRoutes.SettingsNotifications); }} /> { - router.navigate(AppRoutes.WalletSettingsHelp); + router.navigate(AppRoutes.SettingsHelp); }} /> { router.navigate({ - pathname: AppRoutes.WalletWalletsSettingsConfigureAccountAvatar, + pathname: AppRoutes.SettingsWalletConfigureAccountAvatar, params: { wallet: fingerprint, account: accountIndex }, }); }} diff --git a/apps/mobile/src/app/wallet/wallet-settings/configure/[wallet]/index.tsx b/apps/mobile/src/app/(home)/settings/wallet/configure/[wallet]/index.tsx similarity index 98% rename from apps/mobile/src/app/wallet/wallet-settings/configure/[wallet]/index.tsx rename to apps/mobile/src/app/(home)/settings/wallet/configure/[wallet]/index.tsx index 85ad4a06..0b187c16 100644 --- a/apps/mobile/src/app/wallet/wallet-settings/configure/[wallet]/index.tsx +++ b/apps/mobile/src/app/(home)/settings/wallet/configure/[wallet]/index.tsx @@ -81,7 +81,7 @@ function ConfigureWallet({ wallet }: ConfigureWalletProps) { Icon={Eye1ClosedIcon} onPress={() => { router.navigate({ - pathname: AppRoutes.WalletWalletsSettingsConfigureViewSecretKey, + pathname: AppRoutes.SettingsWalletConfigureViewSecretKey, params: { fingerprint: wallet.fingerprint }, }); }} diff --git a/apps/mobile/src/app/wallet/wallet-settings/configure/[wallet]/view-secret-key.tsx b/apps/mobile/src/app/(home)/settings/wallet/configure/[wallet]/view-secret-key.tsx similarity index 100% rename from apps/mobile/src/app/wallet/wallet-settings/configure/[wallet]/view-secret-key.tsx rename to apps/mobile/src/app/(home)/settings/wallet/configure/[wallet]/view-secret-key.tsx diff --git a/apps/mobile/src/app/wallet/wallet-settings/hidden-accounts.tsx b/apps/mobile/src/app/(home)/settings/wallet/hidden-accounts.tsx similarity index 100% rename from apps/mobile/src/app/wallet/wallet-settings/hidden-accounts.tsx rename to apps/mobile/src/app/(home)/settings/wallet/hidden-accounts.tsx diff --git a/apps/mobile/src/app/wallet/wallet-settings/index.tsx b/apps/mobile/src/app/(home)/settings/wallet/index.tsx similarity index 96% rename from apps/mobile/src/app/wallet/wallet-settings/index.tsx rename to apps/mobile/src/app/(home)/settings/wallet/index.tsx index 171921a3..a3d76269 100644 --- a/apps/mobile/src/app/wallet/wallet-settings/index.tsx +++ b/apps/mobile/src/app/(home)/settings/wallet/index.tsx @@ -42,7 +42,7 @@ export default function SettingsScreen() { subtitle={t`${hiddenAccountsLength} hidden accounts`} Icon={Eye1ClosedIcon} onPress={() => { - router.navigate(AppRoutes.WalletWalletsSettingsHiddenAccounts); + router.navigate(AppRoutes.SettingsWalletHiddenAccounts); }} /> ; -} diff --git a/apps/mobile/src/components/action-bar/container.tsx b/apps/mobile/src/components/action-bar/container.tsx index d06a2ea5..a06a081e 100644 --- a/apps/mobile/src/components/action-bar/container.tsx +++ b/apps/mobile/src/components/action-bar/container.tsx @@ -163,21 +163,21 @@ export const ActionBarContainer = forwardRef((_, ref) => { ref={ref} left={ router.navigate(AppRoutes.WalletSend)} + onPress={() => router.navigate(AppRoutes.Send)} icon={} label={t`Send`} /> } center={ router.navigate(AppRoutes.WalletReceive)} + onPress={() => router.navigate(AppRoutes.Receive)} icon={} label={t`Receive`} /> } right={ router.navigate(AppRoutes.WalletSwap)} + onPress={() => router.navigate(AppRoutes.Swap)} icon={} label={t`Swap`} /> diff --git a/apps/mobile/src/components/add-wallet/add-wallet-sheet.tsx b/apps/mobile/src/components/add-wallet/add-wallet-sheet.tsx index aa4f39c5..150c44c4 100644 --- a/apps/mobile/src/components/add-wallet/add-wallet-sheet.tsx +++ b/apps/mobile/src/components/add-wallet/add-wallet-sheet.tsx @@ -19,12 +19,12 @@ export function AddWalletSheet({ addWalletSheetRef }: AddWalletSheetBaseProps) { const router = useRouter(); const [optionData, setOptionData] = useState(null); const createWallet = useCallback(() => { - router.navigate(AppRoutes.WalletCreateNewWallet); + router.navigate(AppRoutes.CreateNewWallet); addWalletSheetRef.current?.close(); }, [addWalletSheetRef, router]); const restoreWallet = useCallback(() => { - router.navigate(AppRoutes.WalletRecoverWallet); + router.navigate(AppRoutes.RecoverWallet); addWalletSheetRef.current?.close(); }, [addWalletSheetRef, router]); diff --git a/apps/mobile/src/components/headers/options.tsx b/apps/mobile/src/components/headers/options.tsx index 78412355..bbe32873 100644 --- a/apps/mobile/src/components/headers/options.tsx +++ b/apps/mobile/src/components/headers/options.tsx @@ -8,10 +8,10 @@ export function OptionsHeader() { return ( - router.navigate(AppRoutes.WalletSettings)}> + router.navigate(AppRoutes.Settings)}> - router.navigate(AppRoutes.WalletDeveloperConsole)}> + router.navigate(AppRoutes.DeveloperConsole)}> diff --git a/apps/mobile/src/components/wallet-settings/wallet-card.tsx b/apps/mobile/src/components/wallet-settings/wallet-card.tsx index 7e517f0c..804108c6 100644 --- a/apps/mobile/src/components/wallet-settings/wallet-card.tsx +++ b/apps/mobile/src/components/wallet-settings/wallet-card.tsx @@ -61,7 +61,7 @@ export function WalletCard({ fingerprint, variant, name }: WalletCardProps) { { router.navigate({ - pathname: AppRoutes.WalletWalletsSettingsConfigureWallet, + pathname: AppRoutes.SettingsWalletConfigureWallet, params: { fingerprint }, }); }} @@ -82,7 +82,7 @@ export function WalletCard({ fingerprint, variant, name }: WalletCardProps) { name={account.name} onPress={() => { router.navigate({ - pathname: AppRoutes.WalletWalletsSettingsConfigureAccount, + pathname: AppRoutes.SettingsWalletConfigureAccount, params: { fingerprint, account: account.accountIndex }, }); }} diff --git a/apps/mobile/src/components/widgets/accounts/accounts-widget.tsx b/apps/mobile/src/components/widgets/accounts/accounts-widget.tsx index 4403c39f..b949c9fe 100644 --- a/apps/mobile/src/components/widgets/accounts/accounts-widget.tsx +++ b/apps/mobile/src/components/widgets/accounts/accounts-widget.tsx @@ -93,7 +93,7 @@ export function AccountsWidget({ accounts, wallets }: AccountsWidgetProps) { ))} {hasAccounts ? ( - router.navigate(AppRoutes.WalletRecoverWallet)} /> + router.navigate(AppRoutes.RecoverWallet)} /> ) : ( addWalletSheetRef.current?.present()} /> )} diff --git a/apps/mobile/src/features/account-selector-sheet.tsx b/apps/mobile/src/features/account-selector-sheet.tsx index d34707dc..4a687d73 100644 --- a/apps/mobile/src/features/account-selector-sheet.tsx +++ b/apps/mobile/src/features/account-selector-sheet.tsx @@ -53,7 +53,7 @@ export function AccountSelectorSheet({ sheetRef }: { sheetRef: RefObject