NMF-earth · PierreBresson · Dec 17, 2025 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025
diff --git a/app/navigation/Navigator/AppNavigator.tsx b/app/navigation/Navigator/AppNavigator.tsx
@@ -10,7 +10,7 @@ const AppStack = createStackNavigator();
 const App = (): React.ReactElement => {
   return (
     <NavigationContainer>
-      <AppStack.Navigator screenOptions={{ presentation: "modal" }}>
+      <AppStack.Navigator id="AppStack" screenOptions={{ presentation: "modal" }}>
         <AppStack.Screen
           name="AppStack"
           options={{ headerShown: false }}

diff --git a/app/navigation/Navigator/BottomTab/ActNavigator.tsx b/app/navigation/Navigator/BottomTab/ActNavigator.tsx
@@ -7,7 +7,7 @@ import ActDetailScreen from "../../../screens/ActDetail";
 const Stack = createStackNavigator();
 
 const ActNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="ActStack">
     <Stack.Screen
       name="ActTabNavigator"
       options={ActTabNavigator.navigationOptions}

diff --git a/app/navigation/Navigator/BottomTab/ActTabNavigator.tsx b/app/navigation/Navigator/BottomTab/ActTabNavigator.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { StyleSheet, TouchableOpacity, View } from "react-native";
 import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs";
+import { StackNavigationOptions } from "@react-navigation/stack";
 
 import { Text } from "components";
 import { t } from "utils";
@@ -75,19 +76,19 @@ const TopTabBar = ({ state, navigation }) => {
 };
 
 const ActTabNavigator: NavStatelessComponent = () => (
-  <Tab.Navigator tabBar={(props) => <TopTabBar {...props} />}>
+  <Tab.Navigator id="ActTab" tabBar={(props) => <TopTabBar {...props} />}>
     {tabs.map((tab) => (
       <Tab.Screen key={tab} name={tab} component={ActScreen} options={{ tabBarLabel: tab }} />
     ))}
   </Tab.Navigator>
 );
 
-const navigationOptions = () => ({
+const navigationOptions = (): StackNavigationOptions => ({
   ...ComponentsStyle.transitionBetweenScreenPresets,
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => <Text.H1>{t("ACT_SCREEN_TITLE")}</Text.H1>,
 });
 

diff --git a/app/navigation/Navigator/BottomTab/AddEmissionNavigator.tsx b/app/navigation/Navigator/BottomTab/AddEmissionNavigator.tsx
@@ -9,7 +9,7 @@ import BarCodeScanScreen from "../../../screens/BarCodeScan";
 const Stack = createStackNavigator();
 
 const AddEmissionNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="AddEmissionStack">
     <Stack.Screen
       name="CategorySelection"
       options={CategorySelectionScreen.navigationOptions}

diff --git a/app/navigation/Navigator/BottomTab/BudgetNavigator.tsx b/app/navigation/Navigator/BottomTab/BudgetNavigator.tsx
@@ -8,7 +8,7 @@ import AddEmissionScreen from "../../../screens/AddEmission";
 const Stack = createStackNavigator();
 
 const BudgetNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="BudgetStack">
     <Stack.Screen name="Budget" options={BudgetScreen.navigationOptions} component={BudgetScreen} />
     <Stack.Screen
       name="MonthlyBudget"

diff --git a/app/navigation/Navigator/BottomTab/EmissionsNavigator.tsx b/app/navigation/Navigator/BottomTab/EmissionsNavigator.tsx
@@ -9,7 +9,7 @@ import RecurringEmissionsScreen from "../../../screens/RecurringEmissions";
 const Stack = createStackNavigator();
 
 const EmissionsNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="EmissionsStack">
     <Stack.Screen
       name="Emissions"
       options={EmissionsScreen.navigationOptions}

diff --git a/app/navigation/Navigator/BottomTab/SettingsNavigator.tsx b/app/navigation/Navigator/BottomTab/SettingsNavigator.tsx
@@ -13,7 +13,7 @@ import LanguagesScreen from "../../../screens/Languages/LanguagesScreen";
 const Stack = createStackNavigator();
 
 const SettingsNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="SettingsStack">
     <Stack.Screen
       name="Settings"
       options={SettingsScreen.navigationOptions}

diff --git a/app/navigation/Navigator/BottomTabNavigator.tsx b/app/navigation/Navigator/BottomTabNavigator.tsx
@@ -35,7 +35,6 @@ const SettingsOptions = {
 };
 
 const AddEmissionOptions = {
-  showLabel: false,
   tabBarLabel: t("ADD_EMISSION_SCREEN_TAB_NAME"),
   tabBarIcon: ({ focused }) => <TabBarIcon focused={focused} name={"add-circle"} />,
 };
@@ -44,6 +43,7 @@ const BottomTabNavigator = (): React.ReactElement => {
   const { bottom } = useSafeAreaInsets();
   return (
     <BottomTab.Navigator
+      id="BottomTab"
       initialRouteName={"EmissionsNavigator"}
       screenOptions={{
         headerShown: false,

diff --git a/app/navigation/Navigator/InfoModalNavigator.tsx b/app/navigation/Navigator/InfoModalNavigator.tsx
@@ -6,7 +6,7 @@ import InfoModalScreen from "../../screens/InfoModal";
 const Stack = createStackNavigator();
 
 const InfoModalNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="InfoModalStack">
     <Stack.Screen
       name="InfoModal"
       options={InfoModalScreen.navigationOptions}

diff --git a/app/navigation/Navigator/ModalNavigator.tsx b/app/navigation/Navigator/ModalNavigator.tsx
@@ -8,7 +8,7 @@ import InfoModalScreen from "../../screens/InfoModal";
 const Stack = createStackNavigator();
 
 const ModalNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="ModalStack">
     <Stack.Screen
       name="ComingSoonModal"
       options={ComingSoonScreen.navigationOptions}

diff --git a/app/navigation/Navigator/PeriodicityModalNavigator.tsx b/app/navigation/Navigator/PeriodicityModalNavigator.tsx
@@ -6,7 +6,7 @@ import PeriodicityModalScreen from "../../screens/Periodicity";
 const Stack = createStackNavigator();
 
 const PeriodicityModalNavigator = (): React.ReactElement => (
-  <Stack.Navigator>
+  <Stack.Navigator id="PeriodicityModalStack">
     <Stack.Screen
       name="PeriodicityModal"
       options={PeriodicityModalScreen.navigationOptions}

diff --git a/app/navigation/Navigator/RootNavigator.tsx b/app/navigation/Navigator/RootNavigator.tsx
@@ -21,7 +21,7 @@ const RootNavigator = (): React.ReactElement => {
     useSelector(userPreferences.selectors.getAcceptedTermsOfUseVersion);
 
   return (
-    <Stack.Navigator>
+    <Stack.Navigator id="RootStack">
       {hasAcceptedTermsOfUseVersion ? (
         <Stack.Screen name="BottomTab" component={BottomTabNavigator} options={screenOptions} />
       ) : (

diff --git a/app/navigation/navigate.ts b/app/navigation/navigate.ts
@@ -10,7 +10,10 @@ const openAddEmissionNavigator = (navigation) => (props = {}) => {
 };
 
 const openEmissions = (navigation) => (props = {}) => {
-  navigation.navigate("Emissions", props);
+  navigation.navigate("EmissionsNavigator", {
+    screen: "Emissions",
+    params: props,
+  });
 };
 
 /* navigate - modal */

diff --git a/app/screens/About/AboutScreen.navigationOptions.tsx b/app/screens/About/AboutScreen.navigationOptions.tsx
@@ -11,7 +11,7 @@ const navigationOptions = (): StackNavigationOptions => ({
     ...ComponentsStyle.header,
   },
   headerTintColor: Colors.grey100,
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => (
     <Text.Header style={Layout.androidNavTitle}>{t("ABOUT_SCREEN_TITLE")}</Text.Header>
   ),

diff --git a/app/screens/Act/ActScreen.navigationOptions.tsx b/app/screens/Act/ActScreen.navigationOptions.tsx
@@ -9,7 +9,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => <Text.H1>{t("ACT_SCREEN_TITLE")}</Text.H1>,
 });
 

diff --git a/app/screens/ActDetail/ActDetailScreen.navigationOptions.tsx b/app/screens/ActDetail/ActDetailScreen.navigationOptions.tsx
@@ -11,7 +11,7 @@ const navigationOptions = (): StackNavigationOptions => ({
     ...ComponentsStyle.header,
   },
   headerTintColor: Colors.grey100,
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => <Text.Header>{t("ACT_DETAIL_SCREEN_TITLE")}</Text.Header>,
 });
 

diff --git a/app/screens/AddEmission/AddEmissionScreen.navigationOptions.tsx b/app/screens/AddEmission/AddEmissionScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerRight: () => <InfoButton />,
   headerTitle: () => <Text.Header>{t("ADD_EMISSION_SCREEN_TITLE")}</Text.Header>,

diff --git a/app/screens/BarCodeScan/BarCodeScanScreen.navigationOptions.tsx b/app/screens/BarCodeScan/BarCodeScanScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("BAR_CODE_SCAN_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/CategorySelection/CategorySelectionScreen.navigationOptions.tsx b/app/screens/CategorySelection/CategorySelectionScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.H1>{t("CATEGORY_SELECTION_SCREEN_TITLE")}</Text.H1>,
 });

diff --git a/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx b/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx
@@ -21,7 +21,7 @@ const navigationOptions = (prop): StackNavigationOptions => {
       ...ComponentsStyle.header,
     },
     headerTintColor: Colors.grey100,
-    headerBackTitleVisible: false,
+    headerBackButtonDisplayMode: "minimal",
     headerRight: () => (showInfoButton ? <InfoButton /> : null),
     headerTitle: () => (
       <Text.Header>

diff --git a/app/screens/Faq/FaqScreen.navigationOptions.tsx b/app/screens/Faq/FaqScreen.navigationOptions.tsx
@@ -11,7 +11,7 @@ const navigationOptions = (): StackNavigationOptions => ({
     ...ComponentsStyle.header,
   },
   headerTintColor: Colors.grey100,
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => (
     <Text.Header style={Layout.androidNavTitle}>{t("FAQ_SCREEN_TITLE")}</Text.Header>
   ),

diff --git a/app/screens/Languages/LanguagesScreen.navigationOptions.tsx b/app/screens/Languages/LanguagesScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("LANGUAGES_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/MonthlyBudget/MonthlyBudgetScreen.navigationOptions.tsx b/app/screens/MonthlyBudget/MonthlyBudgetScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("MONTHLY_BUDGET_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/MonthlyEmissions/MonthlyEmissionsScreen.navigationOptions.tsx b/app/screens/MonthlyEmissions/MonthlyEmissionsScreen.navigationOptions.tsx
@@ -9,7 +9,7 @@ const navigationOptions = ({ route }) => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => (
     <Text.Header style={[Layout.androidNavTitle, { textTransform: "capitalize" }]}>

diff --git a/app/screens/MyData/MyDataScreen.navigationOptions.tsx b/app/screens/MyData/MyDataScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("MY_DATA_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/MyLocation/MyLocationScreen.navigationOptions.tsx b/app/screens/MyLocation/MyLocationScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("MY_LOCATION_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/Notifications/NotificationsScreen.navigationOptions.tsx b/app/screens/Notifications/NotificationsScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("NOTIFICATIONS_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/RecurringEmissions/RecurringEmissionsScreen.navigationOptions.tsx b/app/screens/RecurringEmissions/RecurringEmissionsScreen.navigationOptions.tsx
@@ -11,7 +11,7 @@ const navigationOptions = (): StackNavigationOptions => ({
     ...ComponentsStyle.header,
   },
   headerTintColor: Colors.grey100,
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => (
     <Text.Header style={Layout.androidNavTitle}>
       {t("RECURRING_EMISSIONS_SCREEN_TITLE")}

diff --git a/app/screens/SubCategorySelection/SubCategorySelectionScreen.navigationOptions.tsx b/app/screens/SubCategorySelection/SubCategorySelectionScreen.navigationOptions.tsx
@@ -10,7 +10,7 @@ const navigationOptions = (): StackNavigationOptions => ({
   headerStyle: {
     ...ComponentsStyle.header,
   },
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTintColor: Colors.grey100,
   headerTitle: () => <Text.Header>{t("SUB_CATEGORY_SELECTION_SCREEN_TITLE")}</Text.Header>,
 });

diff --git a/app/screens/SupportUs/SupportUsScreen.navigationOptions.tsx b/app/screens/SupportUs/SupportUsScreen.navigationOptions.tsx
@@ -11,7 +11,7 @@ const navigationOptions = (): StackNavigationOptions => ({
     ...ComponentsStyle.header,
   },
   headerTintColor: Colors.grey100,
-  headerBackTitleVisible: false,
+  headerBackButtonDisplayMode: "minimal",
   headerTitle: () => (
     <Text.Header style={Layout.androidNavTitle}>{t("SUPPORT_US_SCREEN_TITLE")}</Text.Header>
   ),

diff --git a/package.json b/package.json
@@ -31,30 +31,30 @@
     "@react-native-community/datetimepicker": "8.4.4",
     "@react-native-community/slider": "5.0.1",
     "@react-native-masked-view/masked-view": "0.3.2",
-    "@react-navigation/bottom-tabs": "6.4.0",
-    "@react-navigation/material-top-tabs": "6.3.0",
-    "@react-navigation/native": "6.0.13",
-    "@react-navigation/stack": "6.3.3",
+    "@react-navigation/bottom-tabs": "^7.8.12",
+    "@react-navigation/material-top-tabs": "^7.4.10",
+    "@react-navigation/native": "^7.1.25",
+    "@react-navigation/stack": "^7.6.12",
     "@reduxjs/toolkit": "1.8.6",
     "@sentry/react-native": "~7.2.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "carbon-footprint": "1.6.0",
-    "expo": "^54.0.0",
+    "expo": "~54.0.29",
     "expo-application": "~7.0.8",
     "expo-asset": "~12.0.11",
     "expo-camera": "~17.0.10",
-    "expo-constants": "~18.0.11",
+    "expo-constants": "~18.0.12",
     "expo-device": "~8.0.10",
     "expo-document-picker": "~14.0.8",
-    "expo-file-system": "~19.0.20",
+    "expo-file-system": "~19.0.21",
     "expo-font": "~14.0.10",
     "expo-linking": "~8.0.10",
     "expo-localization": "~17.0.8",
-    "expo-notifications": "~0.32.14",
+    "expo-notifications": "~0.32.15",
     "expo-sharing": "~14.0.8",
     "expo-status-bar": "~3.0.9",
     "expo-store-review": "~9.0.9",
-    "expo-updates": "~29.0.14",
+    "expo-updates": "~29.0.15",
     "expo-web-browser": "~15.0.10",
     "i18n-js": "3.5.1",
     "lodash.throttle": "4.1.1",
@@ -75,7 +75,6 @@
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
     "react-native-svg": "15.12.1",
-    "react-native-tab-view": "3.3.0",
     "react-native-worklets": "0.5.1",
     "react-redux": "8.0.4",
     "redux": "4.2.0",
@@ -111,7 +110,7 @@
     "glob": "7.1.6",
     "husky": "4.2.5",
     "jest": "~29.7.0",
-    "jest-expo": "~54.0.14",
+    "jest-expo": "~54.0.16",
     "markdown-it": "10.0.0",
     "mockdate": "3.0.5",
     "prettier": "2.1.2",