Merge remote-tracking branch 'upstream/develop' into develop

.env

@@ -2,9 +2,9 @@
 # eg . npm build android:newlogic --reset-cache
 
 #MIMOTO_HOST=http://mock.mimoto.newlogic.dev
-MIMOTO_HOST=https://api.qa-inji.mosip.net
+MIMOTO_HOST=https://api.qa-inji1.mosip.net
 
-ESIGNET_HOST=https://api.qa-inji.mosip.net
+ESIGNET_HOST=https://api.qa-inji1.mosip.net
 
 OBSRV_HOST = https://dataset-api.obsrv.mosip.net
 
@@ -17,3 +17,6 @@ DEBUG_MODE=false
 
 #supported languages( en, fil, ar, hi, kn, ta)
 APPLICATION_LANGUAGE=en
+
+#Card Templatization - Render Claims Dynamically.
+CARD_TEMPLATIZATION=false

.github/workflows/android-custom-build.yml

@@ -0,0 +1,56 @@
+name: Android Custom Build
+run-name: ${{ inputs.buildName }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      buildName:
+        description: 'Run name'
+        required: true
+        default: 'Edit this name'
+        type: string
+      mimotoBackendServiceUrl:
+        description: 'Mimoto backend service URL'
+        required: true
+        default: 'https://api.sandbox.mosip.net'
+        type: string
+      esignetBackendServiceUrl:
+        description: 'Esignet backend service URL'
+        required: true
+        default: 'https://api.sandbox.mosip.net'
+        type: string
+      allow_env_edit:
+        description: 'Edit ENV'
+        required: true
+        default: 'true'
+        type: choice
+        options:
+          - false
+          - true
+      theme:
+        description: 'Application Theme'
+        required: true
+        default: 'orange'
+        type: choice
+        options:
+          - orange
+          - purple
+
+jobs:
+  build-android:
+    uses: mosip/kattu/.github/workflows/android-build.yml@master
+    with:
+        NODE_VERSION: "16.x"
+        MIMOTO_HOST: ${{ inputs.mimotoBackendServiceUrl }}
+        ESIGNET_HOST: ${{ inputs.esignetBackendServiceUrl }}
+        APPLICATION_THEME: ${{ inputs.theme }}
+        ALLOW_ENV_EDIT: ${{ inputs.allow_env_edit }}
+        KEYSTORE_ALIAS: androidbuildkey
+        KEYSTORE_PASSWORD: 'password'
+        SERVICE_LOCATION: '.'
+        ANDROID_SERVICE_LOCATION: 'android'
+        BUILD_SCRIPT_LOCATION: 'scripts'
+        SCRIPT_NAME: './android-build.sh'
+        UPLOAD_TO_ACTIONS: 'true'
+        ANDROID_ARTIFACT_NAME: ${{ inputs.buildName }}
+        ANDROID_ARTIFACT_PATH: "android/app/build/outputs/apk/residentapp/release/Inji_universal.apk"

.github/workflows/clear_artifacts.yml

@@ -7,4 +7,4 @@ jobs:
     uses: mosip/kattu/.github/workflows/clear-artifacts.yml@master
     secrets:
       ACCESS_TOKEN: ${{ secrets.ACTION_PAT }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}

.github/workflows/internal-build.yml

@@ -104,7 +104,7 @@ jobs:
       ANDROID_KEYSTORE_FILE: ${{ secrets.INJI_ANDROID_RELEASE_KEYSTORE }}
       RELEASE_KEYSTORE_PASSWORD: '${{ secrets.INJI_ANDROID_RELEASE_STOREPASS }}'
       INJI_ANDROID_PLAY_STORE_CONFIG_JSON: ${{ secrets.INJI_ANDROID_PLAY_STORE_CONFIG_JSON }}
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
 
   build-android-beta:
     if: ${{ inputs.release == 'beta' && (inputs.buildFor == 'Both[Android and IOS]' || inputs.buildFor == 'Android') }}
@@ -129,7 +129,7 @@ jobs:
       ANDROID_KEYSTORE_FILE: ${{ secrets.INJI_ANDROID_RELEASE_KEYSTORE }}
       RELEASE_KEYSTORE_PASSWORD: '${{ secrets.INJI_ANDROID_RELEASE_STOREPASS }}'
       INJI_ANDROID_PLAY_STORE_CONFIG_JSON: ${{ secrets.INJI_ANDROID_PLAY_STORE_CONFIG_JSON }}
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
 
   build-ios:
     if: ${{ inputs.buildFor == 'Both[Android and IOS]' || inputs.buildFor == 'IOS'}}
@@ -163,7 +163,7 @@ jobs:
       APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
       APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
       MATCH_PASSWORD: '${{ secrets.INJI_IOS_MATCH_PASSWORD }}'
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
 
   # sonar-check:
   #   uses: mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@master
@@ -174,4 +174,4 @@ jobs:
   #   secrets:
   #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   #     SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
-  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'

.github/workflows/push-triggers.yml

@@ -22,13 +22,13 @@ jobs:
     uses: mosip/kattu/.github/workflows/android-build.yml@master
     with:
       NODE_VERSION: "16.x"
-      DEBUG_KEYSTORE_ALIAS: androiddebugkey
+      KEYSTORE_ALIAS: androidbuildkey
+      KEYSTORE_PASSWORD: 'password'
       SERVICE_LOCATION: '.'
       ANDROID_SERVICE_LOCATION: 'android'
       BUILD_SCRIPT_LOCATION: 'scripts'
       SCRIPT_NAME: './android-build.sh'
-    secrets:
-      DEBUG_KEYSTORE_PASSWORD: '${{ secrets.INJI_ANDROID_DEBUG_STOREPASS }}'
+      UPLOAD_TO_ACTIONS: 'false'
 
   build-ios:
     uses: mosip/kattu/.github/workflows/ios-build.yml@master
@@ -47,4 +47,4 @@ jobs:
   #   secrets:
   #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   #     SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
-  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'

.github/workflows/tag.yml

@@ -32,4 +32,4 @@ jobs:
       PRE_RELEASE: ${{ inputs.PRE_RELEASE }}
       DRAFT: ${{ inputs.DRAFT }}
     secrets:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
   - filename: package.json
-    checksum: 984f91af6d696faf934f7e541801343e146aed1b58d7c950ba11ec02dbd60dda
+    checksum: e09253939abe4c3509c9322ecd97ce2cdbc25fb25e55ce30ed8c70b6320aa9ca
   - filename: package-lock.json
-    checksum: baf08330efcaedd72275354d8e691f0004e0583d0f494a1e40b821fe7ec9046f
+    checksum: 723cd12daeea0e51e30ec3abdba469b693bdfae12a1de6486fe8782c564340eb
   - filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts
     checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a
   - filename: components/PasscodeVerify.tsx
@@ -25,8 +25,6 @@ fileignoreconfig:
     checksum: 4a424adbd2d2404c9d968c54607885af643a07e09acc4a2d37c6e7a7952c4945
   - filename: screens/Home/IntroSlidersScreen.tsx
     checksum: 9ff212530850e9f921f91d406c01f67ea5dd2a44e9cdb5e63d977749c7a7c5bd
-  - filename: machines/store.ts
-    checksum: fda6511ab88566820cf6b7324178b4646f495fae5168af73a0fb1c3bb52e5b8d
   - filename: machines/issuersMachine.ts
     checksum: 742b8ff561dca61be08ab0b9aef3997ad5d043df298a84c17349dc0206ddcee6
   - filename: machines/issuersMachine.typegen.ts
@@ -38,9 +36,9 @@ fileignoreconfig:
   - filename: shared/telemetry/TelemetryUtils.js
     checksum: ffe9aac2dcc590b98b0d588885c088eff189504ade653a77f74b67312bfd27ad
   - filename: shared/fileStorage.ts
-    checksum: 07cb337dc1d5b0f0eef56270ac4f4f589260ee5e490183c024cf98a2aeafb139
+    checksum: f86dc7aa4a69e7109310e7ab5529a8599f38f15eb79f3f4da545aceaaf90d731
   - filename: shared/storage.ts
-    checksum: c8d874aa373bdf526bf59192139822f56915e702ef673bac4e0d7549b0fea3d0
+    checksum: c31270346f2ef717a31168a93d0311ce6f925434eb613ec7cf86553222630cdb
   - filename: screens/Issuers/IssuersScreen.tsx
     checksum: 9c53e3770dbefe26e0de67ee4b7d5cc9c52d9823cbb136a1a5104dcb0a101071
   - filename: ios/Podfile.lock
@@ -61,12 +59,6 @@ fileignoreconfig:
     checksum: 10889302ca05646a283386be1bbe7a5fb510c02bb62a308ee45f3c2a872ae64e
   - filename: shared/telemetry/TelemetryConstants.js
     checksum: 9d9acf3981cbde452489eacbbd70ebaa0b853c1c04e9712fa71368c089a9662b
-  - filename: .github/workflows/internal-build.yml
-    checksum: 3a3b4dea51cb496729c4e568113fc19cf5b008481bb4a5d157f211a2128b951b
-  - filename: .github/workflows/push-triggers.yml
-    checksum: c5de3d912e2cbd55f6898e2f4a24413abbee8f084c99ea11ce6265504a520ce0
-  - filename: android/fastlane/Fastfile
-    checksum: 41d1409adf8df9c843fd2dba89142cd55c471f3060ced57d48ee96dc8793ffcd
   - filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
     checksum: 15308987b1aab0c51c96bfc646ae55a3d7ae728a1f6e03ab31d5e1b786da03eb
   - filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
@@ -75,7 +67,6 @@ fileignoreconfig:
     checksum: a0686e9a5c006176fd720b84bc36ca947db1422caf65c90cd0c2d1102a9e96df
   - filename: ios/fastlane/Fastfile
     checksum: 78edb7772ca7bf64fc0c603cb82771c793e03afff37ccbbfd1b9f578ec0e5369
-    checksum: 78edb7772ca7bf64fc0c603cb82771c793e03afff37ccbbfd1b9f578ec0e5369
   - filename: machines/bleShare/scan/scanMachine.ts
     checksum: a514c958ca3da3c5b22a1a95ad680af8f05fb22638fab79b3842aa8fcc1b4a17
   - filename: locales/spa.json
@@ -93,11 +84,25 @@ fileignoreconfig:
   - filename: machines/store.ts
     checksum: ca2328c39d2757ffebf85c0b6663da1073eb58349f2630c9418b2f16c350cbd1
   - filename: assets/Flip_Camera_Icon.svg
-    checksum: 736b5a7ddb86bd4376229ce198dbf8a663e7ac89fc3311bd4f19afd4a2b36ffd    
-  - filename: machines/store.ts
-    checksum: ca2328c39d2757ffebf85c0b6663da1073eb58349f2630c9418b2f16c350cbd1    
+    checksum: 736b5a7ddb86bd4376229ce198dbf8a663e7ac89fc3311bd4f19afd4a2b36ffd
   - filename: ios/fastlane/Fastfile
     checksum: 086080bc7a04accf5094c457b5acf84d9fec5d7dfa72eaaaf02e433ecf4f996b    
   - filename: assets/Finger_Print_Icon.svg
     checksum: 776d4fe4fc4b54d185ccf97daf0511b9fe2c0e0f7c1a809047020e5e8a100db6
-    version: ""
+  - filename: android/app/build.gradle
+    checksum: d5409b8eda2e1bf5b2552a909595a9e0aea4fd4e7572cf1746c99eee1583b83a
+  - filename: .github/workflows/push-triggers.yml
+    checksum: abc19ea38c8d7b79f15695d015709cc88a34a995181aaf12bc8344f940f3cbc4
+  - filename: ios/fastlane/Fastfile
+    checksum: 086080bc7a04accf5094c457b5acf84d9fec5d7dfa72eaaaf02e433ecf4f996b
+  - filename: android/fastlane/Fastfile
+    checksum: a25f155bcbbae7ab09563637c23771f7349738f12a6ddc8ae71c29c61ed535af
+  - filename: .github/workflows/internal-build.yml
+    checksum: e9b85cf0405d777faee9345269f6f9eb861ed205728dca63cf27a5db79c876a7
+  - filename: assets/Issuer_search_clearing_button.svg
+    checksum: f4e8a054fc4168e08bc9e9fe3e644cebabacdfc31ef0cbe36dd281766f47df5e
+  - filename: screens/Home/MyVcs/IdInputModal.tsx
+    checksum: 7ee46d8ef4761c0e9b59f3e602e6e30be5f47221817c819e91ab10ca2203089f 
+  - filename: screens/Home/MyVcs/OtpVerificationModal.tsx
+    checksum: 1db1f39701019383e1e40e6ed5278177e6c9bb3d28def0935cf6d4bd9e41e63a 
+    version: ""

App.tsx

@@ -94,7 +94,7 @@ const AppLoadingWrapper: React.FC = () => {
         message={t('errors.invalidateKeyError.message')}
         onButtonPress={controller.RESET}
         buttonText={t('common:ok')}
-        customHeight={'auto'}
+        minHeight={'auto'}
       />
 
       {isReadError ? (

android/app/src/main/AndroidManifest.xml

@@ -10,6 +10,8 @@
   <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"/>
   <uses-permission android:name="android.permission.CAMERA"/>
   <uses-permission android:name="android.permission.INTERNET"/>
+  <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.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
   <uses-permission android:name="android.permission.USE_FINGERPRINT"/>

android/fastlane/Fastfile

@@ -4,9 +4,7 @@ MIMOTO_HOST = ENV["MIMOTO_HOST"]
 ESIGNET_HOST = ENV["ESIGNET_HOST"]
 APPLICATION_THEME = ENV["APPLICATION_THEME"]
 RELEASE_KEYSTORE_ALIAS = ENV["RELEASE_KEYSTORE_ALIAS"]
-DEBUG_KEYSTORE_ALIAS = ENV["DEBUG_KEYSTORE_ALIAS"]
 RELEASE_KEYSTORE_PASSWORD = ENV["RELEASE_KEYSTORE_PASSWORD"]
-DEBUG_KEYSTORE_PASSWORD = ENV["DEBUG_KEYSTORE_PASSWORD"]
 PLAY_CONSOLE_RELEASE_DESCRIPTION = ENV["BUILD_DESCRIPTION"]
 SLACK_URL = ENV["SLACK_WEBHOOK_URL"]
 CREDENTIAL_REGISTRY_EDIT = ENV["CREDENTIAL_REGISTRY_EDIT"]
@@ -46,7 +44,7 @@ end
 
 desc "Verify Build for Android"
 lane :android_build do
-  gradle(task: "assemble#{APP_FLAVOR}Debug")
+  gradle(task: "assembleResidentappRelease")
 end
 
 desc "Deploy an Internal testing version to the Google Play"

components/HelpScreen.tsx

@@ -3,11 +3,10 @@ import {useTranslation} from 'react-i18next';
 import {Pressable} from 'react-native';
 import {Modal} from './ui/Modal';
 import {ScrollView} from 'react-native-gesture-handler';
-import {MainRouteProps} from '../routes/main';
 import {Column, Text} from './ui';
 import {Theme} from './ui/styleUtils';
 
-export const HelpScreen: React.FC<HelpScreenProps & MainRouteProps> = props => {
+export const HelpScreen: React.FC<HelpScreenProps> = props => {
   const {t} = useTranslation('HelpScreen');
 
   const [showHelpPage, setShowHelpPage] = useState(false);
@@ -75,6 +74,5 @@ export const HelpScreen: React.FC<HelpScreenProps & MainRouteProps> = props => {
 };
 
 interface HelpScreenProps {
-  testID?: string;
   triggerComponent: React.ReactElement;
 }

components/KebabPopUp.tsx

@@ -36,6 +36,7 @@ export const KebabPopUp: React.FC<KebabPopUpProps> = props => {
             {t('title')}
           </Text>
           <Icon
+            {...testIDProps('close')}
             name="close"
             onPress={props.onDismiss}
             color={Theme.Colors.Details}

components/MessageOverlay.tsx

@@ -10,11 +10,7 @@ export const MessageOverlay: React.FC<MessageOverlayProps> = props => {
   const {t} = useTranslation('common');
   const style = StyleSheet.create({
     customHeight: {
-      height: props.customHeight
-        ? props.customHeight
-        : props.progress
-        ? 100
-        : 170,
+      minHeight: props.minHeight ? props.minHeight : props.progress ? 100 : 170,
     },
   });
   return (
@@ -125,5 +121,5 @@ export interface MessageOverlayProps {
   onRetry?: () => void;
   onBackdropPress?: () => void;
   onShow?: () => void;
-  customHeight?: number | string | undefined;
+  minHeight?: number | string | undefined;
 }