diff --git a/package-lock.json b/package-lock.json
index 6d125e2f6b27..516376916a95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "@react-native-google-signin/google-signin": "^10.0.1",
         "@react-native-picker/picker": "^2.4.3",
         "@react-navigation/material-top-tabs": "^6.6.3",
-        "@react-navigation/native": "6.1.6",
+        "@react-navigation/native": "6.1.8",
         "@react-navigation/stack": "6.3.16",
         "@react-ng/bounds-observer": "^0.2.1",
         "@rnmapbox/maps": "^10.0.11",
@@ -8563,16 +8563,16 @@
       }
     },
     "node_modules/@react-navigation/core": {
-      "version": "6.4.8",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.8.tgz",
-      "integrity": "sha512-klZ9Mcf/P2j+5cHMoGyIeurEzyBM2Uq9+NoSFrF6sdV5iCWHLFhrCXuhbBiQ5wVLCKf4lavlkd/DDs47PXs9RQ==",
+      "version": "6.4.10",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.10.tgz",
+      "integrity": "sha512-oYhqxETRHNHKsipm/BtGL0LI43Hs2VSFoWMbBdHK9OqgQPjTVUitslgLcPpo4zApCcmBWoOLX2qPxhsBda644A==",
       "dependencies": {
-        "@react-navigation/routers": "^6.1.8",
+        "@react-navigation/routers": "^6.1.9",
         "escape-string-regexp": "^4.0.0",
         "nanoid": "^3.1.23",
         "query-string": "^7.1.3",
         "react-is": "^16.13.0",
-        "use-latest-callback": "^0.1.5"
+        "use-latest-callback": "^0.1.7"
       },
       "peerDependencies": {
         "react": "*"
@@ -8608,11 +8608,11 @@
       }
     },
     "node_modules/@react-navigation/native": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.6.tgz",
-      "integrity": "sha512-14PmSy4JR8HHEk04QkxQ0ZLuqtiQfb4BV9kkMXD2/jI4TZ+yc43OnO6fQ2o9wm+Bq8pY3DxyerC2AjNUz+oH7Q==",
+      "version": "6.1.8",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.8.tgz",
+      "integrity": "sha512-0alti852nV+8oCVm9H80G6kZvrHoy51+rXBvVCRUs2rNDDozC/xPZs8tyeCJkqdw3cpxZDK8ndXF22uWq28+0Q==",
       "dependencies": {
-        "@react-navigation/core": "^6.4.8",
+        "@react-navigation/core": "^6.4.9",
         "escape-string-regexp": "^4.0.0",
         "fast-deep-equal": "^3.1.3",
         "nanoid": "^3.1.23"
@@ -8623,9 +8623,9 @@
       }
     },
     "node_modules/@react-navigation/routers": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.8.tgz",
-      "integrity": "sha512-CEge+ZLhb1HBrSvv4RwOol7EKLW1QoqVIQlE9TN5MpxS/+VoQvP+cLbuz0Op53/iJfYhtXRFd1ZAd3RTRqto9w==",
+      "version": "6.1.9",
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz",
+      "integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==",
       "dependencies": {
         "nanoid": "^3.1.23"
       }
@@ -50723,9 +50723,9 @@
       }
     },
     "node_modules/use-latest-callback": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.6.tgz",
-      "integrity": "sha512-VO/P91A/PmKH9bcN9a7O3duSuxe6M14ZoYXgA6a8dab8doWNdhiIHzEkX/jFeTTRBsX0Ubk6nG4q2NIjNsj+bg==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.9.tgz",
+      "integrity": "sha512-CL/29uS74AwreI/f2oz2hLTW7ZqVeV5+gxFeGudzQrgkCytrHw33G4KbnQOrRlAEzzAFXi7dDLMC9zhWcVpzmw==",
       "peerDependencies": {
         "react": ">=16.8"
       }
@@ -58884,16 +58884,16 @@
       }
     },
     "@react-navigation/core": {
-      "version": "6.4.8",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.8.tgz",
-      "integrity": "sha512-klZ9Mcf/P2j+5cHMoGyIeurEzyBM2Uq9+NoSFrF6sdV5iCWHLFhrCXuhbBiQ5wVLCKf4lavlkd/DDs47PXs9RQ==",
+      "version": "6.4.10",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.10.tgz",
+      "integrity": "sha512-oYhqxETRHNHKsipm/BtGL0LI43Hs2VSFoWMbBdHK9OqgQPjTVUitslgLcPpo4zApCcmBWoOLX2qPxhsBda644A==",
       "requires": {
-        "@react-navigation/routers": "^6.1.8",
+        "@react-navigation/routers": "^6.1.9",
         "escape-string-regexp": "^4.0.0",
         "nanoid": "^3.1.23",
         "query-string": "^7.1.3",
         "react-is": "^16.13.0",
-        "use-latest-callback": "^0.1.5"
+        "use-latest-callback": "^0.1.7"
       }
     },
     "@react-navigation/devtools": {
@@ -58915,20 +58915,20 @@
       }
     },
     "@react-navigation/native": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.6.tgz",
