saafe-redirection-flow 2.0.0 → 2.1.0

package/src/pages/accounts/OldUser.tsx

@@ -24,6 +24,7 @@ import { useSetPageTitle } from '@/hooks/use-page-title'
 import { useNavigationBlock } from '@/store/NavigationBlockContext'
 import DummyFooter from '@/components/dummyFooter'
 import { useFipQuery } from '@/hooks/use-fip-query'
+import { parseAutoDiscoveryConfig } from '@/utils/auto-discovery'
 
 interface BankAccount {
   linkRefNumber: string;
@@ -44,6 +45,17 @@ const OldUser = () => {
   const { shouldAllowNavigation } = useNavigationBlock();
   const navigate = useNavigate();
 
+  // Parse auto discovery configuration for showDiscoverMore
+  const autoDiscoveryConfig = parseAutoDiscoveryConfig(decodedInfo?.customization?.otherAppCustomization);
+  
+  // Function to check if discover more should be shown for a category
+  const shouldShowDiscoverMore = (category: string) => {
+    const categoryKey = category.toUpperCase() as keyof typeof autoDiscoveryConfig;
+    return autoDiscoveryConfig[categoryKey]?.showDiscoverMore !== false;
+  };
+
+  console.log('OldUser Debug - Auto Discovery Config:', autoDiscoveryConfig);
+
   // Fetch FIP data with React Query - use dynamic consent handle
   const { refetch } = useFipQuery(consentHandle)
 
@@ -101,7 +113,7 @@ const OldUser = () => {
       onError: () => {
         if (!mounted) return
       }
-    })
+    });
 
     const accounts = getLinkedAccountsList.data;
     return accounts.reduce((acc: any, account) => {
@@ -114,6 +126,64 @@ const OldUser = () => {
     }, {});
   }, [getLinkedAccountsList?.data]);
 
