Remove Onyx.connect

Author: VickyStash

src/Expensify.tsx

@@ -101,6 +101,8 @@ function Expensify() {
     const [isSidebarLoaded] = useOnyx(ONYXKEYS.IS_SIDEBAR_LOADED, {canBeMissing: true});
     const [screenShareRequest] = useOnyx(ONYXKEYS.SCREEN_SHARE_REQUEST, {canBeMissing: true});
     const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH, {canBeMissing: true});
+    const [currentOnboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
+    const [currentOnboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE, {canBeMissing: true});
 
     useDebugShortcut();
 
@@ -204,12 +206,12 @@ function Expensify() {
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
             setInitialUrl(url as Route);
-            Report.openReportFromDeepLink(url ?? '');
+            Report.openReportFromDeepLink(url ?? '', currentOnboardingPurposeSelected, currentOnboardingCompanySize);
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            Report.openReportFromDeepLink(state.url);
+            Report.openReportFromDeepLink(state.url, currentOnboardingPurposeSelected, currentOnboardingCompanySize);
         });
         if (CONFIG.IS_HYBRID_APP) {
             HybridAppModule.onURLListenerAdded();

src/libs/actions/Report.ts

@@ -361,26 +361,6 @@ Onyx.connect({
     },
 });
 
-// This value is used inside openReportFromDeepLink function, which triggered inside setup/hybridApp -> Linking.addEventListener method
-let currentOnboardingPurposeSelected: OnyxEntry<OnboardingPurpose>;
-// eslint-disable-next-line rulesdir/no-onyx-connect
-Onyx.connect({
-    key: ONYXKEYS.ONBOARDING_PURPOSE_SELECTED,
-    callback: (value) => {
-        currentOnboardingPurposeSelected = value;
-    },
-});
-
-// This value is used inside openReportFromDeepLink function, which triggered inside setup/hybridApp -> Linking.addEventListener method
-let currentOnboardingCompanySize: OnyxEntry<OnboardingCompanySize>;
-// eslint-disable-next-line rulesdir/no-onyx-connect
-Onyx.connect({
-    key: ONYXKEYS.ONBOARDING_COMPANY_SIZE,
-    callback: (value) => {
-        currentOnboardingCompanySize = value;
-    },
-});
-
 let onboardingInitialPath: OnyxEntry<string>;
 Onyx.connect({
     key: ONYXKEYS.ONBOARDING_LAST_VISITED_PATH,
@@ -3389,7 +3369,7 @@ function doneCheckingPublicRoom() {
     Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
 }
 
-function openReportFromDeepLink(url: string) {
+function openReportFromDeepLink(url: string, currentOnboardingPurposeSelected: OnyxEntry<OnboardingPurpose>, currentOnboardingCompanySize: OnyxEntry<OnboardingCompanySize>) {
     const reportID = getReportIDFromLink(url);
     const isAuthenticated = hasAuthToken();