react-native-timacare 3.3.44 → 3.3.46

package/src/navigation/navigationRef.ts

@@ -2,30 +2,79 @@
 /**
  * Navigation bridge for the Timacare SDK.
  *
- * The host app already owns its <NavigationContainer ref={...}>, so instead of
- * creating a second ref the host registers its existing one here once (typically
- * right after the container mounts). The SDK then uses it to drive navigation
- * imperatively from outside React — e.g. deep-linking into a loan detail via
- * `goDetail()`.
+ * SDK screens (DetailLoan, DetailLoanTima, ...) live ONLY inside the SDK's
+ * PrimaryNavigator. There are two situations the SDK has to drive navigation in:
  *
- * Accepts either form of ref:
- *  - the object returned by `createNavigationContainerRef()` /
- *    `useNavigationContainerRef()` (methods live directly on it), or
- *  - a plain `useRef()` passed to <NavigationContainer ref={ref}> (methods live
- *    on `ref.current`).
+ *  1. The SDK navigator is currently mounted (the user is somewhere inside the
+ *     SDK). We then navigate using the navigator's OWN navigation object — see
+ *     `sdkNavigation`, captured from inside PrimaryNavigator. React Navigation's
+ *     `navigate()` only bubbles UP to parents, never DOWN into descendants, so
+ *     the host's root container ref cannot reach a nested SDK screen — but the
+ *     SDK navigator's own object can.
+ *
+ *  2. The SDK navigator is NOT mounted (e.g. the host shows its own home with a
+ *     loan list and only mounts <RNTimacare/> under a dedicated route). Here we
+ *     need the host's NavigationContainer ref AND the name of the host route that
+ *     mounts the SDK, so we can mount it and deep-link in one nested navigate.
+ *
+ * The host registers both via `setNavigationRef(ref, hostRoute)`.
  */
+
+// Host's NavigationContainer ref (or a plain useRef passed to the container).
 let externalNavigationRef = null;
 