+  // Check for missing identifiers before account discovery - moved to useEffect
+  React.useEffect(() => {
+    if (!getLinkedAccountsList?.data || getLinkedAccountsList.data.length === 0) {
+      return; // Don't check identifiers if no linked accounts
+    }
+
+    const fipIdsArray = Array.from(new Set(getLinkedAccountsList.data.map((account: BankAccount) => account.fipHandle)));
+    
+    // Get the FIP store state to access fips data
+    const { fips } = useFipStore.getState();
+    
+    const identifiersList: any[] = [];
+    
+    // Collect required identifiers from selected FIPs
+    fips
+      .filter(fip => fipIdsArray.includes(fip.id))
+      .forEach(fip => {
+        fip.Identifiers?.forEach(identifier => {
+          if (!identifiersList.find(i => i.type === identifier.type)) {
+            const value =
+              identifier.type === 'PAN'
+                ? decodedInfo?.pan
+                : identifier.type === 'MOBILE'
+                  ? decodedInfo?.phoneNumber
+                  : identifier.type === 'DOB'
+                  ? decodedInfo?.dob
+                  : null;
+            identifiersList.push({ ...identifier, value });
+          }
+        });
+      });
+
+    console.log('OldUser - Checking identifiers:', identifiersList);
+
+    // Check if any required identifiers are missing (null/undefined/empty)
+    const missingIdentifiers = identifiersList.filter(identifier => 
+      !identifier.value || identifier.value.trim() === ''
+    );
+
+    if (missingIdentifiers.length > 0) {
+      console.log('OldUser - Missing identifiers found:', missingIdentifiers);
+      // Redirect to DiscoverAccount to collect missing identifiers
+      shouldAllowNavigation();
+      navigate(`/link-accounts/discover-account`, {
+        state: {
+          category: activeCategory || categories[0],
+          selectedFips: fipIdsArray,
+          fromOldUser: true
+        }
+      });
+      return;
+    }
+
+    // All identifiers are available, set them in store
+    const { setIdentifiers } = useFipStore.getState();
+    setIdentifiers(identifiersList);
+  }, [getLinkedAccountsList?.data, decodedInfo?.pan, decodedInfo?.phoneNumber, decodedInfo?.dob, activeCategory, categories, navigate, shouldAllowNavigation]);
+
   const toggleBankSelection = (bankId: string) => {
     setAccountForConsent(accountForConsent.includes(bankId)
       ? accountForConsent.filter(id => id !== bankId)
@@ -156,6 +226,95 @@ const OldUser = () => {
     }
   };
 
+  // Function to validate identifiers before navigation
+  const validateIdentifiersBeforeNavigation = (targetFiType: string, selectedFipIds?: string[]) => {
+    console.log('OldUser - Validating identifiers before navigation');
+    
+    // Get the FIP store state to access fips data
+    const { fips } = useFipStore.getState();
+    const identifiersList: any[] = [];
+    
+    // Use provided fipIds or get from linked accounts
+    const fipIdsToCheck = selectedFipIds || Array.from(new Set(getLinkedAccountsList.data?.map((account: BankAccount) => account.fipHandle) || []));
+    
+    // Collect required identifiers from FIPs
+    fips
+      .filter(fip => fipIdsToCheck.includes(fip.id))
+      .forEach(fip => {
+        fip.Identifiers?.forEach(identifier => {
+          if (!identifiersList.find(i => i.type === identifier.type)) {
+            const value =
+              identifier.type === 'PAN'
+                ? decodedInfo?.pan
+                : identifier.type === 'MOBILE'
+                  ? decodedInfo?.phoneNumber
+                  : identifier.type === 'DOB'
+                  ? decodedInfo?.dob
+                  : null;
+            identifiersList.push({ ...identifier, value });
+          }
+        });
+      });
+
+    console.log('OldUser - Identifiers to validate:', identifiersList);
+
+    // Check if any required identifiers are missing
+    const missingIdentifiers = identifiersList.filter(identifier => 
+      !identifier.value || identifier.value.trim() === ''
+    );
+
+    if (missingIdentifiers.length > 0) {
+      console.log('OldUser - Missing identifiers found, redirecting to collect:', missingIdentifiers);
+      // Redirect to DiscoverAccount to collect missing identifiers
+      shouldAllowNavigation();
+      navigate(`/link-accounts/discover-account`, {
+        state: {
+          category: targetFiType.toUpperCase(),
+          selectedFips: fipIdsToCheck,
+          fromOldUser: true
+        }
+      });
+      return false; // Don't proceed with original navigation
+    }
+
+    console.log('OldUser - All identifiers available, proceeding with navigation');
+    // All identifiers are available, set them in store
+    const { setIdentifiers } = useFipStore.getState();
+    setIdentifiers(identifiersList);
+    return true; // Proceed with original navigation
+  };
+
+  // Enhanced discover more handler
+  const handleDiscoverMore = (fiType: string) => {
+    // Validate identifiers first
+    if (!validateIdentifiersBeforeNavigation(fiType)) {
+      return; // Don't proceed if identifiers are missing
+    }
+
+    // Proceed with original navigation
+    refetch();
+    navigate(`/link-accounts/${fiType.toLowerCase()}`, {
+      state: {
+        fiType,
+      }
+    });
+    setAccountForConsent([]);
+  };
+
+  // Enhanced fallback discover handler  
+  const handleFallbackDiscover = () => {
+    const categoryToUse = activeCategory || categories[0] || 'BANK';
+    
+    // Validate identifiers first
+    if (!validateIdentifiersBeforeNavigation(categoryToUse)) {
+      return; // Don't proceed if identifiers are missing
+    }
+
+    // Proceed with original navigation
+    refetch();
+    navigate(`/link-accounts/${categoryToUse.toLowerCase()}`);
+  };
+
   return (
     <FrostedLayout>
       <div className='w-full px-0 md:px-14'>
@@ -218,28 +377,22 @@ const OldUser = () => {
                       </div>
                     ))}
                   </ScrollArea>
-                  <Button
-                    variant={'outline'}
-                    className='bg-primary-foreground text-primary border-primary hover:bg-primary/10 h-[50px] w-full mt-4 mb-6'
-                    onClick={() => {
-                      refetch()
-                      navigate(`/link-accounts/${fiType.toLowerCase()}`, {
-                        state: {
-                          fiType,
-                        }
-                      });
-                      setAccountForConsent([])
-                    }}
-                    size={'lg'}
-                  >
-                    <div className='flex items-center gap-2 text-md text-primary font-[600] dark:text-muted-secondary'>
-                      <PlusIcon
-                        strokeWidth='2.3'
-                        className='size-5 text-primary dark:text-muted-secondary'
-                      />{' '}
-                      {t('discoverMore')}
-                    </div>
-                  </Button>
+                  {shouldShowDiscoverMore(fiType) && (
+                    <Button
+                      variant={'outline'}
+                      className='bg-primary-foreground text-primary border-primary hover:bg-primary/10 h-[50px] w-full mt-4 mb-6'
+                      onClick={() => handleDiscoverMore(fiType)}
+                      size={'lg'}
+                    >
+                      <div className='flex items-center gap-2 text-md text-primary font-[600] dark:text-muted-secondary'>
+                        <PlusIcon
+                          strokeWidth='2.3'
+                          className='size-5 text-primary dark:text-muted-secondary'
+                        />{' '}
+                        {t('discoverMore')}
+                      </div>
+                    </Button>
+                  )}
                 </div>
               ));
             }