-      "integrity": "sha512-14PmSy4JR8HHEk04QkxQ0ZLuqtiQfb4BV9kkMXD2/jI4TZ+yc43OnO6fQ2o9wm+Bq8pY3DxyerC2AjNUz+oH7Q==",
+      "version": "6.1.8",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.8.tgz",
+      "integrity": "sha512-0alti852nV+8oCVm9H80G6kZvrHoy51+rXBvVCRUs2rNDDozC/xPZs8tyeCJkqdw3cpxZDK8ndXF22uWq28+0Q==",
       "requires": {
-        "@react-navigation/core": "^6.4.8",
+        "@react-navigation/core": "^6.4.9",
         "escape-string-regexp": "^4.0.0",
         "fast-deep-equal": "^3.1.3",
         "nanoid": "^3.1.23"
       }
     },
     "@react-navigation/routers": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.8.tgz",
-      "integrity": "sha512-CEge+ZLhb1HBrSvv4RwOol7EKLW1QoqVIQlE9TN5MpxS/+VoQvP+cLbuz0Op53/iJfYhtXRFd1ZAd3RTRqto9w==",
+      "version": "6.1.9",
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz",
+      "integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==",
       "requires": {
         "nanoid": "^3.1.23"
       }
@@ -89240,9 +89240,9 @@
       }
     },
     "use-latest-callback": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.6.tgz",
-      "integrity": "sha512-VO/P91A/PmKH9bcN9a7O3duSuxe6M14ZoYXgA6a8dab8doWNdhiIHzEkX/jFeTTRBsX0Ubk6nG4q2NIjNsj+bg==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.9.tgz",
+      "integrity": "sha512-CL/29uS74AwreI/f2oz2hLTW7ZqVeV5+gxFeGudzQrgkCytrHw33G4KbnQOrRlAEzzAFXi7dDLMC9zhWcVpzmw==",
       "requires": {}
     },
     "use-memo-one": {
diff --git a/package.json b/package.json
index dc1964eac407..6ad3b670ed63 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "@react-native-google-signin/google-signin": "^10.0.1",
     "@react-native-picker/picker": "^2.4.3",
     "@react-navigation/material-top-tabs": "^6.6.3",
-    "@react-navigation/native": "6.1.6",
+    "@react-navigation/native": "6.1.8",
     "@react-navigation/stack": "6.3.16",
     "@react-ng/bounds-observer": "^0.2.1",
     "@rnmapbox/maps": "^10.0.11",
diff --git a/patches/@react-navigation+native+6.1.6.patch b/patches/@react-navigation+native+6.1.8.patch
similarity index 90%
rename from patches/@react-navigation+native+6.1.6.patch
rename to patches/@react-navigation+native+6.1.8.patch
index eb933683c850..c461d7e510fe 100644
--- a/patches/@react-navigation+native+6.1.6.patch
+++ b/patches/@react-navigation+native+6.1.8.patch
@@ -133,7 +133,7 @@ index 0000000..16da117
 +//# sourceMappingURL=findFocusedRouteKey.js.map
 \ No newline at end of file
 diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index 5bf2a88..a4318ef 100644
+index 6f0ac51..a77b608 100644
 --- a/node_modules/@react-navigation/native/lib/module/useLinking.js
 +++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
 @@ -2,6 +2,7 @@ import { findFocusedRoute, getActionFromState as getActionFromStateDefault, getP
@@ -144,37 +144,7 @@ index 5bf2a88..a4318ef 100644
  import ServerContext from './ServerContext';
  /**
   * Find the matching navigation state that changed between 2 navigation states
-@@ -34,32 +35,52 @@ const findMatchingState = (a, b) => {
- /**
-  * Run async function in series as it's called.
-  */
--const series = cb => {
--  // Whether we're currently handling a callback
--  let handling = false;
--  let queue = [];
--  const callback = async () => {
--    try {
--      if (handling) {
--        // If we're currently handling a previous event, wait before handling this one
--        // Add the callback to the beginning of the queue
--        queue.unshift(callback);
--        return;
--      }
--      handling = true;
--      await cb();
--    } finally {
--      handling = false;
--      if (queue.length) {
--        // If we have queued items, handle the last one
--        const last = queue.pop();
--        last === null || last === void 0 ? void 0 : last();
--      }
--    }
-+const series = (cb) => {
-+  let queue = Promise.resolve();
-+  const callback = () => {
-+    queue = queue.then(cb);
-   };
+@@ -42,6 +43,44 @@ export const series = cb => {
    return callback;
  };
  let linkingHandlers = [];
@@ -219,7 +189,7 @@ index 5bf2a88..a4318ef 100644
  export default function useLinking(ref, _ref) {
    let {
      independent,
-@@ -251,6 +272,9 @@ export default function useLinking(ref, _ref) {
+@@ -231,6 +270,9 @@ export default function useLinking(ref, _ref) {
        // Otherwise it's likely a change triggered by `popstate`
        path !== pendingPath) {
          const historyDelta = (focusedState.history ? focusedState.history.length : focusedState.routes.length) - (previousFocusedState.history ? previousFocusedState.history.length : previousFocusedState.routes.length);
@@ -229,7 +199,7 @@ index 5bf2a88..a4318ef 100644
          if (historyDelta > 0) {
            // If history length is increased, we should pushState
            // Note that path might not actually change here, for example, drawer open should pushState
-@@ -262,34 +286,55 @@ export default function useLinking(ref, _ref) {
+@@ -242,34 +284,55 @@ export default function useLinking(ref, _ref) {
            // If history length is decreased, i.e. entries were removed, we want to go back
  
            const nextIndex = history.backIndex({
