fix: [IOBP-2166] Prevent multiple wallet API calls at startup saga

ts/features/identification/sagas/__tests__/identificationSaga.test.ts

@@ -15,7 +15,7 @@ import {
   checkCurrentSession,
   sessionInvalid
 } from "../../../authentication/common/store/actions";
-import { maybeHandlePendingBackgroundActions } from "../../../pushNotifications/sagas/common";
+import { maybeHandlePendingBackgroundActions } from "../../../../sagas/backgroundActions";
 import { isFastLoginEnabledSelector } from "../../../authentication/fastLogin/store/selectors";
 import { startApplicationInitialization } from "../../../../store/actions/application";
 import { PinString } from "../../../../types/PinString";

ts/features/identification/sagas/index.ts

@@ -11,7 +11,7 @@ import {
   sessionInvalid
 } from "../../authentication/common/store/actions";
 import { isFastLoginEnabledSelector } from "../../authentication/fastLogin/store/selectors/index";
-import { maybeHandlePendingBackgroundActions } from "../../pushNotifications/sagas/common";
+import { maybeHandlePendingBackgroundActions } from "../../../sagas/backgroundActions";
 import {
   identificationCancel,
   identificationForceLogout,

ts/features/linking/sagas/index.ts

@@ -3,6 +3,12 @@ import { initiateAarFlow } from "../../pn/aar/store/actions";
 import { isSendAARLink } from "../../pn/aar/utils/deepLinking";
 import { clearLinkingUrl } from "../actions";
 import { storedLinkingUrlSelector } from "../reducers";
+import {
+  isCGNLinking,
+  shouldTriggerWalletUpdate
+} from "../../../utils/deepLinkUtils";
+import { walletUpdate } from "../../wallet/store/actions";
+import { cgnEycaStatus } from "../../bonus/cgn/store/actions/eyca/details";
 
 export function* handleStoredLinkingUrlIfNeeded() {
   const storedLinkingUrl = yield* select(storedLinkingUrlSelector);
@@ -14,6 +20,14 @@ export function* handleStoredLinkingUrlIfNeeded() {
 
       return true;
     }
+    if (shouldTriggerWalletUpdate(storedLinkingUrl)) {
+      yield* put(clearLinkingUrl());
+      yield* put(walletUpdate());
+      // If the stored linking URL is a CGN linking, we also need to get EYCA status
+      if (isCGNLinking(storedLinkingUrl)) {
+        yield* put(cgnEycaStatus.request());
+      }
+    }
   }
   return false;
 }

ts/features/pushNotifications/sagas/__tests__/common.test.ts

@@ -1,5 +1,6 @@
 import { testSaga } from "redux-saga-test-plan";
 import NavigationService from "../../../../navigation/NavigationService";
+import { maybeHandlePendingBackgroundActions } from "../../../../sagas/backgroundActions";
 import { navigateToMainNavigatorAction } from "../../../../store/actions/navigation";
 import { handleStoredLinkingUrlIfNeeded } from "../../../linking/sagas";
 import { resetMessageArchivingAction } from "../../../messages/store/actions/archiving";
