Merge branch 'develop' of https://github.com/mosip/inji into inji-550…

…-rendering-issues Signed-off-by: Sri Kanth Kola <[email protected]>
tw-mosip · Dec 1, 2023 · e68b99c · e68b99c
2 parents 9d85750 + e27c6a2
commit e68b99c
Show file tree

Hide file tree

Showing 22 changed files with 284 additions and 208 deletions.
diff --git a/.talismanrc b/.talismanrc
@@ -1,96 +1,98 @@
 fileignoreconfig:
-- filename: package.json
-  checksum: a5a22604f2b9d917adaf3561fdcaeccd4e69b92e1240070480d7498e1eda5162
-- filename: package-lock.json
-  checksum: 7e8bc0fa27b4eca3b7a825bccdef88ef1c9e7932a5d9af0e5feca2d42d72703b
-- filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts
-  checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a
-- filename: components/PasscodeVerify.tsx
-  checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703
-- filename: i18n.ts
-  checksum: 75dd5536038ba198aa7b12eb6d2c2e7042c9ce292e5a0d5c90883ae5b2312b1e    
-- filename: components/Passcode.tsx
-  checksum: db4a18001be8c63bf7ffb389359861401fa1d22261b10ad729a76fd431c019a7    
-- filename: components/PasscodeVerify.tsx
-  checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703    
-- filename: screens/Home/MyVcs/GetIdInputModal.tsx
-  checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746    
-- filename: screens/AuthScreen.tsx
-  checksum: 4a096c467bb9b3fa476c220993ef0a58d72a758c40cf741dc2e4ec4db0c692e8    
-- filename: screens/BiometricScreen.tsx
-  checksum: 7a730731aaa7540eec9d05d73de277a665dc06425666280842e0f9ba6e5b8514    
-- filename: screens/AuthScreenController.ts
-  checksum: 18af825821bc95e1056050623b804a5a8e7435b9e3383916a5d63024eeba9553    
-- filename: screens/BiometricScreenController.ts
-  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
-  checksum: b17d8cc03347af59098fa4fc439d40cc436998b0d148a2ac922acc2e0288e09c
-- filename: screens/Home/MyVcs/IdInputModal.tsx
-  checksum: 6f21b2caf20ee1821b69e178a69e755e0b1094275e4a9f9cb4ae5ab515ce5d23    
-- filename: screens/WelcomeScreenController.ts
-  checksum: 71917c8c543a4a5b7ab61df259b785d233a80718123b0c8edf6ec81e1b3a81e0
-- filename: shared/telemetry/TelemetryUtils.js
-  checksum: ffe9aac2dcc590b98b0d588885c088eff189504ade653a77f74b67312bfd27ad
-- filename: shared/fileStorage.ts
-  checksum: 07cb337dc1d5b0f0eef56270ac4f4f589260ee5e490183c024cf98a2aeafb139
-- filename: shared/storage.ts
-  checksum: c8d874aa373bdf526bf59192139822f56915e702ef673bac4e0d7549b0fea3d0
-- filename: screens/Issuers/IssuersScreen.tsx
-  checksum: bc12c43ccc27ac04e5763fa6a6ed3cee63e4362ba5666c160b5e53269de924ab
-  checksum: 9a61cd59a3718adf1f14faf3024fec66a3295ef373878a878a28e5cb1287afaa
-- filename: ios/Podfile.lock
-  checksum: edad9c2d11b0b3ed819cb0dcbfaf0515d31adb8116223c07f7b7b79e6689fe96
-- filename: screens/Home/IntroSlidersScreen.tsx
-  checksum: 72ef913857448ef05763e52e32356faa2d1f3de8130a1c638d1897f44823031f
-- filename: shared/commonUtil.ts
-  checksum: 01c3fdcd2f1c1757eae0c6a27fe04eb70c2aaf8660c604f3301997484592b66c
-- filename: screens/Home/MyVcs/GetIdInputModal.tsx
-  checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746
-- filename: shared/openId4VCI/Utils.ts
-  checksum: ba3041b2ce380f44f6f52dc2c3df337d857df4494bd3c8727df9bf6fb5734750    
-- filename: shared/cryptoutil/cryptoUtil.ts
-  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
-- filename: .github/workflows/push-triggers.yml
-  checksum: c5de3d912e2cbd55f6898e2f4a24413abbee8f084c99ea11ce6265504a520ce0
-- filename: android/fastlane/Fastfile
-  checksum: 41d1409adf8df9c843fd2dba89142cd55c471f3060ced57d48ee96dc8793ffcd
-- filename: package.json
-  checksum: b982af1813bb72625c63eb31b3d0a6c0d970cd669d57649cc0ac9358252e3cd3
-- filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
-  checksum: 15308987b1aab0c51c96bfc646ae55a3d7ae728a1f6e03ab31d5e1b786da03eb
-- filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
-  checksum: 533785a3c8096ea93afc59c65025679c24d379e824e784e745ab298a0978cd2a
-- filename: shared/telemetry/TelemetryUtils.js
-  checksum: a0686e9a5c006176fd720b84bc36ca947db1422caf65c90cd0c2d1102a9e96df
-- filename: ios/fastlane/Fastfile
-  checksum: feea5a7f044ef6961d53e7d1e1ffb92a3e0f72761496424f6e64288e3718d605
-- filename: machines/bleShare/scan/scanMachine.ts
-  checksum: a514c958ca3da3c5b22a1a95ad680af8f05fb22638fab79b3842aa8fcc1b4a17
-  version: ""
-- filename: screens/PasscodeScreen.tsx
-  checksum: 57b7a2430252f9982c92c4599797e05bbcba981f8888aee52a7f2986db529edd   
-- filename: screens/Home/MyVcs/OtpVerificationModal.tsx
-  checksum: df6c9d18d5610fd893082509b5f7d8cf5ee8b8a3b76915d4593e901971bbb83f   
-- filename: screens/QrLogin/QrConsent.tsx
-  checksum: 8563a194a4d38814eff670f0652d1a7af77134cafb350462174b4f147dbd890d   
-  version: ""
-- filename: locales/spa.json
-  checksum: eac9685c6b205ece5759e414669d27ad7ce383453d7b5e7d9f5ce75d290cc860   
-  version: ""
-- filename: screens/PasscodeScreen.tsx
-  checksum: 5d3003027b245234f8c00bfc98836f1fb90a5d9525ffacf61c53f3d50954aa6a    
-  version: ""
+  - filename: package.json
+    checksum: a5a22604f2b9d917adaf3561fdcaeccd4e69b92e1240070480d7498e1eda5162
+  - filename: package-lock.json
+    checksum: 7e8bc0fa27b4eca3b7a825bccdef88ef1c9e7932a5d9af0e5feca2d42d72703b
+  - filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts
+    checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a
+  - filename: components/PasscodeVerify.tsx
+    checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703
+  - filename: i18n.ts
+    checksum: 75dd5536038ba198aa7b12eb6d2c2e7042c9ce292e5a0d5c90883ae5b2312b1e
+  - filename: components/Passcode.tsx
+    checksum: db4a18001be8c63bf7ffb389359861401fa1d22261b10ad729a76fd431c019a7
+  - filename: components/PasscodeVerify.tsx
+    checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703
+  - filename: screens/Home/MyVcs/GetIdInputModal.tsx
+    checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746
+  - filename: screens/AuthScreen.tsx
+    checksum: 4a096c467bb9b3fa476c220993ef0a58d72a758c40cf741dc2e4ec4db0c692e8
+  - filename: screens/BiometricScreen.tsx
+    checksum: 7a730731aaa7540eec9d05d73de277a665dc06425666280842e0f9ba6e5b8514
+  - filename: screens/AuthScreenController.ts
+    checksum: 18af825821bc95e1056050623b804a5a8e7435b9e3383916a5d63024eeba9553
+  - filename: screens/BiometricScreenController.ts
+    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
+    checksum: b17d8cc03347af59098fa4fc439d40cc436998b0d148a2ac922acc2e0288e09c
+  - filename: screens/Home/MyVcs/IdInputModal.tsx
+    checksum: 6f21b2caf20ee1821b69e178a69e755e0b1094275e4a9f9cb4ae5ab515ce5d23
+  - filename: screens/WelcomeScreenController.ts
+    checksum: 71917c8c543a4a5b7ab61df259b785d233a80718123b0c8edf6ec81e1b3a81e0
+  - filename: shared/telemetry/TelemetryUtils.js
+    checksum: ffe9aac2dcc590b98b0d588885c088eff189504ade653a77f74b67312bfd27ad
+  - filename: shared/fileStorage.ts
+    checksum: 07cb337dc1d5b0f0eef56270ac4f4f589260ee5e490183c024cf98a2aeafb139
+  - filename: shared/storage.ts
+    checksum: c8d874aa373bdf526bf59192139822f56915e702ef673bac4e0d7549b0fea3d0
+  - filename: screens/Issuers/IssuersScreen.tsx
+    checksum: 9c53e3770dbefe26e0de67ee4b7d5cc9c52d9823cbb136a1a5104dcb0a101071
+  - filename: ios/Podfile.lock
+    checksum: edad9c2d11b0b3ed819cb0dcbfaf0515d31adb8116223c07f7b7b79e6689fe96
+  - filename: screens/Home/IntroSlidersScreen.tsx
+    checksum: 72ef913857448ef05763e52e32356faa2d1f3de8130a1c638d1897f44823031f
+  - filename: shared/commonUtil.ts
+    checksum: 01c3fdcd2f1c1757eae0c6a27fe04eb70c2aaf8660c604f3301997484592b66c
+  - filename: screens/Home/MyVcs/GetIdInputModal.tsx
+    checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746
+  - filename: shared/openId4VCI/Utils.ts
+    checksum: ba3041b2ce380f44f6f52dc2c3df337d857df4494bd3c8727df9bf6fb5734750
+  - filename: shared/cryptoutil/cryptoUtil.ts
+    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
+  - filename: .github/workflows/push-triggers.yml
+    checksum: c5de3d912e2cbd55f6898e2f4a24413abbee8f084c99ea11ce6265504a520ce0
+  - filename: android/fastlane/Fastfile
+    checksum: 41d1409adf8df9c843fd2dba89142cd55c471f3060ced57d48ee96dc8793ffcd
+  - filename: package.json
+    checksum: b982af1813bb72625c63eb31b3d0a6c0d970cd669d57649cc0ac9358252e3cd3
+  - filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
+    checksum: 15308987b1aab0c51c96bfc646ae55a3d7ae728a1f6e03ab31d5e1b786da03eb
+  - filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
+    checksum: 533785a3c8096ea93afc59c65025679c24d379e824e784e745ab298a0978cd2a
+  - filename: shared/telemetry/TelemetryUtils.js
+    checksum: a0686e9a5c006176fd720b84bc36ca947db1422caf65c90cd0c2d1102a9e96df
+  - filename: ios/fastlane/Fastfile
+    checksum: feea5a7f044ef6961d53e7d1e1ffb92a3e0f72761496424f6e64288e3718d605
+  - filename: machines/bleShare/scan/scanMachine.ts
+    checksum: a514c958ca3da3c5b22a1a95ad680af8f05fb22638fab79b3842aa8fcc1b4a17
+    version: ''
+  - filename: screens/PasscodeScreen.tsx
+    checksum: 57b7a2430252f9982c92c4599797e05bbcba981f8888aee52a7f2986db529edd
+  - filename: screens/Home/MyVcs/OtpVerificationModal.tsx
+    checksum: df6c9d18d5610fd893082509b5f7d8cf5ee8b8a3b76915d4593e901971bbb83f
+  - filename: screens/QrLogin/QrConsent.tsx
+    checksum: 8563a194a4d38814eff670f0652d1a7af77134cafb350462174b4f147dbd890d
+    version: ''
+  - filename: locales/spa.json
+    checksum: eac9685c6b205ece5759e414669d27ad7ce383453d7b5e7d9f5ce75d290cc860
+    version: ''
+  - filename: screens/PasscodeScreen.tsx
+    checksum: 5d3003027b245234f8c00bfc98836f1fb90a5d9525ffacf61c53f3d50954aa6a
+    version: ''
+  - filename: screens/Issuers/IssuersScreen.tsx
+    checksum: ec988b29527156057f0e24a9663fc850d22ccf10a0413d51481ae613a9425202
+    version: ''
diff --git a/components/EditableListItem.tsx b/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[];