@@ -262,23 +415,22 @@ const OldUser = () => {
                     </Button>
                   </AlertDescription>
                 </Alert>
-                <Button
-                  variant={'secondary'}
-                  className='bg-gray-200 dark:bg-gray-800 text-gray-700 hover:bg-gray-300 h-[50px] w-full mt-4'
-                  onClick={() => {
-                    refetch()
-                    navigate(`/link-accounts/${completedCategories?.[completedCategories.length - 1]}`);
-                  }}
-                  size={'lg'}
-                >
-                  <div className='flex items-center gap-2 text-md text-consent-primary font-[600] capitalize'>
-                    <PlusIcon
-                      strokeWidth='2.3'
-                      className='size-5 text-consent-primary'
-                    />{' '}
-                    {t('discover')}
-                  </div>
-                </Button>
+                {shouldShowDiscoverMore(activeCategory || categories[0] || 'BANK') && (
+                  <Button
+                    variant={'secondary'}
+                    className='bg-gray-200 dark:bg-gray-800 text-gray-700 hover:bg-gray-300 h-[50px] w-full mt-4'
+                    onClick={handleFallbackDiscover}
+                    size={'lg'}
+                  >
+                    <div className='flex items-center gap-2 text-md text-consent-primary font-[600] capitalize'>
+                      <PlusIcon
+                        strokeWidth='2.3'
+                        className='size-5 text-consent-primary'
+                      />{' '}
+                      {t('discover')}
+                    </div>
+                  </Button>
+                )}
               </>
             );
           })()}

package/src/pages/accounts/link-accounts.tsx

@@ -370,25 +370,31 @@ const LinkAccounts = () => {
                 identifier.type == 'PAN'
                   ? decodedInfo?.pan
                   : identifier.type == 'AADHAAR'
-                    ? decodedInfo?.aadhaar
+                    ? decodedInfo?.pan // Use PAN as fallback since aadhaar doesn't exist in DecodedInfo
                     : identifier.type == 'MOBILE'
                       ? selectedMobileNumber
-                      : null
+                      : identifier.type == 'DOB'
+                        ? decodedInfo?.dob
+                        : null
               identifiersList.push({ ...identifier, value })
             }
           })
         })
 