-export const setNavigationRef = (ref) => {
+// Name of the host route whose screen renders <RNTimacare/> (PrimaryNavigator).
+// Required to deep-link into the SDK when the SDK navigator isn't mounted yet.
+let hostRoute = null;
+
+// Navigation object scoped to the SDK navigator, captured from inside its tree.
+let sdkNavigation = null;
+
+/**
+ * Register the host's NavigationContainer ref, and optionally the host route
+ * name under which <RNTimacare/> is mounted.
+ *
+ * Accepts either ref form:
+ *  - the object from `createNavigationContainerRef()` / `useNavigationContainerRef()`
+ *    (methods live directly on it), or
+ *  - a plain `useRef()` passed to <NavigationContainer ref={ref}> (methods on `.current`).
+ */
+export const setNavigationRef = (ref, route = null) => {
   externalNavigationRef = ref;
+  if (route != null) {
+    hostRoute = route;
+  }
+};
+
+/** Set/override the host route that mounts the SDK navigator. */
+export const setHostRoute = (route) => {
+  hostRoute = route;
 };
 
+export const getHostRoute = () => hostRoute;
+
 /**
- * Resolves the registered ref down to the actual NavigationContainerRef,
- * regardless of which ref form the host provided. Returns null when nothing is
- * registered yet or the container isn't ready.
+ * Registered from inside PrimaryNavigator while it is mounted (and cleared on
+ * unmount, so we never hand out a stale/detached handle).
  */
-export const getNavigation = () => {
+export const setSdkNavigation = (nav) => {
+  sdkNavigation = nav;
+};
+
+/** The SDK navigator's own navigation object, if currently mounted. */
+export const getSdkNavigation = () => {
+  if (sdkNavigation && typeof sdkNavigation.navigate === 'function') {
+    return sdkNavigation;
+  }
+  return null;
+};
+
+/**
+ * Resolves the host ref down to the actual NavigationContainerRef, regardless of
+ * which ref form the host provided. Returns null when nothing is registered yet
+ * or the container isn't ready.
+ */
+export const getHostNavigation = () => {
   const ref = externalNavigationRef;
   if (!ref) {
     return null;
@@ -38,3 +87,12 @@ export const getNavigation = () => {
 
   return nav;
 };
+
+/**
+ * Backwards-compatible resolver: prefers the SDK navigator's own object, falling
+ * back to the host ref (which only reaches SDK screens when the host mounts
+ * PrimaryNavigator as its root). Prefer `goDetail()` for deep-linking.
+ */
+export const getNavigation = () => {
+  return getSdkNavigation() || getHostNavigation();
+};

package/src/navigation/primary-navigator.tsx

@@ -8,7 +8,12 @@
 import React, { useEffect } from 'react';
 
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { getNavigation } from './navigationRef';
+import {
+  getSdkNavigation,
+  getHostNavigation,
+  getHostRoute,
+  setSdkNavigation,
+} from './navigationRef';
 import { OTP } from '../screens/otp';
 import { NationalID } from '../screens/nationalID';
 import { Selfie } from '../screens/selfie';
@@ -157,12 +162,27 @@ export const ScreenNames = {
 const Stack = createNativeStackNavigator();
 
 export function PrimaryNavigator(props) {
+  // When this navigator unmounts, drop the captured navigation so getNavigation()
+  // doesn't hand goDetail() a stale (detached) handle — it should cleanly fall
+  // back to the host ref / return null instead.
+  useEffect(() => {
+    return () => setSdkNavigation(null);
+  }, []);
+
   return (
     <Stack.Navigator
       initialRouteName={ScreenNames.Main}
       screenOptions={{
         headerShown: false,
       }}
+      // Capture this navigator's own navigation object so goDetail() (and any
+      // other imperative SDK navigation) can reach SDK screens even when the host
+      // mounts this navigator nested inside its tree. The screen `navigation`
+      // prop is scoped to THIS stack, so navigate() resolves SDK screens directly.
+      screenListeners={({ navigation }) => {
+        setSdkNavigation(navigation);
+        return {};
+      }}
     >
       <Stack.Screen name={ScreenNames.Main} component={Home} />
       <Stack.Screen name={ScreenNames.NationalID} component={NationalID} />
@@ -323,20 +343,26 @@ export const canExit = (routeName: string) => exitRoutes.includes(routeName);
  * Imperatively navigate into a loan detail screen from outside React.
  *
  * Intended for the host app to deep-link the user straight into a loan detail
- * (e.g. from a push notification or a list rendered outside the SDK). Requires
- * the host to register its NavigationContainer ref once via `setNavigationRef()`.
+ * (e.g. from a push notification or a list rendered outside the SDK).
  *
  * Accepts either a loan id or a partial loan object. The detail screen only
  * needs `id` to fetch its data; `disbursementPartner` (when provided) selects
  * the matching screen — 'CIMB' -> DetailLoan, otherwise -> DetailLoanTima.
+ *
+ * Resolution order:
+ *  1. SDK navigator already mounted -> navigate within it directly.
+ *  2. SDK not mounted, but the host registered its ref + the route that mounts
+ *     <RNTimacare/> (via `setNavigationRef(ref, hostRoute)`) -> mount the SDK and
+ *     deep-link in one nested navigate.
+ *  3. Fallback: dispatch on the host ref directly (only reaches SDK screens when
+ *     the host mounts PrimaryNavigator as its root navigator).
  */
 export function goDetail(
   loan: number | { id: number; disbursementPartner?: string }
 ) {
   const loanObj = typeof loan === 'number' ? { id: loan } : loan;
-  const navigation = getNavigation();
 
-  if (!loanObj?.id || !navigation) {
+  if (!loanObj?.id) {
     return;
   }
 
@@ -345,5 +371,26 @@ export function goDetail(
       ? ScreenNames.DetailLoan
       : ScreenNames.DetailLoanTima;
 
-  navigation.navigate(screen, { loan: loanObj });
+  // 1) SDK navigator is mounted: navigate within the navigator that owns the screen.
+  const sdkNavigation = getSdkNavigation();
+  if (sdkNavigation) {
+    sdkNavigation.navigate(screen, { loan: loanObj });
+    return;
+  }
+
+  // 2) SDK not mounted: mount it via the host route and deep-link in one go.
+  const hostNavigation = getHostNavigation();
+  const hostRoute = getHostRoute();
+  if (hostNavigation && hostRoute) {
+    hostNavigation.navigate(hostRoute, {
+      screen,
+      params: { loan: loanObj },
+    });
+    return;
+  }
+
+  // 3) Last resort: host ref dispatch (works only if the SDK is the host root).
+  if (hostNavigation) {
+    hostNavigation.navigate(screen, { loan: loanObj });
+  }
 }

package/src/screens/home/index.tsx

@@ -2423,6 +2423,7 @@ export const Home = observer(function Home() {
             {() =>
               !isLoading &&
               !homeStore.isLoading &&
+              (listLoan?.length ?? 0) === 0 &&
               (homeStore?.listLoan?.length ?? 0) === 0 ? (
                 <View
                   style={{