feat(INJI-299): refactor confirmation dialog flow

Signed-off-by: Pooja Babusingh <[email protected]>
tw-mosip · Oct 19, 2023 · 19f0405 · 19f0405
1 parent 50583ef
commit 19f0405
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/screens/Home/MyVcs/AddVcModal.tsx b/screens/Home/MyVcs/AddVcModal.tsx
@@ -23,7 +23,7 @@ export const AddVcModal: React.FC<AddVcModalProps> = props => {
 
       <OtpVerificationModal
         isVisible={controller.isAcceptingOtpInput}
-        onDismiss={controller.CANCEL_DOWNLOAD}
+        onDismiss={controller.DISMISS}
         onInputDone={controller.INPUT_OTP}
         error={controller.otpError}
         resend={controller.RESEND_OTP}

diff --git a/screens/Home/MyVcs/AddVcModalController.ts b/screens/Home/MyVcs/AddVcModalController.ts
@@ -26,8 +26,6 @@ export function useAddVcModal({service}: AddVcModalProps) {
 
     DISMISS: () => service.send(AddVcModalEvents.DISMISS()),
 
-    CANCEL_DOWNLOAD: () => service.send(AddVcModalEvents.CANCEL_DOWNLOAD()),
-
     WAIT: () => service.send(AddVcModalEvents.WAIT()),
 
     CANCEL: () => service.send(AddVcModalEvents.CANCEL()),

diff --git a/screens/Home/MyVcs/AddVcModalMachine.ts b/screens/Home/MyVcs/AddVcModalMachine.ts
@@ -35,7 +35,6 @@ const model = createModel(
       DISMISS: () => ({}),
       CANCEL: () => ({}),
       WAIT: () => ({}),
-      CANCEL_DOWNLOAD: () => ({}),
       SELECT_ID_TYPE: (idType: VcIdType) => ({idType}),
     },
   },
@@ -174,13 +173,8 @@ export const AddVcModalMachine =
               actions: 'setOtp',
               target: 'requestingCredential',
             },
-            CANCEL_DOWNLOAD: {
-              actions: ['printContext'],
-              target: 'cancelDownload',
-            },
             DISMISS: {
-              actions: 'resetIdInputRef',
-              target: 'acceptingIdInput',
+              target: 'cancelDownload',
             },
             RESEND_OTP: {
               target: '.resendOTP',
@@ -208,7 +202,6 @@ export const AddVcModalMachine =
           },
         },
         cancelDownload: {
-          entry: 'printContext',
           on: {
             CANCEL: {
               actions: 'resetIdInputRef',

diff --git a/screens/Home/MyVcsTabMachine.ts b/screens/Home/MyVcsTabMachine.ts
@@ -241,14 +241,7 @@ export const MyVcsTabMachine = model.createMachine(
     guards: {
       isMinimumStorageLimitReached: (_context, event) => Boolean(event.data),
       isNetworkOn: (_context, event) => Boolean(event.data),
-      isDownloadCancelled: (context, event) => {
-        console.log('>>>>>>>>>>>>>> isDownloadCancelledF', Boolean(event.data));
-        console.log(
-          '>>>>>>>>>>>>>> isDownloadCancelledF 2222>>>>>>> ',
-          context,
-        );
-        return !Boolean(event.data);
-      },
+      isDownloadCancelled: (context, event) => !Boolean(event.data),
     },
   },
 );