-      setIdentifiers(identifiersList)
-      if (identifiersList?.length > 0 && Boolean(identifiersList.find(val => !val.value)?.type)) {
-        if (identifiersList.find(i => i.type === 'PAN')) {
-          redirect = true
-        }
-        if (identifiersList.find(i => i.type === 'AADHAAR')) {
-          redirect = true
-        }
+      console.log('link-accounts - Identifiers to validate:', identifiersList);
+
+      // Check if ANY required identifiers are missing (not just PAN/AADHAAR)
+      const missingIdentifiers = identifiersList.filter(identifier => 
+        !identifier.value || identifier.value.trim() === ''
+      );
+
+      if (missingIdentifiers.length > 0) {
+        console.log('link-accounts - Missing identifiers found, redirecting to collect:', missingIdentifiers);
+        redirect = true
       }
 
+      setIdentifiers(identifiersList)
+
       if (redirect) {
         navigate(`/link-accounts/discover-account`, {
           state: {
@@ -681,7 +687,7 @@ const LinkAccounts = () => {
       <Modal
         title={showModal.title}
         open={showModal.isOpen}
-        className='w-[380px]'
+        className='w-[450px]'
         onOpenChange={open =>
           !open &&
           setShowModal({
@@ -703,6 +709,7 @@ const LinkAccounts = () => {
             title=''
             editable={true}
             mobileNumber={showModal.number}
+            eyeClassName="translate-x-4"
             onResend={() => {
               setShowModal(old => ({ ...old, otp: null, error: '' }))
               addNewNoQuery.mutate(undefined, {
@@ -836,6 +843,7 @@ const LinkAccounts = () => {
             title=''
             editable={true}
             mobileNumber={showModal.number}
+            eyeClassName="translate-x-2"
             onResend={() => {
               setShowModal(old => ({ ...old, otp: null, error: '' }))
               addNewNoQuery.mutate(undefined, {

package/src/pages/consent/ReviewConsent.tsx

@@ -279,13 +279,21 @@ const ReviewConsent = () => {
       }
 
       const consentResult = await consentService.submitConsentVerification(approvalData)
-      console.log("navigatig")
 
-      if (consentResult?.length && consentResult?.find(item => item.ConsentStatus === 'FAILED')) {
-        navigate('/rejected', { state: { consentResult } })
+      if (consentResult?.length && consentResult?.filter(item => item.ConsentStatus === 'FAILED')?.length === consentResult?.length) {
+        navigate('/rejected', {
+          state: {
+            consentResult: consentResult?.filter(item => item.ConsentStatus === 'FAILED')
+          }
+        })
         return
       } else if (consentResult?.length) {
-        navigate('/success')
+        navigate('/success', {
+          state: {
+            consentResult: consentResult,
+            consents: selectedConsent
+          }
+        })
       } else {
         setError('Failed to approve consent. Please try again.')
       }
@@ -423,22 +431,22 @@ const ReviewConsent = () => {
         {linkedAccounts.length === 0 ?
           <div className='mb-8'>
             <Alert>
-              <AlertTitle className='flex items-center justify-between gap-4'>
-                <div className='flex items-center gap-4'>
-                  <div className='flex items-center justify-center bg-yellow-600 p-2 rounded-full w-fit'>
+              <AlertTitle className='flex flex-col md:flex-row md:items-center md:justify-between gap-4'>
+                <div className='flex items-center gap-3 md:gap-4'>
+                  <div className='flex items-center justify-center bg-yellow-600 p-2 rounded-full w-fit flex-shrink-0'>
                     <Info
                       strokeWidth='2.3'
-                      className='h-[18px] w-[18px] text-white'
+                      className='h-[16px] w-[16px] md:h-[18px] md:w-[18px] text-white'
                     />
                   </div>
-                  <p className='text-lg font-medium'>
+                  <p className='text-sm md:text-lg font-medium leading-tight'>
                     No accounts selected! You need to select accounts to approve this consent
                   </p>
                 </div>
                 <AnimatedButton
                   variant={'outline'}
                   size={'lg'}
-                  className='text-yellow-600 border-yellow-600 border-2 hover:bg-yellow-200 hover:text-yellow-900'
+                  className='text-yellow-600 border-yellow-600 border-2 hover:bg-yellow-200 hover:text-yellow-900 w-full md:w-auto md:flex-shrink-0 text-sm md:text-base'
                   onClick={() => { trackEvent(EVENTS.DISCOVER_MORE); navigate(`/link-accounts/${activeCategory}`) }}
                 >
                   Add accounts

package/src/pages/consent/rejected.tsx

@@ -6,6 +6,7 @@ import { useState, useEffect } from "react";
 import { feedbackService } from "@/services/api";
 import { useLocation } from 'react-router-dom';
 import { useFipStore } from '@/store/fip.store';
+import { HelpModal } from "@/components/modal/HelpModal";
 
 interface ConsentResultItem {
   reasonForRejection: string;
@@ -116,14 +117,22 @@ const Rejected = () => {
 
   return (
     <div className="flex flex-col min-h-screen bg-background">
-      {/* Timer Section - Top */}
-      {decodedInfo?.redirect && (
-        <div className="p-4 text-center">
-          <p className="text-muted-secondary">
-            Redirecting in <span className="font-semibold">00:{countdown < 10 ? `0${countdown}` : countdown}</span>
-          </p>
-        </div>
-      )}
+      {/* Header with help and timer */}
+      <div className="flex justify-between items-start p-4">
+        <HelpModal 
+          variant="dark" 
+          iconSize={16} 
+          textSize="text-xs sm:text-sm"
+          buttonClassName="self-start"
+        />
+        {decodedInfo?.redirect && (
+          <div className="text-center">
+            <p className="text-muted-secondary text-xs sm:text-sm">
+              Redirecting in <span className="font-semibold">00:{countdown < 10 ? `0${countdown}` : countdown}</span>
+            </p>
+          </div>
+        )}
+      </div>
 
       {/* Main Content - Center */}
       <div className="flex-1 flex items-center justify-center p-6">