Merge upstream develop into multiple-inji-builds

.github/workflows/internal-build.yml

@@ -121,45 +121,45 @@ jobs:
       INJI_ANDROID_PLAY_STORE_CONFIG_JSON: ${{ secrets.INJI_ANDROID_PLAY_STORE_CONFIG_JSON }}
       SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
 
-  build-ios:
-    uses: tw-mosip/kattu/.github/workflows/ios-publish.yml@inji-reusable-workflow
-    with:
-      NODE_VERSION: '18.x'
-      MIMOTO_HOST: ${{ inputs.mimotoBackendServiceUrl }}
-      ESIGNET_HOST: ${{ inputs.esignetBackendServiceUrl }}
-      APPLICATION_THEME: ${{ inputs.theme }}
-      TESTFLIGHT_BETA_APP_DESCRIPTION: ${{ inputs.buildDescription }}
-      ALLOW_ENV_EDIT: ${{ inputs.allow_env_edit }}
-      TESTFLIGHT_INTERNAL_TESTERS_GROUP: ${{ inputs.internal-testers }}
-      SERVICE_LOCATION: '.'
-      IOS_SERVICE_LOCATION: 'ios'
-      SCRIPT_NAME: "fastlane beta"
-      IOS_ARTIFACT_NAME: "Inji"
-      IOS_ARTIFACT_PATH: "ios/fastlane/Inji_app_file/Products/Applications/"
-    secrets:
-      APP_STORE_CONNECT_TEAM_ID: '${{ secrets.APP_STORE_CONNECT_TEAM_ID }}'
-      DEVELOPER_APP_ID: '${{ secrets.IOS_INJI_DEVELOPER_APP_ID }}'
-      INJI_IOS_DEVELOPER_APP_IDENTIFIER: '${{ secrets.INJI_IOS_DEVELOPER_APP_IDENTIFIER }}'
-      INJI_IOS_DEVELOPER_PORTAL_TEAM_ID: '${{ secrets.INJI_IOS_DEVELOPER_PORTAL_TEAM_ID }}'
-      INJI_IOS_FASTLANE_APPLE_ID: '${{ secrets.INJI_IOS_FASTLANE_APPLE_ID }}'
-      INJI_IOS_FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: '${{ secrets.INJI_IOS_FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}'
-      GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
-      INJI_IOS_PROVISIONING_PROFILE_SPECIFIER: '${{ secrets.INJI_IOS_PROVISIONING_PROFILE_SPECIFIER }}'
-      INJI_IOS_TEMP_KEYCHAIN_PASSWORD: '${{ secrets.INJI_IOS_TEMP_KEYCHAIN_PASSWORD }}'
-      INJI_IOS_TEMP_KEYCHAIN_USER: '${{ secrets.INJI_IOS_TEMP_KEYCHAIN_USER }}'
-      APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
-      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 }}'
+  # build-ios:
+  #   uses: tw-mosip/kattu/.github/workflows/ios-publish.yml@inji-reusable-workflow
+  #   with:
+  #     NODE_VERSION: '18.x'
+  #     MIMOTO_HOST: ${{ inputs.mimotoBackendServiceUrl }}
+  #     ESIGNET_HOST: ${{ inputs.esignetBackendServiceUrl }}
+  #     APPLICATION_THEME: ${{ inputs.theme }}
+  #     TESTFLIGHT_BETA_APP_DESCRIPTION: ${{ inputs.buildDescription }}
+  #     ALLOW_ENV_EDIT: ${{ inputs.allow_env_edit }}
+  #     TESTFLIGHT_INTERNAL_TESTERS_GROUP: ${{ inputs.internal-testers }}
+  #     SERVICE_LOCATION: '.'
+  #     IOS_SERVICE_LOCATION: 'ios'
+  #     SCRIPT_NAME: "fastlane beta"
+  #     IOS_ARTIFACT_NAME: "Inji"
+  #     IOS_ARTIFACT_PATH: "ios/fastlane/Inji_app_file/Products/Applications/"
+  #   secrets:
+  #     APP_STORE_CONNECT_TEAM_ID: '${{ secrets.APP_STORE_CONNECT_TEAM_ID }}'
+  #     DEVELOPER_APP_ID: '${{ secrets.IOS_INJI_DEVELOPER_APP_ID }}'
+  #     INJI_IOS_DEVELOPER_APP_IDENTIFIER: '${{ secrets.INJI_IOS_DEVELOPER_APP_IDENTIFIER }}'
+  #     INJI_IOS_DEVELOPER_PORTAL_TEAM_ID: '${{ secrets.INJI_IOS_DEVELOPER_PORTAL_TEAM_ID }}'
+  #     INJI_IOS_FASTLANE_APPLE_ID: '${{ secrets.INJI_IOS_FASTLANE_APPLE_ID }}'
+  #     INJI_IOS_FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: '${{ secrets.INJI_IOS_FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}'
+  #     GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
+  #     INJI_IOS_PROVISIONING_PROFILE_SPECIFIER: '${{ secrets.INJI_IOS_PROVISIONING_PROFILE_SPECIFIER }}'
+  #     INJI_IOS_TEMP_KEYCHAIN_PASSWORD: '${{ secrets.INJI_IOS_TEMP_KEYCHAIN_PASSWORD }}'
+  #     INJI_IOS_TEMP_KEYCHAIN_USER: '${{ secrets.INJI_IOS_TEMP_KEYCHAIN_USER }}'
+  #     APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
+  #     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 }}'
 