@@ -16,14 +17,11 @@ import { checkNotificationPermissions } from "../../utils";
 import { navigateToMessageRouterAction } from "../../utils/navigation";
 import {
   checkAndUpdateNotificationPermissionsIfNeeded,
-  maybeHandlePendingBackgroundActions,
-  testable,
+  handlePushNotificationIfNeeded,
   updateNotificationPermissionsIfNeeded
 } from "../common";
 
 describe("maybeHandlePendingBackgroundActions", () => {
-  const pushHandler = testable?.handlePushNotificationIfNeeded;
-
   describe("main functionality", () => {
     const generateTestName = (
       linkingUrlHandled: boolean,
@@ -40,19 +38,17 @@ describe("maybeHandlePendingBackgroundActions", () => {
     [true, false].forEach(linkingUrlHandled =>
       [true, false].forEach(pushNotifHandled =>
         it(generateTestName(linkingUrlHandled, pushNotifHandled), () => {
-          if (pushHandler === undefined) {
-            fail(
-              "testable export does not contain handlePushNotificationIfNeeded"
-            );
-          }
           const saga = testSaga(maybeHandlePendingBackgroundActions, false)
             .next()
             .call(handleStoredLinkingUrlIfNeeded)
             .next(linkingUrlHandled);
           if (linkingUrlHandled) {
             saga.isDone();
           } else {
-            saga.call(pushHandler, false).next(pushNotifHandled).isDone();
+            saga
+              .call(handlePushNotificationIfNeeded, false)
+              .next(pushNotifHandled)
+              .isDone();
           }
         })
       )
@@ -71,10 +67,7 @@ describe("maybeHandlePendingBackgroundActions", () => {
         fromNotification: true
       });
 
-      if (pushHandler === undefined) {
-        fail("testable export does not contain handlePushNotificationIfNeeded");
-      }
-      testSaga(pushHandler, false)
+      testSaga(handlePushNotificationIfNeeded, false)
         .next()
         .select(pendingMessageStateSelector)
         .next(mockedPendingMessageState)
@@ -96,10 +89,7 @@ describe("maybeHandlePendingBackgroundActions", () => {
         fromNotification: true
       });
 
-      if (pushHandler === undefined) {
-        fail("testable export does not contain pushHandler");
-      }
-      testSaga(pushHandler, true)
+      testSaga(handlePushNotificationIfNeeded, true)
         .next()
         .select(pendingMessageStateSelector)
         .next(mockedPendingMessageState)
@@ -123,10 +113,7 @@ describe("maybeHandlePendingBackgroundActions", () => {
         fromNotification: true
       });
 
-      if (pushHandler === undefined) {
-        fail("testable export does not contain pushHandler");
-      }
-      testSaga(pushHandler, false)
+      testSaga(handlePushNotificationIfNeeded, false)
         .next()
         .select(pendingMessageStateSelector)
         .next(mockedPendingMessageState)
@@ -145,10 +132,7 @@ describe("maybeHandlePendingBackgroundActions", () => {
     });
 
     it("does nothing if there are not pending messages", () => {
-      if (pushHandler === undefined) {
-        fail("testable export does not contain pushHandler");
-      }
-      testSaga(pushHandler, false)
+      testSaga(handlePushNotificationIfNeeded, false)
         .next()
         .select(pendingMessageStateSelector)
         .next(null)

ts/features/pushNotifications/sagas/common.ts

@@ -1,8 +1,6 @@
 import { call, put, select } from "typed-redux-saga/macro";
 import NavigationService from "../../../navigation/NavigationService";
 import { navigateToMainNavigatorAction } from "../../../store/actions/navigation";
-import { isTestEnv } from "../../../utils/environment";
-import { handleStoredLinkingUrlIfNeeded } from "../../linking/sagas";
 import { resetMessageArchivingAction } from "../../messages/store/actions/archiving";
 import { isArchivingDisabledSelector } from "../../messages/store/reducers/archiving";
 import { trackNotificationPermissionsStatus } from "../analytics";
@@ -52,32 +50,7 @@ export function* updateNotificationPermissionsIfNeeded(
   }
 }
 
-/**
- * this method is used to handle all actions that
- * are triggered when the app is resumed from scratch or transitions from
- * background to foreground, and also need to be handled
- * later on in the app's life cycle.
- *
- * two examples are Universal/App Links and Push Notifications, which
- * can transition the app from background or from a closed state to foreground,
- *  and need to be handled once the app has finished loading/initializing.
- */
-export function* maybeHandlePendingBackgroundActions(
-  shouldResetToMainNavigator: boolean = false
-) {
-  // check if we have a stored linking URL to process
-  if (yield* call(handleStoredLinkingUrlIfNeeded)) {
-    return true;
-  }
-  // Check if we have a pending notification message
-  if (yield* call(handlePushNotificationIfNeeded, shouldResetToMainNavigator)) {
-    return true;
-  }
-
-  return false;
-}
-
-function* handlePushNotificationIfNeeded(
+export function* handlePushNotificationIfNeeded(
   shouldResetToMainNavigator: boolean = false
 ) {
   const pendingMessageState = yield* select(pendingMessageStateSelector);
@@ -115,9 +88,3 @@ function* handlePushNotificationIfNeeded(
   }
   return false;
 }
-
-export const testable = isTestEnv
-  ? {
-      handlePushNotificationIfNeeded
-    }
-  : undefined;

ts/features/wallet/saga/handleWalletUpdateSaga.ts

@@ -1,8 +1,8 @@
 import { put } from "typed-redux-saga/macro";
+import { getCdcStatusWallet } from "../../bonus/cdc/wallet/store/actions";
 import { cgnDetails } from "../../bonus/cgn/store/actions/details";
 import { idPayWalletGet } from "../../idpay/wallet/store/actions";
 import { getPaymentsWalletUserMethods } from "../../payments/wallet/store/actions";
-import { getCdcStatusWallet } from "../../bonus/cdc/wallet/store/actions";
 
 /**
  * This saga handles the update of the wallet screen

ts/navigation/AppStackNavigator.tsx

@@ -23,13 +23,13 @@ import { idPayLinkingOptions } from "../features/idpay/common/navigation/linking
 import { IngressScreen } from "../features/ingress/screens/IngressScreen";
 import { ITW_ROUTES } from "../features/itwallet/navigation/routes";
 import { useItwLinkingOptions } from "../features/itwallet/navigation/useItwLinkingOptions";
+import { storeLinkingUrl } from "../features/linking/actions";
 import { MESSAGES_ROUTES } from "../features/messages/navigation/routes";
 import { SERVICES_ROUTES } from "../features/services/common/navigation/routes";
 import { SETTINGS_ROUTES } from "../features/settings/common/navigation/routes";
 import { processUtmLink } from "../features/utmLink";
 import { startApplicationInitialization } from "../store/actions/application";
 import { setDebugCurrentRouteName } from "../store/actions/debug";
-import { storeLinkingUrl } from "../features/linking/actions";
 import { useIODispatch, useIOSelector, useIOStore } from "../store/hooks";
 import { trackScreen } from "../store/middlewares/navigation";
 import { isCGNEnabledAfterLoadSelector } from "../store/reducers/backendStatus/remoteConfig";
@@ -150,15 +150,7 @@ const InnerNavigationContainer = (props: InnerNavigationContainerProps) => {
         [ROUTES.PAGE_NOT_FOUND]: "*"
       }
     },
-    subscribe: linkingSubscription(dispatch, store),
-    getInitialURL: async () => {
-      const initialUrl = await Linking.getInitialURL();
-      // check if the url contains main/wallet to remap the url
-      if (initialUrl && /\/main\/wallet(?:[/?#]|$)/.test(initialUrl)) {
-        return initialUrl.replace(/\/main\/wallet(?=\/|[?#]|$)/, "");
-      }
-      return initialUrl;
-    }
+    subscribe: linkingSubscription(dispatch, store)
   };
 
   /**

ts/navigation/linkingSubscription.ts

@@ -6,6 +6,8 @@ import { resetMessageArchivingAction } from "../features/messages/store/actions/
 import { isArchivingDisabledSelector } from "../features/messages/store/reducers/archiving";
 import { isSendAARLink } from "../features/pn/aar/utils/deepLinking";
 import { processUtmLink } from "../features/utmLink";
+import { walletUpdate } from "../features/wallet/store/actions";
+import { shouldTriggerWalletUpdate } from "../utils/deepLinkUtils";
 import { GlobalState } from "../store/reducers/types";
 import { initiateAarFlow } from "../features/pn/aar/store/actions";
 
@@ -29,6 +31,12 @@ export const linkingSubscription =
         if (isSendAARLink(state, url)) {
           dispatch(initiateAarFlow({ aarUrl: url }));
         }
+
+        // Trigger wallet update for external Universal Links and specific internal paths
+        // when the user is authenticated and the app is already running
+        if (shouldTriggerWalletUpdate(url)) {
+          dispatch(walletUpdate());
+        }
       } else {
         // If we are not logged in, we store the URL to be processed later
         dispatch(storeLinkingUrl(url));

ts/sagas/backgroundActions.ts

@@ -0,0 +1,28 @@
+import { call } from "typed-redux-saga/macro";
+import { handleStoredLinkingUrlIfNeeded } from "../features/linking/sagas";
+import { handlePushNotificationIfNeeded } from "../features/pushNotifications/sagas/common";
+
+/**
+ * this method is used to handle all actions that
+ * are triggered when the app is resumed from scratch or transitions from
+ * background to foreground, and also need to be handled
+ * later on in the app's life cycle.
+ *
+ * two examples are Universal/App Links and Push Notifications, which
+ * can transition the app from background or from a closed state to foreground,
+ *  and need to be handled once the app has finished loading/initializing.
+ */
+export function* maybeHandlePendingBackgroundActions(
+  shouldResetToMainNavigator: boolean = false
+) {
+  // check if we have a stored linking URL to process
+  if (yield* call(handleStoredLinkingUrlIfNeeded)) {
+    return true;
+  }
+  // Check if we have a pending notification message
+  if (yield* call(handlePushNotificationIfNeeded, shouldResetToMainNavigator)) {
+    return true;
+  }
+
+  return false;
+}

ts/sagas/index.ts

@@ -3,20 +3,20 @@
  */
 import { all, call } from "typed-redux-saga/macro";
 import versionInfoSaga from "../common/versionInfo/saga/versionInfo";
-import { watchTokenRefreshSaga } from "../features/authentication/fastLogin/saga/tokenRefreshSaga";
-import { watchPendingActionsSaga } from "../features/authentication/fastLogin/saga/pendingActionsSaga";
-import { watchZendeskSupportSaga } from "../features/zendesk/saga";
 import { zendeskEnabled } from "../config";
-import { watchUtmLinkSaga } from "../features/utmLink/saga";
+import { watchLogoutSaga } from "../features/authentication/common/saga/watchLogoutSaga";
+import { watchPendingActionsSaga } from "../features/authentication/fastLogin/saga/pendingActionsSaga";
+import { watchTokenRefreshSaga } from "../features/authentication/fastLogin/saga/tokenRefreshSaga";
 import connectivityStatusSaga from "../features/connectivity/saga";
 import { watchIdentification } from "../features/identification/sagas";
-import { watchLogoutSaga } from "../features/authentication/common/saga/watchLogoutSaga";
+import { watchUtmLinkSaga } from "../features/utmLink/saga";
+import { watchWalletSaga } from "../features/wallet/saga";
+import { watchZendeskSupportSaga } from "../features/zendesk/saga";
 import backendStatusSaga from "./backendStatus";
 import { watchContentSaga } from "./contentLoaders";
 import { loadSystemPreferencesSaga } from "./preferences";
-import { startupSaga } from "./startup";
 import { removePersistedStatesSaga } from "./removePersistedStates";
-
+import { startupSaga } from "./startup";
 import { watchApplicationActivitySaga } from "./startup/watchApplicationActivitySaga";
 
 export default function* root() {
@@ -34,6 +34,7 @@ export default function* root() {
     call(watchPendingActionsSaga),
     call(watchUtmLinkSaga),
     call(watchLogoutSaga),
+    call(watchWalletSaga),
     zendeskEnabled ? call(watchZendeskSupportSaga) : undefined
   ]);
 }

ts/sagas/startup.ts

@@ -80,7 +80,6 @@ import { watchAbortOnboardingSaga } from "../features/onboarding/saga/watchAbort
 import { watchPaymentsSaga } from "../features/payments/common/saga";
 import { watchAarFlowSaga } from "../features/pn/aar/saga/watchAARFlowSaga";
 import { watchPnSaga } from "../features/pn/store/sagas/watchPnSaga";
-import { maybeHandlePendingBackgroundActions } from "../features/pushNotifications/sagas/common";
 import { notificationPermissionsListener } from "../features/pushNotifications/sagas/notificationPermissionsListener";
 import { profileAndSystemNotificationsPermissions } from "../features/pushNotifications/sagas/profileAndSystemNotificationsPermissions";
 import { pushNotificationTokenUpload } from "../features/pushNotifications/sagas/pushNotificationTokenUpload";
@@ -98,7 +97,6 @@ import { loadUserDataProcessing } from "../features/settings/common/store/action
 import { isProfileFirstOnBoarding } from "../features/settings/common/store/utils/guards";
 import { handleApplicationStartupTransientError } from "../features/startup/sagas";
 import { watchTrialSystemSaga } from "../features/trialSystem/store/sagas/watchTrialSystemSaga";
-import { watchWalletSaga } from "../features/wallet/saga";
 import {
   watchGetZendeskTokenSaga,
   watchZendeskGetSessionSaga
@@ -142,6 +140,7 @@ import { navigateToActiveSessionLogin } from "../features/authentication/activeS
 import { showSessionExpirationBlockingScreenSelector } from "../features/authentication/activeSessionLogin/store/selectors";
 import { watchCdcSaga } from "../features/bonus/cdc/common/saga";
 import { watchMessagesSaga } from "../features/messages/saga";
+import { maybeHandlePendingBackgroundActions } from "./backgroundActions";
 import { previousInstallationDataDeleteSaga } from "./installation";
 import {
   askMixpanelOptIn,
@@ -614,9 +613,6 @@ export function* initializeApplicationSaga(
   // active session login watcher
   yield* fork(watchActiveSessionLoginSaga);
 
-  // Start wathing new wallet sagas
-  yield* fork(watchWalletSaga);
-
   // Here we can be sure that the session information is loaded and valid
   const bpdToken = maybeSessionInformation.value.bpdToken as string;
 

ts/sagas/startup/watchApplicationActivitySaga.ts

@@ -10,7 +10,7 @@ import {
   StartupStatusEnum,
   isStartupLoaded
 } from "../../store/reducers/startup";
-import { maybeHandlePendingBackgroundActions } from "../../features/pushNotifications/sagas/common";
+import { maybeHandlePendingBackgroundActions } from "../backgroundActions";
 import { areTwoMinElapsedFromLastActivity } from "../../features/authentication/fastLogin/store/actions/sessionRefreshActions";
 import { isFastLoginEnabledSelector } from "../../features/authentication/fastLogin/store/selectors";
 import { IdentificationBackActionType } from "../../features/identification/store/reducers";

ts/utils/deepLinkUtils.ts

@@ -0,0 +1,18 @@
+const CGN_ROUTE_PATH = "ioit://cgn-details/detail";
+// Internal deep link paths that require wallet update
+const WALLET_UPDATE_PATHS = [
+  CGN_ROUTE_PATH,
+  "ioit://main/wallet",
+  "ioit://idpay/initiative"
+];
+
+/**
+ * Check if the URL requires wallet update based on specific criteria
+ * - External Universal Links from web
+ * - Specific internal paths that need wallet refresh
+ */
+export const shouldTriggerWalletUpdate = (url: string): boolean =>
+  WALLET_UPDATE_PATHS.some(path => url.startsWith(path));
+
+export const isCGNLinking = (url: string): boolean =>
+  url.startsWith(CGN_ROUTE_PATH);