Merge pull request mosip#1421 from mosip/reverse-merge-qa-develop

Reverse sync qa develop

.talismanrc

@@ -38,7 +38,7 @@ fileignoreconfig:
   - filename: screens/Home/MyVcs/GetIdInputModal.tsx
     checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746
   - filename: shared/openId4VCI/Utils.ts
-    checksum: ba3041b2ce380f44f6f52dc2c3df337d857df4494bd3c8727df9bf6fb5734750
+    checksum: d6baca56726c21357ea64ad95e70d940a68585472a1fc12d546186eb5022ca3a
   - filename: shared/cryptoutil/cryptoUtil.ts
     checksum: adbc2ff6df1df412e891c988c9ba03fc82f66c2f6c64339f87d513fc835d14cc
   - filename: shared/telemetry/TelemetryConstants.js
@@ -222,7 +222,7 @@ fileignoreconfig:
   - filename: ios/Inji.xcodeproj/project.pbxproj
     checksum: 766e3dcb299f52ea75e87a1e6e7ce106872bb2f2481d54700995ca02b742b60f
   - filename: ios/Inji/Info.plist
-    checksum: 56dc5e779373759ad93cbbdd7b87509913025ba307962c69d8ea13d976b602d9
+    checksum: 9237e54ac8bbc0a4ad4c5d82ffe5b1ae4ccadfce6745f59cee1260c469212701
   - filename: machines/backupAndRestore/backupRestore.ts
     checksum: 60a55a1d0ef6e79f7b9fa1e61ed31b933364afb429bff03cebbc56339c764499
   - filename: machines/backupAndRestore/backupRestore.typegen.ts

i18n.ts

@@ -44,6 +44,7 @@ i18next
       null,
       existingCredentials.password,
     );
+
     if (language !== i18next.language) {
       i18next.changeLanguage(language);
       populateLanguageCodeMap();

injitest/iosSanity.xml

@@ -46,4 +46,4 @@
 			</class>
 		</classes>
 	</test>
-</suite>
+</suite>

ios/Inji/Info.plist

@@ -12,6 +12,23 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>MaterialIcons.ttf</string>
+		<string>MaterialCommunityIcons.ttf</string>
+		<string>FontAwesome.ttf</string>
+        <string>FontAwesome.ttf</string>
+        <string>FontAwesome5_Regular.ttf</string>
+        <string>FontAwesome6_Brands.ttf</string>
+        <string>FontAwesome6_Solid.ttf</string>
+        <string>FontAwesome5_Brands.ttf</string>
+        <string>FontAwesome5_Solid.ttf</string>
+        <string>FontAwesome6_Regular.ttf</string>
+		<string>SimpleLineIcons.ttf</string>
+        <string>Entypo.ttf</string>
+        <string>Feather.ttf</string>
+        <string>AntDesign.ttf</string>
+	</array>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>

machines/VerifiableCredential/VCItemMachine/VCItemServices.ts

@@ -112,7 +112,7 @@ export const VCItemServices = model => {
         {
           requestTime: String(new Date().toISOString()),
           request: {
-            individualId: getMosipIdentifier(vc.credentialSubject),
+            individualId: VCMetadata.fromVC(context.vcMetadata).id,
             otpChannels: ['EMAIL', 'PHONE'],
           },
         },

machines/auth.typegen.ts

@@ -1,5 +1,3 @@
-// This file was automatically generated. Edits will be overwritten
-
 export interface Typegen0 {
   '@@xstate/typegen': true;
   internalEvents: {

screens/History/HistoryScreen.tsx

@@ -5,10 +5,11 @@ import {useTranslation} from 'react-i18next';
 import {Centered, Column, Text} from '../../components/ui';
 import {useHistoryTab} from './HistoryScreenController';
 import {ActivityLogText} from '../../components/ActivityLogText';
+import {MainRouteProps} from '../../routes/main';
 import {Theme} from '../../components/ui/styleUtils';
 import {BannerNotificationContainer} from '../../components/BannerNotificationContainer';
 
-export const HistoryScreen: React.FC = () => {
+export const HistoryScreen: React.FC<MainRouteProps> = () => {
   const {t} = useTranslation('HistoryScreen');
   const controller = useHistoryTab();
 

screens/MainLayout.tsx

@@ -3,11 +3,16 @@ import {
   BottomTabNavigationOptions,
   createBottomTabNavigator,
 } from '@react-navigation/bottom-tabs';
+import {Icon} from 'react-native-elements';
 import {RequestRouteProps, RootRouteProps} from '../routes';
 import {mainRoutes, share} from '../routes/main';
 import {Theme} from '../components/ui/styleUtils';
 import {useTranslation} from 'react-i18next';
-import {Column} from '../components/ui';
+import {Column, Row} from '../components/ui';
+import {Image} from 'react-native';
+import {SettingScreen} from './Settings/SettingScreen';
+import {HelpScreen} from '../components/HelpScreen';
+
 import {GlobalContext} from '../shared/GlobalContext';
 import {ScanEvents} from '../machines/bleShare/scan/scanMachine';
 import testIDProps from '../shared/commonUtil';

shared/openId4VCI/Utils.ts

@@ -143,8 +143,6 @@ export const updateCredentialInformation = (context, credential) => {
     context.selectedIssuer['.well-known'];
   credentialWrapper.verifiableCredential.credentialTypes =
     context.selectedIssuer['credential_type'];
-  // credentialWrapper.verifiableCredential.wellKnown =
-  //   'https://esignet.collab.mosip.net/.well-known/openid-credential-issuer';
   credentialWrapper.verifiableCredential.issuerLogo =
     getDisplayObjectForCurrentLanguage(context.selectedIssuer.display)?.logo;
   credentialWrapper.vcMetadata = context.vcMetadata || {};
@@ -163,12 +161,14 @@ export const getDisplayObjectForCurrentLanguage = (
   display: [displayType],
 ): displayType => {
   const currentLanguage = i18next.language;
-  let displayType = display.filter(obj => obj.language == currentLanguage)[0];
+  const languageKey = Object.keys(display[0]).includes('language')
+    ? 'language'
+    : 'locale';
+  let displayType = display.filter(
+    obj => obj[languageKey] == currentLanguage,
+  )[0];
   if (!displayType) {
-    displayType = display.filter(obj => obj.language == 'en')[0];
-  }
-  if (!displayType) {
-    displayType = display.filter(obj => obj.locale == currentLanguage)[0];
+    displayType = display.filter(obj => obj[languageKey] === 'en')[0];
   }
   return displayType;
 };