diff --git a/App.tsx b/App.tsx
index f01bf8f77..0706f852b 100644
--- a/App.tsx
+++ b/App.tsx
@@ -1,18 +1,177 @@
 import * as React from 'react';
-import { Provider } from 'mobx-react';
+import { Observer, Provider } from 'mobx-react';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { NavigationContainer } from '@react-navigation/native';
+import { createStackNavigator } from '@react-navigation/stack';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import { BackHandler, NativeEventSubscription } from 'react-native';
 
 import Stores from './stores/Stores';
-import Navigation from './Navigation';
 import NavigationService from './NavigationService';
 import PushNotificationManager from './PushNotificationManager';
 import { AppContainer } from './components/layout/AppContainer';
 import ExternalLinkModal from './components/Modals/ExternalLinkModal';
 import AndroidNfcModal from './components/Modals/AndroidNfcModal';
 import InfoModal from './components/Modals/InfoModal';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
+
+// Views
+import Transaction from './views/Transaction';
+import Wallet from './views/Wallet/Wallet';
+import Send from './views/Send';
+import LnurlPay from './views/LnurlPay/LnurlPay';
+import LnurlChannel from './views/LnurlChannel';
+import LnurlAuth from './views/LnurlAuth';
+import Receive from './views/Receive';
+import PaymentRequest from './views/PaymentRequest';
+import HandleAnythingQRScanner from './views/HandleAnythingQRScanner';
+import NodeQRScanner from './views/NodeQRScanner';
+import OpenChannel from './views/OpenChannel';
+import SendingOnChain from './views/SendingOnChain';
+import SendingLightning from './views/SendingLightning';
+import Channel from './views/Channels/Channel';
+import Payment from './views/Payment';
+import PaymentPaths from './views/PaymentPaths';
+import Invoice from './views/Invoice';
+import Sweep from './views/Sweep';
+
+import SparkQRScanner from './views/SparkQRScanner';
+import NodeInfo from './views/NodeInfo';
+import NetworkInfo from './views/NetworkInfo';
+import Lockscreen from './views/Lockscreen';
+import NostrContacts from './views/NostrContacts';
+import ContactQR from './views/ContactQR';
+
+// Settings views
+import Settings from './views/Settings/Settings';
+import NodeConfiguration from './views/Settings/NodeConfiguration';
+import Nodes from './views/Settings/Nodes';
+import Privacy from './views/Settings/Privacy';
+import Security from './views/Settings/Security';
+import SetPassword from './views/Settings/SetPassword';
+import SetDuressPassword from './views/Settings/SetDuressPassword';
+import SetPin from './views/Settings/SetPin';
+import SetDuressPin from './views/Settings/SetDuressPin';
+import Language from './views/Settings/Language';
+import Currency from './views/Settings/Currency';
+import SelectCurrency from './views/Settings/SelectCurrency';
+import Display from './views/Settings/Display';
+import CertInstallInstructions from './views/Settings/CertInstallInstructions';
+import SignVerifyMessage from './views/Settings/SignVerifyMessage';
+import Support from './views/Settings/Support';
+import Help from './views/Settings/Help';
+import SocialMedia from './views/Settings/SocialMedia';
+import Sponsors from './views/Settings/Sponsors';
+import Olympians from './views/Settings/Olympians';
+import Gods from './views/Settings/Gods';
+import Mortals from './views/Settings/Mortals';
+import PointOfSale from './views/Settings/PointOfSale';
+import PointOfSaleRecon from './views/Settings/PointOfSaleRecon';
+import PointOfSaleReconExport from './views/Settings/PointOfSaleReconExport';
+import Categories from './views/POS/Categories';
+import ProductCategoryDetails from './views/POS/ProductCategoryDetails';
+import Products from './views/POS/Products';
+import ProductDetails from './views/POS/ProductDetails';
+import PaymentsSettings from './views/Settings/PaymentsSettings';
+import InvoicesSettings from './views/Settings/InvoicesSettings';
+import LSP from './views/Settings/LSP';
+import ChannelsSettings from './views/Settings/ChannelsSettings';
+import SetNodePicture from './views/Settings/SetNodePicture';
+
+// Lightning address
+import LightningAddress from './views/Settings/LightningAddress';
+import LightningAddressInfo from './views/Settings/LightningAddress/LightningAddressInfo';
+import LightningAddressSettings from './views/Settings/LightningAddress/LightningAddressSettings';
+import Attestation from './views/Settings/LightningAddress/Attestation';
+import Attestations from './views/Settings/LightningAddress/Attestations';
+import NostrKeys from './views/Settings/LightningAddress/NostrKeys';
+import NostrRelays from './views/Settings/LightningAddress/NostrRelays';
+import ChangeAddress from './views/Settings/LightningAddress/ChangeAddress';
+
+//Embedded Node
+import EmbeddedNode from './views/Settings/EmbeddedNode';
+import DisasterRecovery from './views/Settings/EmbeddedNode/DisasterRecovery';
+import DisasterRecoveryAdvanced from './views/Settings/EmbeddedNode/DisasterRecoveryAdvanced';
+import Pathfinding from './views/Settings/EmbeddedNode/Pathfinding';
+import ExpressGraphSync from './views/Settings/EmbeddedNode/ExpressGraphSync';
+import LNDLogs from './views/Settings/EmbeddedNode/LNDLogs';
+import Peers from './views/Settings/EmbeddedNode/Peers';
+import NeutrinoPeers from './views/Settings/EmbeddedNode/Peers/NeutrinoPeers';
+import ZeroConfPeers from './views/Settings/EmbeddedNode/Peers/ZeroConfPeers';
+import Advanced from './views/Settings/EmbeddedNode/Advanced';
+
+// Routing
+import Routing from './views/Routing/Routing';
+import RoutingEvent from './views/Routing/RoutingEvent';
+import SetFees from './views/Routing/SetFees';
+
+// new views
+import Activity from './views/Activity/Activity';
+import ActivityFilter from './views/Activity/ActivityFilter';
+import CoinControl from './views/UTXOs/CoinControl';
+import Utxo from './views/UTXOs/UTXO';
+import Accounts from './views/Accounts/Accounts';
+import ImportAccount from './views/Accounts/ImportAccount';
+import ImportingAccount from './views/Accounts/ImportingAccount';
+import BumpFee from './views/BumpFee';
+import QR from './views/QR';
+import AddNotes from './views/AddNotes';
+import Contacts from './views/Settings/Contacts';
+import AddContact from './views/Settings/AddContact';
+import ContactDetails from './views/ContactDetails';
+import CurrencyConverter from './views/Settings/CurrencyConverter';
+
+// POS
+import Order from './views/Order';
+
+import Intro from './views/Intro';
+import IntroSplash from './views/IntroSplash';
+
+import EditFee from './views/EditFee';
+
+// Embedded LND
+import Seed from './views/Settings/Seed';
+import SeedRecovery from './views/Settings/SeedRecovery';
+import Sync from './views/Sync';
+import LspExplanationFees from './views/Explanations/LspExplanationFees';
+import LspExplanationRouting from './views/Explanations/LspExplanationRouting';
+import LspExplanationWrappedInvoices from './views/Explanations/LspExplanationWrappedInvoices';
+import LspExplanationOverview from './views/Explanations/LspExplanationOverview';
+import RestoreChannelBackups from './views/Settings/EmbeddedNode/RestoreChannelBackups';
+
+import RawTxHex from './views/RawTxHex';
+
+import CustodialWalletWarning from './views/Settings/CustodialWalletWarning';
+
+import PSBT from './views/PSBT';
+import TxHex from './views/TxHex';
+
+import { themeColor } from './utils/ThemeUtils';
 
 export default class App extends React.PureComponent {
+    private backPressListenerSubscription: NativeEventSubscription;
+
+    private handleBackPress = (navigation: any) => {
+        const dialogHasBeenClosed = Stores.modalStore.closeVisibleModalDialog();
+        if (dialogHasBeenClosed) {
+            return true;
+        }
+
+        if (Stores.settingsStore.loginRequired()) {
+            BackHandler.exitApp();
+            return true;
+        }
+
+        const navigationState = navigation.getState();
+        if (navigationState.routes.length > 1) {
+            navigation.pop();
+            return true;
+        }
+
+        return false;
+    };
+
     render() {
+        const Stack = createStackNavigator();
         return (
             <Provider
                 BalanceStore={Stores.balanceStore}
@@ -41,13 +200,543 @@ export default class App extends React.PureComponent {
                 <AppContainer>
                     <PushNotificationManager>
                         <GestureHandlerRootView style={{ flex: 1 }}>
-                            <Navigation
-                                ref={(navigatorRef) => {
-                                    NavigationService.setTopLevelNavigator(
-                                        navigatorRef
-                                    );
-                                }}
-                            />
+                            <SafeAreaView style={{ height: '100%' }}>
+                                <Observer>
+                                    {() => (
+                                        <NavigationContainer
+                                            ref={(nav) => {
+                                                if (nav != null) {
+                                                    NavigationService.setTopLevelNavigator(
+                                                        nav
+                                                    );
+                                                }
+                                            }}
+                                            theme={{
+                                                dark: true,
+                                                colors: {
+                                                    background:
+                                                        themeColor(
+                                                            'background'
+                                                        ),
+                                                    border: themeColor(
+                                                        'background'
+                                                    ),
+                                                    card: themeColor(
+                                                        'background'
+                                                    ),
+                                                    notification:
+                                                        themeColor('text'),
+                                                    primary:
+                                                        themeColor('highlight'),
+                                                    text: themeColor('text')
+                                                }
+                                            }}
+                                        >
+                                            <Stack.Navigator
+                                                screenOptions={{
+                                                    headerShown: false
+                                                }}
+                                                screenListeners={({
+                                                    navigation
+                                                }) => ({
+                                                    focus: () => {
+                                                        this.backPressListenerSubscription?.remove();
+                                                        this.backPressListenerSubscription =
+                                                            BackHandler.addEventListener(
+                                                                'hardwareBackPress',
+                                                                () =>
+                                                                    this.handleBackPress(
+                                                                        navigation
+                                                                    )
+                                                            );
+                                                    },
+                                                    blur: () =>
+                                                        this.backPressListenerSubscription?.remove()
+                                                })}
+                                            >
+                                                <Stack.Screen
+                                                    name="Wallet"
+                                                    component={Wallet}
+                                                />
+                                                <Stack.Screen
+                                                    name="IntroSplash"
+                                                    component={IntroSplash}
+                                                />
+                                                <Stack.Screen
+                                                    name="Intro"
+                                                    component={Intro}
+                                                />
+                                                <Stack.Screen
+                                                    name="Lockscreen"
+                                                    component={Lockscreen}
+                                                />
+                                                <Stack.Screen
+                                                    name="Accounts"
+                                                    component={Accounts}
+                                                />
+                                                <Stack.Screen
+                                                    name="Send"
+                                                    component={Send}
+                                                />
+                                                <Stack.Screen
+                                                    name="Sweep"
+                                                    component={Sweep}
+                                                />
+                                                <Stack.Screen
+                                                    name="EditFee"
+                                                    component={EditFee}
+                                                />
+                                                <Stack.Screen
+                                                    name="Settings"
+                                                    component={Settings}
+                                                />
+                                                <Stack.Screen
+                                                    name="NodeConfiguration"
+                                                    component={
+                                                        NodeConfiguration
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="Nodes"
+                                                    component={Nodes}
+                                                    options={{
+                                                        animation:
+                                                            'slide_from_left'
+                                                    }}
+                                                />
+                                                <Stack.Screen
+                                                    name="Privacy"
+                                                    component={Privacy}
+                                                />
+                                                <Stack.Screen
+                                                    name="Security"
+                                                    component={Security}
+                                                />
+                                                <Stack.Screen
+                                                    name="SetPassword"
+                                                    component={SetPassword}
+                                                />
+                                                <Stack.Screen
+                                                    name="SetDuressPassword"
+                                                    component={
+                                                        SetDuressPassword
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="SetPin"
+                                                    component={SetPin}
+                                                />
+                                                <Stack.Screen
+                                                    name="SetDuressPin"
+                                                    component={SetDuressPin}
+                                                />
+                                                <Stack.Screen
+                                                    name="Language"
+                                                    component={Language}
+                                                />
+                                                <Stack.Screen
+                                                    name="Currency"
+                                                    component={Currency}
+                                                />
+                                                <Stack.Screen
+                                                    name="SelectCurrency"
+                                                    component={SelectCurrency}
+                                                />
+                                                <Stack.Screen
+                                                    name="Display"
+                                                    component={Display}
+                                                />
+                                                <Stack.Screen
+                                                    name="Support"
+                                                    component={Support}
+                                                />
+                                                <Stack.Screen
+                                                    name="Help"
+                                                    component={Help}
+                                                />
+                                                <Stack.Screen
+                                                    name="Sponsors"
+                                                    component={Sponsors}
+                                                />
+                                                <Stack.Screen
+                                                    name="Olympians"
+                                                    component={Olympians}
+                                                />
+                                                <Stack.Screen
+                                                    name="Gods"
+                                                    component={Gods}
+                                                />
+                                                <Stack.Screen
+                                                    name="Mortals"
+                                                    component={Mortals}
+                                                />
+                                                <Stack.Screen
+                                                    name="CertInstallInstructions"
+                                                    component={
+                                                        CertInstallInstructions
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="SignVerifyMessage"
+                                                    component={
+                                                        SignVerifyMessage
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="Transaction"
+                                                    component={Transaction}
+                                                />
+                                                <Stack.Screen
+                                                    name="Channel"
+                                                    component={Channel}
+                                                />
+                                                <Stack.Screen
+                                                    name="Payment"
+                                                    component={Payment}
+                                                />
+                                                <Stack.Screen
+                                                    name="PaymentPaths"
+                                                    component={PaymentPaths}
+                                                />
+                                                <Stack.Screen
+                                                    name="Invoice"
+                                                    component={Invoice}
+                                                />
+                                                <Stack.Screen
+                                                    name="LnurlPay"
+                                                    component={LnurlPay}
+                                                />
+                                                <Stack.Screen
+                                                    name="Receive"
+                                                    component={Receive}
+                                                />
+                                                <Stack.Screen
+                                                    name="LnurlChannel"
+                                                    component={LnurlChannel}
+                                                />
+                                                <Stack.Screen
+                                                    name="LnurlAuth"
+                                                    component={LnurlAuth}
+                                                />
+                                                <Stack.Screen
+                                                    name="PaymentRequest"
+                                                    component={PaymentRequest}
+                                                />
+                                                <Stack.Screen
+                                                    name="OpenChannel"
+                                                    component={OpenChannel}
+                                                />
+                                                <Stack.Screen
+                                                    name="SendingOnChain"
+                                                    component={SendingOnChain}
+                                                />
+                                                <Stack.Screen
+                                                    name="SendingLightning"
+                                                    component={SendingLightning}
+                                                />
+                                                <Stack.Screen
+                                                    name="NetworkInfo"
+                                                    component={NetworkInfo}
+                                                />
+                                                <Stack.Screen
+                                                    name="NodeInfo"
+                                                    component={NodeInfo}
+                                                />
+                                                <Stack.Screen
+                                                    name="Routing"
+                                                    component={Routing}
+                                                />
+                                                <Stack.Screen
+                                                    name="RoutingEvent"
+                                                    component={RoutingEvent}
+                                                />
+                                                <Stack.Screen
+                                                    name="SetFees"
+                                                    component={SetFees}
+                                                />
+                                                <Stack.Screen
+                                                    name="Activity"
+                                                    component={Activity}
+                                                    options={{
+                                                        animation:
+                                                            'slide_from_bottom'
+                                                    }}
+                                                />
+                                                <Stack.Screen
+                                                    name="ActivityFilter"
+                                                    component={ActivityFilter}
+                                                />
+                                                <Stack.Screen
+                                                    name="CoinControl"
+                                                    component={CoinControl}
+                                                />
+                                                <Stack.Screen
+                                                    name="Utxo"
+                                                    component={Utxo}
+                                                />
+                                                <Stack.Screen
+                                                    name="ImportAccount"
+                                                    component={ImportAccount}
+                                                />
+                                                <Stack.Screen
+                                                    name="ImportingAccount"
+                                                    component={ImportingAccount}
+                                                />
+                                                <Stack.Screen
+                                                    name="HandleAnythingQRScanner"
+                                                    component={
+                                                        HandleAnythingQRScanner
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="NodeQRCodeScanner"
+                                                    component={NodeQRScanner}
+                                                />
+                                                <Stack.Screen
+                                                    name="SparkQRScanner"
+                                                    component={SparkQRScanner}
+                                                />
+                                                <Stack.Screen
+                                                    name="Order"
+                                                    component={Order}
+                                                />
+                                                <Stack.Screen
+                                                    name="PointOfSaleSettings"
+                                                    component={PointOfSale}
+                                                />
+                                                <Stack.Screen
+                                                    name="PointOfSaleRecon"
+                                                    component={PointOfSaleRecon}
+                                                />
+                                                <Stack.Screen
+                                                    name="PointOfSaleReconExport"
+                                                    component={
+                                                        PointOfSaleReconExport
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="Categories"
+                                                    component={Categories}
+                                                />
+                                                <Stack.Screen
+                                                    name="ProductCategoryDetails"
+                                                    component={
+                                                        ProductCategoryDetails
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="Products"
+                                                    component={Products}
+                                                />
+                                                <Stack.Screen
+                                                    name="ProductDetails"
+                                                    component={ProductDetails}
+                                                />
+                                                <Stack.Screen
+                                                    name="PaymentsSettings"
+                                                    component={PaymentsSettings}
+                                                />
+                                                <Stack.Screen
+                                                    name="InvoicesSettings"
+                                                    component={InvoicesSettings}
+                                                />
+                                                <Stack.Screen
+                                                    name="Seed"
+                                                    component={Seed}
+                                                />
+                                                <Stack.Screen
+                                                    name="SeedRecovery"
+                                                    component={SeedRecovery}
+                                                />
+                                                <Stack.Screen
+                                                    name="Sync"
+                                                    component={Sync}
+                                                />
+                                                <Stack.Screen
+                                                    name="BumpFee"
+                                                    component={BumpFee}
+                                                />
+                                                <Stack.Screen
+                                                    name="QR"
+                                                    component={QR}
+                                                />
+                                                <Stack.Screen
+                                                    name="AddNotes"
+                                                    component={AddNotes}
+                                                />
+                                                <Stack.Screen
+                                                    name="LspExplanationFees"
+                                                    component={
+                                                        LspExplanationFees
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="LspExplanationRouting"
+                                                    component={
+                                                        LspExplanationRouting
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="LspExplanationWrappedInvoices"
+                                                    component={
+                                                        LspExplanationWrappedInvoices
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="LspExplanationOverview"
+                                                    component={
+                                                        LspExplanationOverview
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="EmbeddedNodeSettings"
+                                                    component={EmbeddedNode}
+                                                />
+                                                <Stack.Screen
+                                                    name="DisasterRecovery"
+                                                    component={DisasterRecovery}
+                                                />
+                                                <Stack.Screen
+                                                    name="DisasterRecoveryAdvanced"
+                                                    component={
+                                                        DisasterRecoveryAdvanced
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="Pathfinding"
+                                                    component={Pathfinding}
+                                                />
+                                                <Stack.Screen
+                                                    name="ExpressGraphSync"
+                                                    component={ExpressGraphSync}
+                                                />
+                                                <Stack.Screen
+                                                    name="LNDLogs"
+                                                    component={LNDLogs}
+                                                />
+                                                <Stack.Screen
+                                                    name="Peers"
+                                                    component={Peers}
+                                                />
+                                                <Stack.Screen
+                                                    name="NeutrinoPeers"
+                                                    component={NeutrinoPeers}
+                                                />
+                                                <Stack.Screen
+                                                    name="ZeroConfPeers"
+                                                    component={ZeroConfPeers}
+                                                />
+                                                <Stack.Screen
+                                                    name="EmbeddedNodeSettingsAdvanced"
+                                                    component={Advanced}
+                                                />
+                                                <Stack.Screen
+                                                    name="LSPSettings"
+                                                    component={LSP}
+                                                />
+                                                <Stack.Screen
+                                                    name="LightningAddress"
+                                                    component={LightningAddress}
+                                                />
+                                                <Stack.Screen
+                                                    name="LightningAddressInfo"
+                                                    component={
+                                                        LightningAddressInfo
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="LightningAddressSettings"
+                                                    component={
+                                                        LightningAddressSettings
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="Attestations"
+                                                    component={Attestations}
+                                                />
+                                                <Stack.Screen
+                                                    name="Attestation"
+                                                    component={Attestation}
+                                                />
+                                                <Stack.Screen
+                                                    name="Contacts"
+                                                    component={Contacts}
+                                                />
+                                                <Stack.Screen
+                                                    name="AddContact"
+                                                    component={AddContact}
+                                                />
+                                                <Stack.Screen
+                                                    name="ContactDetails"
+                                                    component={ContactDetails}
+                                                />
+                                                <Stack.Screen
+                                                    name="NostrKeys"
+                                                    component={NostrKeys}
+                                                />
+                                                <Stack.Screen
+                                                    name="NostrRelays"
+                                                    component={NostrRelays}
+                                                />
+                                                <Stack.Screen
+                                                    name="ChangeAddress"
+                                                    component={ChangeAddress}
+                                                />
+                                                <Stack.Screen
+                                                    name="SocialMedia"
+                                                    component={SocialMedia}
+                                                />
+                                                <Stack.Screen
+                                                    name="NostrContacts"
+                                                    component={NostrContacts}
+                                                />
+                                                <Stack.Screen
+                                                    name="ContactQR"
+                                                    component={ContactQR}
+                                                />
+                                                <Stack.Screen
+                                                    name="CurrencyConverter"
+                                                    component={
+                                                        CurrencyConverter
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="ChannelsSettings"
+                                                    component={ChannelsSettings}
+                                                />
+                                                <Stack.Screen
+                                                    name="RawTxHex"
+                                                    component={RawTxHex}
+                                                />
+                                                <Stack.Screen
+                                                    name="RestoreChannelBackups"
+                                                    component={
+                                                        RestoreChannelBackups
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="SetNodePicture"
+                                                    component={SetNodePicture}
+                                                />
+                                                <Stack.Screen
+                                                    name="CustodialWalletWarning"
+                                                    component={
+                                                        CustodialWalletWarning
+                                                    }
+                                                />
+                                                <Stack.Screen
+                                                    name="PSBT"
+                                                    component={PSBT}
+                                                />
+                                                <Stack.Screen
+                                                    name="TxHex"
+                                                    component={TxHex}
+                                                />
+                                            </Stack.Navigator>
+                                        </NavigationContainer>
+                                    )}
+                                </Observer>
+                            </SafeAreaView>
                             <ExternalLinkModal />
                             <AndroidNfcModal />
                             <InfoModal />
diff --git a/Navigation.ts b/Navigation.ts
deleted file mode 100644
index 38faa85ee..000000000
--- a/Navigation.ts
+++ /dev/null
@@ -1,475 +0,0 @@
-import { createAppContainer } from 'react-navigation';
-import { createStackNavigator } from 'react-navigation-stack';
-
-// Views
-import Transaction from './views/Transaction';
-import Wallet from './views/Wallet/Wallet';
-import Send from './views/Send';
-import LnurlPay from './views/LnurlPay/LnurlPay';
-import LnurlChannel from './views/LnurlChannel';
-import LnurlAuth from './views/LnurlAuth';
-import Receive from './views/Receive';
-import PaymentRequest from './views/PaymentRequest';
-import HandleAnythingQRScanner from './views/handleAnythingQRScanner';
-import NodeQRScanner from './views/NodeQRScanner';
-import OpenChannel from './views/OpenChannel';
-import SendingOnChain from './views/SendingOnChain';
-import SendingLightning from './views/SendingLightning';
-import Channel from './views/Channels/Channel';
-import Payment from './views/Payment';
-import PaymentPaths from './views/PaymentPaths';
-import Invoice from './views/Invoice';
-import Sweep from './views/Sweep';
-
-import SparkQRScanner from './views/SparkQRScanner';
-import NodeInfo from './views/NodeInfo';
-import NetworkInfo from './views/NetworkInfo';
-import Lockscreen from './views/Lockscreen';
-import NostrContacts from './views/NostrContacts';
-import ContactQR from './views/ContactQR';
-
-// Settings views
-import Settings from './views/Settings/Settings';
-import NodeConfiguration from './views/Settings/NodeConfiguration';
-import Nodes from './views/Settings/Nodes';
-import Privacy from './views/Settings/Privacy';
-import Security from './views/Settings/Security';
-import SetPassword from './views/Settings/SetPassword';
-import SetDuressPassword from './views/Settings/SetDuressPassword';
-import SetPin from './views/Settings/SetPin';
-import SetDuressPin from './views/Settings/SetDuressPin';
-import Language from './views/Settings/Language';
-import Currency from './views/Settings/Currency';
-import SelectCurrency from './views/Settings/SelectCurrency';
-import Display from './views/Settings/Display';
-import CertInstallInstructions from './views/Settings/CertInstallInstructions';
-import SignVerifyMessage from './views/Settings/SignVerifyMessage';
-import Support from './views/Settings/Support';
-import Help from './views/Settings/Help';
-import SocialMedia from './views/Settings/SocialMedia';
-import Sponsors from './views/Settings/Sponsors';
-import Olympians from './views/Settings/Olympians';
-import Gods from './views/Settings/Gods';
-import Mortals from './views/Settings/Mortals';
-import PointOfSale from './views/Settings/PointOfSale';
-import PointOfSaleRecon from './views/Settings/PointOfSaleRecon';
-import PointOfSaleReconExport from './views/Settings/PointOfSaleReconExport';
-import Categories from './views/POS/Categories';
-import ProductCategoryDetails from './views/POS/ProductCategoryDetails';
-import Products from './views/POS/Products';
-import ProductDetails from './views/POS/ProductDetails';
-import PaymentsSettings from './views/Settings/PaymentsSettings';
-import InvoicesSettings from './views/Settings/InvoicesSettings';
-import LSP from './views/Settings/LSP';
-import ChannelsSettings from './views/Settings/ChannelsSettings';
-import SetNodePicture from './views/Settings/SetNodePicture';
-
-// Lightning address
-import LightningAddress from './views/Settings/LightningAddress';
-import LightningAddressInfo from './views/Settings/LightningAddress/LightningAddressInfo';
-import LightningAddressSettings from './views/Settings/LightningAddress/LightningAddressSettings';
-import Attestation from './views/Settings/LightningAddress/Attestation';
-import Attestations from './views/Settings/LightningAddress/Attestations';
-import NostrKeys from './views/Settings/LightningAddress/NostrKeys';
-import NostrRelays from './views/Settings/LightningAddress/NostrRelays';
-import ChangeAddress from './views/Settings/LightningAddress/ChangeAddress';
-
-//Embedded Node
-import EmbeddedNode from './views/Settings/EmbeddedNode';
-import DisasterRecovery from './views/Settings/EmbeddedNode/DisasterRecovery';
-import DisasterRecoveryAdvanced from './views/Settings/EmbeddedNode/DisasterRecoveryAdvanced';
-import Pathfinding from './views/Settings/EmbeddedNode/Pathfinding';
-import ExpressGraphSync from './views/Settings/EmbeddedNode/ExpressGraphSync';
-import LNDLogs from './views/Settings/EmbeddedNode/LNDLogs';
-import Peers from './views/Settings/EmbeddedNode/Peers';
-import NeutrinoPeers from './views/Settings/EmbeddedNode/Peers/NeutrinoPeers';
-import ZeroConfPeers from './views/Settings/EmbeddedNode/Peers/ZeroConfPeers';
-import Advanced from './views/Settings/EmbeddedNode/Advanced';
-
-// Routing
-import Routing from './views/Routing/Routing';
-import RoutingEvent from './views/Routing/RoutingEvent';
-import SetFees from './views/Routing/SetFees';
-
-// new views
-import Activity from './views/Activity/Activity';
-import ActivityFilter from './views/Activity/ActivityFilter';
-import CoinControl from './views/UTXOs/CoinControl';
-import Utxo from './views/UTXOs/UTXO';
-import Accounts from './views/Accounts/Accounts';
-import ImportAccount from './views/Accounts/ImportAccount';
-import ImportingAccount from './views/Accounts/ImportingAccount';
-import BumpFee from './views/BumpFee';
-import QR from './views/QR';
-import AddNotes from './views/AddNotes';
-import Contacts from './views/Settings/Contacts';
-import AddContact from './views/Settings/AddContact';
-import ContactDetails from './views/ContactDetails';
-import CurrencyConverter from './views/Settings/CurrencyConverter';
-
-// POS
-import Order from './views/Order';
-
-import Intro from './views/Intro';
-import IntroSplash from './views/IntroSplash';
-
-import EditFee from './views/EditFee';
-
-// Embedded LND
-import Seed from './views/Settings/Seed';
-import SeedRecovery from './views/Settings/SeedRecovery';
-import Sync from './views/Sync';
-import LspExplanationFees from './views/Explanations/LspExplanationFees';
-import LspExplanationRouting from './views/Explanations/LspExplanationRouting';
-import LspExplanationWrappedInvoices from './views/Explanations/LspExplanationWrappedInvoices';
-import LspExplanationOverview from './views/Explanations/LspExplanationOverview';
-import RestoreChannelBackups from './views/Settings/EmbeddedNode/RestoreChannelBackups';
-
-import RawTxHex from './views/RawTxHex';
-
-import CustodialWalletWarning from './views/Settings/CustodialWalletWarning';
-
-import PSBT from './views/PSBT';
-import TxHex from './views/TxHex';
-
-const AppScenes = {
-    Wallet: {
-        screen: Wallet
-    },
-    IntroSplash: {
-        screen: IntroSplash
-    },
-    Intro: {
-        screen: Intro
-    },
-    Lockscreen: {
-        screen: Lockscreen
-    },
-    Accounts: {
-        screen: Accounts
-    },
-    Send: {
-        screen: Send
-    },
-    Sweep: {
-        screen: Sweep
-    },
-    EditFee: {
-        screen: EditFee
-    },
-    Settings: {
-        screen: Settings
-    },
-    NodeConfiguration: {
-        screen: NodeConfiguration
-    },
-    Nodes: {
-        screen: Nodes
-    },
-    Privacy: {
-        screen: Privacy
-    },
-    Security: {
-        screen: Security
-    },
-    SetPassword: {
-        screen: SetPassword
-    },
-    SetDuressPassword: {
-        screen: SetDuressPassword
-    },
-    SetPin: {
-        screen: SetPin
-    },
-    SetDuressPin: {
-        screen: SetDuressPin
-    },
-    Language: {
-        screen: Language
-    },
-    Currency: {
-        screen: Currency
-    },
-    SelectCurrency: {
-        screen: SelectCurrency
-    },
-    Display: {
-        screen: Display
-    },
-    Support: {
-        screen: Support
-    },
-    Help: {
-        screen: Help
-    },
-    Sponsors: {
-        screen: Sponsors
-    },
-    Olympians: {
-        screen: Olympians
-    },
-    Gods: {
-        screen: Gods
-    },
-    Mortals: {
-        screen: Mortals
-    },
-    CertInstallInstructions: {
-        screen: CertInstallInstructions
-    },
-    SignVerifyMessage: {
-        screen: SignVerifyMessage
-    },
-    Transaction: {
-        screen: Transaction
-    },
-    Channel: {
-        screen: Channel
-    },
-    Payment: {
-        screen: Payment
-    },
-    PaymentPaths: {
-        screen: PaymentPaths
-    },
-    Invoice: {
-        screen: Invoice
-    },
-    LnurlPay: {
-        screen: LnurlPay
-    },
-    Receive: {
-        screen: Receive
-    },
-    LnurlChannel: {
-        screen: LnurlChannel
-    },
-    LnurlAuth: {
-        screen: LnurlAuth
-    },
-    PaymentRequest: {
-        screen: PaymentRequest
-    },
-    OpenChannel: {
-        screen: OpenChannel
-    },
-    SendingOnChain: {
-        screen: SendingOnChain
-    },
-    SendingLightning: {
-        screen: SendingLightning
-    },
-    NetworkInfo: {
-        screen: NetworkInfo
-    },
-    NodeInfo: {
-        screen: NodeInfo
-    },
-    Routing: {
-        screen: Routing
-    },
-    RoutingEvent: {
-        screen: RoutingEvent
-    },
-    SetFees: {
-        screen: SetFees
-    },
-    Activity: {
-        screen: Activity
-    },
-    ActivityFilter: {
-        screen: ActivityFilter
-    },
-    CoinControl: {
-        screen: CoinControl
-    },
-    Utxo: {
-        screen: Utxo
-    },
-    ImportAccount: {
-        screen: ImportAccount
-    },
-    ImportingAccount: {
-        screen: ImportingAccount
-    },
-    HandleAnythingQRScanner: {
-        screen: HandleAnythingQRScanner
-    },
-    NodeQRCodeScanner: {
-        screen: NodeQRScanner
-    },
-    SparkQRScanner: {
-        screen: SparkQRScanner
-    },
-    Order: {
-        screen: Order
-    },
-    PointOfSaleSettings: {
-        screen: PointOfSale
-    },
-    PointOfSaleRecon: {
-        screen: PointOfSaleRecon
-    },
-    PointOfSaleReconExport: {
-        screen: PointOfSaleReconExport
-    },
-    Categories: {
-        screen: Categories
-    },
-    ProductCategoryDetails: {
-        screen: ProductCategoryDetails
-    },
-    Products: {
-        screen: Products
-    },
-    ProductDetails: {
-        screen: ProductDetails
-    },
-    PaymentsSettings: {
-        screen: PaymentsSettings
-    },
-    InvoicesSettings: {
-        screen: InvoicesSettings
-    },
-    Seed: {
-        screen: Seed
-    },
-    SeedRecovery: {
-        screen: SeedRecovery
-    },
-    Sync: {
-        screen: Sync
-    },
-    BumpFee: {
-        screen: BumpFee
-    },
-    QR: {
-        screen: QR
-    },
-    AddNotes: {
-        screen: AddNotes
-    },
-    LspExplanationFees: {
-        screen: LspExplanationFees
-    },
-    LspExplanationRouting: {
-        screen: LspExplanationRouting
-    },
-    LspExplanationWrappedInvoices: {
-        screen: LspExplanationWrappedInvoices
-    },
-    LspExplanationOverview: {
-        screen: LspExplanationOverview
-    },
-    EmbeddedNodeSettings: {
-        screen: EmbeddedNode
-    },
-    DisasterRecovery: {
-        screen: DisasterRecovery
-    },
-    DisasterRecoveryAdvanced: {
-        screen: DisasterRecoveryAdvanced
-    },
-    Pathfinding: {
-        screen: Pathfinding
-    },
-    ExpressGraphSync: {
-        screen: ExpressGraphSync
-    },
-    LNDLogs: {
-        screen: LNDLogs
-    },
-    Peers: {
-        screen: Peers
-    },
-    NeutrinoPeers: {
-        screen: NeutrinoPeers
-    },
-    ZeroConfPeers: {
-        screen: ZeroConfPeers
-    },
-    EmbeddedNodeSettingsAdvanced: {
-        screen: Advanced
-    },
-    LSPSettings: {
-        screen: LSP
-    },
-    LightningAddress: {
-        screen: LightningAddress
-    },
-    LightningAddressInfo: {
-        screen: LightningAddressInfo
-    },
-    LightningAddressSettings: {
-        screen: LightningAddressSettings
-    },
-    Attestations: {
-        screen: Attestations
-    },
-    Attestation: {
-        screen: Attestation
-    },
-    Contacts: {
-        screen: Contacts
-    },
-    AddContact: {
-        screen: AddContact
-    },
-    ContactDetails: {
-        screen: ContactDetails
-    },
-    NostrKeys: {
-        screen: NostrKeys
-    },
-    NostrRelays: {
-        screen: NostrRelays
-    },
-    ChangeAddress: {
-        screen: ChangeAddress
-    },
-    SocialMedia: {
-        screen: SocialMedia
-    },
-    NostrContacts: {
-        screen: NostrContacts
-    },
-    ContactQR: {
-        screen: ContactQR
-    },
-    CurrencyConverter: {
-        screen: CurrencyConverter
-    },
-    ChannelsSettings: {
-        screen: ChannelsSettings
-    },
-    RawTxHex: {
-        screen: RawTxHex
-    },
-    RestoreChannelBackups: {
-        screen: RestoreChannelBackups
-    },
-    SetNodePicture: {
-        screen: SetNodePicture
-    },
-    CustodialWalletWarning: {
-        screen: CustodialWalletWarning
-    },
-    PSBT: {
-        screen: PSBT
-    },
-    TxHex: {
-        screen: TxHex
-    }
-};
-
-const AppNavigator = createStackNavigator(AppScenes, {
-    headerMode: 'none',
-    mode: 'modal',
-    defaultNavigationOptions: {
-        gestureEnabled: false
-    }
-});
-
-const Navigation = createAppContainer(AppNavigator);
-
-export default Navigation;
diff --git a/NavigationService.ts b/NavigationService.ts
index deba73fa6..d8c071b11 100644
--- a/NavigationService.ts
+++ b/NavigationService.ts
@@ -1,15 +1,18 @@
-import { NavigationActions } from 'react-navigation';
+import {
+    CommonActions,
+    NavigationContainerRef
+} from '@react-navigation/native';
 
-let _navigator;
+let _navigator: NavigationContainerRef<{}>;
 
-function setTopLevelNavigator(navigatorRef) {
+function setTopLevelNavigator(navigatorRef: NavigationContainerRef<{}>) {
     _navigator = navigatorRef;
 }
 
 function navigate(routeName: string, params?: any) {
     _navigator.dispatch(
-        NavigationActions.navigate({
-            routeName,
+        CommonActions.navigate({
+            name: routeName,
             params
         })
     );
diff --git a/components/LayerBalances/LightningSwipeableRow.tsx b/components/LayerBalances/LightningSwipeableRow.tsx
index de54c2a7c..cc9ad2042 100644
--- a/components/LayerBalances/LightningSwipeableRow.tsx
+++ b/components/LayerBalances/LightningSwipeableRow.tsx
@@ -9,6 +9,7 @@ import {
     TouchableOpacity
 } from 'react-native';
 import { getParams as getlnurlParams } from 'js-lnurl';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { RectButton } from 'react-native-gesture-handler';
 import Swipeable from 'react-native-gesture-handler/Swipeable';
@@ -24,7 +25,7 @@ import Routing from './../../assets/images/SVG/Routing.svg';
 import Send from './../../assets/images/SVG/Send.svg';
 
 interface LightningSwipeableRowProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     lightning?: string;
     locked?: boolean;
 }
diff --git a/components/LayerBalances/OnchainSwipeableRow.tsx b/components/LayerBalances/OnchainSwipeableRow.tsx
index ff5bed151..f55095aa7 100644
--- a/components/LayerBalances/OnchainSwipeableRow.tsx
+++ b/components/LayerBalances/OnchainSwipeableRow.tsx
@@ -7,9 +7,10 @@ import {
     I18nManager,
     TouchableOpacity
 } from 'react-native';
-
 import { RectButton } from 'react-native-gesture-handler';
 import Swipeable from 'react-native-gesture-handler/Swipeable';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import BackendUtils from './../../utils/BackendUtils';
 import { localeString } from './../../utils/LocaleUtils';
 import { themeColor } from './../../utils/ThemeUtils';
@@ -19,7 +20,7 @@ import Receive from './../../assets/images/SVG/Receive.svg';
 import Send from './../../assets/images/SVG/Send.svg';
 
 interface OnchainSwipeableRowProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     value?: string;
     amount?: string;
     locked?: boolean;
diff --git a/components/LayerBalances/index.tsx b/components/LayerBalances/index.tsx
index 5b15a4aca..3fae7f65b 100644
--- a/components/LayerBalances/index.tsx
+++ b/components/LayerBalances/index.tsx
@@ -9,6 +9,7 @@ import {
 } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 import { RectButton } from 'react-native-gesture-handler';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { inject, observer } from 'mobx-react';
 import Amount from '../Amount';
@@ -37,7 +38,7 @@ interface LayerBalancesProps {
     BalanceStore: BalanceStore;
     UTXOsStore: UTXOsStore;
     UnitsStore: UnitsStore;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     onRefresh?: any;
     value?: string;
     amount?: string;
@@ -164,7 +165,7 @@ const SwipeableRow = ({
 }: {
     item: DataRow;
     index: number;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     selectMode: boolean;
     value?: string;
     amount?: string;
diff --git a/components/OnchainFeeInput.tsx b/components/OnchainFeeInput.tsx
index aa378678f..39f7f02c8 100644
--- a/components/OnchainFeeInput.tsx
+++ b/components/OnchainFeeInput.tsx
@@ -1,19 +1,21 @@
 import React, { useEffect, useState } from 'react';
 import { Text, TouchableWithoutFeedback, View } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/native';
+
 import TextInput from '../components/TextInput';
 import { themeColor } from '../utils/ThemeUtils';
 import { localeString } from '../utils/LocaleUtils';
 import stores from '../stores/Stores';
-import NavigationService from '../NavigationService';
 import LoadingIndicator from './LoadingIndicator';
 
 interface OnchainFeeInputProps {
+    navigation: StackNavigationProp<any, any>;
     fee?: string;
     onChangeFee: (fee: string) => void;
 }
 
 export default function OnchainFeeInput(props: OnchainFeeInputProps) {
-    const { fee, onChangeFee } = props;
+    const { fee, onChangeFee, navigation } = props;
 
     const { settingsStore, feeStore } = stores;
     const { settings } = settingsStore;
@@ -50,7 +52,7 @@ export default function OnchainFeeInput(props: OnchainFeeInputProps) {
             {enableMempoolRates ? (
                 <TouchableWithoutFeedback
                     onPress={() =>
-                        NavigationService.navigate('EditFee', {
+                        navigation.navigate('EditFee', {
                             onNavigateBack: (fee: string) => {
                                 if (fee) {
                                     setErrorOccurredLoadingFees(false);
diff --git a/components/QRCodeScanner.tsx b/components/QRCodeScanner.tsx
index ec606b0a5..64666b7a2 100644
--- a/components/QRCodeScanner.tsx
+++ b/components/QRCodeScanner.tsx
@@ -11,6 +11,7 @@ import {
 import { Camera } from 'react-native-camera-kit';
 import { check, request, PERMISSIONS, RESULTS } from 'react-native-permissions';
 import { launchImageLibrary } from 'react-native-image-picker';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 const LocalQRCode = require('@remobile/react-native-qrcode-local-image');
 
@@ -29,7 +30,7 @@ interface QRProps {
     text?: string;
     handleQRScanned: any;
     goBack: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     parts?: number;
     totalParts?: number;
     mode?: string;
@@ -101,11 +102,11 @@ export default class QRCodeScanner extends React.Component<QRProps, QRState> {
         }
     };
 
+    handleFocus = () => (this.scannedCache = {});
+
     async componentDidMount() {
         // triggers when loaded from navigation or back action
-        this.props.navigation.addListener('didFocus', () => {
-            this.scannedCache = {};
-        });
+        this.props.navigation.addListener('focus', this.handleFocus);
 
         if (Platform.OS !== 'ios' && Platform.OS !== 'macos') {
             // For android
@@ -176,7 +177,7 @@ export default class QRCodeScanner extends React.Component<QRProps, QRState> {
 
     componentWillUnmount() {
         this.props.navigation.removeListener &&
-            this.props.navigation.removeListener('didFocus');
+            this.props.navigation.removeListener('focus', this.handleFocus);
     }
 
     render() {
diff --git a/components/WalletHeader.tsx b/components/WalletHeader.tsx
index 05105b5de..576a383e1 100644
--- a/components/WalletHeader.tsx
+++ b/components/WalletHeader.tsx
@@ -12,6 +12,7 @@ import {
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import Clipboard from '@react-native-clipboard/clipboard';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import ChannelsStore from '../stores/ChannelsStore';
 import LightningAddressStore from '../stores/LightningAddressStore';
@@ -35,7 +36,7 @@ import { themeColor } from '../utils/ThemeUtils';
 
 import Add from '../assets/images/SVG/Add.svg';
 import ClipboardSVG from '../assets/images/SVG/Clipboard.svg';
-import Scan from '../assets/images/SVG/Scan.svg';
+import Gear from '../assets/images/SVG/Gear.svg';
 import POS from '../assets/images/SVG/POS.svg';
 import Search from '../assets/images/SVG/Search.svg';
 import Temple from '../assets/images/SVG/Temple.svg';
@@ -83,7 +84,11 @@ const MailboxAnimated = () => {
     );
 };
 
-const ActivityButton = ({ navigation }: { navigation: any }) => (
+const ActivityButton = ({
+    navigation
+}: {
+    navigation: StackNavigationProp<any, any>;
+}) => (
     <View style={{ width: 80 }}>
         <Button
             icon={{
@@ -98,7 +103,11 @@ const ActivityButton = ({ navigation }: { navigation: any }) => (
     </View>
 );
 
-const TempleButton = ({ navigation }: { navigation: any }) => (
+const TempleButton = ({
+    navigation
+}: {
+    navigation: StackNavigationProp<any, any>;
+}) => (
     <TouchableOpacity
         onPress={() => protectedNavigation(navigation, 'Wallet', true)}
     >
@@ -111,12 +120,16 @@ const TempleButton = ({ navigation }: { navigation: any }) => (
     </TouchableOpacity>
 );
 
-const ScanBadge = ({ navigation }: { navigation: any }) => (
+const SettingsBadge = ({
+    navigation
+}: {
+    navigation: StackNavigationProp<any, any>;
+}) => (
     <TouchableOpacity
-        onPress={() => navigation.navigate('HandleAnythingQRScanner')}
-        accessibilityLabel={localeString('general.scan')}
+        onPress={() => navigation.navigate('Settings')}
+        accessibilityLabel={localeString('views.Settings.title')}
     >
-        <Scan fill={themeColor('text')} width={30} height={30} />
+        <Gear fill={themeColor('text')} width={33} height={33} />
     </TouchableOpacity>
 );
 
@@ -124,7 +137,7 @@ const ClipboardBadge = ({
     navigation,
     clipboard
 }: {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     clipboard: string;
 }) => (
     <TouchableOpacity
@@ -162,7 +175,7 @@ interface WalletHeaderProps {
     LightningAddressStore?: LightningAddressStore;
     PosStore?: PosStore;
     SyncStore?: SyncStore;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     loading: boolean;
     title: string;
     channels: boolean;
@@ -237,10 +250,9 @@ export default class WalletHeader extends React.Component<
             (settings && settings.pos && settings.pos.posEnabled) ||
             PosEnabled.Disabled;
 
-        const SettingsButton = () => (
+        const NodeButton = () => (
             <TouchableOpacity
-                onPress={() => protectedNavigation(navigation, 'Settings')}
-                onLongPress={() => protectedNavigation(navigation, 'Nodes')}
+                onPress={() => protectedNavigation(navigation, 'Nodes')}
                 accessibilityLabel={localeString('views.Settings.title')}
             >
                 {selectedNode && selectedNode.photo ? (
@@ -383,7 +395,11 @@ export default class WalletHeader extends React.Component<
             </TouchableOpacity>
         );
 
-        const SyncBadge = ({ navigation }: { navigation: any }) => {
+        const SyncBadge = ({
+            navigation
+        }: {
+            navigation: StackNavigationProp<any, any>;
+        }) => {
             const [spinAnim] = useState(new Animated.Value(0));
 
             const interpolateRotation = spinAnim.interpolate({
@@ -426,7 +442,7 @@ export default class WalletHeader extends React.Component<
                 leftComponent={
                     loading ? undefined : (
                         <Row>
-                            <SettingsButton />
+                            <NodeButton />
                             {paid && paid.length > 0 && (
                                 <TouchableOpacity
                                     onPress={() =>
@@ -548,7 +564,7 @@ export default class WalletHeader extends React.Component<
                                 </View>
                             )}
                             <View>
-                                <ScanBadge navigation={navigation} />
+                                <SettingsBadge navigation={navigation} />
                             </View>
                             {posEnabled !== PosEnabled.Disabled && (
                                 <View
diff --git a/index.js b/index.js
index 449d88483..48cc5d62b 100644
--- a/index.js
+++ b/index.js
@@ -1,3 +1,5 @@
+import 'react-native-gesture-handler';
+
 /**
  * @format
  * @lint-ignore-every XPLATJSCOPYRIGHT1
@@ -9,7 +11,6 @@ import { TextDecoder } from 'text-encoding';
 global.TextDecoder = TextDecoder;
 
 import {AppRegistry} from 'react-native';
-import 'react-native-gesture-handler';
 import './shim.js'
 import App from './App.tsx';
 import {name as appName} from './app.json';
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 8d51046d6..1dfe8c031 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -921,8 +921,8 @@ PODS:
     - React
   - react-native-restart (0.0.27):
     - React-Core
-  - react-native-safe-area-context (0.6.4):
-    - React
+  - react-native-safe-area-context (4.10.1):
+    - React-Core
   - react-native-tor (0.1.8):
     - React
   - react-native-udp (4.1.7):
@@ -1103,8 +1103,8 @@ PODS:
     - React-Core
   - RNCClipboard (1.13.2):
     - React-Core
-  - RNCMaskedView (0.1.11):
-    - React
+  - RNCMaskedView (0.3.1):
+    - React-Core
   - RNCPicker (2.6.1):
     - React-Core
   - RNFS (2.20.0):
@@ -1212,7 +1212,7 @@ DEPENDENCIES:
   - "RemobileReactNativeQrcodeLocalImage (from `../node_modules/@remobile/react-native-qrcode-local-image`)"
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
-  - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
+  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
@@ -1379,7 +1379,7 @@ EXTERNAL SOURCES:
   RNCClipboard:
     :path: "../node_modules/@react-native-clipboard/clipboard"
   RNCMaskedView:
-    :path: "../node_modules/@react-native-community/masked-view"
+    :path: "../node_modules/@react-native-masked-view/masked-view"
   RNCPicker:
     :path: "../node_modules/@react-native-picker/picker"
   RNFS:
@@ -1453,7 +1453,7 @@ SPEC CHECKSUMS:
   react-native-print: f704aef52d931bfce6d1d84351dbb5232d7ecb89
   react-native-randombytes: 3638d24759d67c68f6ccba60c52a7a8a8faa6a23
   react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
-  react-native-safe-area-context: 52342d2d80ea8faadd0ffa76d83b6051f20c5329
+  react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d
   react-native-tor: 3b14e9160b2eb7fa3f310921b2dee71a5171e5b7
   react-native-udp: df79c3cb72c4e71240cd3ce4687bfb8a137140d5
   React-nativeconfig: 754233aac2a769578f828093b672b399355582e6
@@ -1480,7 +1480,7 @@ SPEC CHECKSUMS:
   RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
   RNCAsyncStorage: c43e6d71e13bb4748503797784839e0fbbf89d56
   RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
-  RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
+  RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
   RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 67fb54b3e6ca338a8044e85cd6f340265aa41091
diff --git a/package.json b/package.json
index 03c2dc2eb..1e373fb2c 100644
--- a/package.json
+++ b/package.json
@@ -36,11 +36,12 @@
     "@ngraveio/bc-ur": "1.1.12",
     "@react-native-async-storage/async-storage": "1.22.0",
     "@react-native-clipboard/clipboard": "1.13.2",
-    "@react-native-community/masked-view": "0.1.11",
     "@react-native-community/netinfo": "11.3.0",
+    "@react-native-masked-view/masked-view": "0.3.1",
     "@react-native-picker/picker": "2.6.1",
-    "@react-navigation/bottom-tabs": "5.11.11",
-    "@react-navigation/native": "6.1.10",
+    "@react-navigation/bottom-tabs": "7.0.0-alpha.22",
+    "@react-navigation/native": "7.0.0-alpha.18",
+    "@react-navigation/stack": "7.0.0-alpha.20",
     "@remobile/react-native-qrcode-local-image": "github:BlueWallet/react-native-qrcode-local-image#31b0113",
     "@scure/base": "1.1.6",
     "@tradle/react-native-http": "2.0.1",
@@ -122,7 +123,7 @@
     "react-native-reanimated": "3.7.0",
     "react-native-reanimated-carousel": "3.5.1",
     "react-native-restart": "0.0.27",
-    "react-native-safe-area-context": "0.6.4",
+    "react-native-safe-area-context": "4.10.1",
     "react-native-screens": "3.29.0",
     "react-native-securerandom": "1.0.1",
     "react-native-snap-carousel": "meliorence/react-native-snap-carousel#962/head",
@@ -134,8 +135,6 @@
     "react-native-udp": "4.1.7",
     "react-native-v8": "0.61.5-patch.4",
     "react-native-vector-icons": "7.1.0",
-    "react-navigation": "4.4.4",
-    "react-navigation-stack": "2.0.16",
     "readable-stream": "1.0.33",
     "sha.js": "2.4.11",
     "socket.io-client": "4.7.2",
diff --git a/utils/ErrorUtils.ts b/utils/ErrorUtils.ts
index 60f081d41..1dfa9ee27 100644
--- a/utils/ErrorUtils.ts
+++ b/utils/ErrorUtils.ts
@@ -21,8 +21,8 @@ const errorToUserFriendly = (error: Error, localize = true) => {
 
     try {
         errorObject = JSON.parse(errorMessage || error.toString());
-    } catch (err) {
-        console.log(err);
+    } catch {
+        // ignore - using original error message
     }
 
     const userFriendlyErrorMessage =
diff --git a/utils/LinkingUtils.ts b/utils/LinkingUtils.ts
index 806accbd1..8e1294bda 100644
--- a/utils/LinkingUtils.ts
+++ b/utils/LinkingUtils.ts
@@ -1,9 +1,11 @@
 import { Linking, Platform, NativeModules } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import { localeString } from './LocaleUtils';
 import handleAnything from './handleAnything';
 
 class LinkingUtils {
-    handleInitialUrl = (navigation: any) =>
+    handleInitialUrl = (navigation: StackNavigationProp<any, any>) =>
         Linking.getInitialURL().then(async (url) => {
             if (url) {
                 this.handleDeepLink(url, navigation);
@@ -15,7 +17,10 @@ class LinkingUtils {
                 if (nfcData) this.handleDeepLink(nfcData, navigation);
             }
         });
-    handleDeepLink = (url: string, navigation: any) => {
+    handleDeepLink = (
+        url: string,
+        navigation: StackNavigationProp<any, any>
+    ) => {
         if (url.startsWith('nostr:')) {
             Linking.openURL(url);
         } else {
diff --git a/utils/NavigationUtils.ts b/utils/NavigationUtils.ts
index 6f978ee4e..1c97f9d40 100644
--- a/utils/NavigationUtils.ts
+++ b/utils/NavigationUtils.ts
@@ -1,7 +1,9 @@
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import stores from '../stores/Stores';
 
 const protectedNavigation = async (
-    navigation: any,
+    navigation: StackNavigationProp<any, any>,
     route: string,
     disactivatePOS?: boolean
 ) => {
diff --git a/views/Accounts/Accounts.tsx b/views/Accounts/Accounts.tsx
index 7ffb554d8..9898492b2 100644
--- a/views/Accounts/Accounts.tsx
+++ b/views/Accounts/Accounts.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -22,11 +24,15 @@ import Add from '../../assets/images/SVG/Add.svg';
 import Filter from '../../assets/images/SVG/Filter On.svg';
 
 interface AccountsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     UTXOsStore: UTXOsStore;
     UnitsStore: UnitsStore;
     SettingsStore: SettingsStore;
+    route: Route<
+        'Accounts',
+        { value: string; amount: string; lightning: string; locked: boolean }
+    >;
 }
 
 interface AccountsState {
@@ -57,34 +63,23 @@ export default class Accounts extends React.Component<
     }
 
     componentDidMount() {
-        const { navigation } = this.props;
-        const value: string = navigation.getParam('value');
-        const amount: string = navigation.getParam('amount');
-        const lightning: string = navigation.getParam('lightning');
-        const locked: boolean = navigation.getParam('locked');
+        const { route } = this.props;
+        const { value, amount, lightning, locked } = route.params ?? {};
 
         if (value) {
-            this.setState({
-                value
-            });
+            this.setState({ value });
         }
 
         if (amount) {
-            this.setState({
-                amount
-            });
+            this.setState({ amount });
         }
 
         if (lightning) {
-            this.setState({
-                lightning
-            });
+            this.setState({ lightning });
         }
 
         if (locked) {
-            this.setState({
-                locked
-            });
+            this.setState({ locked });
         }
     }
 
diff --git a/views/Accounts/ImportAccount.tsx b/views/Accounts/ImportAccount.tsx
index 91d94caac..b247287f6 100644
--- a/views/Accounts/ImportAccount.tsx
+++ b/views/Accounts/ImportAccount.tsx
@@ -7,6 +7,8 @@ import {
     View
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import DropdownSetting from '../../components/DropdownSetting';
@@ -38,8 +40,17 @@ const AddressTypes = [
 
 interface ImportAccountProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     UTXOsStore: UTXOsStore;
+    route: Route<
+        'ImportAccount',
+        {
+            name: string;
+            extended_public_key: string;
+            master_key_fingerprint: string;
+            address_type: number;
+        }
+    >;
 }
 
 interface ImportAccountState {
@@ -65,46 +76,36 @@ export default class ImportAccount extends React.Component<
         };
     }
 
-    handleParams = (navigation: any) => {
-        const name = navigation.getParam('name');
+    handleParams = (props: ImportAccountProps) => {
+        const {
+            name,
+            extended_public_key,
+            master_key_fingerprint,
+            address_type
+        } = props.route.params ?? {};
         if (name) {
-            this.setState({
-                name
-            });
+            this.setState({ name });
         }
 
-        const extended_public_key = navigation.getParam('extended_public_key');
         if (extended_public_key) {
-            this.setState({
-                extended_public_key
-            });
+            this.setState({ extended_public_key });
         }
 
-        const master_key_fingerprint = navigation.getParam(
-            'master_key_fingerprint'
-        );
         if (master_key_fingerprint) {
-            this.setState({
-                master_key_fingerprint
-            });
+            this.setState({ master_key_fingerprint });
         }
 
-        const address_type = navigation.getParam('address_type');
         if (address_type) {
-            this.setState({
-                address_type
-            });
+            this.setState({ address_type });
         }
     };
 
     UNSAFE_componentWillMount = () => {
-        const { navigation } = this.props;
-        this.handleParams(navigation);
+        this.handleParams(this.props);
     };
 
-    UNSAFE_componentWillReceiveProps = (newProps: any) => {
-        const { navigation } = newProps;
-        this.handleParams(navigation);
+    UNSAFE_componentWillReceiveProps = (newProps: ImportAccountProps) => {
+        this.handleParams(newProps);
     };
 
     render() {
diff --git a/views/Accounts/ImportingAccount.tsx b/views/Accounts/ImportingAccount.tsx
index ecd160079..e8fb656d3 100644
--- a/views/Accounts/ImportingAccount.tsx
+++ b/views/Accounts/ImportingAccount.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { ScrollView, StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from './../../components/Button';
 import Header from '../../components/Header';
@@ -21,7 +22,7 @@ import { walletrpc } from '../../proto/lightning';
 
 interface ImportingAccountProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     UTXOsStore: UTXOsStore;
 }
 
diff --git a/views/Activity/Activity.tsx b/views/Activity/Activity.tsx
index 8a040d95c..6fdb88e7b 100644
--- a/views/Activity/Activity.tsx
+++ b/views/Activity/Activity.tsx
@@ -11,6 +11,8 @@ import {
 import { Button, Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import BigNumber from 'bignumber.js';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../../components/Amount';
 import Header from '../../components/Header';
@@ -31,11 +33,12 @@ import Filter from '../../assets/images/SVG/Filter On.svg';
 import Invoice from '../../models/Invoice';
 
 interface ActivityProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ActivityStore: ActivityStore;
     FiatStore: FiatStore;
     PosStore: PosStore;
     SettingsStore: SettingsStore;
+    route: Route<'Activity', { order: any }>;
 }
 
 interface ActivityState {
@@ -135,7 +138,8 @@ export default class Activity extends React.PureComponent<
             ActivityStore,
             FiatStore,
             PosStore,
-            SettingsStore
+            SettingsStore,
+            route
         } = this.props;
         const { selectedPaymentForOrder } = this.state;
 
@@ -145,7 +149,7 @@ export default class Activity extends React.PureComponent<
         const { settings } = SettingsStore;
         const { fiat } = settings;
 
-        const order = navigation.getParam('order', null);
+        const order = route.params?.order;
 
         const MarkPaymentButton = () => (
             <Icon
diff --git a/views/Activity/ActivityFilter.tsx b/views/Activity/ActivityFilter.tsx
index 988057a4a..f8996a89c 100644
--- a/views/Activity/ActivityFilter.tsx
+++ b/views/Activity/ActivityFilter.tsx
@@ -3,8 +3,8 @@ import { FlatList, Text, View } from 'react-native';
 import { Button, Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import { isEqual } from 'lodash';
-
 import DatePicker from 'react-native-date-picker';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import BackendUtils from '../../utils/BackendUtils';
 import { localeString } from '../../utils/LocaleUtils';
@@ -19,7 +19,7 @@ import Switch from '../../components/Switch';
 import TextInput from '../../components/TextInput';
 
 interface ActivityFilterProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ActivityStore: ActivityStore;
     SettingsStore: SettingsStore;
 }
diff --git a/views/AddNotes.tsx b/views/AddNotes.tsx
index edf4f1f08..b91cffe70 100644
--- a/views/AddNotes.tsx
+++ b/views/AddNotes.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { Keyboard, TouchableOpacity, View } from 'react-native';
 import EncryptedStorage from 'react-native-encrypted-storage';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../components/Header';
 import Screen from '../components/Screen';
@@ -16,8 +18,12 @@ import TextInput from '../components/TextInput';
 import SaveIcon from '../assets/images/SVG/Save.svg';
 
 interface AddNotesProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NotesStore: NotesStore;
+    route: Route<
+        'AddNotes',
+        { payment_hash: string; txid: string; getRPreimage: string }
+    >;
 }
 interface AddNotesState {
     notes?: string;
@@ -35,15 +41,8 @@ export default class AddNotes extends React.Component<
 > {
     constructor(props: any) {
         super(props);
-        const payment_hash: string = this.props.navigation.getParam(
-            'payment_hash',
-            null
-        );
-        const txid: string = this.props.navigation.getParam('txid', null);
-        const getRPreimage: string = this.props.navigation.getParam(
-            'getRPreimage',
-            null
-        );
+        const { payment_hash, txid, getRPreimage } =
+            this.props.route.params ?? {};
 
         this.state = {
             notes: '',
diff --git a/views/BumpFee.tsx b/views/BumpFee.tsx
index c1b36351a..ca7b8805b 100644
--- a/views/BumpFee.tsx
+++ b/views/BumpFee.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { StyleSheet, Text, TouchableWithoutFeedback, View } from 'react-native';
 import { ButtonGroup } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import Header from '../components/Header';
@@ -21,9 +23,16 @@ import { themeColor } from '../utils/ThemeUtils';
 import { localeString } from '../utils/LocaleUtils';
 
 interface BumpFeeProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     FeeStore: FeeStore;
     SettingsStore: SettingsStore;
+    route: Route<
+        'BumpFee',
+        {
+            outpoint: string;
+            channel: boolean;
+        }
+    >;
 }
 
 interface BumpFeeState {
@@ -42,7 +51,7 @@ export default class BumpFee extends React.PureComponent<
 > {
     constructor(props: any) {
         super(props);
-        const outpoint: string = this.props.navigation.getParam('outpoint', '');
+        const outpoint = this.props.route.params?.outpoint ?? '';
         this.state = {
             outpoint,
             target_conf: '1',
@@ -63,7 +72,7 @@ export default class BumpFee extends React.PureComponent<
     };
 
     render() {
-        const { FeeStore, SettingsStore, navigation } = this.props;
+        const { FeeStore, SettingsStore, navigation, route } = this.props;
         const { outpoint, target_conf, sat_per_vbyte, force, target_type } =
             this.state;
 
@@ -78,7 +87,7 @@ export default class BumpFee extends React.PureComponent<
         const { privacy } = settings;
         const enableMempoolRates = privacy && privacy.enableMempoolRates;
 
-        const isChannel = navigation.getParam('channel', false);
+        const isChannel = route.params?.channel;
 
         const feeRateButton = () => (
             <Text
diff --git a/views/Channels/Channel.tsx b/views/Channels/Channel.tsx
index 8c11cfe34..9630a3193 100644
--- a/views/Channels/Channel.tsx
+++ b/views/Channels/Channel.tsx
@@ -10,6 +10,9 @@ import {
 
 import { Divider } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import Channel from '../../models/Channel';
 
 import Amount from '../../components/Amount';
@@ -39,10 +42,11 @@ import NodeInfoStore from '../../stores/NodeInfoStore';
 import Edit from '../../assets/images/SVG/Edit.svg';
 
 interface ChannelProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     SettingsStore: SettingsStore;
     NodeInfoStore: NodeInfoStore;
+    route: Route<'Channel', { channel: Channel }>;
 }
 
 interface ChannelState {
@@ -62,8 +66,8 @@ export default class ChannelView extends React.Component<
     listener: any;
     constructor(props: ChannelProps) {
         super(props);
-        const { navigation, ChannelsStore } = props;
-        const channel: Channel = navigation.getParam('channel', null);
+        const { route, ChannelsStore } = props;
+        const channel = route.params?.channel;
 
         this.state = {
             confirmCloseChannel: false,
@@ -624,6 +628,7 @@ export default class ChannelView extends React.Component<
                                                 satPerByte: text
                                             });
                                         }}
+                                        navigation={navigation}
                                     />
                                     <>
                                         <Text
diff --git a/views/Channels/ChannelsPane.tsx b/views/Channels/ChannelsPane.tsx
index f475da866..f29a23db4 100644
--- a/views/Channels/ChannelsPane.tsx
+++ b/views/Channels/ChannelsPane.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { FlatList, View, TouchableHighlight } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import { duration } from 'moment';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { ChannelsHeader } from '../../components/Channels/ChannelsHeader';
 import { ChannelItem } from '../../components/Channels/ChannelItem';
@@ -30,7 +31,7 @@ export enum Status {
 }
 
 interface ChannelsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore?: ChannelsStore;
     SettingsStore?: SettingsStore;
 }
diff --git a/views/ContactDetails.tsx b/views/ContactDetails.tsx
index 7f937a88d..7823b2c22 100644
--- a/views/ContactDetails.tsx
+++ b/views/ContactDetails.tsx
@@ -8,6 +8,9 @@ import {
     ScrollView
 } from 'react-native';
 import EncryptedStorage from 'react-native-encrypted-storage';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import Screen from '../components/Screen';
 import Button from '../components/Button';
 import LoadingIndicator from '../components/LoadingIndicator';
@@ -29,7 +32,15 @@ import { localeString } from '../utils/LocaleUtils';
 import Contact from '../models/Contact';
 
 interface ContactDetailsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<
+        'ContactDetails',
+        {
+            isNostrContact: boolean;
+            contactId: string;
+            nostrContact: any;
+        }
+    >;
 }
 
 interface ContactDetailsState {
@@ -68,10 +79,7 @@ export default class ContactDetails extends React.Component<
         try {
             await this.fetchContact();
 
-            const isNostrContact = this.props.navigation.getParam(
-                'isNostrContact',
-                null
-            );
+            const isNostrContact = this.props.route.params?.isNostrContact;
 
             this.setState({ isNostrContact });
         } catch (error) {
@@ -80,16 +88,10 @@ export default class ContactDetails extends React.Component<
     }
 
     fetchContact = async () => {
-        this.props.navigation.addListener('didFocus', async () => {
+        this.props.navigation.addListener('focus', async () => {
             try {
-                const contactId = this.props.navigation.getParam(
-                    'contactId',
-                    null
-                );
-                const nostrContact = this.props.navigation.getParam(
-                    'nostrContact',
-                    null
-                );
+                const { contactId, nostrContact } =
+                    this.props.route.params ?? {};
                 const contactsString = await EncryptedStorage.getItem(
                     'zeus-contacts'
                 );
@@ -203,10 +205,7 @@ export default class ContactDetails extends React.Component<
         const { navigation } = this.props;
 
         const contact = new Contact(this.state.contact);
-        const nostrContact = this.props.navigation.getParam(
-            'nostrContact',
-            null
-        );
+        const nostrContact = this.props.route.params?.nostrContact;
         const StarButton = () => (
             <TouchableOpacity onPress={this.toggleFavorite}>
                 <Star
diff --git a/views/ContactQR.tsx b/views/ContactQR.tsx
index 70a7a5888..a5a4c7960 100644
--- a/views/ContactQR.tsx
+++ b/views/ContactQR.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Dimensions, View, SafeAreaView } from 'react-native';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Animated, {
     Extrapolate,
@@ -15,19 +17,24 @@ import { themeColor } from '../utils/ThemeUtils';
 import CollapsedQR from '../components/CollapsedQR';
 
 interface ContactQRProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<
+        'ContactQR',
+        {
+            contactData: string;
+            addressData: string[];
+        }
+    >;
 }
 
 const ContactQR: React.FC<ContactQRProps> = (props: ContactQRProps) => {
     const [addressData, setAddressData] = useState(['']);
-    const { navigation } = props;
+    const { navigation, route } = props;
 
     useEffect(() => {
-        const contactData = navigation.getParam('contactData', null);
-        const addressData = navigation.getParam('addressData', null);
-
+        const { contactData, addressData } = route.params ?? {};
         setAddressData([contactData, ...addressData]);
-    }, [navigation]);
+    }, [route]);
 
     let screenWidth: number;
     const progressValue = useSharedValue<number>(0);
diff --git a/views/EditFee.tsx b/views/EditFee.tsx
index 3475a75be..e0b113c72 100644
--- a/views/EditFee.tsx
+++ b/views/EditFee.tsx
@@ -12,6 +12,8 @@ import {
     Keyboard
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import Header from '../components/Header';
@@ -31,8 +33,16 @@ import SettingsStore from './../stores/SettingsStore';
 interface EditFeeProps {
     FeeStore: FeeStore;
     SettingsStore: SettingsStore;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     displayOnly?: boolean;
+    route: Route<
+        'EditFee',
+        {
+            fee: any;
+            displayOnly: boolean;
+            onNavigateBack: (fee: any) => {};
+        }
+    >;
 }
 
 interface EditFeeState {
@@ -57,8 +67,8 @@ export default class EditFee extends React.Component<
     }
 
     async UNSAFE_componentWillMount() {
-        const { FeeStore, SettingsStore, navigation } = this.props;
-        const fee = navigation.getParam('fee', null);
+        const { FeeStore, SettingsStore, route } = this.props;
+        const fee = route.params?.fee;
         const { settings } = SettingsStore;
         const fees: any = await FeeStore.getOnchainFeesviaMempool();
 
@@ -74,8 +84,8 @@ export default class EditFee extends React.Component<
 
     render() {
         const { selectedFee, fee, customFee } = this.state;
-        const { navigation, FeeStore } = this.props;
-        const displayOnly = navigation.getParam('displayOnly', null);
+        const { navigation, FeeStore, route } = this.props;
+        const displayOnly = route.params?.displayOnly;
         const { recommendedFees, loading, error, getOnchainFeesviaMempool } =
             FeeStore;
 
@@ -378,7 +388,7 @@ export default class EditFee extends React.Component<
                                             'views.EditFee.confirmFee'
                                         )}
                                         onPress={() => {
-                                            this.props.navigation.state.params.onNavigateBack(
+                                            this.props.route.params.onNavigateBack(
                                                 fee
                                             );
                                             this.props.navigation.goBack();
diff --git a/views/Explanations/LspExplanationFees.tsx b/views/Explanations/LspExplanationFees.tsx
index 0bfc44580..c399968b3 100644
--- a/views/Explanations/LspExplanationFees.tsx
+++ b/views/Explanations/LspExplanationFees.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Text, View } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import NavigationService from '../../NavigationService';
 
@@ -12,7 +13,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import UrlUtils from '../../utils/UrlUtils';
 
 interface LspExplanationProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 const FONT_SIZE = 18;
diff --git a/views/Explanations/LspExplanationOverview.tsx b/views/Explanations/LspExplanationOverview.tsx
index 061061598..72213ea87 100644
--- a/views/Explanations/LspExplanationOverview.tsx
+++ b/views/Explanations/LspExplanationOverview.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Text, ScrollView } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import NavigationService from '../../NavigationService';
 import Button from '../../components/Button';
@@ -10,7 +11,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface LspExplanationOverviewProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 const FONT_SIZE = 17;
diff --git a/views/Explanations/LspExplanationRouting.tsx b/views/Explanations/LspExplanationRouting.tsx
index fb212ac73..090e13a1f 100644
--- a/views/Explanations/LspExplanationRouting.tsx
+++ b/views/Explanations/LspExplanationRouting.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Text, View } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import NavigationService from '../../NavigationService';
 
@@ -11,7 +12,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface LspExplanationProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 const FONT_SIZE = 18;
diff --git a/views/Explanations/LspExplanationWrappedInvoices.tsx b/views/Explanations/LspExplanationWrappedInvoices.tsx
index c49a189fe..7d66159dc 100644
--- a/views/Explanations/LspExplanationWrappedInvoices.tsx
+++ b/views/Explanations/LspExplanationWrappedInvoices.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 import { Text, ScrollView } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import Screen from '../../components/Screen';
 import Header from '../../components/Header';
 
@@ -7,7 +9,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface LspExplanationWrappedInvoicesProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 const FONT_SIZE = 18;
diff --git a/views/handleAnythingQRScanner.tsx b/views/HandleAnythingQRScanner.tsx
similarity index 93%
rename from views/handleAnythingQRScanner.tsx
rename to views/HandleAnythingQRScanner.tsx
index e729b3bcd..415b7b7e0 100644
--- a/views/handleAnythingQRScanner.tsx
+++ b/views/HandleAnythingQRScanner.tsx
@@ -3,6 +3,7 @@ import { Alert, View } from 'react-native';
 import { Header } from 'react-native-elements';
 import { observer } from 'mobx-react';
 import { URDecoder } from '@ngraveio/bc-ur';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import LoadingIndicator from '../components/LoadingIndicator';
 import QRCodeScanner from '../components/QRCodeScanner';
@@ -13,11 +14,11 @@ import { joinQRs } from '../utils/BbqrUtils';
 import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
-interface handleAnythingQRProps {
-    navigation: any;
+interface HandleAnythingQRProps {
+    navigation: StackNavigationProp<any, any>;
 }
 
-interface handleAnythingQRState {
+interface HandleAnythingQRState {
     loading: boolean;
     mode: string;
     totalParts: number;
@@ -25,9 +26,9 @@ interface handleAnythingQRState {
 }
 
 @observer
-export default class handleAnythingQRScanner extends React.Component<
-    handleAnythingQRProps,
-    handleAnythingQRState
+export default class HandleAnythingQRScanner extends React.Component<
+    HandleAnythingQRProps,
+    HandleAnythingQRState
 > {
     decoder: any;
     constructor(props: any) {
@@ -187,7 +188,9 @@ export default class handleAnythingQRScanner extends React.Component<
         return (
             <QRCodeScanner
                 handleQRScanned={this.handleAnythingScanned}
-                goBack={() => navigation.goBack()}
+                goBack={() => {
+                    navigation.goBack();
+                }}
                 navigation={navigation}
                 parts={parts.length}
                 totalParts={totalParts}
diff --git a/views/Intro.tsx b/views/Intro.tsx
index 04ac7b418..a0b8b077a 100644
--- a/views/Intro.tsx
+++ b/views/Intro.tsx
@@ -9,6 +9,7 @@ import Animated, {
     useSharedValue
 } from 'react-native-reanimated';
 import Carousel from 'react-native-reanimated-carousel';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import stores from '../stores/Stores';
 
@@ -30,7 +31,7 @@ const Four = require('../assets/images/intro/4.png');
 import Wordmark from '../assets/images/SVG/wordmark-black.svg';
 
 interface IntroProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 const Intro: React.FC<IntroProps> = (props) => {
diff --git a/views/IntroSplash.tsx b/views/IntroSplash.tsx
index 236e1468f..464350d87 100644
--- a/views/IntroSplash.tsx
+++ b/views/IntroSplash.tsx
@@ -9,6 +9,7 @@ import {
     Text
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Globe from '../assets/images/SVG/Globe.svg';
 import Wordmark from '../assets/images/SVG/wordmark-black.svg';
@@ -27,7 +28,7 @@ import { themeColor } from '../utils/ThemeUtils';
 import TresArrows from '../assets/images/SVG/TresArrows.svg';
 
 interface IntroSplashProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
@@ -52,7 +53,7 @@ export default class IntroSplash extends React.Component<
 
     componentDidMount() {
         // triggers when loaded from navigation or back action
-        this.props.navigation.addListener('didFocus', () => {
+        this.props.navigation.addListener('focus', () => {
             this.props.SettingsStore.getSettings();
         });
 
diff --git a/views/Invoice.tsx b/views/Invoice.tsx
index c20b8e8ec..b5734b34d 100644
--- a/views/Invoice.tsx
+++ b/views/Invoice.tsx
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import EncryptedStorage from 'react-native-encrypted-storage';
-
 import { StyleSheet, ScrollView, View, TouchableOpacity } from 'react-native';
 import { inject } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import SettingsStore from '../stores/SettingsStore';
 
@@ -23,8 +24,9 @@ import EditNotes from '../assets/images/SVG/Pen.svg';
 import QR from '../assets/images/SVG/QR.svg';
 
 interface InvoiceProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore?: SettingsStore;
+    route: Route<'InvoiceView', { invoice: Invoice }>;
 }
 
 @inject('SettingsStore')
@@ -33,9 +35,9 @@ export default class InvoiceView extends React.Component<InvoiceProps> {
         storedNotes: ''
     };
     async componentDidMount() {
-        const { navigation } = this.props;
-        const invoice: Invoice = navigation.getParam('invoice', null);
-        navigation.addListener('didFocus', () => {
+        const { navigation, route } = this.props;
+        const invoice = route.params?.invoice;
+        navigation.addListener('focus', () => {
             const noteKey = invoice.getRPreimage || invoice.payment_hash;
             EncryptedStorage.getItem('note-' + noteKey)
                 .then((storedNotes) => {
@@ -48,9 +50,9 @@ export default class InvoiceView extends React.Component<InvoiceProps> {
     }
 
     render() {
-        const { navigation, SettingsStore } = this.props;
+        const { navigation, SettingsStore, route } = this.props;
         const { storedNotes } = this.state;
-        const invoice: Invoice = navigation.getParam('invoice', null);
+        const invoice = route.params?.invoice;
         const locale = SettingsStore?.settings.locale;
         invoice.determineFormattedOriginalTimeUntilExpiry(locale);
         invoice.determineFormattedRemainingTimeUntilExpiry(locale);
diff --git a/views/LnurlAuth.tsx b/views/LnurlAuth.tsx
index eb1140019..f28e263a1 100644
--- a/views/LnurlAuth.tsx
+++ b/views/LnurlAuth.tsx
@@ -5,6 +5,8 @@ import { inject, observer } from 'mobx-react';
 import { Alert, StyleSheet, Text, View } from 'react-native';
 import querystring from 'querystring-es3';
 import { HMAC as sha256HMAC } from 'fast-sha256';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import Header from '../components/Header';
@@ -29,8 +31,9 @@ const LNURLAUTH_CANONICAL_PHRASE =
     'DO NOT EVER SIGN THIS TEXT WITH YOUR PRIVATE KEYS! IT IS ONLY USED FOR DERIVATION OF LNURL-AUTH HASHING-KEY, DISCLOSING ITS SIGNATURE WILL COMPROMISE YOUR LNURL-AUTH IDENTITY AND MAY LEAD TO LOSS OF FUNDS!';
 
 interface LnurlAuthProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
+    route: Route<'LnurlAuth', { lnurlParams: any }>;
 }
 
 interface LnurlAuthState {
@@ -85,8 +88,8 @@ export default class LnurlAuth extends React.Component<
     }
 
     stateFromProps(props: LnurlAuthProps) {
-        const { navigation } = props;
-        const lnurl = navigation.getParam('lnurlParams');
+        const { route } = props;
+        const lnurl = route.params?.lnurlParams;
 
         return {
             domain: lnurl.domain,
@@ -164,9 +167,9 @@ export default class LnurlAuth extends React.Component<
     sendValues() {
         this.setState({ authenticating: true });
 
-        const { navigation } = this.props;
+        const { route } = this.props;
         const { domain } = this.state;
-        const lnurl = navigation.getParam('lnurlParams');
+        const lnurl = route.params?.lnurlParams;
         const u = url.parse(lnurl.callback);
         const qs = querystring.parse(u.query);
         qs.key = this.state.linkingKeyPub;
diff --git a/views/LnurlChannel.tsx b/views/LnurlChannel.tsx
index 131c9db77..3d7c391ce 100644
--- a/views/LnurlChannel.tsx
+++ b/views/LnurlChannel.tsx
@@ -4,6 +4,8 @@ import ReactNativeBlobUtil from 'react-native-blob-util';
 import { Alert, StyleSheet, Switch, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import querystring from 'querystring-es3';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import Header from '../components/Header';
@@ -23,9 +25,10 @@ import NodeUriUtils from '../utils/NodeUriUtils';
 import BackendUtils from '../utils/BackendUtils';
 
 interface LnurlChannelProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     NodeInfoStore: NodeInfoStore;
+    route: Route<'LnurlChannel', { lnurlParams: any }>;
 }
 
 interface LnurlChannelState {
@@ -74,8 +77,8 @@ export default class LnurlChannel extends React.Component<
     }
 
     stateFromProps(props: LnurlChannelProps) {
-        const { navigation } = props;
-        const lnurl = navigation.getParam('lnurlParams');
+        const { route } = props;
+        const lnurl = route.params?.lnurlParams;
 
         const { pubkey, host } = NodeUriUtils.processNodeUri(lnurl.uri);
         return {
@@ -126,9 +129,9 @@ export default class LnurlChannel extends React.Component<
     }
 
     sendValues() {
-        const { navigation, NodeInfoStore } = this.props;
+        const { route, NodeInfoStore } = this.props;
         const { domain, k1 } = this.state;
-        const lnurl = navigation.getParam('lnurlParams');
+        const lnurl = route.params?.lnurlParams;
         const u = url.parse(lnurl.callback);
         const qs = querystring.parse(u.query);
         qs.k1 = k1;
@@ -180,7 +183,7 @@ export default class LnurlChannel extends React.Component<
     }
 
     render() {
-        const { navigation } = this.props;
+        const { navigation, route } = this.props;
         const {
             domain,
             privateChannel,
@@ -188,7 +191,7 @@ export default class LnurlChannel extends React.Component<
             lnurlChannelSuccess,
             errorMsgPeer
         } = this.state;
-        const lnurl = navigation.getParam('lnurlParams');
+        const lnurl = route.params?.lnurlParams;
 
         return (
             <Screen>
diff --git a/views/LnurlPay/Historical.tsx b/views/LnurlPay/Historical.tsx
index de45c58c1..e48029e5a 100644
--- a/views/LnurlPay/Historical.tsx
+++ b/views/LnurlPay/Historical.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react';
 import { Text, View, TouchableOpacity } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import { LnurlPayTransaction } from './../../stores/LnurlPayStore';
 import LnurlPayMetadata from './Metadata';
 import LnurlPaySuccess from './Success';
 import { themeColor } from './../../utils/ThemeUtils';
 
 interface LnurlPayHistoricalProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     lnurlpaytx: LnurlPayTransaction;
     preimage: string;
 }
diff --git a/views/LnurlPay/LnurlPay.tsx b/views/LnurlPay/LnurlPay.tsx
index 3a4a5cc7a..2cb694f5f 100644
--- a/views/LnurlPay/LnurlPay.tsx
+++ b/views/LnurlPay/LnurlPay.tsx
@@ -4,6 +4,8 @@ import ReactNativeBlobUtil from 'react-native-blob-util';
 import { Alert, StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import querystring from 'querystring-es3';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../../components/Amount';
 import AmountInput from '../../components/AmountInput';
@@ -24,10 +26,11 @@ import { themeColor } from '../../utils/ThemeUtils';
 import { ScrollView } from 'react-native-gesture-handler';
 
 interface LnurlPayProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     InvoicesStore: InvoicesStore;
     LnurlPayStore: LnurlPayStore;
     UnitsStore: UnitsStore;
+    route: Route<'LnurlPay', { lnurlParams: any; amount: any }>;
 }
 
 interface LnurlPayState {
@@ -66,9 +69,8 @@ export default class LnurlPay extends React.Component<
     }
 
     stateFromProps(props: LnurlPayProps) {
-        const { UnitsStore, navigation } = props;
-        const lnurl = navigation.getParam('lnurlParams');
-        const amount = navigation.getParam('amount');
+        const { UnitsStore, route } = props;
+        const { lnurlParams: lnurl, amount } = route.params ?? {};
 
         UnitsStore.resetUnits();
 
@@ -83,9 +85,9 @@ export default class LnurlPay extends React.Component<
     }
 
     sendValues(satAmount: string | number) {
-        const { navigation, InvoicesStore, LnurlPayStore } = this.props;
+        const { navigation, InvoicesStore, LnurlPayStore, route } = this.props;
         const { domain, comment } = this.state;
-        const lnurl = navigation.getParam('lnurlParams');
+        const lnurl = route.params?.lnurlParams;
         const u = url.parse(lnurl.callback);
         const qs = querystring.parse(u.query);
         qs.amount = Number((parseFloat(satAmount) * 1000).toString());
@@ -180,10 +182,10 @@ export default class LnurlPay extends React.Component<
     }
 
     render() {
-        const { navigation } = this.props;
+        const { navigation, route } = this.props;
         const { amount, satAmount, domain, comment } = this.state;
 
-        const lnurl = navigation.getParam('lnurlParams');
+        const lnurl = route.params?.lnurlParams;
 
         return (
             <Screen>
diff --git a/views/Lockscreen.tsx b/views/Lockscreen.tsx
index 27d63f93b..76dcfa7c4 100644
--- a/views/Lockscreen.tsx
+++ b/views/Lockscreen.tsx
@@ -9,6 +9,8 @@ import {
     Text,
     View
 } from 'react-native';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import Header from '../components/Header';
@@ -26,8 +28,17 @@ import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
 interface LockscreenProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
+    route: Route<
+        'Lockscreen',
+        {
+            modifySecurityScreen: string;
+            deletePin: boolean;
+            deleteDuressPin: boolean;
+            attemptAdminLogin: boolean;
+        }
+    >;
 }
 
 interface LockscreenState {
@@ -89,15 +100,14 @@ export default class Lockscreen extends React.Component<
     };
 
     async UNSAFE_componentWillMount() {
-        const { SettingsStore, navigation } = this.props;
+        const { SettingsStore, navigation, route } = this.props;
         const { settings } = SettingsStore;
-        const modifySecurityScreen: string = navigation.getParam(
-            'modifySecurityScreen'
-        );
-        const deletePin: boolean = navigation.getParam('deletePin');
-        const deleteDuressPin: boolean = navigation.getParam('deleteDuressPin');
-        const attemptAdminLogin: boolean =
-            navigation.getParam('attemptAdminLogin');
+        const {
+            modifySecurityScreen,
+            deletePin,
+            deleteDuressPin,
+            attemptAdminLogin
+        } = route.params ?? {};
 
         const posEnabled: PosEnabled =
             (settings && settings.pos && settings.pos.posEnabled) ||
diff --git a/views/NetworkInfo.tsx b/views/NetworkInfo.tsx
index fc3a2a957..2d6b482f9 100644
--- a/views/NetworkInfo.tsx
+++ b/views/NetworkInfo.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { FlatList, StyleSheet } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../components/Header';
 import KeyValue from '../components/KeyValue';
@@ -12,7 +13,7 @@ import { themeColor } from '../utils/ThemeUtils';
 import NodeInfoStore from '../stores/NodeInfoStore';
 
 interface NetworkInfoProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
 }
 
diff --git a/views/NodeInfo.tsx b/views/NodeInfo.tsx
index 9b0385012..3573b6d3e 100644
--- a/views/NodeInfo.tsx
+++ b/views/NodeInfo.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { RefreshControl, StyleSheet, ScrollView } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import CollapsedQR from '../components/CollapsedQR';
 import Header from '../components/Header';
@@ -15,7 +16,7 @@ import NodeInfoStore from '../stores/NodeInfoStore';
 import SettingsStore from '../stores/SettingsStore';
 
 interface NodeInfoProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
     SettingsStore: SettingsStore;
 }
diff --git a/views/NodeQRScanner.tsx b/views/NodeQRScanner.tsx
index f2c153cc0..cbbc942f1 100644
--- a/views/NodeQRScanner.tsx
+++ b/views/NodeQRScanner.tsx
@@ -1,11 +1,14 @@
 import * as React from 'react';
 import { Alert } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import QRCodeScanner from './../components/QRCodeScanner';
+
 import NodeUriUtils from './../utils/NodeUriUtils';
 import { localeString } from './../utils/LocaleUtils';
 
 interface NodeQRProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 function NodeQRScanner(props: NodeQRProps) {
diff --git a/views/NostrContacts.tsx b/views/NostrContacts.tsx
index e7abd0a19..bdc712c7b 100644
--- a/views/NostrContacts.tsx
+++ b/views/NostrContacts.tsx
@@ -12,6 +12,7 @@ import {
 import { CheckBox, Icon } from 'react-native-elements';
 import EncryptedStorage from 'react-native-encrypted-storage';
 import { relayInit, nip05, nip19 } from 'nostr-tools';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import Header from '../components/Header';
@@ -32,7 +33,7 @@ import SelectOff from '../assets/images/SVG/Select Off.svg';
 import SelectOn from '../assets/images/SVG/Select On.svg';
 
 interface NostrContactsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 interface NostrContactsState {
diff --git a/views/OpenChannel.tsx b/views/OpenChannel.tsx
index ee146d32b..c22dacefe 100644
--- a/views/OpenChannel.tsx
+++ b/views/OpenChannel.tsx
@@ -10,6 +10,8 @@ import {
 import Clipboard from '@react-native-clipboard/clipboard';
 import { inject, observer } from 'mobx-react';
 import NfcManager, { NfcEvents, TagEvent } from 'react-native-nfc-manager';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../components/Amount';
 import AmountInput from '../components/AmountInput';
@@ -50,13 +52,14 @@ import Scan from '../assets/images/SVG/Scan.svg';
 
 interface OpenChannelProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     ChannelsStore: ChannelsStore;
     ModalStore: ModalStore;
     NodeInfoStore: NodeInfoStore;
     SettingsStore: SettingsStore;
     UTXOsStore: UTXOsStore;
+    route: Route<'OpenChannel', { node_pubkey_string: string; host: string }>;
 }
 
 interface OpenChannelState {
@@ -209,14 +212,11 @@ export default class OpenChannel extends React.Component<
         this.initFromProps(nextProps);
     }
 
-    initFromProps(props: any) {
-        const { navigation } = props;
+    initFromProps(props: OpenChannelProps) {
+        const { route } = props;
 
-        const node_pubkey_string = navigation.getParam(
-            'node_pubkey_string',
-            ''
-        );
-        const host = navigation.getParam('host', '');
+        const node_pubkey_string = route.params?.node_pubkey_string ?? '';
+        const host = route.params?.host ?? '';
 
         this.setState({
             node_pubkey_string,
@@ -790,6 +790,7 @@ export default class OpenChannel extends React.Component<
                                                 sat_per_vbyte: text
                                             });
                                         }}
+                                        navigation={navigation}
                                     />
                                 </>
 
diff --git a/views/Order.tsx b/views/Order.tsx
index 27a96399c..493ba0987 100644
--- a/views/Order.tsx
+++ b/views/Order.tsx
@@ -10,6 +10,8 @@ import {
 import { ButtonGroup } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import BigNumber from 'bignumber.js';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../components/Amount';
 import Button from '../components/Button';
@@ -30,11 +32,12 @@ import RNPrint from 'react-native-print';
 import PosStore from '../stores/PosStore';
 
 interface OrderProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
     FiatStore: FiatStore;
     UnitsStore: UnitsStore;
     PosStore: PosStore;
+    route: Route<'Order', { orderId: string; order: any; print: boolean }>;
 }
 
 interface OrderState {
@@ -50,11 +53,10 @@ interface OrderState {
 @inject('FiatStore', 'SettingsStore', 'UnitsStore', 'PosStore')
 @observer
 export default class OrderView extends React.Component<OrderProps, OrderState> {
-    constructor(props: any) {
+    constructor(props: OrderProps) {
         super(props);
-        const { SettingsStore, navigation } = props;
-        const order = navigation.getParam('order', null);
-        const print = navigation.getParam('print', false);
+        const { SettingsStore, route } = props;
+        const { order, print } = route.params ?? {};
 
         const { settings } = SettingsStore;
         const disableTips: boolean =
@@ -75,12 +77,8 @@ export default class OrderView extends React.Component<OrderProps, OrderState> {
         // print and order id are passed from the paid screen
         // we update the order so it includes payment details
         // which will enable the receipt printing
-        if (
-            this.props.navigation.getParam('print', false) !==
-            prevProps.navigation.getParam('print', false)
-        ) {
-            const orderId = this.props.navigation.getParam('orderId', null);
-            const print = this.props.navigation.getParam('print', false);
+        if (this.props.route.params?.print !== prevProps.route.params?.print) {
+            const { orderId, print } = this.props.route.params ?? {};
 
             const { PosStore } = this.props;
             if (orderId) {
diff --git a/views/POS/Categories.tsx b/views/POS/Categories.tsx
index 270073d2d..836b7bf23 100644
--- a/views/POS/Categories.tsx
+++ b/views/POS/Categories.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { FlatList, Text, TouchableOpacity, View } from 'react-native';
 import { ListItem, SearchBar } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import LoadingIndicator from '../../components/LoadingIndicator';
@@ -17,7 +18,7 @@ import ProductCategory from '../../models/ProductCategory';
 import AddIcon from '../../assets/images/SVG/Add.svg';
 
 interface ProductCategoriesProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     InventoryStore: InventoryStore;
 }
 
@@ -40,7 +41,7 @@ export default class ProductCategories extends React.Component<
     };
 
     async componentDidMount() {
-        this.props.navigation.addListener('didFocus', async () => {
+        this.props.navigation.addListener('focus', async () => {
             this.loadCategories();
         });
     }
@@ -84,7 +85,11 @@ export default class ProductCategories extends React.Component<
         const { navigation } = this.props;
         const { categories, search, loading } = this.state;
 
-        const Add = ({ navigation }: { navigation: any }) => (
+        const Add = ({
+            navigation
+        }: {
+            navigation: StackNavigationProp<any, any>;
+        }) => (
             <TouchableOpacity
                 onPress={() => navigation.navigate('ProductCategoryDetails')}
             >
diff --git a/views/POS/ProductCategoryDetails.tsx b/views/POS/ProductCategoryDetails.tsx
index 503f1bbef..400d3980d 100644
--- a/views/POS/ProductCategoryDetails.tsx
+++ b/views/POS/ProductCategoryDetails.tsx
@@ -12,6 +12,8 @@ import InventoryStore from '../../stores/InventoryStore';
 import { inject, observer } from 'mobx-react';
 import { v4 as uuidv4 } from 'uuid';
 import { Divider, Icon } from 'react-native-elements';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -26,9 +28,10 @@ import DeleteIcon from '../../assets/images/SVG/Delete.svg';
 import PosStore from '../../stores/PosStore';
 
 interface ProductCategoryProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     InventoryStore: InventoryStore;
     PosStore: PosStore;
+    route: Route<'ProductCategoryDetails', { categoryId: string }>;
 }
 
 interface ProductCategoryState {
@@ -59,12 +62,9 @@ export default class ProductCategoryDetails extends React.Component<
     }
 
     fetchCategory = async () => {
-        this.props.navigation.addListener('didFocus', async () => {
+        this.props.navigation.addListener('focus', async () => {
             try {
-                const categoryId = this.props.navigation.getParam(
-                    'categoryId',
-                    null
-                );
+                const categoryId = this.props.route.params?.categoryId;
 
                 if (!categoryId) {
                     this.setState({
@@ -159,9 +159,7 @@ export default class ProductCategoryDetails extends React.Component<
         const BackButton = () => (
             <Icon
                 name="arrow-back"
-                onPress={() => {
-                    navigation.goBack();
-                }}
+                onPress={() => navigation.goBack()}
                 color={themeColor('text')}
                 underlayColor="transparent"
                 size={35}
diff --git a/views/POS/ProductDetails.tsx b/views/POS/ProductDetails.tsx
index 328062957..30dce59b2 100644
--- a/views/POS/ProductDetails.tsx
+++ b/views/POS/ProductDetails.tsx
@@ -13,6 +13,8 @@ import UnitsStore from '../../stores/UnitsStore';
 import { inject, observer } from 'mobx-react';
 import { v4 as uuidv4 } from 'uuid';
 import { Divider, ListItem } from 'react-native-elements';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -30,10 +32,11 @@ import DropdownSetting from '../../components/DropdownSetting';
 import PosStore from '../../stores/PosStore';
 
 interface ProductProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     InventoryStore: InventoryStore;
     PosStore: PosStore;
     UnitsStore: UnitsStore;
+    route: Route<'ProductDetails', { productId: string }>;
 }
 
 interface ProductState {
@@ -67,83 +70,82 @@ export default class ProductDetails extends React.Component<
 
     componentWillUnmount(): void {
         this.props.navigation.removeListener &&
-            this.props.navigation.removeListener('didFocus');
+            this.props.navigation.removeListener('focus', this.handleFocus);
     }
 
     fetchProduct = async () => {
-        this.props.navigation.addListener('didFocus', async () => {
-            try {
-                const { InventoryStore } = this.props;
-                const { getInventory } = InventoryStore;
-                const { products, categories } = await getInventory();
-
-                const mappedCategories = categories
-                    ? categories.map((category: any) => ({
-                          key: category.name,
-                          value: category.name
-                      }))
-                    : [];
-                let categoryOptions: any[] = [
-                    {
-                        key: 'Uncategorized',
-                        value: '',
-                        translateKey: 'pos.views.Wallet.PosPane.uncategorized'
-                    }
-                ];
-                categoryOptions = categoryOptions.concat(...mappedCategories);
+        this.props.navigation.addListener('focus', this.handleFocus);
+    };
 
-                const productId = this.props.navigation.getParam(
-                    'productId',
-                    null
-                );
+    handleFocus = async () => {
+        try {
+            const { InventoryStore } = this.props;
+            const { getInventory } = InventoryStore;
+            const { products, categories } = await getInventory();
 
-                if (!productId) {
-                    this.setState({
-                        categories: categoryOptions,
-                        product: new Product({
-                            id: uuidv4(),
-                            name: '',
-                            sku: '',
-                            pricedIn: PricedIn.Fiat,
-                            price: 0,
-                            category: '',
-                            status: ProductStatus.Active
-                        }),
-                        isLoading: false,
-                        isExisting: false
-                    });
-                    return;
+            const mappedCategories = categories
+                ? categories.map((category: any) => ({
+                      key: category.name,
+                      value: category.name
+                  }))
+                : [];
+            let categoryOptions: any[] = [
+                {
+                    key: 'Uncategorized',
+                    value: '',
+                    translateKey: 'pos.views.Wallet.PosPane.uncategorized'
                 }
+            ];
+            categoryOptions = categoryOptions.concat(...mappedCategories);
 
-                if (products) {
-                    const product =
-                        products.find(
-                            (product: Product) => product.id === productId
-                        ) || null;
+            const productId = this.props.route.params?.productId;
 
-                    if (product) {
-                        if (this.props.UnitsStore.units !== product.pricedIn) {
-                            // change unit to match product
-                            while (
-                                this.props.UnitsStore.units !== product.pricedIn
-                            ) {
-                                this.props.UnitsStore.changeUnits();
-                            }
-                        }
+            if (!productId) {
+                this.setState({
+                    categories: categoryOptions,
+                    product: new Product({
+                        id: uuidv4(),
+                        name: '',
+                        sku: '',
+                        pricedIn: PricedIn.Fiat,
+                        price: 0,
+                        category: '',
+                        status: ProductStatus.Active
+                    }),
+                    isLoading: false,
+                    isExisting: false
+                });
+                return;
+            }
+
+            if (products) {
+                const product =
+                    products.find(
+                        (product: Product) => product.id === productId
+                    ) || null;
 
-                        this.setState({
-                            categories: categoryOptions,
-                            product,
-                            isLoading: false,
-                            isExisting: true
-                        });
+                if (product) {
+                    if (this.props.UnitsStore.units !== product.pricedIn) {
+                        // change unit to match product
+                        while (
+                            this.props.UnitsStore.units !== product.pricedIn
+                        ) {
+                            this.props.UnitsStore.changeUnits();
+                        }
                     }
+
+                    this.setState({
+                        categories: categoryOptions,
+                        product,
+                        isLoading: false,
+                        isExisting: true
+                    });
                 }
-            } catch (error) {
-                console.log('Error fetching product:', error);
-                this.setState({ isLoading: false });
             }
-        });
+        } catch (error) {
+            console.log('Error fetching product:', error);
+            this.setState({ isLoading: false });
+        }
     };
 
     setValue = (field: string, value: any) => {
diff --git a/views/POS/Products.tsx b/views/POS/Products.tsx
index 77e283514..a3e806502 100644
--- a/views/POS/Products.tsx
+++ b/views/POS/Products.tsx
@@ -3,6 +3,7 @@ import { FlatList, Text, TouchableOpacity, View } from 'react-native';
 import { ListItem, SearchBar } from 'react-native-elements';
 import AddIcon from '../../assets/images/SVG/Add.svg';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import LoadingIndicator from '../../components/LoadingIndicator';
@@ -15,7 +16,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import Product from '../../models/Product';
 
 interface ProductsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     InventoryStore: InventoryStore;
 }
 
@@ -38,9 +39,9 @@ export default class Products extends React.Component<
     };
 
     async componentDidMount() {
-        this.props.navigation.addListener('didFocus', async () => {
-            this.loadProducts();
-        });
+        this.props.navigation.addListener('focus', async () =>
+            this.loadProducts()
+        );
     }
 
     async loadProducts() {
@@ -82,7 +83,11 @@ export default class Products extends React.Component<
         const { navigation } = this.props;
         const { products, search, loading } = this.state;
 
-        const Add = ({ navigation }: { navigation: any }) => (
+        const Add = ({
+            navigation
+        }: {
+            navigation: StackNavigationProp<any, any>;
+        }) => (
             <TouchableOpacity
                 onPress={() => navigation.navigate('ProductDetails')}
             >
diff --git a/views/PSBT.tsx b/views/PSBT.tsx
index 18ff8f638..c1e8cb7f0 100644
--- a/views/PSBT.tsx
+++ b/views/PSBT.tsx
@@ -3,6 +3,8 @@ import { ScrollView, StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import { ButtonGroup } from 'react-native-elements';
 import { UR, UREncoder } from '@ngraveio/bc-ur';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 const bitcoin = require('bitcoinjs-lib');
 
@@ -23,9 +25,10 @@ import ChannelsStore from '../stores/ChannelsStore';
 import TransactionsStore from '../stores/TransactionsStore';
 
 interface PSBTProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     TransactionsStore: TransactionsStore;
+    route: Route<'PSBT', { psbt: string }>;
 }
 
 interface PSBTState {
@@ -54,8 +57,8 @@ export default class PSBT extends React.Component<PSBTProps, PSBTState> {
     };
 
     UNSAFE_componentWillMount(): void {
-        const { navigation } = this.props;
-        const psbt: string = navigation.getParam('psbt');
+        const { route } = this.props;
+        const psbt = route.params?.psbt;
         this.setState(
             {
                 fundedPsbt: psbt
diff --git a/views/Payment.tsx b/views/Payment.tsx
index ca5ee2425..ca6ff4d1d 100644
--- a/views/Payment.tsx
+++ b/views/Payment.tsx
@@ -9,6 +9,8 @@ import {
 } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { Row } from '../components/layout/Row';
 import Amount from '../components/Amount';
@@ -32,10 +34,11 @@ import LnurlPayHistorical from './LnurlPay/Historical';
 import EditNotes from '../assets/images/SVG/Pen.svg';
 
 interface PaymentProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     LnurlPayStore?: LnurlPayStore;
     NodeInfoStore?: NodeInfoStore;
     SettingsStore?: SettingsStore;
+    route: Route<'Payment', { payment: Payment }>;
 }
 
 @inject('LnurlPayStore', 'NodeInfoStore', 'SettingsStore')
@@ -47,15 +50,15 @@ export default class PaymentView extends React.Component<PaymentProps> {
     };
 
     async componentDidMount() {
-        const { navigation, LnurlPayStore } = this.props;
-        const payment: Payment = navigation.getParam('payment', null);
+        const { navigation, LnurlPayStore, route } = this.props;
+        const payment = route.params?.payment;
         const lnurlpaytx = payment.paymentHash
             ? await LnurlPayStore!.load(payment.paymentHash)
             : undefined;
         if (lnurlpaytx) {
             this.setState({ lnurlpaytx });
         }
-        navigation.addListener('didFocus', () => {
+        navigation.addListener('focus', () => {
             const noteKey = payment.noteKey;
 
             EncryptedStorage.getItem('note-' + noteKey)
@@ -69,11 +72,11 @@ export default class PaymentView extends React.Component<PaymentProps> {
     }
 
     render() {
-        const { navigation, SettingsStore, NodeInfoStore } = this.props;
+        const { navigation, SettingsStore, NodeInfoStore, route } = this.props;
         const { storedNotes, lnurlpaytx } = this.state;
         const { testnet } = NodeInfoStore;
 
-        const payment: Payment = navigation.getParam('payment', null);
+        const payment = route.params?.payment;
         const formattedOriginalTimeUntilExpiry =
             payment.getFormattedOriginalTimeUntilExpiry(
                 SettingsStore!.settings.locale
diff --git a/views/PaymentPaths.tsx b/views/PaymentPaths.tsx
index b06e449b2..02cb902cb 100644
--- a/views/PaymentPaths.tsx
+++ b/views/PaymentPaths.tsx
@@ -1,5 +1,7 @@
 import * as React from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../components/Header';
 import PaymentPath from '../components/PaymentPath';
@@ -11,14 +13,15 @@ import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
 interface PaymentPathsViewProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
+    route: Route<'PaymentPaths', { enhancedPath: any[] }>;
 }
 
 export default class PaymentPathsView extends React.Component<PaymentPathsViewProps> {
     render() {
-        const { navigation } = this.props;
-        const enhancedPath = navigation.getParam('enhancedPath', null);
+        const { navigation, route } = this.props;
+        const enhancedPath = route.params?.enhancedPath;
 
         return (
             <Screen>
diff --git a/views/PaymentRequest.tsx b/views/PaymentRequest.tsx
index 4de0e1670..bc78c628f 100644
--- a/views/PaymentRequest.tsx
+++ b/views/PaymentRequest.tsx
@@ -9,6 +9,7 @@ import {
     TouchableOpacity
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../components/Amount';
 import AmountInput from '../components/AmountInput';
@@ -54,7 +55,7 @@ const zaplockerDestinations = [
 
 interface InvoiceProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     InvoicesStore: InvoicesStore;
     TransactionsStore: TransactionsStore;
diff --git a/views/QR.tsx b/views/QR.tsx
index ad4802b02..d71cd6c9b 100644
--- a/views/QR.tsx
+++ b/views/QR.tsx
@@ -1,5 +1,7 @@
 import * as React from 'react';
 import { Dimensions, View } from 'react-native';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import CollapsedQR from '../components/CollapsedQR';
 import Header from '../components/Header';
@@ -9,7 +11,17 @@ import Text from '../components/Text';
 import { themeColor } from '../utils/ThemeUtils';
 
 interface QRProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<
+        'QR',
+        {
+            value: string;
+            label: string;
+            hideText: boolean;
+            jumboLabel: boolean;
+            logo: any;
+        }
+    >;
 }
 
 interface QRState {
@@ -21,21 +33,12 @@ interface QRState {
 }
 
 export default class QR extends React.PureComponent<QRProps, QRState> {
-    constructor(props: any) {
+    constructor(props: QRProps) {
         super(props);
 
-        const value: string = this.props.navigation.getParam('value', '');
-        const label: string = this.props.navigation.getParam('label', '');
-        const hideText: boolean = this.props.navigation.getParam(
-            'hideText',
-            false
-        );
-        const jumboLabel: boolean = this.props.navigation.getParam(
-            'jumboLabel',
-            false
-        );
-
-        const logo: any = this.props.navigation.getParam('logo', null);
+        const value = props.route.params?.value ?? '';
+        const label = props.route.params?.label ?? '';
+        const { hideText, jumboLabel, logo } = props.route.params ?? {};
 
         this.state = {
             value,
diff --git a/views/RawTxHex.tsx b/views/RawTxHex.tsx
index 57a54dacc..d14a82a2b 100644
--- a/views/RawTxHex.tsx
+++ b/views/RawTxHex.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { Dimensions, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import {
     SuccessMessage,
@@ -21,8 +23,18 @@ import stores from '../stores/Stores';
 import TransactionsStore from '../stores/TransactionsStore';
 
 interface RawTxHexProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     TransactionsStore: TransactionsStore;
+    route: Route<
+        'RawTxHex',
+        {
+            value: string;
+            label: string;
+            hideText: boolean;
+            jumboLabel: boolean;
+            logo: any;
+        }
+    >;
 }
 
 interface RawTxHexState {
@@ -39,21 +51,12 @@ export default class RawTxHex extends React.PureComponent<
     RawTxHexProps,
     RawTxHexState
 > {
-    constructor(props: any) {
+    constructor(props: RawTxHexProps) {
         super(props);
 
-        const value: string = this.props.navigation.getParam('value', '');
-        const label: string = this.props.navigation.getParam('label', '');
-        const hideText: boolean = this.props.navigation.getParam(
-            'hideText',
-            false
-        );
-        const jumboLabel: boolean = this.props.navigation.getParam(
-            'jumboLabel',
-            false
-        );
-
-        const logo: any = this.props.navigation.getParam('logo', null);
+        const value = props.route.params?.value ?? '';
+        const label = props.route.params?.label ?? '';
+        const { hideText, jumboLabel, logo } = props.route.params ?? {};
 
         this.state = {
             value,
diff --git a/views/Receive.tsx b/views/Receive.tsx
index 1550f3e33..f8dedef8b 100644
--- a/views/Receive.tsx
+++ b/views/Receive.tsx
@@ -14,12 +14,13 @@ import { LNURLWithdrawParams } from 'js-lnurl';
 import { ButtonGroup, Icon } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import _map from 'lodash/map';
-
 import NfcManager, {
     NfcEvents,
     TagEvent,
     Ndef
 } from 'react-native-nfc-manager';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import handleAnything from '../utils/handleAnything';
 
@@ -88,7 +89,7 @@ import DropdownSetting from '../components/DropdownSetting';
 
 interface ReceiveProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     InvoicesStore: InvoicesStore;
     PosStore: PosStore;
@@ -98,6 +99,23 @@ interface ReceiveProps {
     UnitsStore: UnitsStore;
     LSPStore: LSPStore;
     LightningAddressStore: LightningAddressStore;
+    route: Route<
+        'Receive',
+        {
+            lnurlParams: LNURLWithdrawParams | undefined;
+            amount: string;
+            autoGenerate: boolean;
+            autoGenerateOnChain: boolean;
+            account: string;
+            selectedIndex: number;
+            memo: string;
+            orderId: string;
+            orderTotal: string;
+            orderTip: string;
+            exchangeRate: string;
+            rate: number;
+        }
+    >;
 }
 
 interface ReceiveState {
@@ -175,11 +193,11 @@ export default class Receive extends React.Component<
 
     async UNSAFE_componentWillMount() {
         const {
-            navigation,
             InvoicesStore,
             SettingsStore,
             LightningAddressStore,
-            NodeInfoStore
+            NodeInfoStore,
+            route
         } = this.props;
         const { reset } = InvoicesStore;
         const { getSettings, posStatus } = SettingsStore;
@@ -234,15 +252,15 @@ export default class Receive extends React.Component<
             settings.pos.confirmationPreference === 'lnOnly';
 
         reset();
-        const lnurl: LNURLWithdrawParams | undefined =
-            navigation.getParam('lnurlParams');
 
-        const amount: string = navigation.getParam('amount');
-        const autoGenerate: boolean = navigation.getParam('autoGenerate');
-        const autoGenerateOnChain: boolean = navigation.getParam(
-            'autoGenerateOnChain'
-        );
-        const account: string = navigation.getParam('account');
+        const {
+            lnurlParams: lnurl,
+            amount,
+            autoGenerate,
+            autoGenerateOnChain,
+            account,
+            selectedIndex
+        } = route.params ?? {};
 
         if (account) {
             this.setState({
@@ -250,8 +268,6 @@ export default class Receive extends React.Component<
             });
         }
 
-        const selectedIndex: number = navigation.getParam('selectedIndex');
-
         if (selectedIndex) {
             this.setState({
                 selectedIndex
@@ -262,12 +278,9 @@ export default class Receive extends React.Component<
             this.state;
 
         // POS
-        const memo: string = navigation.getParam('memo', this.state.memo);
-        const orderId: string = navigation.getParam('orderId');
-        const orderTotal: string = navigation.getParam('orderTotal');
-        const orderTip: string = navigation.getParam('orderTip');
-        const exchangeRate: string = navigation.getParam('exchangeRate');
-        const rate: number = navigation.getParam('rate');
+        const memo = route.params?.memo ?? this.state.memo;
+        const { orderId, orderTotal, orderTip, exchangeRate, rate } =
+            route.params ?? {};
 
         if (orderId) {
             this.setState({
@@ -339,13 +352,11 @@ export default class Receive extends React.Component<
     }
 
     async UNSAFE_componentWillReceiveProps(nextProps: any) {
-        const { navigation, InvoicesStore } = nextProps;
+        const { route, InvoicesStore } = nextProps;
         const { reset } = InvoicesStore;
 
         reset();
-        const amount: string = navigation.getParam('amount');
-        const lnurl: LNURLWithdrawParams | undefined =
-            navigation.getParam('lnurlParams');
+        const { amount, lnurlParams: lnurl } = route.params ?? {};
 
         if (amount) {
             let needInbound = false;
@@ -518,10 +529,10 @@ export default class Receive extends React.Component<
     };
 
     validateAddress = (text: string) => {
-        const { navigation, InvoicesStore } = this.props;
+        const { navigation, InvoicesStore, route } = this.props;
         const { lspIsActive } = this.state;
         const { createUnifiedInvoice } = InvoicesStore;
-        const amount = getSatAmount(navigation.getParam('amount'));
+        const amount = getSatAmount(route.params?.amount);
 
         handleAnything(text, amount.toString())
             .then((response) => {
@@ -553,7 +564,6 @@ export default class Receive extends React.Component<
                                     rHash: string;
                                     onChainAddress?: string;
                                 }) => {
-                                    navigation.setParam;
                                     this.subscribeInvoice(
                                         rHash,
                                         onChainAddress
@@ -952,7 +962,8 @@ export default class Receive extends React.Component<
             LightningAddressStore,
             LSPStore,
             NodeInfoStore,
-            navigation
+            navigation,
+            route
         } = this.props;
         const {
             selectedIndex,
@@ -1010,8 +1021,7 @@ export default class Receive extends React.Component<
             settings.pos.confirmationPreference &&
             settings.pos.confirmationPreference === 'lnOnly';
 
-        const lnurl: LNURLWithdrawParams | undefined =
-            navigation.getParam('lnurlParams');
+        const lnurl = route.params?.lnurlParams;
 
         const ClearButton = () => (
             <Icon
diff --git a/views/Routing/Routing.tsx b/views/Routing/Routing.tsx
index dc9405aec..0677176a8 100644
--- a/views/Routing/Routing.tsx
+++ b/views/Routing/Routing.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { FlatList, View, Text, TouchableOpacity } from 'react-native';
 import { ButtonGroup } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import { ErrorMessage } from '../../components/SuccessErrorMessage';
@@ -21,7 +22,7 @@ import { RoutingListItem } from './RoutingListItem';
 import { RoutingHeader } from './RoutingHeader';
 
 interface RoutingProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     FeeStore: FeeStore;
 }
 
@@ -99,7 +100,11 @@ export default class Routing extends React.PureComponent<
                   })`
                 : localeString('general.routing');
 
-        const FeeBadge = ({ navigation }: { navigation: any }) => (
+        const FeeBadge = ({
+            navigation
+        }: {
+            navigation: StackNavigationProp<any, any>;
+        }) => (
             <TouchableOpacity onPress={() => navigation.navigate('SetFees')}>
                 <Pie stroke={themeColor('highlight')} />
             </TouchableOpacity>
diff --git a/views/Routing/RoutingEvent.tsx b/views/Routing/RoutingEvent.tsx
index 1df03ccbf..d6fd0072d 100644
--- a/views/Routing/RoutingEvent.tsx
+++ b/views/Routing/RoutingEvent.tsx
@@ -7,6 +7,9 @@ import {
     View
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import ForwardEvent from '../../models/ForwardEvent';
 
 import Amount from '../../components/Amount';
@@ -21,8 +24,9 @@ import { themeColor } from '../../utils/ThemeUtils';
 import ChannelsStore from '../../stores/ChannelsStore';
 
 interface RoutingEventProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
+    route: Route<'RoutingEvent', { routingEvent: ForwardEvent }>;
 }
 
 interface RoutingEventState {
@@ -35,14 +39,11 @@ export default class RoutingEvent extends React.Component<
     RoutingEventProps,
     RoutingEventState
 > {
-    constructor(props: any) {
+    constructor(props: RoutingEventProps) {
         super(props);
-        const { navigation } = props;
+        const { route } = props;
 
-        const routingEvent: ForwardEvent = navigation.getParam(
-            'routingEvent',
-            null
-        );
+        const routingEvent = route.params?.routingEvent;
 
         const { chan_id_in, chan_id_out } = routingEvent;
 
diff --git a/views/Routing/SetFees.tsx b/views/Routing/SetFees.tsx
index 68016d2d3..0b5ae9daa 100644
--- a/views/Routing/SetFees.tsx
+++ b/views/Routing/SetFees.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { ScrollView, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -17,17 +19,18 @@ import { themeColor } from '../../utils/ThemeUtils';
 import { localeString } from '../../utils/LocaleUtils';
 
 interface SetFeesProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     FeeStore: FeeStore;
     NodeInfoStore: NodeInfoStore;
+    route: Route<'SetFees', { channel: Channel }>;
 }
 
 @inject('ChannelsStore', 'FeeStore', 'NodeInfoStore')
 @observer
 export default class SetFees extends React.PureComponent<SetFeesProps, {}> {
     render() {
-        const { ChannelsStore, FeeStore, NodeInfoStore, navigation } =
+        const { ChannelsStore, FeeStore, NodeInfoStore, navigation, route } =
             this.props;
 
         const { chanInfo, nodes } = ChannelsStore;
@@ -35,7 +38,7 @@ export default class SetFees extends React.PureComponent<SetFeesProps, {}> {
         const { nodeInfo } = NodeInfoStore;
         const { nodeId } = nodeInfo;
 
-        const channel: Channel = navigation.getParam('channel', null);
+        const channel = route.params?.channel;
 
         let peerName;
         if (channel) {
diff --git a/views/Send.tsx b/views/Send.tsx
index c13f7cb51..2e948cae2 100644
--- a/views/Send.tsx
+++ b/views/Send.tsx
@@ -15,15 +15,15 @@ import {
 } from 'react-native';
 import { Chip, Icon } from 'react-native-elements';
 import EncryptedStorage from 'react-native-encrypted-storage';
-
 import Clipboard from '@react-native-clipboard/clipboard';
 import { inject, observer } from 'mobx-react';
-
 import NfcManager, {
     NfcEvents,
     TagEvent,
     Ndef
 } from 'react-native-nfc-manager';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import handleAnything, { isClipboardValue } from '../utils/handleAnything';
 
@@ -66,7 +66,7 @@ import { AdditionalOutput } from '../models/TransactionRequest';
 
 interface SendProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     InvoicesStore: InvoicesStore;
     ModalStore: ModalStore;
@@ -74,6 +74,17 @@ interface SendProps {
     TransactionsStore: TransactionsStore;
     SettingsStore: SettingsStore;
     UTXOsStore: UTXOsStore;
+    route: Route<
+        'Send',
+        {
+            destination: string;
+            amount: string;
+            transactionType: string | null;
+            isValid: boolean;
+            contactName: string;
+            clearOnBackPress: boolean;
+        }
+    >;
 }
 
 interface SendState {
@@ -118,16 +129,10 @@ export default class Send extends React.Component<SendProps, SendState> {
 
     constructor(props: SendProps) {
         super(props);
-        const { navigation } = props;
-        const destination = navigation.getParam('destination', null);
-        const amount = navigation.getParam('amount', null);
-        const transactionType = navigation.getParam('transactionType', null);
-        const isValid = navigation.getParam('isValid', false);
-        const contactName = navigation.getParam('contactName', null);
-        const clearOnBackPress = navigation.getParam(
-            'clearOnBackPress',
-            !destination
-        );
+        const { route } = props;
+        const { destination, amount, transactionType, isValid, contactName } =
+            route.params ?? {};
+        const clearOnBackPress = route.params?.clearOnBackPress ?? !destination;
 
         if (transactionType === 'Lightning') {
             this.props.InvoicesStore.getPayReq(destination);
@@ -178,11 +183,9 @@ export default class Send extends React.Component<SendProps, SendState> {
     }
 
     UNSAFE_componentWillReceiveProps(nextProps: any) {
-        const { navigation } = nextProps;
-        const destination = navigation.getParam('destination', null);
-        const amount = navigation.getParam('amount', null);
-        const transactionType = navigation.getParam('transactionType', null);
-        const contactName = navigation.getParam('contactName', null);
+        const { route } = nextProps;
+        const { destination, amount, transactionType, contactName } =
+            route.params ?? {};
 
         if (transactionType === 'Lightning') {
             this.props.InvoicesStore.getPayReq(destination);
@@ -220,7 +223,7 @@ export default class Send extends React.Component<SendProps, SendState> {
     }
 
     loadContacts = async () => {
-        this.props.navigation.addListener('didFocus', async () => {
+        this.props.navigation.addListener('focus', async () => {
             try {
                 const contactsString = await EncryptedStorage.getItem(
                     'zeus-contacts'
@@ -1088,6 +1091,7 @@ export default class Send extends React.Component<SendProps, SendState> {
                                     onChangeFee={(text: string) =>
                                         this.setState({ fee: text })
                                     }
+                                    navigation={navigation}
                                 />
 
                                 <View
diff --git a/views/SendingLightning.tsx b/views/SendingLightning.tsx
index 319107203..54adc97f3 100644
--- a/views/SendingLightning.tsx
+++ b/views/SendingLightning.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import EncryptedStorage from 'react-native-encrypted-storage';
-
 import {
     BackHandler,
     Dimensions,
@@ -10,6 +9,8 @@ import {
     View
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import LnurlPaySuccess from './LnurlPay/Success';
 
 import Button from '../components/Button';
@@ -30,7 +31,7 @@ import Wordmark from '../assets/images/SVG/wordmark-black.svg';
 import CopyBox from '../components/CopyBox';
 
 interface SendingLightningProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     TransactionsStore: TransactionsStore;
     LnurlPayStore: LnurlPayStore;
 }
@@ -49,7 +50,7 @@ export default class SendingLightning extends React.Component<
     componentDidMount() {
         const { TransactionsStore, navigation } = this.props;
 
-        navigation.addListener('didFocus', () => {
+        navigation.addListener('focus', () => {
             const noteKey =
                 typeof TransactionsStore.payment_hash === 'string'
                     ? TransactionsStore.payment_hash
diff --git a/views/SendingOnChain.tsx b/views/SendingOnChain.tsx
index fed07ebce..203e5ae96 100644
--- a/views/SendingOnChain.tsx
+++ b/views/SendingOnChain.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import EncryptedStorage from 'react-native-encrypted-storage';
 import { Dimensions, StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import CopyBox from '../components/CopyBox';
@@ -20,7 +21,7 @@ import ErrorIcon from '../assets/images/SVG/ErrorIcon.svg';
 import Wordmark from '../assets/images/SVG/wordmark-black.svg';
 
 interface SendingOnChainProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
     TransactionsStore: TransactionsStore;
 }
@@ -36,7 +37,7 @@ export default class SendingOnChain extends React.Component<
     };
     async componentDidMount() {
         const { TransactionsStore, navigation } = this.props;
-        navigation.addListener('didFocus', () => {
+        navigation.addListener('focus', () => {
             EncryptedStorage.getItem('note-' + TransactionsStore.txid)
                 .then((storedNotes) => {
                     this.setState({ storedNotes });
diff --git a/views/Settings/AddContact.tsx b/views/Settings/AddContact.tsx
index 900be2c61..448919edb 100644
--- a/views/Settings/AddContact.tsx
+++ b/views/Settings/AddContact.tsx
@@ -16,6 +16,8 @@ import EncryptedStorage from 'react-native-encrypted-storage';
 import { Icon, Divider } from 'react-native-elements';
 import { launchImageLibrary } from 'react-native-image-picker';
 import RNFS from 'react-native-fs';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import { localeString } from '../../utils/LocaleUtils';
@@ -36,7 +38,11 @@ import Scan from '../../assets/images/SVG/Scan.svg';
 import Star from '../../assets/images/SVG/Star.svg';
 
 interface AddContactProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<
+        'AddContact',
+        { isEdit: boolean; prefillContact: Contact; isNostrContact: boolean }
+    >;
 }
 
 interface Contact {
@@ -112,7 +118,7 @@ export default class AddContact extends React.Component<
     };
 
     saveContact = async () => {
-        const { navigation } = this.props;
+        const { navigation, route } = this.props;
         const {
             lnAddress,
             onchainAddress,
@@ -125,9 +131,7 @@ export default class AddContact extends React.Component<
             isFavourite
         } = this.state;
 
-        const isEdit = !!navigation.getParam('isEdit', false);
-        const prefillContact = navigation.getParam('prefillContact', null);
-        const isNostrContact = navigation.getParam('isNostrContact', null);
+        const { isEdit, prefillContact, isNostrContact } = route.params ?? {};
 
         try {
             // Retrieve existing contacts from storage
@@ -217,8 +221,8 @@ export default class AddContact extends React.Component<
     };
 
     deleteContact = async () => {
-        const { navigation } = this.props;
-        const prefillContact = navigation.getParam('prefillContact', null);
+        const { navigation, route } = this.props;
+        const prefillContact = route.params?.prefillContact;
 
         if (prefillContact) {
             try {
@@ -335,15 +339,9 @@ export default class AddContact extends React.Component<
         this.handlePrefillContact();
     }
 
-    componentDidUpdate(prevProps) {
-        const prefillContact = this.props.navigation.getParam(
-            'prefillContact',
-            null
-        );
-        const prevPrefillContact = prevProps.navigation.getParam(
-            'prefillContact',
-            null
-        );
+    componentDidUpdate(prevProps: AddContactProps) {
+        const prefillContact = this.props.route.params?.prefillContact;
+        const prevPrefillContact = prevProps.route.params?.prefillContact;
 
         // Check if the prefillContact prop has changed
         if (prefillContact !== prevPrefillContact) {
@@ -352,10 +350,7 @@ export default class AddContact extends React.Component<
     }
 
     handlePrefillContact() {
-        const prefillContact = this.props.navigation.getParam(
-            'prefillContact',
-            null
-        );
+        const prefillContact = this.props.route.params?.prefillContact;
 
         if (prefillContact) {
             this.setState({
@@ -421,13 +416,13 @@ export default class AddContact extends React.Component<
                 />
             </TouchableOpacity>
         );
-        const isEdit = !!this.props.navigation.getParam('isEdit', false);
-        const prefillContact = this.props.navigation.getParam(
-            'prefillContact',
-            null
-        );
+        const { isEdit, prefillContact } = this.props.route.params ?? {};
 
-        const ScanBadge = ({ navigation }: { navigation: any }) => (
+        const ScanBadge = ({
+            navigation
+        }: {
+            navigation: StackNavigationProp<any, any>;
+        }) => (
             <TouchableOpacity
                 onPress={() => navigation.navigate('HandleAnythingQRScanner')}
                 accessibilityLabel={localeString('general.scan')}
diff --git a/views/Settings/CertInstallInstructions.tsx b/views/Settings/CertInstallInstructions.tsx
index 987dd88c3..95e6b85be 100644
--- a/views/Settings/CertInstallInstructions.tsx
+++ b/views/Settings/CertInstallInstructions.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Platform, StyleSheet, Text, View, ScrollView } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -8,7 +9,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface CertInstallInstructionsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 export default class CertInstallInstructions extends React.Component<
diff --git a/views/Settings/ChannelsSettings.tsx b/views/Settings/ChannelsSettings.tsx
index 84930f676..40b0b8075 100644
--- a/views/Settings/ChannelsSettings.tsx
+++ b/views/Settings/ChannelsSettings.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -14,7 +15,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface ChannelsSettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/Contacts.tsx b/views/Settings/Contacts.tsx
index 7eb53c91a..a86bfd4be 100644
--- a/views/Settings/Contacts.tsx
+++ b/views/Settings/Contacts.tsx
@@ -9,6 +9,8 @@ import {
 } from 'react-native';
 import { SearchBar, Divider } from 'react-native-elements';
 import EncryptedStorage from 'react-native-encrypted-storage';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Screen from '../../components/Screen';
 import Button from '../../components/Button';
@@ -24,7 +26,8 @@ import Add from '../../assets/images/SVG/Add.svg';
 import NostrichIcon from '../../assets/images/SVG/Nostrich.svg';
 
 interface ContactsSettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<'Contacts', { SendScreen: boolean; loading: boolean }>;
 }
 
 interface ContactsSettingsState {
@@ -41,10 +44,7 @@ export default class Contacts extends React.Component<
 > {
     constructor(props: ContactsSettingsProps) {
         super(props);
-        const SendScreen: boolean = this.props.navigation.getParam(
-            'SendScreen',
-            null
-        );
+        const SendScreen = this.props.route.params?.SendScreen;
         this.state = {
             contacts: [],
             search: '',
@@ -55,20 +55,16 @@ export default class Contacts extends React.Component<
     }
 
     componentDidMount() {
-        this.props.navigation.addListener('didFocus', async () => {
-            this.loadContacts();
-        });
+        this.props.navigation.addListener('focus', () => this.loadContacts());
     }
 
     UNSAFE_componentWillReceiveProps(
         nextProps: Readonly<ContactsSettingsProps>
     ): void {
-        const loading: boolean = nextProps.navigation.getParam('loading', null);
+        const loading = nextProps.route.params?.loading;
 
         if (loading) {
-            this.setState({
-                loading
-            });
+            this.setState({ loading });
         }
     }
 
diff --git a/views/Settings/Currency.tsx b/views/Settings/Currency.tsx
index c87763afe..e16bb8a0e 100644
--- a/views/Settings/Currency.tsx
+++ b/views/Settings/Currency.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Screen from '../../components/Screen';
 import Header from '../../components/Header';
@@ -21,7 +22,7 @@ import DropdownSetting from '../../components/DropdownSetting';
 import Switch from '../../components/Switch';
 
 interface CurrencyProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
     UnitsStore: UnitsStore;
 }
diff --git a/views/Settings/CurrencyConverter.tsx b/views/Settings/CurrencyConverter.tsx
index 1aebe15a3..e0c52102c 100644
--- a/views/Settings/CurrencyConverter.tsx
+++ b/views/Settings/CurrencyConverter.tsx
@@ -12,6 +12,9 @@ import Svg, { Text } from 'react-native-svg';
 import DragList, { DragListRenderItemInfo } from 'react-native-draglist';
 import { Icon } from 'react-native-elements';
 import EncryptedStorage from 'react-native-encrypted-storage';
+import { isEmpty } from 'lodash';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Screen from '../../components/Screen';
 import Header from '../../components/Header';
@@ -29,12 +32,12 @@ import Add from '../../assets/images/SVG/Add.svg';
 import Edit from '../../assets/images/SVG/Pen.svg';
 import DragDots from '../../assets/images/SVG/DragDots.svg';
 import BitcoinIcon from '../../assets/images/SVG/bitcoin-icon.svg';
-import { isEmpty } from 'lodash';
 
 interface CurrencyConverterProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     FiatStore?: FiatStore;
     SettingsStore?: SettingsStore;
+    route: Route<'CurrencyConverter', { selectedCurrency: string }>;
 }
 
 interface CurrencyConverterState {
@@ -69,22 +72,17 @@ export default class CurrencyConverter extends React.Component<
     }
 
     componentDidMount() {
-        const { navigation } = this.props;
         this.retrieveInputValues();
         this.addDefaultCurrenciesToStorage();
-        const selectedCurrency = navigation.getParam('selectedCurrency', '');
+        const selectedCurrency = this.props.route.params?.selectedCurrency;
         if (selectedCurrency) {
             this.handleCurrencySelect(selectedCurrency);
         }
     }
 
-    componentDidUpdate(prevProps) {
-        const { navigation } = this.props;
-        const selectedCurrency = navigation.getParam('selectedCurrency', '');
-        const prevSelectedCurrency = prevProps.navigation.getParam(
-            'selectedCurrency',
-            ''
-        );
+    componentDidUpdate(prevProps: CurrencyConverterProps) {
+        const selectedCurrency = this.props.route.params?.selectedCurrency;
+        const prevSelectedCurrency = prevProps.route.params?.selectedCurrency;
 
         // Check if the selected currency prop has changed
         if (selectedCurrency !== prevSelectedCurrency) {
diff --git a/views/Settings/CustodialWalletWarning.tsx b/views/Settings/CustodialWalletWarning.tsx
index 287ecf85b..b76fad7c1 100644
--- a/views/Settings/CustodialWalletWarning.tsx
+++ b/views/Settings/CustodialWalletWarning.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, Text, View, ScrollView } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -13,7 +14,7 @@ import SettingsStore from '../../stores/SettingsStore';
 
 interface CustodialWalletWarningProps {
     SettingsStore: SettingsStore;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 @inject('SettingsStore')
diff --git a/views/Settings/Display.tsx b/views/Settings/Display.tsx
index 38d799bef..8e5cca6ed 100644
--- a/views/Settings/Display.tsx
+++ b/views/Settings/Display.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { ScrollView, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import SettingsStore, {
     DEFAULT_VIEW_KEYS,
     THEME_KEYS
@@ -15,7 +17,7 @@ import Screen from '../../components/Screen';
 import Switch from '../../components/Switch';
 
 interface DisplayProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/Advanced.tsx b/views/Settings/EmbeddedNode/Advanced.tsx
index 9e05a9e93..988f9693f 100644
--- a/views/Settings/EmbeddedNode/Advanced.tsx
+++ b/views/Settings/EmbeddedNode/Advanced.tsx
@@ -3,6 +3,7 @@ import { Platform, NativeModules, ScrollView, Text, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import Header from '../../../components/Header';
@@ -19,7 +20,7 @@ import { themeColor } from '../../../utils/ThemeUtils';
 import { stopLnd } from '../../../utils/LndMobileUtils';
 
 interface EmbeddedNodeAdvancedSettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/DisasterRecovery.tsx b/views/Settings/EmbeddedNode/DisasterRecovery.tsx
index dc1d06014..cdc3f403f 100644
--- a/views/Settings/EmbeddedNode/DisasterRecovery.tsx
+++ b/views/Settings/EmbeddedNode/DisasterRecovery.tsx
@@ -4,6 +4,7 @@ import { ListItem, Divider } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import Clipboard from '@react-native-clipboard/clipboard';
 import EncryptedStorage from 'react-native-encrypted-storage';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import Screen from '../../../components/Screen';
@@ -22,7 +23,7 @@ import { themeColor } from '../../../utils/ThemeUtils';
 import { exportAllChannelBackups } from '../../../lndmobile/channel';
 
 interface DisasterRecoveryProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx b/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx
index e8d575d9e..e1af4bd90 100644
--- a/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx
+++ b/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx
@@ -3,6 +3,7 @@ import { FlatList, Text, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import moment from 'moment';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import Screen from '../../../components/Screen';
@@ -15,7 +16,7 @@ import { themeColor } from '../../../utils/ThemeUtils';
 import LoadingIndicator from '../../../components/LoadingIndicator';
 
 interface DisasterRecoveryAdvancedProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelBackupStore: ChannelBackupStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/ExpressGraphSync.tsx b/views/Settings/EmbeddedNode/ExpressGraphSync.tsx
index 6e34ceb25..bb1e8aeb6 100644
--- a/views/Settings/EmbeddedNode/ExpressGraphSync.tsx
+++ b/views/Settings/EmbeddedNode/ExpressGraphSync.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { ScrollView, Text, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../../components/Header';
 import Screen from '../../../components/Screen';
@@ -14,7 +15,7 @@ import { restartNeeded } from '../../../utils/RestartUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface ExpressGraphSyncProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/LNDLogs.tsx b/views/Settings/EmbeddedNode/LNDLogs.tsx
index 210fbb716..7e5ceb085 100644
--- a/views/Settings/EmbeddedNode/LNDLogs.tsx
+++ b/views/Settings/EmbeddedNode/LNDLogs.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { NativeModules, Platform, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import CopyButton from '../../../components/CopyButton';
 import Screen from '../../../components/Screen';
@@ -14,7 +15,7 @@ import { themeColor } from '../../../utils/ThemeUtils';
 import { LndMobileToolsEventEmitter } from '../../../utils/EventListenerUtils';
 
 interface LNDLogsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/Pathfinding.tsx b/views/Settings/EmbeddedNode/Pathfinding.tsx
index ed0813934..e6b26f101 100644
--- a/views/Settings/EmbeddedNode/Pathfinding.tsx
+++ b/views/Settings/EmbeddedNode/Pathfinding.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { ScrollView, Text, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import Header from '../../../components/Header';
@@ -17,7 +18,7 @@ import { themeColor } from '../../../utils/ThemeUtils';
 import { resetMissionControl } from '../../../lndmobile';
 
 interface PathfindingProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
index 83c73725b..399dcd09d 100644
--- a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
+++ b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx
@@ -3,6 +3,7 @@ import { FlatList, ScrollView, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import Ping from 'react-native-ping';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../../components/Button';
 import Header from '../../../../components/Header';
@@ -28,7 +29,7 @@ import { themeColor } from '../../../../utils/ThemeUtils';
 import LoadingIndicator from '../../../../components/LoadingIndicator';
 
 interface NeutrinoPeersProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx b/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx
index 385a932a2..7ccafb9c6 100644
--- a/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx
+++ b/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { FlatList, ScrollView, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { Row } from '../../../../components/layout/Row';
 import Button from '../../../../components/Button';
@@ -15,7 +16,7 @@ import { localeString } from '../../../../utils/LocaleUtils';
 import { themeColor } from '../../../../utils/ThemeUtils';
 
 interface ZeroConfPeersProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/Peers/index.tsx b/views/Settings/EmbeddedNode/Peers/index.tsx
index 64a951235..db0280164 100644
--- a/views/Settings/EmbeddedNode/Peers/index.tsx
+++ b/views/Settings/EmbeddedNode/Peers/index.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { ScrollView, Text, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Screen from '../../../../components/Screen';
 import Header from '../../../../components/Header';
@@ -11,7 +12,7 @@ import SettingsStore from '../../../../stores/SettingsStore';
 import { localeString } from '../../../../utils/LocaleUtils';
 import { themeColor } from '../../../../utils/ThemeUtils';
 interface PeersProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/RestoreChannelBackups.tsx b/views/Settings/EmbeddedNode/RestoreChannelBackups.tsx
index 53ee67411..388d91204 100644
--- a/views/Settings/EmbeddedNode/RestoreChannelBackups.tsx
+++ b/views/Settings/EmbeddedNode/RestoreChannelBackups.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, Text, View, ScrollView } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import Header from '../../../components/Header';
@@ -16,7 +17,7 @@ import SettingsStore from '../../../stores/SettingsStore';
 import { restoreChannelBackups } from '../../../lndmobile/channel';
 
 interface RestoreChannelBackupsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/EmbeddedNode/index.tsx b/views/Settings/EmbeddedNode/index.tsx
index 56743fa03..6f5612741 100644
--- a/views/Settings/EmbeddedNode/index.tsx
+++ b/views/Settings/EmbeddedNode/index.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { ScrollView, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../../components/Header';
 import Screen from '../../../components/Screen';
@@ -12,7 +13,7 @@ import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface EmbeddedNodeProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/Gods.tsx b/views/Settings/Gods.tsx
index 20fb48cb1..528ae1ffc 100644
--- a/views/Settings/Gods.tsx
+++ b/views/Settings/Gods.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Dimensions, FlatList, Text } from 'react-native';
 import { Avatar, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -15,7 +16,7 @@ import UrlUtils from '../../utils/UrlUtils';
 import SettingsStore from '../../stores/SettingsStore';
 
 interface GodsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/Help.tsx b/views/Settings/Help.tsx
index 162dc91bd..04669e0e1 100644
--- a/views/Settings/Help.tsx
+++ b/views/Settings/Help.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { FlatList, Linking, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -10,7 +11,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import UrlUtils from '../../utils/UrlUtils';
 
 interface HelpProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 function Help(props: HelpProps) {
diff --git a/views/Settings/InvoicesSettings.tsx b/views/Settings/InvoicesSettings.tsx
index f22f4e4d9..0d6f12143 100644
--- a/views/Settings/InvoicesSettings.tsx
+++ b/views/Settings/InvoicesSettings.tsx
@@ -3,6 +3,7 @@ import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import BigNumber from 'bignumber.js';
 import _map from 'lodash/map';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import DropdownSetting from '../../components/DropdownSetting';
 import Header from '../../components/Header';
@@ -21,7 +22,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import Gear from '../../assets/images/SVG/Gear.svg';
 
 interface InvoicesSettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/LSP.tsx b/views/Settings/LSP.tsx
index 2b932109a..d2d436156 100644
--- a/views/Settings/LSP.tsx
+++ b/views/Settings/LSP.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -20,7 +21,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import UrlUtils from '../../utils/UrlUtils';
 
 interface LSPProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
     SettingsStore: SettingsStore;
 }
diff --git a/views/Settings/Language.tsx b/views/Settings/Language.tsx
index 6557b8013..113fef271 100644
--- a/views/Settings/Language.tsx
+++ b/views/Settings/Language.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { FlatList, View } from 'react-native';
 import { Icon, ListItem, SearchBar } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -12,7 +13,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface LanguageProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/LightningAddress/Attestation.tsx b/views/Settings/LightningAddress/Attestation.tsx
index f26e48919..812964406 100644
--- a/views/Settings/LightningAddress/Attestation.tsx
+++ b/views/Settings/LightningAddress/Attestation.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { ScrollView, Text, View } from 'react-native';
 import { nip19 } from 'nostr-tools';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../../../components/Amount';
 import Button from '../../../components/Button';
@@ -14,12 +16,13 @@ import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface AttestationProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<'Attestation', { attestation: any }>;
 }
 
 export default function Attestation(props: AttestationProps) {
-    const { navigation } = props;
-    const item = navigation.getParam('attestation', null);
+    const { navigation, route } = props;
+    const item = route.params?.attestation;
 
     const handleNostr = (value: string) => {
         const deepLink = `nostr:${value}`;
diff --git a/views/Settings/LightningAddress/Attestations.tsx b/views/Settings/LightningAddress/Attestations.tsx
index 456a1a90f..4da360ee6 100644
--- a/views/Settings/LightningAddress/Attestations.tsx
+++ b/views/Settings/LightningAddress/Attestations.tsx
@@ -1,5 +1,7 @@
 import * as React from 'react';
 import { FlatList, Text, TouchableOpacity, View } from 'react-native';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from '../../../components/Amount';
 import Screen from '../../../components/Screen';
@@ -12,12 +14,13 @@ import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface AttestationProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<'Attestations', { attestations: any[] }>;
 }
 
-export default function Attestation(props: AttestationProps) {
-    const { navigation } = props;
-    const attestations = navigation.getParam('attestations', null);
+export default function Attestations(props: AttestationProps) {
+    const { navigation, route } = props;
+    const attestations = route.params?.attestations;
     return (
         <Screen>
             <View style={{ flex: 1 }}>
diff --git a/views/Settings/LightningAddress/ChangeAddress.tsx b/views/Settings/LightningAddress/ChangeAddress.tsx
index 114fb5879..bcf4f42ba 100644
--- a/views/Settings/LightningAddress/ChangeAddress.tsx
+++ b/views/Settings/LightningAddress/ChangeAddress.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import Screen from '../../../components/Screen';
@@ -16,7 +17,7 @@ import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface ChangeAddressProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     LightningAddressStore: LightningAddressStore;
 }
 
diff --git a/views/Settings/LightningAddress/LightningAddressInfo.tsx b/views/Settings/LightningAddress/LightningAddressInfo.tsx
index d0c9b09cb..1b34606b2 100644
--- a/views/Settings/LightningAddress/LightningAddressInfo.tsx
+++ b/views/Settings/LightningAddress/LightningAddressInfo.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { ScrollView, StyleSheet, Text, View } from 'react-native';
 import { Divider, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import { Row } from '../../../components/layout/Row';
@@ -22,7 +23,7 @@ import NostrichNotFound from '../../../assets/images/SVG/Nostrich_not-found.svg'
 import Receive from '../../../assets/images/SVG/Receive.svg';
 
 interface LightningAddressInfoProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     LightningAddressStore: LightningAddressStore;
 }
 
diff --git a/views/Settings/LightningAddress/LightningAddressSettings.tsx b/views/Settings/LightningAddress/LightningAddressSettings.tsx
index 9002b63c8..514a44aca 100644
--- a/views/Settings/LightningAddress/LightningAddressSettings.tsx
+++ b/views/Settings/LightningAddress/LightningAddressSettings.tsx
@@ -11,6 +11,7 @@ import Switch from '../../../components/Switch';
 import Header from '../../../components/Header';
 import { ErrorMessage } from '../../../components/SuccessErrorMessage';
 import LoadingIndicator from '../../../components/LoadingIndicator';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import SettingsStore, {
     NOTIFICATIONS_PREF_KEYS,
@@ -22,7 +23,7 @@ import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface LightningAddressSettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
     LightningAddressStore: LightningAddressStore;
 }
diff --git a/views/Settings/LightningAddress/NostrKeys.tsx b/views/Settings/LightningAddress/NostrKeys.tsx
index bfffc4d04..2d6b71c5c 100644
--- a/views/Settings/LightningAddress/NostrKeys.tsx
+++ b/views/Settings/LightningAddress/NostrKeys.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../../components/Button';
 import KeyValue from '../../../components/KeyValue';
@@ -28,9 +30,10 @@ import VisibleSVG from '../../../assets/images/SVG/eye_opened.svg';
 import Edit from '../../../assets/images/SVG/Pen.svg';
 
 interface NostrKeyProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
     LightningAddressStore: LightningAddressStore;
+    route: Route<'NostrKey', { setup: boolean; nostrPrivateKey: string }>;
 }
 
 interface NostrKeyState {
@@ -76,14 +79,13 @@ export default class NostrKey extends React.Component<
     };
 
     async UNSAFE_componentWillMount() {
-        const { SettingsStore, navigation } = this.props;
+        const { SettingsStore, route } = this.props;
         const { settings } = SettingsStore;
 
-        const setup = navigation.getParam('setup', false);
-        const nostrPrivateKey = navigation.getParam(
-            'nostrPrivateKey',
-            settings?.lightningAddress?.nostrPrivateKey || ''
-        );
+        const setup = route.params?.setup;
+        const nostrPrivateKey =
+            route.params?.nostrPrivateKey ??
+            (settings?.lightningAddress?.nostrPrivateKey || '');
 
         let nostrPublicKey, nostrNsec, nostrNpub;
         if (nostrPrivateKey) {
diff --git a/views/Settings/LightningAddress/NostrRelays.tsx b/views/Settings/LightningAddress/NostrRelays.tsx
index 553ca3643..762af6561 100644
--- a/views/Settings/LightningAddress/NostrRelays.tsx
+++ b/views/Settings/LightningAddress/NostrRelays.tsx
@@ -5,6 +5,8 @@ import { inject, observer } from 'mobx-react';
 import { schnorr } from '@noble/curves/secp256k1';
 import { bytesToHex } from '@noble/hashes/utils';
 import hashjs from 'hash.js';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { Row } from '../../../components/layout/Row';
 import { ErrorMessage } from '../../../components/SuccessErrorMessage';
@@ -23,9 +25,10 @@ import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
 interface NostrRelaysProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
     LightningAddressStore: LightningAddressStore;
+    route: Route<'NostrRelays', { setup: boolean; relays: string[] }>;
 }
 
 interface NostrRelaysState {
@@ -53,11 +56,10 @@ export default class NostrRelays extends React.Component<
     };
 
     async UNSAFE_componentWillMount() {
-        const { SettingsStore, navigation } = this.props;
+        const { SettingsStore, route } = this.props;
         const { settings, getSettings } = SettingsStore;
 
-        const setup = navigation.getParam('setup', false);
-        const relays = navigation.getParam('relays', null);
+        const { setup, relays } = route.params ?? {};
 
         await getSettings();
 
diff --git a/views/Settings/LightningAddress/index.tsx b/views/Settings/LightningAddress/index.tsx
index 37294c7b6..d114c6016 100644
--- a/views/Settings/LightningAddress/index.tsx
+++ b/views/Settings/LightningAddress/index.tsx
@@ -10,6 +10,8 @@ import {
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import LightningAddressPayment from './LightningAddressPayment';
 
@@ -41,11 +43,15 @@ import QR from '../../../assets/images/SVG/QR.svg';
 import Gear from '../../../assets/images/SVG/Gear.svg';
 
 interface LightningAddressProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     LightningAddressStore: LightningAddressStore;
     SettingsStore: SettingsStore;
     UnitsStore: UnitsStore;
+    route: Route<
+        'LightningAddress',
+        { skipStatus: boolean; relays: string[]; nostrPrivateKey: string }
+    >;
 }
 
 interface LightningAddressState {
@@ -85,10 +91,10 @@ export default class LightningAddress extends React.Component<
     };
 
     async componentDidMount() {
-        const { LightningAddressStore, navigation } = this.props;
+        const { LightningAddressStore, navigation, route } = this.props;
         const { status } = LightningAddressStore;
 
-        const skipStatus: boolean = navigation.getParam('skipStatus', false);
+        const skipStatus = route.params?.skipStatus;
 
         this.generateNostrKeys();
 
@@ -99,7 +105,7 @@ export default class LightningAddress extends React.Component<
         if (!skipStatus) status();
 
         // triggers when loaded from navigation or back action
-        navigation.addListener('didFocus', this.handleFocus);
+        navigation.addListener('focus', this.handleFocus);
     }
 
     handleFocus = () => {
@@ -110,16 +116,14 @@ export default class LightningAddress extends React.Component<
         }
     };
 
-    UNSAFE_componentWillReceiveProps = (newProps: any) => {
-        const { navigation } = newProps;
-        const nostrRelays = navigation.getParam('relays', null);
+    UNSAFE_componentWillReceiveProps = (newProps: LightningAddressProps) => {
+        const { route } = newProps;
+        const nostrRelays = route.params?.relays;
         if (nostrRelays) {
-            this.setState({
-                nostrRelays
-            });
+            this.setState({ nostrRelays });
         }
 
-        const nostrPrivateKey = navigation.getParam('nostrPrivateKey', '');
+        const nostrPrivateKey = route.params?.nostrPrivateKey ?? '';
         if (nostrPrivateKey) {
             const nostrPublicKey = getPublicKey(nostrPrivateKey);
             const nostrNpub = nip19.npubEncode(nostrPublicKey);
diff --git a/views/Settings/Mortals.tsx b/views/Settings/Mortals.tsx
index b361994e7..56ad535f6 100644
--- a/views/Settings/Mortals.tsx
+++ b/views/Settings/Mortals.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Dimensions, FlatList, Text } from 'react-native';
 import { Avatar, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -15,7 +16,7 @@ import UrlUtils from '../../utils/UrlUtils';
 import SettingsStore from '../../stores/SettingsStore';
 
 interface MortalsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx
index 512eb1709..517adfc72 100644
--- a/views/Settings/NodeConfiguration.tsx
+++ b/views/Settings/NodeConfiguration.tsx
@@ -12,6 +12,8 @@ import Clipboard from '@react-native-clipboard/clipboard';
 import { inject, observer } from 'mobx-react';
 import EncryptedStorage from 'react-native-encrypted-storage';
 import cloneDeep from 'lodash/cloneDeep';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { hash, STORAGE_KEY } from '../../backends/LNC/credentialStore';
 
@@ -50,8 +52,20 @@ import { getPhoto } from '../../utils/PhotoUtils';
 import { createLndWallet } from '../../utils/LndMobileUtils';
 
 interface NodeConfigurationProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
+    route: Route<
+        'NodeConfiguration',
+        {
+            node: any;
+            index: any;
+            active: any;
+            tor: any;
+            saved: any;
+            newEntry: any;
+            newPhoto: any;
+        }
+    >;
 }
 
 interface NodeConfigurationState {
@@ -270,15 +284,10 @@ export default class NodeConfiguration extends React.Component<
     }
 
     async initFromProps(props: any) {
-        const { navigation } = props;
+        const { route } = props;
 
-        const node = navigation.getParam('node', null);
-        const index = navigation.getParam('index', null);
-        const active = navigation.getParam('active', null);
-        const tor = navigation.getParam('enableTor', false);
-        const saved = navigation.getParam('saved', null);
-        const newEntry = navigation.getParam('newEntry', null);
-        const newPhoto = navigation.getParam('photo', null);
+        const { node, index, active, tor, saved, newEntry, newPhoto } =
+            route.params ?? {};
 
         if (node) {
             const {
@@ -584,8 +593,8 @@ export default class NodeConfiguration extends React.Component<
     };
 
     render() {
-        const { navigation, SettingsStore } = this.props;
-        const node = navigation.getParam('node', null);
+        const { route, navigation, SettingsStore } = this.props;
+        const node = route.params?.node;
         const {
             nickname,
             host,
diff --git a/views/Settings/Nodes.tsx b/views/Settings/Nodes.tsx
index 00956d1a7..c133337d9 100644
--- a/views/Settings/Nodes.tsx
+++ b/views/Settings/Nodes.tsx
@@ -3,6 +3,7 @@ import { View, Text, TouchableOpacity, Image, StyleSheet } from 'react-native';
 import DragList, { DragListRenderItemInfo } from 'react-native-draglist';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -22,10 +23,11 @@ import BackendUtils from '../../utils/BackendUtils';
 import Add from '../../assets/images/SVG/Add.svg';
 import DragDots from '../../assets/images/SVG/DragDots.svg';
 import LoadingIndicator from '../../components/LoadingIndicator';
+import { cloneDeep } from 'lodash';
 
 interface NodesProps {
     nodes: any[];
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     edit?: boolean;
     loading?: boolean;
     selectedNode?: number;
@@ -55,12 +57,12 @@ export default class Nodes extends React.Component<NodesProps, NodesState> {
     componentDidMount() {
         this.refreshSettings();
 
-        this.props.navigation.addListener('didFocus', this.handleFocus);
+        this.props.navigation.addListener('focus', this.handleFocus);
     }
 
     componentWillUnmount() {
         this.props.navigation.removeListener &&
-            this.props.navigation.removeListener('didFocus');
+            this.props.navigation.removeListener('focus', this.handleFocus);
     }
 
     handleFocus = () => {
@@ -310,7 +312,9 @@ export default class Nodes extends React.Component<NodesProps, NodesState> {
                                                         navigation.navigate(
                                                             'NodeConfiguration',
                                                             {
-                                                                node: item,
+                                                                node: cloneDeep(
+                                                                    item
+                                                                ),
                                                                 index,
                                                                 active:
                                                                     selectedNode ===
diff --git a/views/Settings/Olympians.tsx b/views/Settings/Olympians.tsx
index ba09153a8..513e5fdc0 100644
--- a/views/Settings/Olympians.tsx
+++ b/views/Settings/Olympians.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Dimensions, FlatList, Text } from 'react-native';
 import { Avatar, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -15,7 +16,7 @@ import UrlUtils from '../../utils/UrlUtils';
 import SettingsStore from '../../stores/SettingsStore';
 
 interface OlympiansProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/PaymentsSettings.tsx b/views/Settings/PaymentsSettings.tsx
index 3e5c7f1fc..866cc469f 100644
--- a/views/Settings/PaymentsSettings.tsx
+++ b/views/Settings/PaymentsSettings.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Text, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import DropdownSetting from '../../components/DropdownSetting';
 import Header from '../../components/Header';
@@ -17,7 +18,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import TextInput from '../../components/TextInput';
 
 interface PaymentsSettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/PointOfSale.tsx b/views/Settings/PointOfSale.tsx
index fc40b1fef..70d8cf13c 100644
--- a/views/Settings/PointOfSale.tsx
+++ b/views/Settings/PointOfSale.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Platform, ScrollView, Text, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import BackendUtils from '../../utils/BackendUtils';
 import { localeString } from '../../utils/LocaleUtils';
@@ -24,7 +25,7 @@ import SettingsStore, {
 } from '../../stores/SettingsStore';
 
 interface PointOfSaleProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/PointOfSaleRecon.tsx b/views/Settings/PointOfSaleRecon.tsx
index 6810e17d5..97dbc6826 100644
--- a/views/Settings/PointOfSaleRecon.tsx
+++ b/views/Settings/PointOfSaleRecon.tsx
@@ -9,6 +9,7 @@ import {
 import { ButtonGroup } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import BigNumber from 'bignumber.js';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -31,7 +32,7 @@ import { ReconHeader } from './PointOfSaleReconHeader';
 import OrderItem from '../../views/Wallet/OrderItem';
 
 interface PointOfSaleReconProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     FiatStore: FiatStore;
     PosStore: PosStore;
 }
@@ -123,7 +124,11 @@ export default class PointOfSaleRecon extends React.PureComponent<
                   })`
                 : localeString('views.Settings.POS.recon');
 
-        const ExportBadge = ({ navigation }: { navigation: any }) => (
+        const ExportBadge = ({
+            navigation
+        }: {
+            navigation: StackNavigationProp<any, any>;
+        }) => (
             <TouchableOpacity
                 onPress={() => navigation.navigate('PointOfSaleReconExport')}
             >
diff --git a/views/Settings/PointOfSaleReconExport.tsx b/views/Settings/PointOfSaleReconExport.tsx
index df16c5487..ea512349e 100644
--- a/views/Settings/PointOfSaleReconExport.tsx
+++ b/views/Settings/PointOfSaleReconExport.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { View, ScrollView, Text, TouchableOpacity } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import Clipboard from '@react-native-clipboard/clipboard';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import ClipboardSVG from '../../assets/images/SVG/Clipboard.svg';
 
@@ -13,7 +14,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface PointOfSaleReconExportProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     PosStore: PosStore;
 }
 
diff --git a/views/Settings/Privacy.tsx b/views/Settings/Privacy.tsx
index d49fdb3c5..067dedc74 100644
--- a/views/Settings/Privacy.tsx
+++ b/views/Settings/Privacy.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { ScrollView, View } from 'react-native';
 import { ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import SettingsStore, { BLOCK_EXPLORER_KEYS } from '../../stores/SettingsStore';
 import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
@@ -14,7 +16,7 @@ import Text from '../../components/Text';
 import TextInput from '../../components/TextInput';
 
 interface PrivacyProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/Security.tsx b/views/Settings/Security.tsx
index c92f522cb..6d2a63baa 100644
--- a/views/Settings/Security.tsx
+++ b/views/Settings/Security.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { FlatList, ScrollView, View } from 'react-native';
 import { BiometryType } from 'react-native-biometrics';
 import { Icon, ListItem } from 'react-native-elements';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -15,7 +16,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface SecurityProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/Seed.tsx b/views/Settings/Seed.tsx
index 8368dc626..4880dd970 100644
--- a/views/Settings/Seed.tsx
+++ b/views/Settings/Seed.tsx
@@ -9,6 +9,7 @@ import {
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import EncryptedStorage from 'react-native-encrypted-storage';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { ErrorMessage } from '../../components/SuccessErrorMessage';
 
@@ -25,7 +26,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import Skull from '../../assets/images/SVG/Skull.svg';
 
 interface SeedProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/SeedRecovery.tsx b/views/Settings/SeedRecovery.tsx
index 19ed99349..13570c500 100644
--- a/views/Settings/SeedRecovery.tsx
+++ b/views/Settings/SeedRecovery.tsx
@@ -8,6 +8,8 @@ import {
 } from 'react-native';
 import Clipboard from '@react-native-clipboard/clipboard';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { ErrorMessage } from '../../components/SuccessErrorMessage';
 
@@ -27,8 +29,9 @@ import SettingsStore from '../../stores/SettingsStore';
 import LoadingIndicator from '../../components/LoadingIndicator';
 
 interface SeedRecoveryProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
+    route: Route<'SeedRecovery', { network: string }>;
 }
 
 interface SeedRecoveryState {
@@ -134,14 +137,9 @@ export default class SeedRecovery extends React.PureComponent<
         this.initFromProps(nextProps);
     }
 
-    async initFromProps(props: any) {
-        const { navigation } = props;
-
-        const network = navigation.getParam('network', 'mainnet');
-
-        this.setState({
-            network
-        });
+    async initFromProps(props: SeedRecoveryProps) {
+        const network = props.route.params?.network ?? 'mainnet';
+        this.setState({ network });
     }
 
     async UNSAFE_componentWillMount() {
diff --git a/views/Settings/SelectCurrency.tsx b/views/Settings/SelectCurrency.tsx
index f1a0d6f2b..d0227c589 100644
--- a/views/Settings/SelectCurrency.tsx
+++ b/views/Settings/SelectCurrency.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { FlatList, View } from 'react-native';
 import { Icon, ListItem, SearchBar } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Screen from '../../components/Screen';
 import Header from '../../components/Header';
@@ -16,8 +18,9 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface SelectCurrencyProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
+    route: Route<'SelectCurrency', { currencyConverter: boolean }>;
 }
 
 interface SelectCurrencyState {
@@ -71,7 +74,7 @@ export default class SelectCurrency extends React.Component<
     };
 
     render() {
-        const { navigation, SettingsStore } = this.props;
+        const { navigation, SettingsStore, route } = this.props;
         const { selectedCurrency, search, fiatRatesSource } = this.state;
         const currencies = this.state.currencies
             .sort((a, b) =>
@@ -83,10 +86,7 @@ export default class SelectCurrency extends React.Component<
 
         const { updateSettings, getSettings }: any = SettingsStore;
 
-        const currencyConverter = navigation.getParam(
-            'currencyConverter',
-            null
-        );
+        const currencyConverter = route.params?.currencyConverter;
 
         return (
             <Screen>
diff --git a/views/Settings/SetDuressPassword.tsx b/views/Settings/SetDuressPassword.tsx
index d1c14f118..9d143e12c 100644
--- a/views/Settings/SetDuressPassword.tsx
+++ b/views/Settings/SetDuressPassword.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { Platform, StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -13,7 +14,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import SettingsStore from '../../stores/SettingsStore';
 
 interface SetDuressPassphraseProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/SetDuressPin.tsx b/views/Settings/SetDuressPin.tsx
index c49ad41b9..e21a2486e 100644
--- a/views/Settings/SetDuressPin.tsx
+++ b/views/Settings/SetDuressPin.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Pin from '../../components/Pin';
@@ -12,7 +13,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import SettingsStore from '../../stores/SettingsStore';
 
 interface SetDuressPinProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/SetNodePicture.tsx b/views/Settings/SetNodePicture.tsx
index a99982a44..cf5bb56f1 100644
--- a/views/Settings/SetNodePicture.tsx
+++ b/views/Settings/SetNodePicture.tsx
@@ -11,6 +11,8 @@ import {
 import { Avatar } from 'react-native-elements';
 import { launchImageLibrary } from 'react-native-image-picker';
 import RNFS from 'react-native-fs';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import AddIcon from '../../assets/images/SVG/Add.svg';
 
@@ -24,7 +26,8 @@ import Button from '../../components/Button';
 import { localeString } from '../../utils/LocaleUtils';
 
 interface SetNodePictureProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<'SetNodePicture', { implementation: string }>;
 }
 
 interface SetNodePictureState {
@@ -38,10 +41,7 @@ export default class SetNodePicture extends React.Component<
 > {
     constructor(props: SetNodePictureProps) {
         super(props);
-        const implementation = this.props.navigation.getParam(
-            'implementation',
-            null
-        );
+        const implementation = this.props.route.params?.implementation;
         let images: string[] = [
             require('../../assets/images/zeus-illustration-1a.jpg'),
             require('../../assets/images/zeus-illustration-1b.jpg'),
diff --git a/views/Settings/SetPassword.tsx b/views/Settings/SetPassword.tsx
index 70321b55b..c54886b81 100644
--- a/views/Settings/SetPassword.tsx
+++ b/views/Settings/SetPassword.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, Text, View, Platform } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -13,7 +14,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import SettingsStore from '../../stores/SettingsStore';
 
 interface SetPassphraseProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/SetPin.tsx b/views/Settings/SetPin.tsx
index 6b5da52e6..bb287685c 100644
--- a/views/Settings/SetPin.tsx
+++ b/views/Settings/SetPin.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Pin from '../../components/Pin';
@@ -13,7 +14,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface SetPinProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SettingsStore: SettingsStore;
 }
 
diff --git a/views/Settings/Settings.tsx b/views/Settings/Settings.tsx
index 2d769d6c1..dcc707182 100644
--- a/views/Settings/Settings.tsx
+++ b/views/Settings/Settings.tsx
@@ -10,6 +10,7 @@ import {
 } from 'react-native';
 import { Icon } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import AccountIcon from '../../assets/images/SVG/Account.svg';
 import AddIcon from '../../assets/images/SVG/Add.svg';
@@ -54,7 +55,7 @@ import UnitsStore from '../../stores/UnitsStore';
 import { version } from '../../package.json';
 
 interface SettingsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
     LightningAddressStore: LightningAddressStore;
     SettingsStore: SettingsStore;
@@ -83,16 +84,16 @@ export default class Settings extends React.Component<
         SettingsStore.getSettings();
 
         // triggers when loaded from navigation or back action
-        navigation.addListener('didFocus', () => {
-            SettingsStore.getSettings();
-        });
+        navigation.addListener('focus', this.handleFocus);
     }
 
     componentWillUnmount() {
         this.props.navigation.removeListener &&
-            this.props.navigation.removeListener('didFocus');
+            this.props.navigation.removeListener('focus', this.handleFocus);
     }
 
+    handleFocus = () => this.props.SettingsStore.getSettings();
+
     render() {
         const {
             navigation,
diff --git a/views/Settings/SignVerifyMessage.tsx b/views/Settings/SignVerifyMessage.tsx
index 022a3496a..56ec9890c 100644
--- a/views/Settings/SignVerifyMessage.tsx
+++ b/views/Settings/SignVerifyMessage.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { StyleSheet, Text, View, ScrollView } from 'react-native';
 import { ButtonGroup } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import CopyButton from '../../components/CopyButton';
@@ -20,7 +21,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import MessageSignStore from '../../stores/MessageSignStore';
 
 interface SignVerifyMessageProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     MessageSignStore: MessageSignStore;
 }
 
diff --git a/views/Settings/SocialMedia.tsx b/views/Settings/SocialMedia.tsx
index b885d27e9..9f2c2748e 100644
--- a/views/Settings/SocialMedia.tsx
+++ b/views/Settings/SocialMedia.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { FlatList, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -10,7 +11,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import UrlUtils from '../../utils/UrlUtils';
 
 interface HelpProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 function Help(props: HelpProps) {
diff --git a/views/Settings/Sponsors.tsx b/views/Settings/Sponsors.tsx
index a39246d39..1aa8c3044 100644
--- a/views/Settings/Sponsors.tsx
+++ b/views/Settings/Sponsors.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { FlatList, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -9,7 +10,7 @@ import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 
 interface SponsorsProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 function Sponsors(props: SponsorsProps) {
diff --git a/views/Settings/Support.tsx b/views/Settings/Support.tsx
index 5bfa6bb1b..b6cd22f9e 100644
--- a/views/Settings/Support.tsx
+++ b/views/Settings/Support.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { FlatList, View } from 'react-native';
 import { Icon, ListItem } from 'react-native-elements';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
@@ -10,7 +11,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import UrlUtils from '../../utils/UrlUtils';
 
 interface SupportProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
 }
 
 function Support(props: SupportProps) {
diff --git a/views/SparkQRScanner.tsx b/views/SparkQRScanner.tsx
index 113614e1a..73089ac1e 100644
--- a/views/SparkQRScanner.tsx
+++ b/views/SparkQRScanner.tsx
@@ -1,17 +1,22 @@
 import * as React from 'react';
 import { Alert } from 'react-native';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
 import QRCodeScanner from './../components/QRCodeScanner';
+
 import { localeString } from './../utils/LocaleUtils';
 
 interface SparkQRProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
+    route: Route<'SparkQRScanner', { index: any }>;
 }
 
 export default class SparkQRScanner extends React.Component<SparkQRProps, {}> {
     handleSparkInvoiceScanned = (data: string) => {
-        const { navigation } = this.props;
+        const { navigation, route } = this.props;
 
-        const index = navigation.getParam('index', null);
+        const index = route.params?.index;
 
         const [url, accessKey] = data.split('?access-key=');
 
@@ -34,9 +39,9 @@ export default class SparkQRScanner extends React.Component<SparkQRProps, {}> {
     };
 
     render() {
-        const { navigation } = this.props;
+        const { navigation, route } = this.props;
 
-        const index = navigation.getParam('index', null);
+        const index = route.params?.index;
 
         return (
             <QRCodeScanner
diff --git a/views/Sweep.tsx b/views/Sweep.tsx
index e0dd2b4b0..0d02dadc9 100644
--- a/views/Sweep.tsx
+++ b/views/Sweep.tsx
@@ -8,8 +8,9 @@ import {
     ScrollView,
     TouchableOpacity
 } from 'react-native';
-
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import BalanceStore from '../stores/BalanceStore';
 import InvoicesStore from '../stores/InvoicesStore';
@@ -36,13 +37,14 @@ import Scan from '../assets/images/SVG/Scan.svg';
 
 interface SweepProps {
     exitSetup: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     InvoicesStore: InvoicesStore;
     ModalStore: ModalStore;
     NodeInfoStore: NodeInfoStore;
     TransactionsStore: TransactionsStore;
     SettingsStore: SettingsStore;
+    route: Route<'Sweep', { destination: string }>;
 }
 
 interface SweepState {
@@ -65,8 +67,8 @@ export default class Sweep extends React.Component<SweepProps, SweepState> {
     listener: any;
     constructor(props: SweepProps) {
         super(props);
-        const { navigation } = props;
-        const destination = navigation.getParam('destination', null);
+        const { route } = props;
+        const destination = route.params?.destination;
 
         this.state = {
             destination: destination || '',
@@ -80,20 +82,8 @@ export default class Sweep extends React.Component<SweepProps, SweepState> {
         if (this.listener && this.listener.stop) this.listener.stop();
     }
 
-    UNSAFE_componentWillReceiveProps(nextProps: any) {
-        const { navigation } = nextProps;
-        const destination = navigation.getParam('destination', null);
-        const amount = navigation.getParam('amount', null);
-
-        this.setState({
-            destination
-        });
-
-        if (amount) {
-            this.setState({
-                amount
-            });
-        }
+    UNSAFE_componentWillReceiveProps(nextProps: SweepProps) {
+        this.setState({ destination: nextProps.route.params?.destination });
     }
 
     subscribePayment = (streamingCall: string) => {
@@ -288,6 +278,7 @@ export default class Sweep extends React.Component<SweepProps, SweepState> {
                             onChangeFee={(text: string) =>
                                 this.setState({ fee: text })
                             }
+                            navigation={navigation}
                         />
 
                         <Text
diff --git a/views/Sync.tsx b/views/Sync.tsx
index 8c483aaa4..7af285a8a 100644
--- a/views/Sync.tsx
+++ b/views/Sync.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Dimensions, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import CircularProgress from 'react-native-circular-progress-indicator';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../components/Button';
 import KeyValue from '../components/KeyValue';
@@ -14,7 +15,7 @@ import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
 interface SyncProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     SyncStore: SyncStore;
 }
 
diff --git a/views/Transaction.tsx b/views/Transaction.tsx
index 72391995c..2ba2370f9 100644
--- a/views/Transaction.tsx
+++ b/views/Transaction.tsx
@@ -10,6 +10,8 @@ import {
     View
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import { Row } from '../components/layout/Row';
 import Amount from '../components/Amount';
@@ -33,9 +35,10 @@ import CaretRight from '../assets/images/SVG/Caret Right.svg';
 import EditNotes from '../assets/images/SVG/Pen.svg';
 
 interface TransactionProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
     TransactionsStore: TransactionsStore;
+    route: Route<'Transaction', { transaction: Transaction }>;
 }
 
 interface TransactionState {
@@ -52,12 +55,9 @@ export default class TransactionView extends React.Component<
         storedNotes: ''
     };
     async componentDidMount() {
-        const { navigation } = this.props;
-        const transaction: Transaction = navigation.getParam(
-            'transaction',
-            null
-        );
-        navigation.addListener('didFocus', () => {
+        const { navigation, route } = this.props;
+        const transaction = route.params?.transaction;
+        navigation.addListener('focus', () => {
             this.props.TransactionsStore.resetBroadcast();
             EncryptedStorage.getItem('note-' + transaction.tx)
                 .then((storedNotes) => {
@@ -69,11 +69,8 @@ export default class TransactionView extends React.Component<
         });
     }
     render() {
-        const { NodeInfoStore, navigation } = this.props;
-        const transaction: Transaction = navigation.getParam(
-            'transaction',
-            null
-        );
+        const { NodeInfoStore, navigation, route } = this.props;
+        const transaction = route.params?.transaction;
         const { storedNotes } = this.state;
         const { testnet } = NodeInfoStore;
 
diff --git a/views/TxHex.tsx b/views/TxHex.tsx
index 231de972c..ae42c6b53 100644
--- a/views/TxHex.tsx
+++ b/views/TxHex.tsx
@@ -10,6 +10,8 @@ import { inject, observer } from 'mobx-react';
 import { ButtonGroup } from 'react-native-elements';
 import { UR, UREncoder } from '@ngraveio/bc-ur';
 import clone from 'lodash/clone';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 const bitcoin = require('bitcoinjs-lib');
 
@@ -34,10 +36,11 @@ import NodeInfoStore from '../stores/NodeInfoStore';
 import TransactionsStore from '../stores/TransactionsStore';
 
 interface TxHexProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     NodeInfoStore: NodeInfoStore;
     TransactionsStore: TransactionsStore;
+    route: Route<'TxHex', { txHex: string }>;
 }
 
 interface TxHexState {
@@ -66,16 +69,9 @@ export default class TxHex extends React.Component<TxHexProps, TxHexState> {
     };
 
     UNSAFE_componentWillMount(): void {
-        const { navigation } = this.props;
-        const txHex: string = navigation.getParam('txHex');
-        this.setState(
-            {
-                txHex
-            },
-            () => {
-                this.generateInfo();
-            }
-        );
+        const { route } = this.props;
+        const txHex = route.params?.txHex;
+        this.setState({ txHex }, () => this.generateInfo());
     }
 
     generateInfo = () => {
diff --git a/views/UTXOs/CoinControl.tsx b/views/UTXOs/CoinControl.tsx
index 68845e2fa..fd2b15b0a 100644
--- a/views/UTXOs/CoinControl.tsx
+++ b/views/UTXOs/CoinControl.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { FlatList, View } from 'react-native';
 import { Button, ListItem } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import AccountFilter from './../../components/AccountFilter';
 import Amount from './../../components/Amount';
@@ -16,8 +18,9 @@ import { themeColor } from './../../utils/ThemeUtils';
 import UTXOsStore from './../../stores/UTXOsStore';
 
 interface CoinControlProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     UTXOsStore: UTXOsStore;
+    route: Route<'CoinControl', { account: string }>;
 }
 
 interface CoinControlState {
@@ -30,10 +33,10 @@ export default class CoinControl extends React.Component<
     CoinControlProps,
     CoinControlState
 > {
-    constructor(props: any) {
+    constructor(props: CoinControlProps) {
         super(props);
 
-        const accountParam = props.navigation.getParam('account');
+        const accountParam = props.route.account;
         const account =
             accountParam && accountParam === 'On-chain'
                 ? 'default'
diff --git a/views/UTXOs/UTXO.tsx b/views/UTXOs/UTXO.tsx
index 7c181c426..4b24f249d 100644
--- a/views/UTXOs/UTXO.tsx
+++ b/views/UTXOs/UTXO.tsx
@@ -7,6 +7,8 @@ import {
     View
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { Route } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Amount from './../../components/Amount';
 import Header from '../../components/Header';
@@ -22,16 +24,17 @@ import UrlUtils from './../../utils/UrlUtils';
 import NodeInfoStore from './../../stores/NodeInfoStore';
 
 interface UTXOProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     NodeInfoStore: NodeInfoStore;
+    route: Route<'UTXO', { utxo: Utxo }>;
 }
 
 @inject('NodeInfoStore')
 @observer
 export default class UTXO extends React.Component<UTXOProps> {
     render() {
-        const { NodeInfoStore, navigation } = this.props;
-        const utxo: Utxo = navigation.getParam('utxo', null);
+        const { NodeInfoStore, navigation, route } = this.props;
+        const utxo = route.params?.utxo;
         const { testnet } = NodeInfoStore;
 
         const { getOutpoint, address, getConfs, isUnconfirmed, blockheight } =
diff --git a/views/Wallet/BalancePane.tsx b/views/Wallet/BalancePane.tsx
index 422f5df2b..342f2642b 100644
--- a/views/Wallet/BalancePane.tsx
+++ b/views/Wallet/BalancePane.tsx
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react';
 import { LinearProgress } from 'react-native-elements';
 import EncryptedStorage from 'react-native-encrypted-storage';
 import BigNumber from 'bignumber.js';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import WalletHeader from '../../components/WalletHeader';
@@ -22,7 +23,7 @@ import { version, playStore } from '../../package.json';
 import LockIcon from '../../assets/images/SVG/Lock.svg';
 
 interface BalancePaneProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     NodeInfoStore: NodeInfoStore;
     SettingsStore: SettingsStore;
diff --git a/views/Wallet/KeypadPane.tsx b/views/Wallet/KeypadPane.tsx
index 235181b63..04bd63498 100644
--- a/views/Wallet/KeypadPane.tsx
+++ b/views/Wallet/KeypadPane.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { Animated, View, Text, TouchableOpacity } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import BigNumber from 'bignumber.js';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Conversion from '../../components/Conversion';
@@ -19,10 +21,9 @@ import BackendUtils from '../../utils/BackendUtils';
 import { localeString } from '../../utils/LocaleUtils';
 import { themeColor } from '../../utils/ThemeUtils';
 import { getDecimalPlaceholder } from '../../utils/UnitsUtils';
-import BigNumber from 'bignumber.js';
 
 interface KeypadPaneProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore: ChannelsStore;
     FiatStore: FiatStore;
     NodeInfoStore: NodeInfoStore;
@@ -65,7 +66,7 @@ export default class KeypadPane extends React.PureComponent<
     async UNSAFE_componentWillMount() {
         this.handleLsp();
 
-        this.props.navigation.addListener('didFocus', async () => {
+        this.props.navigation.addListener('focus', async () => {
             this.handleLsp();
         });
     }
diff --git a/views/Wallet/SquarePosPane.tsx b/views/Wallet/SquarePosPane.tsx
index d174a8175..a8413d4ee 100644
--- a/views/Wallet/SquarePosPane.tsx
+++ b/views/Wallet/SquarePosPane.tsx
@@ -11,6 +11,7 @@ import BigNumber from 'bignumber.js';
 import { ButtonGroup, SearchBar } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import Swipeable from 'react-native-gesture-handler/Swipeable';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import LoadingIndicator from '../../components/LoadingIndicator';
@@ -34,7 +35,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import { version } from './../../package.json';
 
 interface SquarePosPaneProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ActivityStore?: ActivityStore;
     FiatStore?: FiatStore;
     NodeInfoStore?: NodeInfoStore;
diff --git a/views/Wallet/StandalonePosKeypadPane.tsx b/views/Wallet/StandalonePosKeypadPane.tsx
index 80bf94f1e..763472ee5 100644
--- a/views/Wallet/StandalonePosKeypadPane.tsx
+++ b/views/Wallet/StandalonePosKeypadPane.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { Animated, View, Text } from 'react-native';
 import { inject, observer } from 'mobx-react';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import Conversion from '../../components/Conversion';
@@ -21,7 +22,7 @@ import { getDecimalPlaceholder } from '../../utils/UnitsUtils';
 import { PricedIn } from '../../models/Product';
 
 interface PosKeypadPaneProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ChannelsStore?: ChannelsStore;
     FiatStore?: FiatStore;
     UnitsStore?: UnitsStore;
diff --git a/views/Wallet/StandalonePosPane.tsx b/views/Wallet/StandalonePosPane.tsx
index dce46960b..db310ff6d 100644
--- a/views/Wallet/StandalonePosPane.tsx
+++ b/views/Wallet/StandalonePosPane.tsx
@@ -13,6 +13,7 @@ import { ButtonGroup, SearchBar } from 'react-native-elements';
 import { inject, observer } from 'mobx-react';
 import Swipeable from 'react-native-gesture-handler/Swipeable';
 import moment from 'moment';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import Button from '../../components/Button';
 import LoadingIndicator from '../../components/LoadingIndicator';
@@ -38,7 +39,7 @@ import { themeColor } from '../../utils/ThemeUtils';
 import { version } from './../../package.json';
 
 interface StandalonePosPaneProps {
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     ActivityStore: ActivityStore;
     FiatStore: FiatStore;
     NodeInfoStore: NodeInfoStore;
diff --git a/views/Wallet/Wallet.tsx b/views/Wallet/Wallet.tsx
index 73d415be2..0c96de15a 100644
--- a/views/Wallet/Wallet.tsx
+++ b/views/Wallet/Wallet.tsx
@@ -17,7 +17,8 @@ import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import {
     DefaultTheme,
     NavigationContainer,
-    NavigationContainerRef
+    NavigationContainerRef,
+    NavigationIndependentTree
 } from '@react-navigation/native';
 import { inject, observer } from 'mobx-react';
 import RNRestart from 'react-native-restart';
@@ -70,11 +71,14 @@ import CaretUp from '../../assets/images/SVG/Caret Up.svg';
 import ChannelsIcon from '../../assets/images/SVG/Channels.svg';
 import POS from '../../assets/images/SVG/POS.svg';
 import Temple from '../../assets/images/SVG/Temple.svg';
+import Scan from '../../assets/images/SVG/Scan.svg';
+
+import { StackNavigationProp } from '@react-navigation/stack';
 
 interface WalletProps {
     enterSetup: any;
     exitTransaction: any;
-    navigation: any;
+    navigation: StackNavigationProp<any, any>;
     BalanceStore: BalanceStore;
     ChannelsStore: ChannelsStore;
     NodeInfoStore: NodeInfoStore;
@@ -120,7 +124,7 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
     private handleAppStateChangeSubscription: NativeEventSubscription;
     private backPressSubscription: NativeEventSubscription;
 
-    constructor(props) {
+    constructor(props: WalletProps) {
         super(props);
         this.state = {
             unlocked: false,
@@ -154,22 +158,6 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
     }
 
     private handleBackButton() {
-        const dialogHasBeenClosed =
-            this.props.ModalStore.closeVisibleModalDialog();
-        if (dialogHasBeenClosed) {
-            return true;
-        }
-
-        if (this.props.SettingsStore.loginRequired()) {
-            // pop to close lock screen and return false to close the app
-            this.props.navigation.pop();
-            return false;
-        }
-
-        if (this.props.navigation.pop()) {
-            return true;
-        }
-
         const tabNavigator = this.tabNavigationRef.current;
         if (!tabNavigator) {
             return false;
@@ -192,25 +180,31 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
         return false;
     }
 
+    private handleFocus = () => {
+        this.backPressSubscription?.remove();
+        this.backPressSubscription = BackHandler.addEventListener(
+            'hardwareBackPress',
+            this.handleBackButton.bind(this)
+        );
+        this.getSettingsAndNavigate();
+    };
+
+    private handleBlur = () => this.backPressSubscription?.remove();
+
     async componentDidMount() {
         // triggers when loaded from navigation or back action
-        this.props.navigation.addListener('didFocus', () => {
-            this.getSettingsAndNavigate();
-        });
+        this.props.navigation.addListener('focus', this.handleFocus);
+        this.props.navigation.addListener('blur', this.handleBlur);
 
         this.handleAppStateChangeSubscription = AppState.addEventListener(
             'change',
             this.handleAppStateChange
         );
-        this.backPressSubscription = BackHandler.addEventListener(
-            'hardwareBackPress',
-            this.handleBackButton.bind(this)
-        );
     }
 
     componentWillUnmount() {
         this.props.navigation.removeListener &&
-            this.props.navigation.removeListener('didFocus');
+            this.props.navigation.removeListener('focus', this.handleFocus);
         this.handleAppStateChangeSubscription?.remove();
         this.backPressSubscription?.remove();
     }
@@ -391,7 +385,7 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
                     if (SettingsStore.settings.automaticDisasterRecoveryBackup)
                         ChannelBackupStore.initSubscribeChannelEvents();
                 } catch (e) {
-                    console.log('recover error', e);
+                    console.error('recover error', e);
                 }
             } else {
                 if (SettingsStore.settings.automaticDisasterRecoveryBackup)
@@ -621,6 +615,8 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
             );
         };
 
+        const CameraScreen = () => {};
+
         const ChannelsScreen = () => {
             return (
                 <Screen>
@@ -642,107 +638,134 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
             <View style={{ flex: 1 }}>
                 {!connecting &&
                     (!loginRequired || posEnabled !== PosEnabled.Disabled) && (
-                        <NavigationContainer
-                            theme={Theme}
-                            ref={this.tabNavigationRef}
-                        >
-                            <Tab.Navigator
-                                initialRouteName={
-                                    posEnabled !== PosEnabled.Disabled &&
-                                    posStatus === 'active'
-                                        ? 'POS'
-                                        : isSyncing
-                                        ? 'Balance'
-                                        : (settings.display &&
-                                              settings.display.defaultView) ||
-                                          'Keypad'
-                                }
-                                backBehavior="none"
-                                screenOptions={({ route }) => ({
-                                    tabBarIcon: ({ color }) => {
-                                        if (
-                                            isSyncing &&
-                                            route.name === 'Keypad'
-                                        ) {
-                                            return;
-                                        }
-                                        if (route.name === 'Keypad') {
-                                            return <Bitcoin fill={color} />;
-                                        }
-                                        if (route.name === 'Balance') {
-                                            return <Temple fill={color} />;
-                                        }
-                                        if (route.name === 'POS') {
-                                            return <POS stroke={color} />;
-                                        }
-                                        if (route.name === 'POS Keypad') {
-                                            return <Bitcoin fill={color} />;
-                                        }
-                                        if (
-                                            BackendUtils.supportsChannelManagement()
-                                        ) {
-                                            return (
-                                                <ChannelsIcon
-                                                    height={26}
-                                                    width={26}
-                                                    fill={color}
-                                                />
-                                            );
-                                        }
-                                    }
-                                })}
-                                tabBarOptions={{
-                                    activeTintColor: error
-                                        ? themeColor('error')
-                                        : themeColor('text'),
-                                    inactiveTintColor: error
-                                        ? themeColor('error')
-                                        : 'gray',
-                                    showLabel: false
-                                }}
+                        <NavigationIndependentTree>
+                            <NavigationContainer
+                                theme={Theme}
+                                ref={this.tabNavigationRef}
+                                independent={true}
                             >
-                                {posEnabled !== PosEnabled.Disabled &&
-                                posStatus === 'active' ? (
-                                    <Tab.Screen
-                                        name="POS"
-                                        component={PosScreen}
-                                    />
-                                ) : (
-                                    <Tab.Screen
-                                        name="Balance"
-                                        component={BalanceScreen}
-                                    />
-                                )}
-                                {posEnabled === PosEnabled.Standalone &&
-                                    posStatus === 'active' &&
-                                    showKeypad && (
+                                <Tab.Navigator
+                                    initialRouteName={
+                                        posEnabled !== PosEnabled.Disabled &&
+                                        posStatus === 'active'
+                                            ? 'POS'
+                                            : isSyncing
+                                            ? 'Balance'
+                                            : (settings.display &&
+                                                  settings.display
+                                                      .defaultView) ||
+                                              'Keypad'
+                                    }
+                                    backBehavior="none"
+                                    screenOptions={({ route }) => ({
+                                        tabBarIcon: ({ color }) => {
+                                            if (
+                                                isSyncing &&
+                                                route.name === 'Keypad'
+                                            ) {
+                                                return;
+                                            }
+                                            if (route.name === 'Keypad') {
+                                                return <Bitcoin fill={color} />;
+                                            }
+                                            if (route.name === 'Balance') {
+                                                return <Temple fill={color} />;
+                                            }
+                                            if (route.name === 'POS') {
+                                                return <POS stroke={color} />;
+                                            }
+                                            if (route.name === 'POS Keypad') {
+                                                return <Bitcoin fill={color} />;
+                                            }
+                                            if (route.name === 'Camera') {
+                                                return (
+                                                    <Scan
+                                                        fill={color}
+                                                        width={20}
+                                                    />
+                                                );
+                                            }
+                                            if (
+                                                BackendUtils.supportsChannelManagement()
+                                            ) {
+                                                return (
+                                                    <ChannelsIcon
+                                                        height={26}
+                                                        width={26}
+                                                        fill={color}
+                                                    />
+                                                );
+                                            }
+                                        },
+                                        headerShown: false,
+                                        tabBarActiveTintColor: error
+                                            ? themeColor('error')
+                                            : themeColor('text'),
+                                        tabBarInactiveTintColor: error
+                                            ? themeColor('error')
+                                            : 'gray',
+                                        tabBarShowLabel: false,
+                                        tabBarStyle: { display: 'flex' }
+                                    })}
+                                >
+                                    {posEnabled !== PosEnabled.Disabled &&
+                                    posStatus === 'active' ? (
+                                        <Tab.Screen
+                                            name="POS"
+                                            component={PosScreen}
+                                        />
+                                    ) : (
                                         <Tab.Screen
-                                            name="POS Keypad"
-                                            component={PosKeypadScreen}
+                                            name="Balance"
+                                            component={BalanceScreen}
                                         />
                                     )}
-                                {posStatus !== 'active' && (
-                                    <>
-                                        {!error && !isSyncing && (
+                                    {posEnabled === PosEnabled.Standalone &&
+                                        posStatus === 'active' &&
+                                        showKeypad && (
                                             <Tab.Screen
-                                                name="Keypad"
-                                                component={KeypadScreen}
+                                                name="POS Keypad"
+                                                component={PosKeypadScreen}
                                             />
                                         )}
-                                        {BackendUtils.supportsChannelManagement() &&
-                                            !error &&
-                                            !isSyncing && (
+                                    {posStatus !== 'active' && (
+                                        <>
+                                            {!error && !isSyncing && (
                                                 <Tab.Screen
-                                                    name={localeString(
-                                                        'views.Wallet.Wallet.channels'
-                                                    )}
-                                                    component={ChannelsScreen}
+                                                    name="Keypad"
+                                                    component={KeypadScreen}
                                                 />
                                             )}
-                                    </>
-                                )}
-                            </Tab.Navigator>
-                        </NavigationContainer>
+                                            {BackendUtils.supportsChannelManagement() &&
+                                                !error &&
+                                                !isSyncing && (
+                                                    <Tab.Screen
+                                                        name={localeString(
+                                                            'views.Wallet.Wallet.channels'
+                                                        )}
+                                                        component={
+                                                            ChannelsScreen
+                                                        }
+                                                    />
+                                                )}
+                                        </>
+                                    )}
+                                    <Tab.Screen
+                                        name="Camera"
+                                        component={CameraScreen}
+                                        listeners={{
+                                            tabPress: (e) => {
+                                                // Prevent default action
+                                                e.preventDefault();
+                                                navigation.navigate(
+                                                    'HandleAnythingQRScanner'
+                                                );
+                                            }
+                                        }}
+                                    />
+                                </Tab.Navigator>
+                            </NavigationContainer>
+                        </NavigationIndependentTree>
                     )}
                 {connecting &&
                     (!loginRequired || posEnabled !== PosEnabled.Disabled) && (
diff --git a/yarn.lock b/yarn.lock
index 28607defe..7dc41c5b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2079,16 +2079,16 @@
     prompts "^2.4.2"
     semver "^7.5.2"
 
-"@react-native-community/masked-view@0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.11.tgz#2f4c6e10bee0786abff4604e39a37ded6f3980ce"
-  integrity sha512-rQfMIGSR/1r/SyN87+VD8xHHzDYeHaJq6elOSCAD+0iLagXkSI2pfA0LmSXP21uw5i3em7GkkRjfJ8wpqWXZNw==
-
 "@react-native-community/netinfo@11.3.0":
   version "11.3.0"
   resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.3.0.tgz#9d99ba00138b38350a794eab5eca436f6e209114"
   integrity sha512-mR9iqUi0GzuC8ut+goI/lLkgG+a2OViI1mjSdXHKZnkfdJVjHblyWX3xoA8GE4GH8X4r0X/PNM3Vvyf2FH9mVg==
 
+"@react-native-masked-view/masked-view@0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@react-native-masked-view/masked-view/-/masked-view-0.3.1.tgz#5bd76f17004a6ccbcec03856893777ee91f23d29"
+  integrity sha512-uVm8U6nwFIlUd1iDIB5cS+lDadApKR+l8k4k84d9hn+GN4lzAIJhUZ9syYX7c022MxNgAlbxoFLt0pqKoyaAGg==
+
 "@react-native-picker/picker@2.6.1":
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.6.1.tgz#3b20ddd1385fab0487db103dc6519570f8892e6d"
@@ -2286,60 +2286,58 @@
     invariant "^2.2.4"
     nullthrows "^1.1.1"
 
-"@react-navigation/bottom-tabs@5.11.11":
-  version "5.11.11"
-  resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.11.tgz#ad4dfee4316522d8c05b5a8ad460f597bddb9e3c"
-  integrity sha512-hThj6Vfw+ITzAVj5TgLEoxkVEcBD+gYeieWOe6FryBRgokgKNCzFQzqArJ5UCmNMxklNH0rstJfcdyHflLuPtw==
+"@react-navigation/bottom-tabs@7.0.0-alpha.22":
+  version "7.0.0-alpha.22"
+  resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.0.0-alpha.22.tgz#3205fe030afc28994cad3b698b73a37e4d570723"
+  integrity sha512-aiqbPjAfAcR57XItMQaYhrRdWYdgMqsh5WuXkGWDaSi53WQm1a9GYAteSkm/gtY6Flxro77Q++2L6e09VBh+kA==
   dependencies:
-    color "^3.1.3"
-    react-native-iphone-x-helper "^1.3.0"
+    "@react-navigation/elements" "^2.0.0-alpha.17"
+    color "^4.2.3"
 
-"@react-navigation/core@^3.7.9":
-  version "3.7.9"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.7.9.tgz#3f7ba0fcb6c8d74a77a057382af198d84c7c4e3b"
-  integrity sha512-EknbzM8OI9A5alRxXtQRV5Awle68B+z1QAxNty5DxmlS3BNfmduWNGnim159ROyqxkuDffK9L/U/Tbd45mx+Jg==
+"@react-navigation/core@^7.0.0-alpha.17":
+  version "7.0.0-alpha.17"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-7.0.0-alpha.17.tgz#6ed770634ed07ca71a4956f7bc11e098ebd4a754"
+  integrity sha512-Oto3GAHCYWbLe8Fck8I7+1M5ATYlHkippoyNMM2UQWyBR5eudvPlvhioxzupdUu/70P8H4LX7lksyFBtVTGZIA==
   dependencies:
-    hoist-non-react-statics "^3.3.2"
-    path-to-regexp "^1.8.0"
-    query-string "^6.13.6"
-    react-is "^16.13.0"
-
-"@react-navigation/core@^6.4.10":
-  version "6.4.10"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.4.10.tgz#0c52621968b35e3a75e189e823d3b9e3bad77aff"
-  integrity sha512-oYhqxETRHNHKsipm/BtGL0LI43Hs2VSFoWMbBdHK9OqgQPjTVUitslgLcPpo4zApCcmBWoOLX2qPxhsBda644A==
-  dependencies:
-    "@react-navigation/routers" "^6.1.9"
+    "@react-navigation/routers" "^7.0.0-alpha.6"
     escape-string-regexp "^4.0.0"
-    nanoid "^3.1.23"
+    nanoid "3.3.7"
     query-string "^7.1.3"
-    react-is "^16.13.0"
-    use-latest-callback "^0.1.7"
+    react-is "^18.2.0"
+    use-latest-callback "^0.1.9"
 
-"@react-navigation/native@6.1.10":
-  version "6.1.10"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.1.10.tgz#d108423ae3acbe13f11d9b7351c1f5522d8391a5"
-  integrity sha512-jDG89TbZItY7W7rIcS1RqT63vWOPD4XuQLNKqZO0DY7mKnKh/CGBd0eg3nDMXUl143Qp//IxJKe2TfBQRDEU4A==
+"@react-navigation/elements@^2.0.0-alpha.17":
+  version "2.0.0-alpha.17"
+  resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.0.0-alpha.17.tgz#433ca7ff49097c46e7db40a08b8dc37f344d688c"
+  integrity sha512-DvKPYhqDMjS7/61MM+xlAq22078M/WKqzwwjmXR5/fd+rDtOq3ysMzyCBSRKSjy5Dh+UUcQP3GobIWZhzVBPsA==
   dependencies:
-    "@react-navigation/core" "^6.4.10"
+    color "^4.2.3"
+
+"@react-navigation/native@7.0.0-alpha.18":
+  version "7.0.0-alpha.18"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-7.0.0-alpha.18.tgz#ea18461ff40d538f87b80938384c470788d924db"
+  integrity sha512-XzRTvWav7pM/S1by0wGMbDIYsuy0uel7chPi3ZHEcbPnskOmzs0h8QietVTz04LYclY8tSg8ojLjq1KNG7dGYA==
+  dependencies:
+    "@react-navigation/core" "^7.0.0-alpha.17"
     escape-string-regexp "^4.0.0"
     fast-deep-equal "^3.1.3"
-    nanoid "^3.1.23"
+    nanoid "3.3.7"
+    use-latest-callback "^0.1.9"
 
-"@react-navigation/native@^3.8.4":
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.8.4.tgz#4d77f86506364ecf18b33c7f8740afb6763d0b37"
-  integrity sha512-gXSVcL7bfFDyVkvyg1FiAqTCIgZub5K1X/TZqURBs2CPqDpfX1OsCtB9D33eTF14SpbfgHW866btqrrxoCACfg==
+"@react-navigation/routers@^7.0.0-alpha.6":
+  version "7.0.0-alpha.6"
+  resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-7.0.0-alpha.6.tgz#d10fcbc408d94b9b6904b1e97de88422f69954fb"
+  integrity sha512-0V+/WRbgVmrPXW5TjMLxf8NJAHsUoG9G8X4WWmVIf1ASMF3POZM4CCbhEeudhgUxN4QEvkoSIrzvUpoUplQOMw==
   dependencies:
-    hoist-non-react-statics "^3.3.2"
-    react-native-safe-area-view "^0.14.9"
+    nanoid "3.3.7"
 
-"@react-navigation/routers@^6.1.9":
-  version "6.1.9"
-  resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-6.1.9.tgz#73f5481a15a38e36592a0afa13c3c064b9f90bed"
-  integrity sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==
+"@react-navigation/stack@7.0.0-alpha.20":
+  version "7.0.0-alpha.20"
+  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-7.0.0-alpha.20.tgz#90a3aea5e78ab629193da3972ae984e25d39b43b"
+  integrity sha512-yi+PyNQoa/7Jt3+dqCiSElo+7+Wk3ZGz0Q/aOlvTeAFmJtj/PzimOX2Ysul08thpHBdo7SL06HfSEEAIB6exxA==
   dependencies:
-    nanoid "^3.1.23"
+    "@react-navigation/elements" "^2.0.0-alpha.17"
+    color "^4.2.3"
 
 "@remobile/react-native-qrcode-local-image@github:BlueWallet/react-native-qrcode-local-image#31b0113":
   version "1.0.4"
@@ -3988,7 +3986,7 @@ color-name@^1.0.0, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.6.0:
+color-string@^1.6.0, color-string@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
   integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
@@ -3996,7 +3994,7 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color@^3.1.2, color@^3.1.3:
+color@^3.1.2:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
   integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
@@ -4004,6 +4002,14 @@ color@^3.1.2, color@^3.1.3:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
+color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.9.0"
+
 colorette@^1.0.7:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
@@ -5636,11 +5642,6 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^2.3.1:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
-  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
-
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -7410,10 +7411,10 @@ ms@2.1.3, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-nanoid@^3.1.23:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+nanoid@3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -7880,13 +7881,6 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-to-regexp@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -8151,7 +8145,7 @@ qrcode@^1.5.1:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
-query-string@^6.12.1, query-string@^6.13.6:
+query-string@^6.12.1:
   version "6.14.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
   integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
@@ -8239,7 +8233,7 @@ react-freeze@^1.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-is@^16.13.0, react-is@^16.13.1, react-is@^16.7.0:
+react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8357,11 +8351,6 @@ react-native-image-picker@5.0.1:
   resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-5.0.1.tgz#c9e99217396bc82a977785e39e14afb4819e8448"
   integrity sha512-+poQTHOnEGrbxJnut591XA9006svFOyfPg/i5bv+fLuwoSHh5HW0E/PVhvT8lbX0Z5C108vh3DAsnrfFFnPBGw==
 
-react-native-iphone-x-helper@^1.2.1, react-native-iphone-x-helper@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
-  integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==
-
 react-native-keychain@8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/react-native-keychain/-/react-native-keychain-8.1.1.tgz#3bb5e37946b964a7bcf7df2fe470dd244e01a340"
@@ -8466,17 +8455,10 @@ react-native-restart@0.0.27:
   resolved "https://registry.yarnpkg.com/react-native-restart/-/react-native-restart-0.0.27.tgz#43aa8210312c9dfa5ec7bd4b2f35238ad7972b19"
   integrity sha512-8KScVICrXwcTSJ1rjWkqVTHyEKQIttm5AIMGSK1QG1+RS5owYlE4z/1DykOTdWfVl9l16FIk0w9Xzk9ZO6jxlA==
 
-react-native-safe-area-context@0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.6.4.tgz#624bd50cebc9f47853f179373501511931d2a0c3"
-  integrity sha512-xj8Mv8ZHfc8RquBgVYt+4+nOJaexTblLsQJpyx4Dh4qFUG+3QtbNlfOF7/ITj/qY5LNdlfafKoDsVgFz0WIU1w==
-
-react-native-safe-area-view@^0.14.9:
-  version "0.14.9"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d"
-  integrity sha512-WII/ulhpVyL/qbYb7vydq7dJAfZRBcEhg4/UWt6F6nAKpLa3gAceMOxBxI914ppwSP/TdUsandFy6lkJQE0z4A==
-  dependencies:
-    hoist-non-react-statics "^2.3.1"
+react-native-safe-area-context@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.1.tgz#29fb27395ff7dfa2fa38788a27226330d73a81cc"
+  integrity sha512-w8tCuowDorUkPoWPXmhqosovBr33YsukkwYCDERZFHAxIkx6qBadYxfeoaJ91nCQKjkNzGrK5qhoNOeSIcYSpA==
 
 react-native-safe-modules@^1.0.3:
   version "1.0.3"
@@ -8628,22 +8610,6 @@ react-native@0.73.7:
     ws "^6.2.2"
     yargs "^17.6.2"
 
-react-navigation-stack@2.0.16:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-2.0.16.tgz#083ee644eeb600782222ff1d9ef6df939120ec8a"
-  integrity sha512-l6Fqvz0tvs7i9+KHZDW9hdQbzzgE78bq85pLALllyiHBfz/aFAaoNG4RUWNSen+54uU4xLC5uioowxTJPRLQWQ==
-  dependencies:
-    color "^3.1.2"
-    react-native-iphone-x-helper "^1.2.1"
-
-react-navigation@4.4.4:
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.4.4.tgz#8cda2219196311db440e54998bc724523359949f"
-  integrity sha512-08Nzy1aKEd73496CsuzN49vLFmxPKYF5WpKGgGvkQ10clB79IRM2BtAfVl6NgPKuUM8FXq1wCsrjo/c5ftl5og==
-  dependencies:
-    "@react-navigation/core" "^3.7.9"
-    "@react-navigation/native" "^3.8.4"
-
 react-refresh@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
@@ -9807,7 +9773,7 @@ url@0.10.3:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-latest-callback@^0.1.7:
+use-latest-callback@^0.1.9:
   version "0.1.9"
   resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.1.9.tgz#10191dc54257e65a8e52322127643a8940271e2a"
   integrity sha512-CL/29uS74AwreI/f2oz2hLTW7ZqVeV5+gxFeGudzQrgkCytrHw33G4KbnQOrRlAEzzAFXi7dDLMC9zhWcVpzmw==