Merge pull request #264 from idpass/fix/mosip-276-unused-prop-crash

fix(mosip#276): crash due to undefined function
idpass · Nov 30, 2022 · b50b137 · b50b137
2 parents f44558c + ab7fcd0
commit b50b137
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 44 deletions.
diff --git a/components/SingleVcItem.tsx b/components/SingleVcItem.tsx
@@ -114,12 +114,17 @@ export const SingleVcItem: React.FC<VcItemProps> = (props) => {
     ? ''
     : getLocalizedField(verifiableCredential.credentialSubject.fullName);
 
-  const selectableOrCheck = props.selectable ? null : null;
+  const selectableOrCheck = props.selectable ? (
+    <CheckBox
+      checked={props.selected}
+      checkedIcon={<Icon name="radio-button-checked" />}
+      uncheckedIcon={<Icon name="radio-button-unchecked" />}
+      onPress={() => props.onPress(service)}
+    />
+  ) : null;
 
   return (
-    <Column
-      onShow={props.onShow(service)}
-      style={Theme.Styles.closeCardBgContainer}>
+    <Column style={Theme.Styles.closeCardBgContainer}>
       <ImageBackground
         source={!verifiableCredential ? null : Theme.CloseCard}
         resizeMode="stretch"

diff --git a/machines/scan.ts b/machines/scan.ts
@@ -59,9 +59,7 @@ const model = createModel(
       SELECT_VC: (vc: VC) => ({ vc }),
       SCAN: (params: string) => ({ params }),
       ACCEPT_REQUEST: (shouldVerifySender: boolean) => ({ shouldVerifySender }),
-      VERIFY_AND_ACCEPT_REQUEST: (shouldVerifySender: boolean) => ({
-        shouldVerifySender,
-      }),
+      VERIFY_AND_ACCEPT_REQUEST: () => ({}),
       VC_ACCEPTED: () => ({}),
       VC_REJECTED: () => ({}),
       CANCEL: () => ({}),
@@ -252,22 +250,13 @@ export const scanMachine = model.createMachine(
               SELECT_VC: {
                 actions: ['setSelectedVc'],
               },
-              VERIFY_AND_ACCEPT_REQUEST: [
-                {
-                  cond: 'shouldVerifySender',
-                  target: 'verifyingIdentity',
-                },
-                {
-                  target: 'verifyingIdentity',
-                },
-              ],
-              ACCEPT_REQUEST: [
-                {
-                  cond: 'shouldVerifySender',
-                  actions: 'setShouldVerifyPresence',
-                  target: 'sendingVc',
-                },
-              ],
+              VERIFY_AND_ACCEPT_REQUEST: {
+                target: 'verifyingIdentity',
+              },
+              ACCEPT_REQUEST: {
+                actions: 'setShouldVerifyPresence',
+                target: 'sendingVc',
+              },
               CANCEL: '#scan.reviewing.cancelling',
             },
           },
@@ -480,7 +469,7 @@ export const scanMachine = model.createMachine(
       setShouldVerifyPresence: assign({
         selectedVc: (context) => ({
           ...context.selectedVc,
-          shouldVerifyPresence: true,
+          shouldVerifyPresence: context.shouldVerifySender,
         }),
       }),
     },
@@ -675,8 +664,6 @@ export const scanMachine = model.createMachine(
           return false;
         }
       },
-
-      shouldVerifySender: (_context, event) => event.shouldVerifySender,
     },
 
     delays: {

diff --git a/machines/scan.typegen.ts b/machines/scan.typegen.ts
@@ -113,7 +113,6 @@ export interface Typegen0 {
   'eventsCausingGuards': {
     isQrOffline: 'SCAN';
     isQrOnline: 'SCAN';
-    shouldVerifySender: 'ACCEPT_REQUEST' | 'VERIFY_AND_ACCEPT_REQUEST';
   };
   'eventsCausingDelays': {
     CANCEL_TIMEOUT: 'CANCEL';

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,7 +67,6 @@
     "react-native-simple-markdown": "^1.1.0",
     "react-native-svg": "12.1.1",
     "react-native-swipe-gestures": "^1.0.5",
-    "react-native-system-setting": "^1.7.6",
     "react-native-uuid": "^2.0.1",
     "react-native-vector-icons": "^8.1.0",
     "xstate": "^4.26.0"
@@ -101,4 +100,4 @@
     "react": "17.0.1",
     "react-native": "0.64.4"
   }
-}
+}
diff --git a/screens/Home/ViewVcModal.tsx b/screens/Home/ViewVcModal.tsx
@@ -41,7 +41,7 @@ export const ViewVcModal: React.FC<ViewVcModalProps> = (props) => {
     <Modal
       isVisible={props.isVisible}
       onDismiss={props.onDismiss}
-      headerTitle={controller.vc.tag || controller.vc.id}
+      headerTitle={controller.vc.id}
       headerElevation={2}
       headerRight={
         <DropdownIcon

diff --git a/screens/Scan/SendVcScreenController.ts b/screens/Scan/SendVcScreenController.ts
@@ -85,9 +85,7 @@ export function useSendVcScreen() {
     ACCEPT_REQUEST: () =>
       scanService.send(ScanEvents.ACCEPT_REQUEST(shouldVerifySender)),
     VERIFY_AND_ACCEPT_REQUEST: () =>
-      scanService.send(
-        ScanEvents.VERIFY_AND_ACCEPT_REQUEST(shouldVerifySender)
-      ),
+      scanService.send(ScanEvents.VERIFY_AND_ACCEPT_REQUEST()),
     DISMISS: () => scanService.send(ScanEvents.DISMISS()),
     UPDATE_REASON: (reason: string) =>
       scanService.send(ScanEvents.UPDATE_REASON(reason)),