diff --git a/components/MessageOverlay.tsx b/components/MessageOverlay.tsx
@@ -29,6 +29,7 @@ export const MessageOverlay: React.FC<MessageOverlayProps> = props => {
         <Column padding="21" crossAlign="center">
           {props.title && (
             <Text
+              testID={props.testID}
               style={{paddingTop: 3}}
               align="center"
               weight="bold"
@@ -107,6 +108,7 @@ const Progress: React.FC<Pick<MessageOverlayProps, 'progress'>> = props => {
 };
 
 export interface MessageOverlayProps {
+  testID?: string;
   isVisible: boolean;
   title?: string;
   buttonText?: string;

diff --git a/components/PasscodeVerify.tsx b/components/PasscodeVerify.tsx
@@ -22,9 +22,7 @@ export const PasscodeVerify: React.FC<PasscodeVerifyProps> = props => {
     }
   }, [isVerified]);
 
-  return (
-    <PinInput testID="confirmPasscodePin" length={MAX_PIN} onDone={verify} />
-  );
+  return <PinInput testID={props.testID} length={MAX_PIN} onDone={verify} />;
 
   async function verify(value: string) {
     try {
@@ -54,4 +52,5 @@ interface PasscodeVerifyProps {
   onSuccess: () => void;
   onError?: (error: string) => void;
   salt: string;
+  testID: string;
 }
diff --git a/components/openId4VCI/Issuer.tsx b/components/openId4VCI/Issuer.tsx
@@ -1,15 +1,13 @@
 import React from 'react';
 import {Image, Pressable} from 'react-native';
 import {Theme} from '../ui/styleUtils';
-import {useTranslation} from 'react-i18next';
 import testIDProps from '../../shared/commonUtil';
 import {Text} from '../ui';
+import {displayType} from '../../machines/issuersMachine';
 
 export const Issuer: React.FC<IssuerProps> = (props: IssuerProps) => {
-  const {t} = useTranslation('IssuersScreen');
-
   function getIssuerLogo() {
-    return {uri: props.logoUrl};
+    return {uri: props.displayDetails.logo.url};
   }
 
   return (
@@ -30,26 +28,25 @@ export const Issuer: React.FC<IssuerProps> = (props: IssuerProps) => {
       <Image
         {...testIDProps(`issuerIcon-${props.testID}`)}
         style={Theme.IssuersScreenStyles.issuerIcon}
+        alt={props.displayDetails.logo.alt_text}
         source={getIssuerLogo()}
       />
       <Text
         testID={`issuerHeading-${props.testID}`}
         style={Theme.IssuersScreenStyles.issuerHeading}>
-        {t('itemHeading', {issuer: props.displayName})}
+        {props.displayDetails.title}
       </Text>
       <Text
         testID={`issuerDescription-${props.testID}`}
         style={Theme.IssuersScreenStyles.issuerDescription}>
-        {t('itemSubHeading')}
+        {props.displayDetails.description}
       </Text>
     </Pressable>
   );
 };
 
 interface IssuerProps {
-  id: string;
-  displayName: string;
-  logoUrl: string;
+  displayDetails: displayType;
   onPress: () => void;
   testID: string;
 }
diff --git a/components/ui/SearchBar.tsx b/components/ui/SearchBar.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import {TextInput} from 'react-native';
+import {Icon} from 'react-native-elements';
+import {Row} from './Layout';
+import {Theme} from './styleUtils';
+
+export const SearchBar = (props: SearchBarProps) => {
+  return (
+    <Row margin="3">
+      <Icon
+        testID={props.searchIconTestID}
+        name="search"
+        color={Theme.Colors.GrayIcon}
+        size={27}
+        style={Theme.SearchBarStyles.searchIcon}
+      />
+      <TextInput
+        testID={props.searchBarTestID}
+        style={Theme.SearchBarStyles.searchBar}
+        placeholder={props.placeholder}
+        value={props.search}
+        onChangeText={searchText => props.onChangeText(searchText)}
+        onLayout={props.onLayout}
+      />
+    </Row>
+  );
+};
+
+interface SearchBarProps {
+  searchIconTestID: string;
+  searchBarTestID: string;
+  search: string;
+  placeholder: string;
+  onChangeText: (searchText: string) => void;
+  onLayout: () => void;
+}
diff --git a/components/ui/SetupPicker.tsx b/components/ui/SetupPicker.tsx
@@ -4,6 +4,7 @@ import {Icon, ListItem} from 'react-native-elements';
 import {Column} from './Layout';
 import {Text} from './Text';
 import {Theme} from './styleUtils';
+import testIDProps from '../../shared/commonUtil';
 
 interface Picker extends React.VFC<PickerProps<unknown>> {
   <T>(props: PickerProps<T>): ReturnType<React.FC>;
@@ -34,13 +35,14 @@ export const SetupPicker: Picker = (props: PickerProps<unknown>) => {
       backgroundColor={Theme.Colors.whiteBackgroundColor}>
       {props.items.map((item, index) => (
         <ListItem
-          testID={item.value}
           bottomDivider
           topDivider={index !== 0}
           onPress={() => selectItem(index)}
           key={index}>
           <ListItem.Content>
-            <ListItem.Title style={{paddingTop: 3}}>
+            <ListItem.Title
+              {...testIDProps(item.value)}
+              style={{paddingTop: 3}}>
               <Text
                 color={selectedIndex === index ? Theme.Colors.Icon : null}
                 weight={selectedIndex === index ? 'semibold' : 'regular'}>