[INJI-577]: fix clearing of UIN/VID after retreiving it from AID in V…

…C download flow Signed-off-by: Alka <[email protected]>
tw-mosip · Dec 12, 2023 · 08878e2 · 08878e2
1 parent 60f5831
commit 08878e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/screens/Home/MyVcs/AddVcModalMachine.ts b/screens/Home/MyVcs/AddVcModalMachine.ts
@@ -64,14 +64,6 @@ export const AddVcModalMachine =
       },
       id: 'AddVcModal',
       initial: 'acceptingIdInput',
-      on: {
-        INPUT_ID: {
-          actions: 'setId',
-        },
-        SELECT_ID_TYPE: {
-          actions: ['clearIdError', 'setIdType'],
-        },
-      },
       states: {
         acceptingIdInput: {
           entry: ['setTransactionId', 'clearOtp'],
@@ -115,7 +107,7 @@ export const AddVcModalMachine =
                   },
                 ],
                 SELECT_ID_TYPE: {
-                  actions: ['clearIdError', 'setIdType', 'clearId'],
+                  actions: ['clearIdError', 'setIdType'],
                 },
               },
             },
@@ -216,7 +208,7 @@ export const AddVcModalMachine =
         cancelDownload: {
           on: {
             CANCEL: {
-              actions: ['resetIdInputRef', 'forwardToParent'],
+              actions: ['clearId', 'resetIdInputRef', 'forwardToParent'],
             },
             WAIT: {
               target: 'acceptingOtpInput',

diff --git a/screens/Home/MyVcs/OtpVerificationModal.tsx b/screens/Home/MyVcs/OtpVerificationModal.tsx
@@ -17,7 +17,7 @@ import {
   OtpVerificationModalProps,
   useOtpVerificationModal,
 } from './OtpVerificationModalController';
-import {isIOS} from '../../../shared/constants';
+import {GET_INDIVIDUAL_ID, isIOS} from '../../../shared/constants';
 
 export const OtpVerificationModal: React.FC<
   OtpVerificationModalProps
@@ -68,6 +68,11 @@ export const OtpVerificationModal: React.FC<
     props.onInputDone(otp);
   };
 
+  const handleRequestOTPCancel = () => {
+    GET_INDIVIDUAL_ID({id: '', idType: 'UIN'});
+    controller.CANCEL();
+  };
+
   return (
     <Modal
       isVisible={props.isVisible}
@@ -157,7 +162,7 @@ export const OtpVerificationModal: React.FC<
             testID="cancel"
             type="clear"
             title={t('confirmationDialog.cancel')}
-            onPress={controller.CANCEL}
+            onPress={handleRequestOTPCancel}
           />
         </Column>
       </MessageOverlay>