Merge pull request #1072 from tw-mosip/inji-577-release

[Release 08-12-2023] OIDC4VC enhancements and major bug fixes

.github/workflows/ios-automation-build.yml

@@ -61,7 +61,7 @@ jobs:
         with:
           name: Inji
           path: ios/fastlane/Inji_app_file/Products/Applications/
-          retention-days: 1
+          retention-days: 7
 
       - name: Upload Runner Log on Failure
         if: failure() # Only run this step if the previous steps failed

.gitignore

@@ -13,7 +13,6 @@ web-build/
 # The following patterns were generated by expo-cli
 
 # Built application files
-*.apk
 *.aab
 android/app/debug/output-metadata.json
 android/app/release/output-metadata.json
@@ -121,4 +120,13 @@ android/app/debug.keystore
 # Expo
 .expo
 dist/
-web-build/
+web-build/
+
+# automation test results
+# test reports generated after running test
+injitest/report/ 
+injitest/testng-report/
+# logs from tests ran
+injitest/src/logs/
+# test case class files
+injitest/target/

App.tsx

@@ -1,5 +1,4 @@
 import React, {useContext, useEffect} from 'react';
-import AppLoading from 'expo-app-loading';
 import {AppLayout} from './screens/AppLayout';
 import {useFont} from './shared/hooks/useFont';
 import {GlobalContextProvider} from './components/GlobalContextProvider';