-  sonar-check:
-    uses: tw-mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@inji-reusable-workflow
-    with:
-      SERVICE_LOCATION: '.'
-      ANDROID_LOCATION: 'android'
-      SONAR_ARGS: -Dsonarqube
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+  # sonar-check:
+  #   uses: tw-mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@inji-reusable-workflow
+  #   with:
+  #     SERVICE_LOCATION: '.'
+  #     ANDROID_LOCATION: 'android'
+  #     SONAR_ARGS: -Dsonarqube
+  #   secrets:
+  #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  #     SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
+  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'

.github/workflows/push-triggers.yml

@@ -38,13 +38,13 @@ jobs:
       IOS_SERVICE_LOCATION: 'ios'
       SCRIPT_NAME: "fastlane ios_app_build"
 
-  sonar-check:
-    if: ${{ github.event_name != 'pull_request' }}
-    uses: tw-mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@inji-reusable-workflow
-    with:
-      SERVICE_LOCATION: '.'
-      ANDROID_LOCATION: 'android'
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+  # sonar-check:
+  #   if: ${{ github.event_name != 'pull_request' }}
+  #   uses: tw-mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@inji-reusable-workflow
+  #   with:
+  #     SERVICE_LOCATION: '.'
+  #     ANDROID_LOCATION: 'android'
+  #   secrets:
+  #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  #     SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
+  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'

.gitignore

@@ -121,3 +121,12 @@ android/app/debug.keystore
 .expo
 dist/
 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/

.talismanrc

@@ -1,10 +1,10 @@
 fileignoreconfig:
-- filename: ios/Podfile.lock
-  checksum: cc123c3e1f04d41b394ceb16843b15c08bac3ba619ae853ff322717739761a85    
 - filename: package.json
-  checksum: fdd5905228a1afbfb004c710fd6c61adf073a12840200327c0592b76bea5e7e3
+  checksum: a5a22604f2b9d917adaf3561fdcaeccd4e69b92e1240070480d7498e1eda5162
 - filename: package-lock.json
-  checksum: 179883df6d414d82b7f54353a3a4cc75e6a681224f4b6d1831ce85de27de2726
+  checksum: 7e8bc0fa27b4eca3b7a825bccdef88ef1c9e7932a5d9af0e5feca2d42d72703b
+- filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts
+  checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a
 - filename: components/PasscodeVerify.tsx
   checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703
 - filename: i18n.ts
@@ -45,9 +45,7 @@ fileignoreconfig:
   checksum: bc12c43ccc27ac04e5763fa6a6ed3cee63e4362ba5666c160b5e53269de924ab
   checksum: 9a61cd59a3718adf1f14faf3024fec66a3295ef373878a878a28e5cb1287afaa
 - filename: ios/Podfile.lock
