Merge pull request #2540 from tekdi/release-1.13.0-prod-register

Release 1.13.0 prod register to learner qa

Author: rushi-tekdi

apps/learner-web-app/src/app/enroll-profile-completion/page.tsx

@@ -127,23 +127,11 @@ const EnrollProfileCompletionInner = () => {
         localStorage.removeItem('previousTenantId');
 
         // Store landing page for later navigation
-        const finalLandingPage = landingPage || '/home';
-        setLandingPage(finalLandingPage);
-
-        // Check if isForNavaPatham is true, skip popup and directly trigger start learning action
-        const isForNavaPatham =
-          typeof window !== 'undefined'
-            ? localStorage.getItem('isForNavaPatham') === 'true'
-            : false;
-
-        if (isForNavaPatham) {
-          // Skip popup and directly trigger start learning action
-          onSigin(finalLandingPage);
-        } else {
-          // Show success modal instead of redirecting immediately
-          setSignupSuccessModal(true);
-        }
-      }
+    setLandingPage(landingPage || '/home');
+
+    // Show success modal instead of redirecting immediately
+    setSignupSuccessModal(true);
+  }
     } catch (error) {
       console.error('Failed to access program:', error);
       router.push('/programs');
@@ -154,36 +142,35 @@ const EnrollProfileCompletionInner = () => {
     setSignupSuccessModal(false);
   };
 
-  const onSigin = (customLandingPage?: string) => {
+  const onSigin = () => {
     setSignupSuccessModal(false);
     console.log('enroll user to tenant', localStorage.getItem('tenantId'));
-    const targetLandingPage = customLandingPage || landingPage || '/home';
+    if(localStorage.getItem('isAndroidApp') == 'yes')
+      {
+       // Send message to React Native WebView
 
-    if (localStorage.getItem('isAndroidApp') == 'yes') {
-      // Send message to React Native WebView
+            //  const enrolledProgramData = localStorage.getItem('enrolledProgramData');
 
-      //  const enrolledProgramData = localStorage.getItem('enrolledProgramData');
+            //        const program = JSON.parse(enrolledProgramData || '{}');
 
-      //        const program = JSON.parse(enrolledProgramData || '{}');
 
-      if (window.ReactNativeWebView) {
-        window.ReactNativeWebView.postMessage(
-          JSON.stringify({
-            type: 'ENROLL_PROGRAM_EVENT', // Event type identifier
-            data: {
-              userId: localStorage.getItem('userId'),
-              tenantId: localStorage.getItem('tenantId'),
-              token: localStorage.getItem('token'),
-              refreshToken: localStorage.getItem('refreshTokenForAndroid'),
+       if (window.ReactNativeWebView) {
+         window.ReactNativeWebView.postMessage(JSON.stringify({
+           type: 'ENROLL_PROGRAM_EVENT', // Event type identifier
+           data: {
+             userId: localStorage.getItem('userId'),
+             tenantId: localStorage.getItem('tenantId'),
+             token: localStorage.getItem('token'),
+             refreshToken: localStorage.getItem('refreshTokenForAndroid'),
 
-              // Add any data you want to send
-            },
-          })
-        );
+             // Add any data you want to send
+           }
+         }));
+       }
       }
-    } else {
-      localStorage.removeItem('enrollTenantId');
-      router.push(targetLandingPage);
+      else{
+        localStorage.removeItem('enrollTenantId')
+            router.push(landingPage || '/home');
     }
     // Navigate to landing page
   };

apps/learner-web-app/src/app/landing/page.tsx

@@ -69,6 +69,9 @@ export default function LandingPage() {
     };
 
     fetchPrograms();
+  if (typeof window !== 'undefined' && window.localStorage) {
+    localStorage.removeItem('isForNavaPatham');
+  }
   }, []);
 
   const handleGetStarted = async () => {

…ner-web-app/src/app/nava-patham/page.tsx …rner-web-app/src/app/navapatham/page.tsxapps/learner-web-app/src/app/nava-patham/page.tsx renamed to apps/learner-web-app/src/app/navapatham/page.tsx apps/learner-web-app/src/app/nava-patham/page.tsx renamed to apps/learner-web-app/src/app/navapatham/page.tsx

@@ -486,30 +486,18 @@ const RegisterationFlow = () => {
 
           //sent username and password
           sendMessage({
-            sms: {
-              to: [updated_payload.mobile],
-              body: 'Hey',
-              templateId: '6948f41681326042a2454bb2',
-              replacements: {
-                var1: username,
-                var2: password,
-              },
-            },
+            "sms": {
+              "to": [updated_payload.mobile],
+              "body":"Hey",
+              "templateId": "6948f41681326042a2454bb2", 
+              "replacements": {
+                "var1": username,
+                "var2": password
+              }
+            }
           });
 
-          // Check if isForNavaPatham is true, skip popup and directly trigger login
-          const isForNavaPatham =
-            typeof window !== 'undefined'
-              ? localStorage.getItem('isForNavaPatham') === 'true'
-              : false;
-
-          if (isForNavaPatham) {
-            // Skip popup and directly trigger start exploring action
-            await onSigin();
-          } else {
-            // Show success popup as usual
-            setSignupSuccessModal(true);
-          }
+          setSignupSuccessModal(true);
         } else {
           showToastMessage(
             t('LEARNER_APP.REGISTRATION_FLOW.USERNAME_ALREADY_EXIST'),