From 7eaeb40533af4ea91f73457393621edaa3b5c24c Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Wed, 8 Jan 2025 18:11:45 -0500
Subject: [PATCH] Merge pull request #54972 from
 rayane-djouah/add-nudgeMigration-timestamp-to-transition-url

Get nudgeMigration timestamp from OldDot transition url

(cherry picked from commit b81230d53c196d15c29c0a8d324d38ff7a1a7be2)

(CP triggered by thienlnam)
---
 src/components/ExplanationModal.tsx | 8 --------
 src/libs/actions/Session/index.ts   | 6 +++++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/ExplanationModal.tsx b/src/components/ExplanationModal.tsx
index 9c44bc4d0fd3..d846dd4d28ba 100644
--- a/src/components/ExplanationModal.tsx
+++ b/src/components/ExplanationModal.tsx
@@ -1,19 +1,11 @@
 import React from 'react';
-import {useOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import * as Welcome from '@userActions/Welcome';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import FeatureTrainingModal from './FeatureTrainingModal';
 
 function ExplanationModal() {
     const {translate} = useLocalize();
-    const [tryNewDot] = useOnyx(ONYXKEYS.NVP_TRYNEWDOT);
-    const hasBeenAddedToNudgeMigration = !!tryNewDot?.nudgeMigration?.timestamp;
-
-    if (hasBeenAddedToNudgeMigration) {
-        return null;
-    }
 
     return (
         <FeatureTrainingModal
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 1dbb01b008dd..c8c5536356aa 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -510,6 +510,7 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
         autoGeneratedPassword,
         clearOnyxOnStart,
         completedHybridAppOnboarding,
+        nudgeMigrationTimestamp,
         isSingleNewDotEntry,
         primaryLogin,
         shouldRemoveDelegatedAccess,
@@ -542,7 +543,10 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
                     [ONYXKEYS.ACCOUNT]: {primaryLogin},
                     [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin, autoGeneratedPassword},
                     [ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY]: isSingleNewDotEntry === 'true',
-                    [ONYXKEYS.NVP_TRYNEWDOT]: {classicRedirect: {completedHybridAppOnboarding: completedHybridAppOnboarding === 'true'}},
+                    [ONYXKEYS.NVP_TRYNEWDOT]: {
+                        classicRedirect: {completedHybridAppOnboarding: completedHybridAppOnboarding === 'true'},
+                        nudgeMigration: nudgeMigrationTimestamp ? {timestamp: new Date(nudgeMigrationTimestamp)} : undefined,
+                    },
                 }),
             )
             .then(() => {