Skip to content

Commit

Permalink
Merge pull request #13 from phuongngo0320/setup
Browse files Browse the repository at this point in the history
Setup hotfix: Nesting Navigation
  • Loading branch information
pnv2003 authored May 27, 2024
2 parents 78e9554 + f9acd8f commit d962269
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Navigation/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import { StatusBar } from "react-native";
import { NativeStackHeaderProps, createNativeStackNavigator } from "@react-navigation/native-stack";
import { NavigationContainer, NavigationProp } from "@react-navigation/native";
import { MainNavigator } from "./Main";
import { NavigationContainer, NavigationProp, NavigatorScreenParams } from "@react-navigation/native";
import { BottomTabParamList, MainNavigator } from "./Main";
import { WelcomeContainer } from "@/Screens/Welcome";
import { RootScreens } from "@/Screens";
import { SettingsContainer } from "@/Screens/Settings";
Expand All @@ -13,7 +13,7 @@ import { DefaultAppbar } from "./Appbar/DefaultAppbar";
import { MainAppbar } from "./Appbar/MainAppbar";

export type RootStackParamList = {
[RootScreens.MAIN]: undefined;
[RootScreens.MAIN]: NavigatorScreenParams<BottomTabParamList>;
[RootScreens.WELCOME]: undefined;
[RootScreens.SETTINGS]: undefined;
[RootScreens.LOGIN]: undefined;
Expand Down

0 comments on commit d962269

Please sign in to comment.