-  checksum: cc123c3e1f04d41b394ceb16843b15c08bac3ba619ae853ff322717739761a85
-- filename: ios/Podfile.lock
-  checksum: cc123c3e1f04d41b394ceb16843b15c08bac3ba619ae853ff322717739761a85
+  checksum: edad9c2d11b0b3ed819cb0dcbfaf0515d31adb8116223c07f7b7b79e6689fe96
 - filename: screens/Home/IntroSlidersScreen.tsx
   checksum: 72ef913857448ef05763e52e32356faa2d1f3de8130a1c638d1897f44823031f
 - filename: shared/commonUtil.ts
@@ -57,15 +55,15 @@ fileignoreconfig:
 - filename: shared/openId4VCI/Utils.ts
   checksum: ba3041b2ce380f44f6f52dc2c3df337d857df4494bd3c8727df9bf6fb5734750    
 - filename: shared/cryptoutil/cryptoUtil.ts
-  checksum: b785ff3f01ab9530119072c4d38195048bfeee6155c54ea7dd031559acb722f3
+  checksum: adbc2ff6df1df412e891c988c9ba03fc82f66c2f6c64339f87d513fc835d14cc
 - filename: machines/store.typegen.ts
   checksum: 6d22bc5c77398316b943c512c208ce0846a9fff674c1ccac79e07f21962acd5f
 - filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
   checksum: 10889302ca05646a283386be1bbe7a5fb510c02bb62a308ee45f3c2a872ae64e
 - filename: shared/telemetry/TelemetryConstants.js
   checksum: 9d9acf3981cbde452489eacbbd70ebaa0b853c1c04e9712fa71368c089a9662b
 - filename: .github/workflows/internal-build.yml
-  checksum: 3a3b4dea51cb496729c4e568113fc19cf5b008481bb4a5d157f211a2128b951b
+  checksum: 0e114dbacfcd26fc540e15c30bde9b7ee2d5b3be7b1c93637655704d2e2d659e
 - filename: .github/workflows/push-triggers.yml
   checksum: c5de3d912e2cbd55f6898e2f4a24413abbee8f084c99ea11ce6265504a520ce0
 - filename: android/fastlane/Fastfile
@@ -82,5 +80,9 @@ fileignoreconfig:
   checksum: feea5a7f044ef6961d53e7d1e1ffb92a3e0f72761496424f6e64288e3718d605
 - filename: android/app/build.gradle
   checksum: c2d2ab90258fc346d2f2d57b360883b6e57540eac5467a8e8438c2d5eada90df
+- filename: machines/bleShare/scan/scanMachine.ts
+  checksum: a514c958ca3da3c5b22a1a95ad680af8f05fb22638fab79b3842aa8fcc1b4a17
   version: ""
-
+- filename: locales/spa.json
+  checksum: eac9685c6b205ece5759e414669d27ad7ce383453d7b5e7d9f5ce75d290cc860   
+  version: ""

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';
@@ -26,9 +25,12 @@ 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');
@@ -48,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);
   }