@@ -15,15 +14,23 @@ import {
 import {DualMessageOverlay} from './components/DualMessageOverlay';
 import {useApp} from './screens/AppController';
 import {Alert} from 'react-native';
-import {configureTelemetry} from './shared/telemetry/TelemetryUtils';
+import {
+  TelemetryConstants,
+  configureTelemetry,
+  getErrorEventData,
+  sendErrorEvent,
+} from './shared/telemetry/TelemetryUtils';
 import {MessageOverlay} from './components/MessageOverlay';
 import SecureKeystore from 'react-native-secure-keystore';
 import {isHardwareKeystoreExists} from './shared/cryptoutil/cryptoUtil';
 import i18n from './i18n';
 import './shared/flipperConfig';
+import * as SplashScreen from 'expo-splash-screen';
+
+SplashScreen.preventAutoHideAsync();
 
 // kludge: this is a bad practice but has been done temporarily to surface
-//  an occurance of a bug with minimal residual code changes, this should
+//  an occurrence of a bug with minimal residual code changes, this should
 //  be removed once the bug cause is determined & fixed, ref: INJI-222
 const DecryptErrorAlert = (controller, t) => {
   const heading = t('errors.decryptionFailed');
@@ -43,6 +50,14 @@ const AppLayoutWrapper: React.FC = () => {
   const isDecryptError = useSelector(appService, selectIsDecryptError);
   const controller = useApp();
   const {t} = useTranslation('WelcomeScreen');
+
+  useEffect(() => {
+    async function hideAppLoading() {
+      await SplashScreen.hideAsync();
+    }
+    hideAppLoading();
+  }, []);
+
   if (isDecryptError) {
     DecryptErrorAlert(controller, t);
   }
@@ -59,9 +74,20 @@ const AppLoadingWrapper: React.FC = () => {
   );
   const controller = useApp();
   const {t} = useTranslation('WelcomeScreen');
+  useEffect(() => {
+    if (isKeyInvalidateError) {
+      configureTelemetry();
+      sendErrorEvent(
+        getErrorEventData(
+          TelemetryConstants.FlowType.appLogin,
+          TelemetryConstants.ErrorId.appWasReset,
+          TelemetryConstants.ErrorMessage.appWasReset,
+        ),
+      );
+    }
+  }, [isKeyInvalidateError]);
   return (
     <>
-      <AppLoading />
       <MessageOverlay
         isVisible={isKeyInvalidateError}
         title={t('errors.invalidateKeyError.title')}

android/app/build.gradle

@@ -1,12 +1,10 @@
-plugins { 
+plugins {
     id 'com.gladed.androidgitversion' version '0.4.14'
 }
 
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 
-import com.android.build.OutputFile
-
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
@@ -37,6 +35,7 @@ react {
     //
     //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
     // entryFile = file("../js/MyApplication.android.js")
+    entryFile = file("../../index.js")
     //
     //   A list of extra flags to pass to the 'bundle' commands.
     //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
@@ -102,9 +101,6 @@ android {
     }
 
 
-    namespace 'io.mosip.residentapp'
-
-
     namespace 'io.mosip.residentapp'
 
     defaultConfig {
@@ -130,7 +126,7 @@ android {
             include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
-    
+
     signingConfigs {
         release {
             def keystore = file('release.keystore')
@@ -232,7 +228,7 @@ dependencies {
             implementation 'com.facebook.fresco:animated-webp:2.0.0'
         }
     }
-
+    compileOnly project(':react-native-android-location-services-dialog-box')
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
@@ -252,4 +248,4 @@ dependencies {
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-apply from: "./eas-build.gradle"
+apply from: "./eas-build.gradle"

android/app/src/main/AndroidManifest.xml

@@ -9,11 +9,8 @@
   <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
   <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"/>
   <uses-permission android:name="android.permission.CAMERA"/>
-  <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.RECORD_AUDIO"/>
   <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
   <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

android/settings.gradle

@@ -3,6 +3,7 @@ rootProject.name = 'Inji'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/react-native-gradle-plugin')
-
+include ':react-native-android-location-services-dialog-box'
+project(':react-native-android-location-services-dialog-box').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-android-location-services-dialog-box/android')
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
+useExpoModules()

components/EditableListItem.tsx

@@ -4,6 +4,7 @@ import {Icon, ListItem, Overlay, Input} from 'react-native-elements';
 import {Text, Column, Row, Button} from './ui';
 import {Theme} from './ui/styleUtils';
 import {useTranslation} from 'react-i18next';
+import testIDProps from '../shared/commonUtil';
 
 export const EditableListItem: React.FC<EditableListItemProps> = props => {
   const {t} = useTranslation('common');
@@ -37,7 +38,7 @@ export const EditableListItem: React.FC<EditableListItemProps> = props => {
         color={Theme.Colors.Icon}
       />
       <ListItem.Content>
-        <ListItem.Title style={{paddingTop: 3}}>
+        <ListItem.Title {...testIDProps(props.testID)} style={{paddingTop: 3}}>
           <Text weight="semibold" color={props.titleColor}>
             {props.title}
           </Text>
@@ -109,6 +110,7 @@ export const EditableListItem: React.FC<EditableListItemProps> = props => {
 };
 
 interface EditableListItemProps {
+  testID?: string;
   title: string;
   content: string;
   items: ListItemProps[];

components/FaceScanner.tsx

@@ -1,12 +1,6 @@
 import React, {useCallback, useContext, useEffect, useRef} from 'react';
 import {Camera} from 'expo-camera';
-import {
-  Platform,
-  StyleSheet,
-  TouchableOpacity,
-  View,
-  Image,
-} from 'react-native';
+import {TouchableOpacity, View, Image} from 'react-native';
 import {Button, Centered, Column, Row, Text} from './ui';
 import {useInterpret, useSelector} from '@xstate/react';
 import {useTranslation} from 'react-i18next';
@@ -26,7 +20,6 @@ import {GlobalContext} from '../shared/GlobalContext';
 import {selectIsActive} from '../machines/app';
 import {RotatingIcon} from './RotatingIcon';
 import {Theme} from './ui/styleUtils';
-import {isIOS} from '../shared/constants';
 
 export const FaceScanner: React.FC<FaceScannerProps> = props => {
   const {t} = useTranslation('FaceScanner');
@@ -86,7 +79,7 @@ export const FaceScanner: React.FC<FaceScannerProps> = props => {
   }
 
   return (
-    <View>
+    <Column fill align="space-between">
       <View style={Theme.Styles.scannerContainer}>
         <Camera
           style={Theme.Styles.scanner}
@@ -98,14 +91,14 @@ export const FaceScanner: React.FC<FaceScannerProps> = props => {
         align="center"
         weight="semibold"
         style={Theme.TextStyles.base}
-        margin="50 57 0 57">
+        margin="0 57">
         {t('imageCaptureGuide')}
       </Text>
-      <Centered margin="24 0">
+      <Centered>
         {isCapturing || isVerifying ? (
           <RotatingIcon name="sync" size={64} />
         ) : (
-          <Row align="center" style={{marginTop: 42}}>
+          <Row align="center">
             <Centered style={Theme.Styles.imageCaptureButton}>
               <TouchableOpacity
                 onPress={() => service.send(FaceScannerEvents.CAPTURE())}>
@@ -131,7 +124,7 @@ export const FaceScanner: React.FC<FaceScannerProps> = props => {
           </Row>
         )}
       </Centered>
-    </View>
+    </Column>
   );
 };
 

components/KebabPopUpController.tsx

@@ -1,8 +1,7 @@
 import {useSelector} from '@xstate/react';
 import {ActorRefFrom} from 'xstate';
 import {
-  ExistingMosipVCItemEvents,
-  ExistingMosipVCItemMachine,
+  selectBindingAuthFailedError,
   selectEmptyWalletBindingId,
   selectIsPinned,
   selectKebabPopUp,
@@ -14,22 +13,14 @@ import {
   selectShowActivities,
   selectShowWalletBindingError,
   selectWalletBindingError,
+} from '../machines/VCItemMachine/commonSelectors';
+import {
+  ExistingMosipVCItemEvents,
+  ExistingMosipVCItemMachine,
 } from '../machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine';
-
 import {
   EsignetMosipVCItemEvents,
   EsignetMosipVCItemMachine,
-  selectEmptyWalletBindingId as esignetSelectEmptyWalletBindingId,
-  selectIsPinned as esignetSelectIsPinned,
-  selectKebabPopUp as esignetSelectKebabPopUp,
-  selectKebabPopUpAcceptingBindingOtp as esignetSelectKebabPopUpAcceptingBindingOtp,
-  selectKebabPopUpBindingWarning as esignetSelectKebabPopUpBindingWarning,
-  selectKebabPopUpWalletBindingInProgress as esignetSelectKebabPopUpWalletBindingInProgress,
-  selectOtpError as esignetSelectOtpError,
-  selectRemoveWalletWarning as esignetSelectRemoveWalletWarning,
-  selectShowActivities as esignetSelectShowActivities,
-  selectShowWalletBindingError as esignetSelectShowWalletBindingError,
-  selectWalletBindingError as esignetSelectWalletBindingError,
 } from '../machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine';
 import {selectActivities} from '../machines/activityLog';
 import {GlobalContext} from '../shared/GlobalContext';
@@ -56,55 +47,31 @@ export function useKebabPopUp(props) {
   const SHOW_ACTIVITY = () => service.send(vcEvents.SHOW_ACTIVITY());
   const INPUT_OTP = (otp: string) => service.send(vcEvents.INPUT_OTP(otp));
   const RESEND_OTP = () => service.send(vcEvents.RESEND_OTP());
-  let isPinned = useSelector(service, selectIsPinned);
-  let isBindingWarning = useSelector(service, selectKebabPopUpBindingWarning);
-  let isRemoveWalletWarning = useSelector(service, selectRemoveWalletWarning);
-  let isAcceptingOtpInput = useSelector(
+  const isPinned = useSelector(service, selectIsPinned);
+  const isBindingWarning = useSelector(service, selectKebabPopUpBindingWarning);
+  const isRemoveWalletWarning = useSelector(service, selectRemoveWalletWarning);
+  const isAcceptingOtpInput = useSelector(
     service,
     selectKebabPopUpAcceptingBindingOtp,
   );
-  let isWalletBindingError = useSelector(service, selectShowWalletBindingError);
-  let otpError = useSelector(service, selectOtpError);
-  let walletBindingError = useSelector(service, selectWalletBindingError);
-  let WalletBindingInProgress = useSelector(
+  const isWalletBindingError = useSelector(
+    service,
+    selectShowWalletBindingError,
+  );
+  const otpError = useSelector(service, selectOtpError);
+  const walletBindingError = useSelector(service, selectWalletBindingError);
+  const bindingAuthFailedError = useSelector(
+    service,
+    selectBindingAuthFailedError,
+  );
+  const WalletBindingInProgress = useSelector(
     service,
     selectKebabPopUpWalletBindingInProgress,
   );
-  let emptyWalletBindingId = useSelector(service, selectEmptyWalletBindingId);
-  let isKebabPopUp = useSelector(service, selectKebabPopUp);
-  let isShowActivities = useSelector(service, selectShowActivities);
+  const emptyWalletBindingId = useSelector(service, selectEmptyWalletBindingId);
+  const isKebabPopUp = useSelector(service, selectKebabPopUp);
+  const isShowActivities = useSelector(service, selectShowActivities);
 
-  if (props.vcMetadata.isFromOpenId4VCI()) {
-    isPinned = useSelector(service, esignetSelectIsPinned);
-    isBindingWarning = useSelector(
-      service,
-      esignetSelectKebabPopUpBindingWarning,
-    );
-    isRemoveWalletWarning = useSelector(
-      service,
-      esignetSelectRemoveWalletWarning,
-    );
-    isAcceptingOtpInput = useSelector(
-      service,
-      esignetSelectKebabPopUpAcceptingBindingOtp,
-    );
-    isWalletBindingError = useSelector(
-      service,
-      esignetSelectShowWalletBindingError,
-    );
-    otpError = useSelector(service, esignetSelectOtpError);
-    walletBindingError = useSelector(service, esignetSelectWalletBindingError);
-    WalletBindingInProgress = useSelector(
-      service,
-      esignetSelectKebabPopUpWalletBindingInProgress,
-    );
-    emptyWalletBindingId = useSelector(
-      service,
-      esignetSelectEmptyWalletBindingId,
-    );
-    isKebabPopUp = useSelector(service, esignetSelectKebabPopUp);
-    isShowActivities = useSelector(service, esignetSelectShowActivities);
-  }
   const {appService} = useContext(GlobalContext);
   const activityLogService = appService.children.get('activityLog');
 
@@ -124,6 +91,7 @@ export function useKebabPopUp(props) {
     isAcceptingOtpInput,
     isWalletBindingError,
     walletBindingError,
+    bindingAuthFailedError,
     otpError,
     WalletBindingInProgress,
     emptyWalletBindingId,