@@ -78,7 +88,6 @@ const AppLoadingWrapper: React.FC = () => {
   }, [isKeyInvalidateError]);
   return (
     <>
-      <AppLoading />
       <MessageOverlay
         isVisible={isKeyInvalidateError}
         title={t('errors.invalidateKeyError.title')}

android/app/build.gradle

@@ -36,6 +36,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
@@ -127,6 +128,7 @@ android {
             // for sonarqube job we will generate dummy release keystore to sign the app as we are not doing it in workflow
             def hasSonarqube = System.properties.containsKey("sonarqube")
             def keystore = file('release.keystore').exists() ? file('release.keystore') : file('dummyrelease.keystore')
+            storeFile file("$keystore")
             if (hasSonarqube && !keystore.exists() ) {
                 exec {
                     commandLine 'keytool',
@@ -136,19 +138,23 @@ android {
                             '-keyalg', 'RSA',
                             '-keysize', '2048',
                             '-validity', '10000',
-                            '-storepass', System.getenv("RELEASE_KEYSTORE_PASSWORD"),
-                            '-keypass', System.getenv("RELEASE_KEYSTORE_PASSWORD"),
-                            '-alias', System.getenv("RELEASE_KEYSTORE_ALIAS"),
+                            '-storepass', 'password',
+                            '-keypass', 'password',
+                            '-alias', 'androidreleasekey',
                             '-keystore', 'dummyrelease.keystore',
                             '-dname', 'CN=,OU=,O=,L=,S=,C=US'
                 }
+                storePassword "password"
+                keyAlias "androidreleasekey"
+                keyPassword "password"
+            }
+            else{
+                def keystoreAlias = System.getenv("RELEASE_KEYSTORE_ALIAS")
+                def keystorePass = System.getenv("RELEASE_KEYSTORE_PASSWORD")
+                storePassword "$keystorePass"
+                keyAlias "$keystoreAlias"
+                keyPassword "$keystorePass"
             }
-            def keystoreAlias = System.getenv("RELEASE_KEYSTORE_ALIAS")
-            def keystorePass = System.getenv("RELEASE_KEYSTORE_PASSWORD")
-            storeFile file("$keystore")
-            storePassword "$keystorePass"
-            keyAlias "$keystoreAlias"
-            keyPassword "$keystorePass"
             v2SigningEnabled true
             v1SigningEnabled false
         }

android/fastlane/Fastfile

@@ -8,7 +8,7 @@ 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_URL"]
+SLACK_URL = ENV["SLACK_WEBHOOK_URL"]
 CREDENTIAL_REGISTRY_EDIT = ENV["CREDENTIAL_REGISTRY_EDIT"]
 INJI_FLAVOR = ENV["APP_FLAVOR"]
 

components/VC/MosipVCItem/MosipVCItemDetails.tsx

@@ -368,7 +368,16 @@ export const MosipVCItemDetails: React.FC<
         props.isBindingPending ? (
           <Column style={Theme.Styles.openCardBgContainer} padding="10">
             <Column margin={'0 0 4 0'} crossAlign={'flex-start'}>
-              <Image source={Theme.activationPending}></Image>
+              <Icon
+                name="shield-alert"
+                color={Theme.Colors.Icon}
+                size={Theme.ICON_LARGE_SIZE}
+                type="material-community"
+                containerStyle={{
+                  marginEnd: 5,
+                  bottom: 1,
+                }}
+              />
               <Text
                 testID="offlineAuthDisabledHeader"
                 style={{flex: 1}}

components/ui/themes/DefaultTheme.ts

@@ -33,8 +33,8 @@ const Colors = {
   LightOrange: '#FDF1E6',
   GradientColors: ['#F59B4B', '#E86E04'],
   DisabledColors: ['#C7C7C7', '#C7C7C7'],
-  captureIconBorder: '#F59B4B',
   TimeoutHintBoxColor: '#FFF7E5',
+  TimeoutHintBoxBorder: '#FFF2D6',
   TimoutHintText: '#8B6105',
   resendCodeTimer: '#555555',
   uncheckedIcon: '#DBDBDB',
@@ -789,7 +789,7 @@ export const DefaultTheme = {
       borderColor: Colors.Orange,
     },
     container: {
-      height: 'auto',
+      height: 45,
       flexDirection: 'row',
     },
     disabled: {
@@ -853,6 +853,8 @@ export const DefaultTheme = {
       margin: 21,
       paddingHorizontal: 14,
       paddingVertical: 12,
+      borderWidth: 2,
+      borderColor: Colors.TimeoutHintBoxBorder,
       borderRadius: 12,
     },
     sharedSuccessfully: {
@@ -1312,11 +1314,11 @@ export const DefaultTheme = {
 
   ICON_SMALL_SIZE: 16,
   ICON_MID_SIZE: 22,
+  ICON_LARGE_SIZE: 33,
   PinIcon: require('../../../assets/pin_icon.png'),
   CloseCard: require('../../../assets/card_bg.png'),
   CardBackground: require('../../../assets/card_bg.png'),
   OpenCard: require('../../../assets/card_bg.png'),
-  activationPending: require('../../../assets/pending_activation.png'),
   cardFaceIcon: require('../../../assets/placeholder-photo.png'),
   MosipSplashLogo: require('../../../assets/icon.png'),
   MosipLogo: require('../../../assets/mosip-logo.png'),