diff --git a/.talismanrc b/.talismanrc index 648b6afb..1cb598ac 100644 --- a/.talismanrc +++ b/.talismanrc @@ -2,7 +2,7 @@ fileignoreconfig: - filename: package.json checksum: 5b4fcb5ddc7cc96cc2d1733b544d56ea66e88cdab995a1052fbf9ac0e9c2dc21 - filename: package-lock.json - checksum: 0332759e70995880ae622b6b40cf3dc7bb8d98b1a5004bad9bc0b096589ebd83 + checksum: 039a6c9f516b16824b6694db32e57ef763e8799a096141e49f33a0ca4e5832c4 - filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a - filename: components/PasscodeVerify.tsx @@ -64,7 +64,7 @@ fileignoreconfig: - filename: assets/Finger_Print_Icon.svg checksum: 776d4fe4fc4b54d185ccf97daf0511b9fe2c0e0f7c1a809047020e5e8a100db6 - filename: android/app/build.gradle - checksum: fac9d67005e860f4eb1fb1de3c7be51b55afca169951ff5b289d07f3f266900c + checksum: 9f9cdcd2ffb37338760d741694486cf5418a38834c3ca1bd9c573098ee10d997 - filename: .github/workflows/push-triggers.yml checksum: abc19ea38c8d7b79f15695d015709cc88a34a995181aaf12bc8344f940f3cbc4 - filename: android/fastlane/Fastfile @@ -108,7 +108,7 @@ fileignoreconfig: - filename: injitest/src/test/java/androidTestCases/CredentialRegistryTest.java checksum: 126ad4f513d5e417fdc3ccbace187315b8aae4399806d3259421f8bca7d41254 - filename: injitest/src/test/java/iosTestCases/NoNetworkIosTest.java - checksum: e4ce65bb37f3c6a2a36b327afdec2e25747c4a7d4a6f5c7f369306848a319dd8 + checksum: 07bd2bf9f7917f8f15a1ead7717f9c24489aacc91516c69c68857cdf7b3b3cc2 - filename: ios/fastlane/Fastfile checksum: a4e3772dc67a07ecbcfc58be0d6d4f7fa799cec7ac25bd269ac29459c8669ca4 - filename: injitest/src/test/java/iosTestCases/CredentialRegistryTest.java @@ -144,7 +144,7 @@ fileignoreconfig: - filename: shared/VCMetadata.ts checksum: e93f988415bf91064e2cf5fbc09ff6c7226798baa5da721fa0715d5d0d6afddf - filename: ios/Podfile.lock - checksum: e29b6cd09b56959ecf7747e3a9a67676e521856162af1ad2da91a2c13daad908 + checksum: d4084b7d5e04ee4199014c561a8ae228471bfed38751239acf9232fd2f57c045 - filename: components/BackupAndRestoreBannerNotification.tsx checksum: e465a9947727687d784d0cb9d8db1e28f765b0659bf4a3aa6d75643aa7b14102 - filename: components/ActivityLogEvent.ts @@ -168,13 +168,13 @@ fileignoreconfig: - filename: injitest/src/main/java/inji/api/ConfigManager.java checksum: 880e066743f5979929cbfa90ef3a28bf4eb7147c9dba425b2abb035025d21aa7 - filename: injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java - checksum: 6d40247474a1d1dcfb86f5d7e904b14b53ab1f786ea464a59bef39d5775a762b + checksum: 12a3b4d1350373a964313c0f272ccceb0b71e2f9f6c0f4baf7b1dcb4be6c2608 - filename: injitest/src/test/java/androidTestCases/ChangeLanguageTest.java - checksum: 381f1ac3d03fa524aabd38904efa5031bd5c07717b1d51dcd2465cea58076362 + checksum: 2c318055f0567a01b60204e00747d24bd757b73ffed12505787c61b033f45036 - filename: ios/Inji/Inji.entitlements checksum: b2d643f91a929933747b539b9d6a87fcac17317716dbb9ccfb399e7c53d8cd52 - filename: injitest/src/test/java/iosTestCases/ChangeLanguageTest.java - checksum: d94cbf47726c3650b4b623e6aa76e113edf553616319450d01f05294163572e9 + checksum: 600e8cd0167d51511be6b9f91c6de19adf49d0c1d300aa41d2ecd050c8c2952f - filename: screens/Home/MyVcs/IdInputModal.tsx checksum: c18e8bbcf1c8de3327c0920fddcf1b6df54b74d894e3f04677f498712c680fe9 - filename: screens/Home/MyVcs/OtpVerificationModal.tsx @@ -214,7 +214,7 @@ fileignoreconfig: - filename: machines/auth.ts checksum: 46195ee93f9b7ac6794a06eeef5dee5ea242047a557af8bf95df04e1343d7b9e - filename: machines/auth.typegen.ts - checksum: 53be3eb5ec658fccc2764a5e8b0a9992c5c2b86f70ccb122c6cf6fba50f0d0f8 + checksum: f93996f750549f6de91c2a35c5817cfa85ad7b255ef36dea85224a0a154db188 - filename: shared/commonUtil.generated.test.ts checksum: 4ca5983bb133f8f02bfd52fd0cc49ce37b24b164f3ca78a03ad97bb353ed00a4 - filename: __mocks__/en.mock.json @@ -244,7 +244,7 @@ fileignoreconfig: - filename: screens/Issuers/CredentialTypeSelectionScreen.tsx checksum: 144bbf59e86a89bf580ac7931645ca3eaed69a9409de36f6ce9f88a14091a9d3 - filename: components/QrCodeOverlay.tsx - checksum: b49a3f53dd4a522f8ce47f2af72ade33e337ddbd40068911458bb3ad54197b63 + checksum: 47220a4ebd8af702afe622a29b689f651eb23387bac1c623f241839beb413d25 - filename: machines/Issuers/IssuersEvents.ts checksum: fd8c30e0cf43a784be883c9d79a3bff0d2bcd9075e937d225939040542998b10 - filename: machines/Issuers/IssuersGuards.ts @@ -260,11 +260,11 @@ fileignoreconfig: - filename: injitest/src/main/resources/TestData.json checksum: 1b5af14c96b456898259b4cb7a5607b006404cf0360274bdc204d7d065698e3c - filename: injitest/src/test/java/androidTestCases/ActivateVcTest.java - checksum: a9abd8c0478e9f5d7db8b8289002104107d26c2d08af8959219267f71f4a7a0b + checksum: ef35bd00dfa77e62018f11fa5ae8864720b1abdfa5da04dc429c046c72bab7c8 - filename: machines/VerifiableCredential/VCMetaMachine/VCMetaActions.ts checksum: 5ff9b2a0ad8b7f38b95ad84ec2006b8aecf119c678fadebb18de4ffffd966da8 - filename: injitest/src/test/java/androidTestCases/DeletingVcTest.java - checksum: e4c92989937c203ca6371cf6cb3920ceaf61ad53b38d667ff2606044dc5ce469 + checksum: 8ce5adb75377348b48613c06fa759a63b9f0f9dc20d51218bbe13c4bf1f93d5d - filename: injitest/src/test/java/androidTestCases/GenerateUinOrVidTest.java checksum: 3dec3f9d8b28467af89f574e868058446beff12d5dfba13892a2d2f3033b6894 - filename: machines/VerifiableCredential/VCMetaMachine/VCMetaSelectors.ts @@ -272,7 +272,7 @@ fileignoreconfig: - filename: injitest/src/test/java/androidTestCases/UnlockWithPasscodeTest.java checksum: efe21ba6b9e1b760cee02f0d6c5c776722142feeff7417cfdb7536ab80be3476 - filename: injitest/src/test/java/androidTestCases/VerifyHistoryTest.java - checksum: c2787a9adffade8310bd2245d8ea295f01e5528ae8dd156bc68ccda5321f150d + checksum: dffc4741b251b42c81d5bdac7d649c02b37bb9045285590b29f86c2d5f526fd1 - filename: injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingUinTest.java checksum: ca06dd901386edcd914bd39b301629589d82269b79e80fad5e3562968532b590 - filename: machines/bleShare/scan/scanGuards.ts @@ -282,13 +282,13 @@ fileignoreconfig: - filename: machines/QrLogin/QrLoginServices.ts checksum: b20d0caa6d23078b4010ea5185f01270356422dd216edd7834b069cdedd3383d - filename: machines/bleShare/scan/scanActions.ts - checksum: 1be68caa29937d5f724fc45f8164ee607e556aae008c00ac89b83968030ed7ed + checksum: 7b1c55e1913622d142433a296f1c75ec831441670d9b84cfaabb4863af2c1fe6 - filename: injitest/src/test/java/iosTestCases/ActivateVcTest.java checksum: 280fcbfa6e7b26baa41aa9e60e8be857a16fd409f2dcc5b31d53ced7d1b26dec - filename: injitest/src/test/java/iosTestCases/GenerateUinOrVidTest.java checksum: c2a97d691bad5e07ff04b2da0487ffeb86884e14d1489657276a3e003e954735 - filename: injitest/src/test/java/iosTestCases/VerifyHistoryTest.java - checksum: ff7f467874f8fa6284150359f81cf1f9f00bf979f58aeda608460fc026d6c79b + checksum: 8a00278af4c8744c713c57328991bbca438eb5d5d89b492a7f5234c47362f44b - filename: machines/store.ts checksum: 8c54719e45c1784f0c21b04f18db2c6ee87d9df08f9dfee5e4050f96eaa07592 - filename: components/BannerNotificationContainer.tsx @@ -302,13 +302,13 @@ fileignoreconfig: - filename: machines/backupAndRestore/backupWithEncryption.typegen.ts checksum: 19ccac58df42ce0b6e36c66592e53441d709713fb1bff64454e0039dd3b0ac97 - filename: injitest/src/main/java/inji/utils/TestDataReader.java - checksum: 02d9ff0873d2f9685c4db6ad41d56eb91a59966feda20d7072ec32da6c2e22fe + checksum: 002870c5c4d400c6d0f63001cd308fea6972a57ad7fef7e21f9ac17909d57a96 - filename: injitest/src/test/java/iosTestCases/UnlockWithPasscodeTest.java checksum: a44dab1127143fa303824068f81a8ee3e7697ace4c38460d5400a0a56fe9ba7d - filename: injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java - checksum: 23bcfd393abb1802d3ecf913dd535e2487a23db7afded1fa0a1fe284513c0fa8 + checksum: 3d9e317d4463e3df61ce135ae9ed2acaef8074cf60d12f672140ab45d59c3df7 - filename: injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingUinTest.java - checksum: fdf6e7b3fc04af16c0c47d2d1d7e051d7cb03e0891d4697e40997932362d06e0 + checksum: a6feabb768e2d97dfb0a1693f09d839686ce6be686523cf273b2d3ce614b34fd - filename: machines/Issuers/IssuersMachine.typegen.ts checksum: 08fd5e4eff836c219a0f16f6d4178a3511ec2581507076d3f9d32dcadbc01351 - filename: injitest/src/test/java/iosTestCases/DeletingVcTest.java @@ -319,33 +319,31 @@ fileignoreconfig: - filename: android/app/src/main/java/io/mosip/residentapp/InjiVciClientModule.java checksum: 17f55840bab193bc353034445ba4fce53e1ce466e95f616c15a1351f8d2f23bc - filename: ios/Inji.xcodeproj/project.pbxproj - checksum: 0a8e851803f826cc392d95d2f88b8c304948697863a528ef756e34c76614940d + checksum: d4ae3df6731b4019fb1fc821c4a886ed378c90151c0e78ad67608bc2067df304 - filename: ios/Inji.xcworkspace/xcshareddata/swiftpm/Package.resolved checksum: ca94b7893a0a9e7f4025675be1adec9e0e28ccc389c2f30a2a0723dec9a8b460 - - filename: ios/Inji.xcodeproj/project.pbxproj - checksum: 0a8e851803f826cc392d95d2f88b8c304948697863a528ef756e34c76614940d - - filename: ios/Inji.xcworkspace/xcshareddata/swiftpm/Package.resolved - checksum: 31f1365526ceaa0f1aae6f2b8cab4e1ab4e798322fc3d6e6a1a74c861ae73850 - - filename: ios/Inji.xcodeproj/project.pbxproj - checksum: 0a8e851803f826cc392d95d2f88b8c304948697863a528ef756e34c76614940d - - filename: ios/Inji.xcworkspace/xcshareddata/swiftpm/Package.resolved - checksum: 31f1365526ceaa0f1aae6f2b8cab4e1ab4e798322fc3d6e6a1a74c861ae73850 - - filename: ios/Inji.xcodeproj/project.pbxproj - checksum: 0a8e851803f826cc392d95d2f88b8c304948697863a528ef756e34c76614940d - - filename: ios/Inji.xcworkspace/xcshareddata/swiftpm/Package.resolved - checksum: 31f1365526ceaa0f1aae6f2b8cab4e1ab4e798322fc3d6e6a1a74c861ae73850 - - filename: screens/HomeScreenLayout.tsx - checksum: 4bf5a896dcbe74afbef3b66a2ab13fa620a3e1d23de5271a795d75a26821e893 - - filename: screens/Home/HomeScreen.tsx - checksum: 4cb4e516acecd5607c675b8d1bb184678fbd86a39255ddd217417f3a037f3090 - - filename: components/ui/Copilot.tsx - checksum: d9f22b5c75112518bf6216605be6ae8a72abfb5a4827cf0a3df773b4866ba290 - - filename: components/VC/Views/VCCardView.tsx - checksum: 0444e4b854ade3ff6f4ca6964a1453b76c31e170748f219599effaa70837f086 + - filename: injitest/src/main/resources/Vids.json + checksum: 8bcffed7a6dd565ae695e1b29de0655e10bd5c5420af2718defd593a687b8817 + - filename: injitest/src/main/java/inji/utils/UpdateNetworkSettings.java + checksum: e249ce3e6b7f47abc183fe5a3637bb39ccb06900ef75b9b2f08426d1535e22aa - filename: App.tsx - checksum: 57584cfe40dfbc9b5818e3f28cf23706e1915c0a3f31b0faf91d30087a19585f - - filename: android/app/src/main/java/io/mosip/residentapp/RNSecureKeystoreModule.java - checksum: f307f8273f72ec70b991baf799ae71f93c785c76e3e15847004f567558340e32 - - filename: machines/VerifiableCredential/VCItemMachine/VCItemServices.ts + checksum: d16d4a40b246abe25a5d2da7ec65163b5756fe8ba9390608a7fc7f8e721b2ed1 + - filename: machines/VerifiableCredential/VCItemMachine/VCItemServices.ts checksum: 46f5b7ad6e6dcd9de9f9872c79d2c07addcd228324a43cca18525f6b1f4ff7cb + - filename: injitest/src/test/java/iosTestCases/ShareVcTest.java + checksum: 1cf9b61d3fcea9b63b2b9f7dffe9b5a1848e196c39f77790b6c9d83f201c6197 + - filename: android/app/src/main/java/io/mosip/residentapp/RNSecureKeystoreModule.java + checksum: f307f8273f72ec70b991baf799ae71f93c785c76e3e15847004f567558340e32 + - filename: injitest/src/test/java/androidTestCases/ShareVcTest.java + checksum: a7e3e579b6ac05f95932638b61272142774d0690c13717c890e87374782ea509 + - filename: ios/RNPixelpassModule.m + checksum: c91348eceec5edbffa03ba03f3f52a8e90ff7f942816c9609080d1647052fd66 + - filename: ios/RNPixelpassModule.swift + checksum: 822a2421798d5c0669f4ab1b983194eb770cbef2aa30bf212d06bd959738c4ca + - filename: injitest/src/test/java/androidTestCases/VerifyHistoryTest.java + checksum: dffc4741b251b42c81d5bdac7d649c02b37bb9045285590b29f86c2d5f526fd1 + - filename: android/app/src/main/java/io/mosip/residentapp/RNPixelpassModule.java + checksum: cef9be4bfafb54e2c885b2459f2819554cad6448b5dc372976706894df704e5d + - filename: android/app/src/main/AndroidManifest.xml + checksum: 8f4bd61770b8bb0a28859ca0f3b4b095aed4e3fb5adef435cb74b9389ff13e09 version: "" diff --git a/App.tsx b/App.tsx index 02d66ca1..45296436 100644 --- a/App.tsx +++ b/App.tsx @@ -26,9 +26,7 @@ import {NativeModules} from 'react-native'; import {isHardwareKeystoreExists} from './shared/cryptoutil/cryptoUtil'; import i18n from './i18n'; import './shared/flipperConfig'; -import * as SplashScreen from 'expo-splash-screen'; -SplashScreen.preventAutoHideAsync(); const {RNSecureKeystoreModule} = NativeModules; // kludge: this is a bad practice but has been done temporarily to surface // an occurrence of a bug with minimal residual code changes, this should @@ -52,13 +50,6 @@ const AppLayoutWrapper: React.FC = () => { const controller = useApp(); const {t} = useTranslation('WelcomeScreen'); - useEffect(() => { - async function hideAppLoading() { - await SplashScreen.hideAsync(); - } - hideAppLoading(); - }, []); - useEffect(() => { if (AppState.currentState === 'active') { appService.send(APP_EVENTS.ACTIVE()); diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7621e587..a5a8d7ff 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ - + diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png deleted file mode 100644 index 74f09d47..00000000 Binary files a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png deleted file mode 100644 index b3c779cd..00000000 Binary files a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png deleted file mode 100644 index f0bc985d..00000000 Binary files a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png deleted file mode 100644 index 8b9628b1..00000000 Binary files a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png deleted file mode 100644 index 11c27057..00000000 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index ca3826a4..00000000 --- a/android/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/res/drawable/splash_image.png b/android/app/src/main/res/drawable/splash_image.png deleted file mode 100644 index ce339f7d..00000000 Binary files a/android/app/src/main/res/drawable/splash_image.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/splashscreen.xml b/android/app/src/main/res/drawable/splashscreen.xml deleted file mode 100644 index 341aa537..00000000 --- a/android/app/src/main/res/drawable/splashscreen.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index b0cbdbeb..723f056f 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -10,7 +10,4 @@ #c8c8c8 @android:color/black - \ No newline at end of file diff --git a/app.config.ts b/app.config.ts index 6b90963c..37ca6bf1 100644 --- a/app.config.ts +++ b/app.config.ts @@ -1,3 +1,10 @@ +import {APPLICATION_THEME} from 'react-native-dotenv'; + +const adaptiveImage = + APPLICATION_THEME?.toLowerCase() === 'purple' + ? '../assets/purpleSplashScreen.png' + : './assets/orangeSplashScreen.png'; + export default { name: 'Inji', slug: 'inji', @@ -5,7 +12,7 @@ export default { orientation: 'portrait', icon: './assets/icon.png', splash: { - image: './assets/splash.png', + image: adaptiveImage, resizeMode: 'cover', backgroundColor: '#ffffff', }, @@ -22,7 +29,7 @@ export default { package: 'io.mosip.residentapp', versionCode: 1, adaptiveIcon: { - foregroundImage: './assets/Adaptive_Icon.png', + foregroundImage: adaptiveImage, backgroundColor: '#FFFFFF', }, }, diff --git a/assets/Info.svg b/assets/Info.svg index 62338917..db2b1aa0 100644 --- a/assets/Info.svg +++ b/assets/Info.svg @@ -1,4 +1,9 @@ - - - + + + + + + + + diff --git a/assets/Inji_Home_Logo.svg b/assets/Inji_Home_Logo.svg new file mode 100644 index 00000000..b4f14395 --- /dev/null +++ b/assets/Inji_Home_Logo.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/Inji_Home_Logo1.svg b/assets/Inji_Home_Logo1.svg deleted file mode 100644 index 3bcf3ac7..00000000 --- a/assets/Inji_Home_Logo1.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/assets/Inji_Logo.svg b/assets/Inji_Logo.svg index 5bd1e101..dcf33008 100644 --- a/assets/Inji_Logo.svg +++ b/assets/Inji_Logo.svg @@ -1,16 +1,12 @@ - + - - - - - - - + + + + - + + + + diff --git a/assets/Intro_Backup.png b/assets/Intro_Backup.png index dd36833c..cdc08edf 100644 Binary files a/assets/Intro_Backup.png and b/assets/Intro_Backup.png differ diff --git a/assets/Intro_Secure_Sharing.png b/assets/Intro_Secure_Sharing.png index f635f8da..94ed10c3 100644 Binary files a/assets/Intro_Secure_Sharing.png and b/assets/Intro_Secure_Sharing.png differ diff --git a/assets/Intro_Share.png b/assets/Intro_Share.png index 7c4cefd4..da3539f7 100644 Binary files a/assets/Intro_Share.png and b/assets/Intro_Share.png differ diff --git a/assets/Intro_Unlock.png b/assets/Intro_Unlock.png index 5e52fdc8..64c28fb0 100644 Binary files a/assets/Intro_Unlock.png and b/assets/Intro_Unlock.png differ diff --git a/assets/Intro_Wallet.png b/assets/Intro_Wallet.png index fa59b5de..95015908 100644 Binary files a/assets/Intro_Wallet.png and b/assets/Intro_Wallet.png differ diff --git a/assets/orangeSplashScreen.png b/assets/orangeSplashScreen.png new file mode 100644 index 00000000..4e559aad Binary files /dev/null and b/assets/orangeSplashScreen.png differ diff --git a/assets/purpleSplashScreen.png b/assets/purpleSplashScreen.png new file mode 100644 index 00000000..fe194955 Binary files /dev/null and b/assets/purpleSplashScreen.png differ diff --git a/assets/splash.png b/assets/splash.png deleted file mode 100644 index 48c75eb7..00000000 Binary files a/assets/splash.png and /dev/null differ diff --git a/components/QrCodeOverlay.tsx b/components/QrCodeOverlay.tsx index 16a4b9f2..9d9a88e0 100644 --- a/components/QrCodeOverlay.tsx +++ b/components/QrCodeOverlay.tsx @@ -13,7 +13,6 @@ import RNSecureKeyStore, {ACCESSIBLE} from 'react-native-secure-key-store'; import {DEFAULT_ECL} from '../shared/constants'; import {VCMetadata} from '../shared/VCMetadata'; - export const QrCodeOverlay: React.FC = props => { const {RNPixelpassModule} = NativeModules; const {t} = useTranslation('VcDetails'); diff --git a/components/VC/Views/VCCardView.tsx b/components/VC/Views/VCCardView.tsx index b3dfe1ad..f8f318eb 100644 --- a/components/VC/Views/VCCardView.tsx +++ b/components/VC/Views/VCCardView.tsx @@ -76,17 +76,14 @@ export const VCCardView: React.FC = props => { /> ); - const wrapTopCard = props => - props.isTopCard ? ( - - ) : ( - CardViewContent(props) - ); + const wrapTopCard = props => ( + + ); return ( @@ -98,7 +95,7 @@ export const VCCardView: React.FC = props => { ? Theme.Styles.selectedBindedVc : Theme.Styles.closeCardBgContainer }> - {props.isInitialLaunch || controller.isTourGuide + {(props.isInitialLaunch || controller.isTourGuide) && props.isTopCard ? wrapTopCard(props) : CardViewContent(props)} diff --git a/components/ui/svg.tsx b/components/ui/svg.tsx index 8457c697..67beba4d 100644 --- a/components/ui/svg.tsx +++ b/components/ui/svg.tsx @@ -15,13 +15,13 @@ import WalletUnActivatedIcon from '../../assets/Wallet_UnActivated_Icon.svg'; import WalletUnActivatedLargeIcon from '../../assets/Wallet_UnActivated_Large_Icon.svg'; import InjiSmallLogo from '../../assets/Inji_Logo.svg'; import LockIcon from '../../assets/Lock_Icon1.svg'; -import InjiLogo from '../../assets/Inji_Home_Logo1.svg'; +import InjiLogo from '../../assets/Inji_Home_Logo.svg'; import DigitalIdentity from '../../assets/Digital_Identity_Icon1.svg'; import ReceiveCard from '../../assets/Receive_Card.svg'; import ReceivedCards from '../../assets/Received_Cards.svg'; import ProgressIcon from '../../assets/Progress_Icon1.svg'; import testIDProps from '../../shared/commonUtil'; -import Logo from '../../assets/Mosip_Logo1.svg'; +import Logo from '../../assets/Inji_Logo'; import WarningLogo from '../../assets/Warning_Icon.svg'; import OtpVerificationIcon from '../../assets/Otp_Verification_Icon.svg'; import FlipCameraIcon from '../../assets/Flip_Camera_Icon.svg'; @@ -253,11 +253,13 @@ export class SvgImage { ); } - static InjiLogo() { + static InjiLogo(props: LogoProps) { return ( ); } diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts index 2b4f3749..6b645c20 100644 --- a/components/ui/themes/DefaultTheme.ts +++ b/components/ui/themes/DefaultTheme.ts @@ -389,8 +389,12 @@ export const DefaultTheme = { justifyContent: 'space-between', }, welcomeLogo: { - width: 160.441, - height: 173.276, + width: 185, + height: 71, + }, + injiLogo: { + width: 105, + height: 40, }, logo: { height: 35, diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts index 2fbdcc57..8efb35a8 100644 --- a/components/ui/themes/PurpleTheme.ts +++ b/components/ui/themes/PurpleTheme.ts @@ -394,8 +394,12 @@ export const PurpleTheme = { justifyContent: 'space-between', }, welcomeLogo: { - width: 160.441, - height: 173.276, + width: 185, + height: 71, + }, + injiLogo: { + width: 105, + height: 40, }, logo: { height: 35, diff --git a/injitest/androidConfig.yml b/injitest/androidConfig.yml index 442b01f9..1a28a5d8 100644 --- a/injitest/androidConfig.yml +++ b/injitest/androidConfig.yml @@ -43,15 +43,7 @@ platforms: - platformName: android deviceName: OnePlus 9 platformVersion: 11.0 - - platformName: android - deviceName: Xiaomi Redmi Note 11 - platformVersion: 11.0 - - platformName: android - deviceName: Samsung Galaxy S21 - platformVersion: 12.0 - - platformName: android - deviceName: Motorola Moto G71 5G - platformVersion: 11.0 + # ======================= # Parallels per Platform @@ -62,7 +54,7 @@ platforms: # Example 1 - If you have configured 3 platforms and set `parallelsPerPlatform` as 2, a total of 6 (2 * 3) parallel threads will be used on BrowserStack # # Example 2 - If you have configured 1 platform and set `parallelsPerPlatform` as 5, a total of 5 (1 * 5) parallel threads will be used on BrowserStack -parallelsPerPlatform: 1 +parallelsPerPlatform: 2 source: java:appium-intellij:v1.1.4 diff --git a/injitest/androidRegression.xml b/injitest/androidRegression.xml index d5db78fa..0257ed30 100644 --- a/injitest/androidRegression.xml +++ b/injitest/androidRegression.xml @@ -13,11 +13,7 @@ - - - - @@ -27,42 +23,29 @@ - - - - + + + + + - - - - - - - - - - - - - - @@ -71,19 +54,11 @@ - - - - - - - - @@ -97,6 +72,7 @@ + @@ -134,26 +110,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -161,13 +117,8 @@ - - - - - @@ -181,3 +132,190 @@ + + diff --git a/injitest/androidSanity.xml b/injitest/androidSanity.xml index e7741baa..b76b8ac9 100644 --- a/injitest/androidSanity.xml +++ b/injitest/androidSanity.xml @@ -1,6 +1,6 @@ - + @@ -12,25 +12,9 @@ - - - - - - - - - - - - - - - - - + @@ -40,11 +24,62 @@ - - + + + + + + diff --git a/injitest/iosConfig.yml b/injitest/iosConfig.yml index 1143db19..0601b08d 100644 --- a/injitest/iosConfig.yml +++ b/injitest/iosConfig.yml @@ -37,21 +37,13 @@ app: bs://0e29daf05319be0da00ca11b0acdd385cacaae78 # BrowserStack Sample App # Platforms object contains all the browser / device combinations you want to test on. # Entire list available here -> (https://www.browserstack.com/list-of-browsers-and-platforms/automate) platforms: - - platformName: ios - deviceName: iPhone 14 Pro Max - platformVersion: 16 - platformName: ios deviceName: iPhone 13 Pro platformVersion: 15 - platformName: ios deviceName: iPhone 11 platformVersion: 14 - - platformName: ios - deviceName: iPhone 15 Pro - platformVersion: 17 - - platformName: ios - deviceName: iPhone 12 Pro Max - platformVersion: 14 + - # ======================= # Parallels per Platform # ======================= @@ -61,7 +53,7 @@ platforms: # Example 1 - If you have configured 3 platforms and set `parallelsPerPlatform` as 2, a total of 6 (2 * 3) parallel threads will be used on BrowserStack # # Example 2 - If you have configured 1 platform and set `parallelsPerPlatform` as 5, a total of 5 (1 * 5) parallel threads will be used on BrowserStack -parallelsPerPlatform: 1 +parallelsPerPlatform: 2 source: java:appium-intellij:v1.1.4 diff --git a/injitest/iosRegression.xml b/injitest/iosRegression.xml index 8afb3784..e808c7d7 100644 --- a/injitest/iosRegression.xml +++ b/injitest/iosRegression.xml @@ -13,11 +13,7 @@ - - - - @@ -27,66 +23,47 @@ - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + @@ -109,26 +86,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -136,10 +93,6 @@ - - - - @@ -157,3 +110,161 @@ + + diff --git a/injitest/iosSanity.xml b/injitest/iosSanity.xml index bfaa1ed1..f95c7370 100644 --- a/injitest/iosSanity.xml +++ b/injitest/iosSanity.xml @@ -1,36 +1,20 @@ - + - + - - - - - - - - - - - - - - - - - + @@ -40,10 +24,58 @@ - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/injitest/src/main/java/inji/pages/EsignetLoginPage.java b/injitest/src/main/java/inji/pages/EsignetLoginPage.java index 620df9c5..dda71ea5 100644 --- a/injitest/src/main/java/inji/pages/EsignetLoginPage.java +++ b/injitest/src/main/java/inji/pages/EsignetLoginPage.java @@ -29,7 +29,7 @@ public class EsignetLoginPage extends BasePage { private WebElement enterYourVidTextHeader; @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.EditText\").instance(0)") - @iOSXCUITFindBy(accessibility = "Please fill in this field") + @iOSXCUITFindBy(className = "XCUIElementTypeTextField") private WebElement enterIdTextBox; @AndroidFindBy(xpath = "//android.widget.Button[@text=\"Get OTP\"]") @@ -64,17 +64,25 @@ public class EsignetLoginPage extends BasePage { private WebElement invalidOtpText; @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.TextView\").instance(1)") + @iOSXCUITFindBy(xpath = "(//XCUIElementTypeStaticText)[5]") private WebElement loginTextHeader; @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.TextView\").instance(2)") + @iOSXCUITFindBy(xpath = "(//XCUIElementTypeStaticText)[6]") private WebElement pleaseEnterUinHeaderText; @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.TextView\").instance(5)") + @iOSXCUITFindBy(xpath = "(//XCUIElementTypeStaticText)[9]") private WebElement dontHaveAccountText; @AndroidFindBy(uiAutomator = "UiSelector().className(\"android.widget.TextView\").instance(6)") + @iOSXCUITFindBy(xpath = "(//XCUIElementTypeStaticText)[10]") private WebElement signUpwithUnifiedLoginText; + @AndroidFindBy(accessibility = "Close tab") + @iOSXCUITFindBy(xpath ="//XCUIElementTypeButton[@name=\"Cancel\"]") + private WebElement CloseTab; + public EsignetLoginPage(AppiumDriver driver) { @@ -117,8 +125,6 @@ public class EsignetLoginPage extends BasePage { return new OtpVerificationPage(driver); } - - public boolean isEnterYourVidTextDisplayed() { return this.isElementDisplayed(enterYourVidTextHeader); } @@ -151,18 +157,34 @@ public class EsignetLoginPage extends BasePage { case "English": boolean isEnglishMatch = (actualText.equalsIgnoreCase("Please fill in this field")==true) ? true : false; return isEnglishMatch ; + case "EnglishIos": + boolean isEnglishMatchIos = (actualText.equalsIgnoreCase("Enter Your UIN or VID")==true) ? true : false; + return isEnglishMatchIos ; case "Tamil": boolean isTamilMatch = (actualText.equalsIgnoreCase("இந்த புலத்தை நிரப்பவும்")==true) ? true : false; return isTamilMatch ; + case "TamilIos": + boolean isTamilMatchIos = (actualText.equalsIgnoreCase("உங்கள் UIN அல்லது VID ஐ உள்ளிடவும்")==true) ? true : false; + System.out.println(actualText); + return isTamilMatchIos; case "Kannada": boolean isKannadaMatch = (actualText.equalsIgnoreCase("ದಯವಿಟ್ಟು ಈ ಕ್ಷೇತ್ರವನ್ನು ಭರ್ತಿ ಮಾಡಿ")==true) ? true : false; return isKannadaMatch ; + case "KannadaIos": + boolean isKannadaMatchIos = (actualText.equalsIgnoreCase("ನಿಮ್ಮ UIN ಅಥವಾ VID ನಮೂದಿಸಿ")==true) ? true : false; + return isKannadaMatchIos ; case "Hindi": boolean isHindiMatch = (actualText.equalsIgnoreCase("कृपया इस क्षेत्र को भरें")==true) ? true : false; return isHindiMatch ; + case "HindiIos": + boolean isHindiMatchIos = (actualText.equalsIgnoreCase("अपना यूआईएन या वीआईडी \u200B\u200Bदर्ज करें")==true) ? true : false; + return isHindiMatchIos ; case "Arabic": boolean isArabicMatch = (actualText.equalsIgnoreCase("يرجى ملء هذا الحقل")==true) ? true : false; return isArabicMatch ; + case "ArabicIos": + boolean isArabicMatchIos = (actualText.equalsIgnoreCase("أدخل رقم UIN أو VID الخاص بك")==true) ? true : false; + return isArabicMatchIos ; } return false; @@ -182,10 +204,13 @@ public class EsignetLoginPage extends BasePage { boolean isKannadaMatch = (actualText.equalsIgnoreCase("ಇಸಿಗ್ನೆಟ್ ಮೂಲಕ ಲಾಗಿನ್ ಮಾಡಿ")==true) ? true : false; return isKannadaMatch ; case "Hindi": - boolean isHindiMatch = (actualText.equalsIgnoreCase("कृपया इस क्षेत्र को भरें")==true) ? true : false; + boolean isHindiMatch = (actualText.equalsIgnoreCase("ईसिग्नेट से लॉगिन करें")==true) ? true : false; return isHindiMatch ; + case "HindiIos": + boolean isHindiMatchIos = (actualText.equalsIgnoreCase("ईसिग्नेट से लॉगिन करें")==true) ? true : false; + return isHindiMatchIos ; case "Arabic": - boolean isArabicMatch = (actualText.equalsIgnoreCase("يرجى ملء هذا الحقل")==true) ? true : false; + boolean isArabicMatch = (actualText.equalsIgnoreCase("تسجيل الدخول باستخدام eSignet")==true) ? true : false; return isArabicMatch ; } return false; @@ -201,14 +226,20 @@ public class EsignetLoginPage extends BasePage { case "Tamil": boolean isTamilMatch = (actualText.equalsIgnoreCase("உங்கள் UIN/VIDஐ உள்ளிடவும்")==true) ? true : false; return isTamilMatch ; + case "TamilIos": + boolean isTamilMatchIos = (actualText.equalsIgnoreCase("உங்கள் UIN/VIDஐ உள்ளிடவும்")==true) ? true : false; + return isTamilMatchIos ; case "Kannada": boolean isKannadaMatch = (actualText.equalsIgnoreCase("ದಯವಿಟ್ಟು ನಿಮ್ಮ UIN/VID ಅನ್ನು ನಮೂದಿಸಿ")==true) ? true : false; return isKannadaMatch ; case "Hindi": boolean isHindiMatch = (actualText.equalsIgnoreCase("कृपया अपना यूआईएन/वीआईडी \u200B\u200Bदर्ज करें")==true) ? true : false; return isHindiMatch ; + case "HindiIos": + boolean isHindiMatchIos = (actualText.equalsIgnoreCase("अपना यूआईएन या वीआईडी \u200B\u200Bदर्ज करें")==true) ? true : false; + return isHindiMatchIos ; case "Arabic": - boolean isArabicMatch = (actualText.equalsIgnoreCase("يرجى ملء هذا الحقل")==true) ? true : false; + boolean isArabicMatch = (actualText.equalsIgnoreCase("الرجاء إدخال UIN/VID الخاص بك")==true) ? true : false; return isArabicMatch ; } return false; @@ -259,4 +290,13 @@ public class EsignetLoginPage extends BasePage { } return false; } + + public void clickOnCloseButton() { + clickOnElement(CloseTab); + } + + public String getText(){ + System.out.println(getTextFromLocator(enterIdTextBox)); + return getTextFromLocator(enterIdTextBox); + } } diff --git a/injitest/src/main/java/inji/pages/MoreOptionsPage.java b/injitest/src/main/java/inji/pages/MoreOptionsPage.java index 88d8e2cd..94fe7036 100644 --- a/injitest/src/main/java/inji/pages/MoreOptionsPage.java +++ b/injitest/src/main/java/inji/pages/MoreOptionsPage.java @@ -91,7 +91,9 @@ public class MoreOptionsPage extends BasePage { } public HomePage clickOnCloseButton() { - clickOnElement(closeButton); + if(isElementDisplayed(closeButton)) { + clickOnElement(closeButton); + } return new HomePage(driver); } diff --git a/injitest/src/main/java/inji/pages/SettingsPage.java b/injitest/src/main/java/inji/pages/SettingsPage.java index ed2d9df1..65b3fd70 100644 --- a/injitest/src/main/java/inji/pages/SettingsPage.java +++ b/injitest/src/main/java/inji/pages/SettingsPage.java @@ -33,6 +33,10 @@ public class SettingsPage extends BasePage { @AndroidFindBy(accessibility = "fil") @iOSXCUITFindBy(accessibility = "fil") private WebElement filipinoLanguageButton; + + @AndroidFindBy(accessibility = "en") + @iOSXCUITFindBy(accessibility = "en") + private WebElement englishLanguageButton; @AndroidFindBy(accessibility = "hi") @iOSXCUITFindBy(accessibility = "hi") @@ -119,7 +123,9 @@ public class SettingsPage extends BasePage { return this; } - + public void clickOnEnglishLanguage() { + clickOnElement(englishLanguageButton); + } public void clickOnFilipinoLanguage() { clickOnElement(filipinoLanguageButton); diff --git a/injitest/src/main/java/inji/pages/SharePage.java b/injitest/src/main/java/inji/pages/SharePage.java index b7051ae2..32ee9e92 100644 --- a/injitest/src/main/java/inji/pages/SharePage.java +++ b/injitest/src/main/java/inji/pages/SharePage.java @@ -69,6 +69,22 @@ public class SharePage extends BasePage { @AndroidFindBy(xpath = "//android.widget.TextView[@resource-id=\"close\"]") private WebElement closePopupButton; + @AndroidFindBy(xpath = "//android.widget.Button[@resource-id=\"com.android.permissioncontroller:id/permission_deny_button\"]") + @iOSXCUITFindBy(accessibility = "Don’t Allow") + private WebElement cameraDontAllAccessPopup; + + @AndroidFindBy(accessibility = "holdPhoneSteadyMessage") + @iOSXCUITFindBy(accessibility = "cameraAccessDisabled") + private WebElement CameraDisabledToaster; + + @AndroidFindBy(xpath = "//android.widget.TextView[@resource-id=\"close\"]") + @iOSXCUITFindBy(accessibility = "close") + private WebElement CameraDisabledToasterClose; + + @AndroidFindBy(accessibility = "sharingStatusTitle") + @iOSXCUITFindBy(accessibility = "sharingStatusTitle") + private WebElement CameraAccessLostPage; + public SharePage(AppiumDriver driver) { super(driver); @@ -170,4 +186,21 @@ public class SharePage extends BasePage { clickOnElement(gallaryAccessPopup); } + public boolean isCameraDisabledToasterLoaded() { + return isElementDisplayed(CameraDisabledToaster); + } + + public void clickOnCameraDisabledToasterClose(){ + if(isElementDisplayed(CameraDisabledToasterClose)) + clickOnElement(CameraDisabledToasterClose); + } + + public void clickOnDontAllowCameraAccessButton(){ + if(isElementDisplayed(cameraDontAllAccessPopup)) + clickOnElement(cameraDontAllAccessPopup); + } + + public boolean isCameraAccessLostPageLoaded() { + return isElementDisplayed(CameraAccessLostPage); + } } diff --git a/injitest/src/test/java/androidTestCases/ActivateVcTest.java b/injitest/src/test/java/androidTestCases/ActivateVcTest.java index d60c9127..e7529c80 100644 --- a/injitest/src/test/java/androidTestCases/ActivateVcTest.java +++ b/injitest/src/test/java/androidTestCases/ActivateVcTest.java @@ -257,10 +257,9 @@ public class ActivateVcTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); +// assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); - addNewCardPage.sendTextInIssuerSearchBar("Download MOSIP Credentials"); +// addNewCardPage.sendTextInIssuerSearchBar("Download MOSIP Credentials"); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); assertTrue(addNewCardPage.isAddNewCardPageGuideMessageForEsignetDisplayed(), "Verify if add new card guide message displayed"); assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(), "Verify if download via uin displayed"); diff --git a/injitest/src/test/java/androidTestCases/ChangeLanguageTest.java b/injitest/src/test/java/androidTestCases/ChangeLanguageTest.java index f826fbd0..de4c391d 100644 --- a/injitest/src/test/java/androidTestCases/ChangeLanguageTest.java +++ b/injitest/src/test/java/androidTestCases/ChangeLanguageTest.java @@ -506,7 +506,6 @@ public class ChangeLanguageTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); //addNewCardPage.sendTextInIssuerSearchBar("Download Sunbird Credentials"); @@ -599,4 +598,268 @@ public class ChangeLanguageTest extends AndroidBaseTest { assertEquals(homePage.GetActivationPendingHeaderText(), "التنشيط معلق لتسجيل الدخول عبر الإنترنت!"); } + @Test + public void changeLanguageToHindiAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnHindiLanguage(); + + assertTrue(settingsPage.verifyHindiLanguage(), "Verify if language is changed to hindi"); + homePage.clickOnHomeButton(); + + assertEquals(homePage.verifyLanguageForNoVCDownloadedPageLoaded(),"अपनी डिजिटल आईडी लाओ"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + assertEquals(addNewCardPage.verifyLanguageForAddNewCardGuideMessage(),"नया कार्ड जोड़ने के लिए कृपया नीचे दिए गए विकल्पों में से अपना पसंदीदा जारीकर्ता चुनें।"); + assertTrue(addNewCardPage.isIssuerSearchBarDisplayedInHindi(),"verify if search bar is displayed in hindi"); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Hindi"),"verify if enter uin or vid text hindi"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Hindi"),"verify login text in hindi"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Hindi"),"verify if enter uin/vid header in hindi"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Hindi"),"verify if dont have account text in hindi"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Hindi"),"verify if signup with unified login hindi"); + } + + @Test + public void changeLanguageToTamilAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnTamilLanguage(); + + assertTrue(settingsPage.verifyTamilLanguage(), "Verify if language is changed to tamil"); + homePage.clickOnHomeButton(); + + AddNewCardPage addNewCardPage = homePage.downloadCard(); + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Tamil"),"verify if search bar is displayed in tamil"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Tamil"),"verify if search bar is displayed in tamil"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Tamil"),"verify if search bar is displayed in tamil"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Tamil"),"verify if search bar is displayed in tamil"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Tamil"),"verify if search bar is displayed in tamil"); + } + + @Test + public void changeLanguageToKannadaAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnKannadaLanguage(); + + assertTrue(settingsPage.verifyKannadaLanguage(), "Verify if language is changed to Kannada"); + homePage.clickOnHomeButton(); + + AddNewCardPage addNewCardPage = homePage.downloadCard(); + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + } + + @Test + public void changeLanguageToArabicAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnArabicLanguageButton(); + + UnlockApplicationPage unlockApplicationPage = new UnlockApplicationPage(driver); + assertTrue(unlockApplicationPage.isUnlockApplicationPageLoadedInArabic(), "Verify if language is changed to arabic"); + unlockApplicationPage.clickOnUnlockApplicationButton(); + setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + homePage.clickOnHomeButton(); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Arabic"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Arabic"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Arabic"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Arabic"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Arabic"),"verify if search bar is displayed in Kannada"); + } + + @Test + public void changeLanguageToFillipineAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnKannadaLanguage(); + + assertTrue(settingsPage.verifyKannadaLanguage(), "Verify if language is changed to Kannada"); + homePage.clickOnHomeButton(); + + AddNewCardPage addNewCardPage = homePage.downloadCard(); + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + + esignetLoginPage.clickOnCloseButton(); + addNewCardPage.clickOnBack(); + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + + homePage.clickOnSettingIcon(); + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnFilipinoLanguage(); + + homePage.clickOnHomeButton(); + homePage.downloadCard(); + addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + } + + @Test + public void changeLanguageFromKannadaToEnglishAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnKannadaLanguage(); + + assertTrue(settingsPage.verifyKannadaLanguage(), "Verify if language is changed to Kannada"); + homePage.clickOnHomeButton(); + + AddNewCardPage addNewCardPage = homePage.downloadCard(); + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + + esignetLoginPage.clickOnCloseButton(); + addNewCardPage.clickOnBack(); + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + + homePage.clickOnSettingIcon(); + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnEnglishLanguage(); + + homePage.clickOnHomeButton(); + homePage.downloadCard(); + addNewCardPage.clickOnDownloadViaEsignet(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("English"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("English"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("English"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("English"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("English"),"verify if search bar is displayed in Kannada"); + } + } diff --git a/injitest/src/test/java/androidTestCases/DeletingVcTest.java b/injitest/src/test/java/androidTestCases/DeletingVcTest.java index 0711f041..d22fcf6f 100644 --- a/injitest/src/test/java/androidTestCases/DeletingVcTest.java +++ b/injitest/src/test/java/androidTestCases/DeletingVcTest.java @@ -197,10 +197,9 @@ public class DeletingVcTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); +// assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); - addNewCardPage.sendTextInIssuerSearchBar("Download MOSIP Credentials"); +// addNewCardPage.sendTextInIssuerSearchBar("Download MOSIP Credentials"); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); assertTrue(addNewCardPage.isAddNewCardPageGuideMessageForEsignetDisplayed(), "Verify if add new card guide message displayed"); assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(), "Verify if download via uin displayed"); @@ -261,7 +260,6 @@ public class DeletingVcTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); diff --git a/injitest/src/test/java/androidTestCases/ShareVcTest.java b/injitest/src/test/java/androidTestCases/ShareVcTest.java index 10821218..28ec60e2 100644 --- a/injitest/src/test/java/androidTestCases/ShareVcTest.java +++ b/injitest/src/test/java/androidTestCases/ShareVcTest.java @@ -111,4 +111,56 @@ public class ShareVcTest extends AndroidBaseTest { assertTrue(SharePage.isFlipCameraClickable(),"Verify if flip camera is enabled"); } + @Test + public void rejectingCameraAccessesOnShareScreen() throws InterruptedException { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.ANDROID); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + + esignetLoginPage.clickOnEsignetLoginWithOtpButton(); + + assertTrue(esignetLoginPage.isEnterYourVidTextDisplayed(), "Verify if enter your vid text is displayed"); + String uin=TestDataReader.readData("uin"); + OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(uin); + + esignetLoginPage.clickOnGetOtpButton(); + assertTrue(esignetLoginPage.isOtpHasSendMessageDisplayed(),"verify if otp page is displayed"); + + otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.ANDROID); + esignetLoginPage.clickOnVerifyButton(); + + assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed"); + + SharePage SharePage = homePage.clickOnShareButton(); + + SharePage.clickOnAllowLocationPopupButton(); + SharePage.acceptPermissionPopupBluetooth(); + + SharePage.clickOnDontAllowCameraAccessButton(); + + assertTrue(SharePage.isCameraDisabledToasterLoaded(), "Verify camera disabled toaster displayed"); + SharePage.clickOnCameraDisabledToasterClose(); + assertTrue(SharePage.isCameraAccessLostPageLoaded(), "Verify Proper error message is shown"); + } + } diff --git a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java index 1b5e8316..f12be214 100644 --- a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java +++ b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingEsignetTest.java @@ -34,10 +34,9 @@ public class VcDownloadAndVerifyUsingEsignetTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); - addNewCardPage.sendTextInIssuerSearchBar("Download MOSIP Credentials"); +// addNewCardPage.sendTextInIssuerSearchBar("Download MOSIP Credentials"); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); assertTrue(addNewCardPage.isAddNewCardPageGuideMessageForEsignetDisplayed(), "Verify if add new card guide message displayed"); assertTrue(addNewCardPage.isDownloadViaEsignetDisplayed(), "Verify if download via uin displayed"); diff --git a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingSunbirdTest.java b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingSunbirdTest.java index 9e6fffe4..f0c56d5d 100644 --- a/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingSunbirdTest.java +++ b/injitest/src/test/java/androidTestCases/VcDownloadAndVerifyUsingSunbirdTest.java @@ -33,7 +33,6 @@ public class VcDownloadAndVerifyUsingSunbirdTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); diff --git a/injitest/src/test/java/androidTestCases/VerifyHistoryTest.java b/injitest/src/test/java/androidTestCases/VerifyHistoryTest.java index eda066f5..791e7cdc 100644 --- a/injitest/src/test/java/androidTestCases/VerifyHistoryTest.java +++ b/injitest/src/test/java/androidTestCases/VerifyHistoryTest.java @@ -372,7 +372,6 @@ public class VerifyHistoryTest extends AndroidBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); diff --git a/injitest/src/test/java/iosTestCases/ChangeLanguageTest.java b/injitest/src/test/java/iosTestCases/ChangeLanguageTest.java index 2e8671ce..739a38a6 100644 --- a/injitest/src/test/java/iosTestCases/ChangeLanguageTest.java +++ b/injitest/src/test/java/iosTestCases/ChangeLanguageTest.java @@ -163,7 +163,7 @@ public class ChangeLanguageTest extends IosBaseTest { assertTrue(addNewCardPage.isIssuerSearchBarDisplayedInFilipino(),"verify if search bar is displayed in filipino"); addNewCardPage.sendTextInIssuerSearchBar("I-download ang Mga Kredensyal ng MOSIP "); - assertTrue(addNewCardPage.isDownloadViaUinDisplayed(),"verify if download via uin vid aid"); +// assertTrue(addNewCardPage.isDownloadViaUinDisplayed(),"verify if download via uin vid aid"); addNewCardPage.clickOnBack(); homePage.downloadCard(); @@ -630,6 +630,294 @@ public class ChangeLanguageTest extends IosBaseTest { assertEquals(sunbirdLoginPage.getStatusValueForSunbirdCard(),"वैध"); assertTrue(sunbirdLoginPage.isPolicyExpiresOnValueDisplayed(), "Verify if policy expireson value displayed"); assertTrue(sunbirdLoginPage.isbenefitsValueDisplayed(), "Verify if policy expireson value displayed"); - assertEquals(sunbirdLoginPage.getIdTypeValueForSunbirdCard(),TestDataReader.readData("idTypeSunbird")); + assertEquals(sunbirdLoginPage.getIdTypeValueForSunbirdCard(),TestDataReader.readData("idTypeSunbirdHindi")); + } + + @Test + public void changeLanguageToHindiAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnHindiLanguage(); + + assertTrue(settingsPage.verifyHindiLanguage(), "Verify if language is changed to hindi"); + homePage.clickOnHomeButton(); + + assertEquals(homePage.verifyLanguageForNoVCDownloadedPageLoaded(),"अपनी डिजिटल आईडी लाओ"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + assertEquals(addNewCardPage.verifyLanguageForAddNewCardGuideMessage(),"नया कार्ड जोड़ने के लिए कृपया नीचे दिए गए विकल्पों में से अपना पसंदीदा जारीकर्ता चुनें।"); + assertTrue(addNewCardPage.isIssuerSearchBarDisplayedInHindi(),"verify if search bar is displayed in hindi"); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("HindiIos"),"verify if enter uin or vid text hindi"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("HindiIos"),"verify login text in hindi"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Hindi"),"verify if enter uin/vid header in hindi"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Hindi"),"verify if dont have account text in hindi"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Hindi"),"verify if signup with unified login hindi"); + } + + @Test + public void changeLanguageToTamilAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnTamilLanguage(); + + assertTrue(settingsPage.verifyTamilLanguage(), "Verify if language is changed to tamil"); + homePage.clickOnHomeButton(); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + +// assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("TamilIos"),"verify if enter uin or vid text tamil"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Tamil"),"verify login text in tamil"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Tamil"),"verify if enter uin/vid header in tamil"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Tamil"),"verify if dont have account text in tamil"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Tamil"),"verify if signup with unified login tamil"); + } + + @Test + public void changeLanguageToKannadaAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnKannadaLanguage(); + + assertTrue(settingsPage.verifyKannadaLanguage(), "Verify if language is changed to kannada"); + homePage.clickOnHomeButton(); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("KannadaIos"),"verify if enter uin or vid text kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify login text in kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if enter uin/vid header in kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if dont have account text in kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if signup with unified login kannada"); + } + + @Test + public void changeLanguageToArabicAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnArabicLanguageButton(); + +// assertTrue(settingsPage.(), "Verify if language is changed to Arabic"); + UnlockApplicationPage unlockApplicationPage = new UnlockApplicationPage(driver); + assertTrue(unlockApplicationPage.isUnlockApplicationPageLoadedInArabic(), "Verify if language is changed to arabic"); + unlockApplicationPage.clickOnUnlockApplicationButton(); + setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("ArabicIos"),"verify if enter uin or vid text Arabic"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Arabic"),"verify login text in Arabic"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Arabic"),"verify if enter uin/vid header in Arabic"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Arabic"),"verify if dont have account text in Arabic"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Arabic"),"verify if signup with unified login Arabic"); + } + + @Test + public void changeLanguageToFillpinoAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnKannadaLanguage(); + + assertTrue(settingsPage.verifyKannadaLanguage(), "Verify if language is changed to kannada"); + homePage.clickOnHomeButton(); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("KannadaIos"),"verify if enter uin or vid text kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify login text in kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if enter uin/vid header in kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if dont have account text in kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if signup with unified login kannada"); + + esignetLoginPage.clickOnCloseButton(); + addNewCardPage.clickOnBack(); + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + + homePage.clickOnSettingIcon(); + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnFilipinoLanguage(); + + homePage.clickOnHomeButton(); + homePage.downloadCard(); + addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("KannadaIos"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if search bar is displayed in Kannada"); + } + + @Test + public void changeLanguageToKannadaToEnglishAndVerifyEsignetPage() { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + SettingsPage settingsPage = homePage.clickOnSettingIcon(); + + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnKannadaLanguage(); + + assertTrue(settingsPage.verifyKannadaLanguage(), "Verify if language is changed to kannada"); + homePage.clickOnHomeButton(); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("KannadaIos"),"verify if enter uin or vid text kannada"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("Kannada"),"verify login text in kannada"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("Kannada"),"verify if enter uin/vid header in kannada"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("Kannada"),"verify if dont have account text in kannada"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("Kannada"),"verify if signup with unified login kannada"); + + esignetLoginPage.clickOnCloseButton(); + addNewCardPage.clickOnBack(); + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + + homePage.clickOnSettingIcon(); + assertTrue(settingsPage.isSettingPageLoaded(), "Verify if setting page is displayed"); + settingsPage.clickOnLanguage().clickOnEnglishLanguage(); + + homePage.clickOnHomeButton(); + homePage.downloadCard(); + addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + assertTrue(esignetLoginPage.verifyLanguageEnterUinOrVidBoxTextDisplayed("EnglishIos"),"verify if search bar is displayed in english"); + assertTrue(esignetLoginPage.verifyLanguageLoginHeaderTextDisplayed("English"),"verify if search bar is displayed in english"); + assertTrue(esignetLoginPage.verifyLanguagePleaseEnterUinHeaderTextDisplayed("English"),"verify if search bar is displayed in english"); + assertTrue(esignetLoginPage.verifyLanguageForDontHaveAccountTextDisplayed("English"),"verify if search bar is displayed in english"); + assertTrue(esignetLoginPage.verifyLanguageForSignUpwithUnifiedLoginTextDisplayed("English"),"verify if search bar is displayed in english"); } } diff --git a/injitest/src/test/java/iosTestCases/NoNetworkIosTest.java b/injitest/src/test/java/iosTestCases/NoNetworkIosTest.java index bc820f3b..b6f00058 100644 --- a/injitest/src/test/java/iosTestCases/NoNetworkIosTest.java +++ b/injitest/src/test/java/iosTestCases/NoNetworkIosTest.java @@ -355,7 +355,7 @@ public class NoNetworkIosTest extends IosBaseTest { addNewCardPage.clickOnBack(); homePage.downloadCard(); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); +// assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); addNewCardPage.clickOnDownloadViaUin(); @@ -394,7 +394,7 @@ public class NoNetworkIosTest extends IosBaseTest { addNewCardPage.clickOnBack(); homePage.downloadCard(); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); +// assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); addNewCardPage.clickOnDownloadViaEsignet(); diff --git a/injitest/src/test/java/iosTestCases/ShareVcTest.java b/injitest/src/test/java/iosTestCases/ShareVcTest.java index 7dc64875..cf4274ec 100644 --- a/injitest/src/test/java/iosTestCases/ShareVcTest.java +++ b/injitest/src/test/java/iosTestCases/ShareVcTest.java @@ -62,4 +62,53 @@ public class ShareVcTest extends IosBaseTest { assertTrue(settingsPage.isReceivedCardsPresent(), "Verify if received cards tab is displayed"); } + + @Test + public void rejectingCameraAccessesOnShareScreen() throws InterruptedException { + ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver); + + assertTrue(chooseLanguagePage.isChooseLanguagePageLoaded(), "Verify if choose language page is displayed"); + WelcomePage welcomePage = chooseLanguagePage.clickOnSavePreference(); + + assertTrue(welcomePage.isWelcomePageLoaded(), "Verify if welcome page is loaded"); + AppUnlockMethodPage appUnlockMethodPage = welcomePage.clickOnSkipButton(); + + assertTrue(appUnlockMethodPage.isAppUnlockMethodPageLoaded(), "Verify if app unlocked page is displayed"); + SetPasscode setPasscode = appUnlockMethodPage.clickOnUsePasscode(); + + assertTrue(setPasscode.isSetPassCodePageLoaded(), "Verify if set passcode page is displayed"); + ConfirmPasscode confirmPasscode = setPasscode.enterPasscode(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(confirmPasscode.isConfirmPassCodePageLoaded(), "Verify if confirm passcode page is displayed"); + HomePage homePage = confirmPasscode.enterPasscodeInConfirmPasscodePage(TestDataReader.readData("passcode"), Target.IOS); + + assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed"); + AddNewCardPage addNewCardPage = homePage.downloadCard(); + + assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); + + EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); + addNewCardPage.clickOnContinueButtonInSigninPopupIos(); + + esignetLoginPage.clickOnEsignetLoginWithOtpButton(); + Thread.sleep(9000); + String uin = TestDataReader.readData("uin"); + OtpVerificationPage otpVerification= esignetLoginPage.setEnterIdTextBox(uin); + + esignetLoginPage.clickOnGetOtpButton(); + + otpVerification.enterOtpForEsignet(TestDataReader.readData("otp"), Target.IOS); + esignetLoginPage.clickOnVerifyButtonIos(); + + assertTrue(homePage.isNameDisplayed(TestDataReader.readData("fullName")), "Verify if full name is displayed"); + + SharePage SharePage = homePage.clickOnShareButton(); + + SharePage.acceptPermissionPopupBluetooth(); + SharePage.clickOnDontAllowCameraAccessButton(); + + assertTrue(SharePage.isCameraDisabledToasterLoaded(), "Verify camera disabled toaster displayed"); + SharePage.clickOnCameraDisabledToasterClose(); + assertTrue(SharePage.isCameraAccessLostPageLoaded(), "Verify Proper error message is shown"); + } } \ No newline at end of file diff --git a/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java b/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java index 9bacdcba..cec9935a 100644 --- a/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java +++ b/injitest/src/test/java/iosTestCases/VcDownloadAndVerifyUsingEsignetTest.java @@ -171,7 +171,7 @@ public class VcDownloadAndVerifyUsingEsignetTest extends IosBaseTest { AddNewCardPage addNewCardPage = homePage.downloadCard(); assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed"); - assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); +// assertTrue(addNewCardPage.isIssuerDescriptionMosipDisplayed(), "Verify if issuer description mosip displayed"); assertTrue(addNewCardPage.isIssuerDescriptionEsignetDisplayed(), "Verify if issuer description esignet displayed"); assertTrue(addNewCardPage.isIssuerSearchBarDisplayed(), "Verify if issuer search bar displayed"); EsignetLoginPage esignetLoginPage = addNewCardPage.clickOnDownloadViaEsignet(); diff --git a/ios/Inji/Images.xcassets/Contents.json b/ios/Inji/Images.xcassets/Contents.json index ed285c2e..b4ded435 100644 --- a/ios/Inji/Images.xcassets/Contents.json +++ b/ios/Inji/Images.xcassets/Contents.json @@ -1,6 +1,6 @@ { - "info" : { - "version" : 1, - "author" : "expo" + "info": { + "version": 1, + "author": "expo" } } diff --git a/ios/Inji/Images.xcassets/SplashScreen.imageset/Contents.json b/ios/Inji/Images.xcassets/SplashScreen.imageset/Contents.json deleted file mode 100644 index 2c0dd9b9..00000000 --- a/ios/Inji/Images.xcassets/SplashScreen.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "splash.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "splash@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "splash@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Inji/Images.xcassets/SplashScreen.imageset/splash.png b/ios/Inji/Images.xcassets/SplashScreen.imageset/splash.png deleted file mode 100644 index b3c779cd..00000000 Binary files a/ios/Inji/Images.xcassets/SplashScreen.imageset/splash.png and /dev/null differ diff --git a/ios/Inji/Images.xcassets/SplashScreen.imageset/splash@2x.png b/ios/Inji/Images.xcassets/SplashScreen.imageset/splash@2x.png deleted file mode 100644 index f0bc985d..00000000 Binary files a/ios/Inji/Images.xcassets/SplashScreen.imageset/splash@2x.png and /dev/null differ diff --git a/ios/Inji/Images.xcassets/SplashScreen.imageset/splash@3x.png b/ios/Inji/Images.xcassets/SplashScreen.imageset/splash@3x.png deleted file mode 100644 index 8b9628b1..00000000 Binary files a/ios/Inji/Images.xcassets/SplashScreen.imageset/splash@3x.png and /dev/null differ diff --git a/ios/Inji/Images.xcassets/SplashScreenBackground.imageset/Contents.json b/ios/Inji/Images.xcassets/SplashScreenBackground.imageset/Contents.json deleted file mode 100644 index 3cf84897..00000000 --- a/ios/Inji/Images.xcassets/SplashScreenBackground.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "image.png", - "scale": "1x" - }, - { - "idiom": "universal", - "scale": "2x" - }, - { - "idiom": "universal", - "scale": "3x" - } - ], - "info": { - "version": 1, - "author": "expo" - } -} \ No newline at end of file diff --git a/ios/Inji/Images.xcassets/SplashScreenBackground.imageset/image.png b/ios/Inji/Images.xcassets/SplashScreenBackground.imageset/image.png deleted file mode 100644 index 33ddf20b..00000000 Binary files a/ios/Inji/Images.xcassets/SplashScreenBackground.imageset/image.png and /dev/null differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1b1cd427..66e8172b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -61,10 +61,6 @@ PODS: - ReactCommon/turbomodule/core - ExpoWebBrowser (12.5.0): - ExpoModulesCore - - EXSplashScreen (0.22.0): - - ExpoModulesCore - - RCT-Folly (= 2021.07.22.00) - - React-Core - EXStructuredHeaders (3.3.0) - EXUpdates (0.18.17): - ASN1Decoder (~> 1.8) @@ -556,7 +552,6 @@ DEPENDENCIES: - ExpoLocalization (from `../node_modules/expo-localization/ios`) - ExpoModulesCore (from `../node_modules/expo-modules-core`) - ExpoWebBrowser (from `../node_modules/expo-web-browser/ios`) - - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`) - EXStructuredHeaders (from `../node_modules/expo-structured-headers/ios`) - EXUpdates (from `../node_modules/expo-updates/ios`) - EXUpdatesInterface (from `../node_modules/expo-updates-interface/ios`) @@ -692,8 +687,6 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-modules-core" ExpoWebBrowser: :path: "../node_modules/expo-web-browser/ios" - EXSplashScreen: - :path: "../node_modules/expo-splash-screen/ios" EXStructuredHeaders: :path: "../node_modules/expo-structured-headers/ios" EXUpdates: @@ -855,7 +848,6 @@ SPEC CHECKSUMS: ExpoLocalization: f26cd431ad9ea3533c5b08c4fabd879176a794bb ExpoModulesCore: f0581cd745335dd7a68117f6fedd22b98e2c73f0 ExpoWebBrowser: b6e56949734089d75f758f21cfe93fad02bd828c - EXSplashScreen: 5ed09ea490155ef603d007d9f194c9e04a4b7980 EXStructuredHeaders: 324cc3130571d2696357fafd8be7fd9a0b5fdf6e EXUpdates: 8f03b362414e8f9f0998f8a6d6c9fc00f2a9d2f2 EXUpdatesInterface: 82ed48d417cdcd376c12ca1c2ce390d35500bed6 diff --git a/machines/bleShare/scan/scanActions.ts b/machines/bleShare/scan/scanActions.ts index 2688ba50..6aab8030 100644 --- a/machines/bleShare/scan/scanActions.ts +++ b/machines/bleShare/scan/scanActions.ts @@ -29,7 +29,7 @@ import {ActivityLogEvents} from '../../activityLog'; import {StoreEvents} from '../../store'; import tuvali from '@mosip/tuvali'; import BluetoothStateManager from 'react-native-bluetooth-state-manager'; -import { NativeModules } from 'react-native'; +import {NativeModules} from 'react-native'; const {wallet, EventTypes, VerificationStatus} = tuvali; export const ScanActions = (model: any, QR_LOGIN_REF_ID: any) => { @@ -229,7 +229,9 @@ export const ScanActions = (model: any, QR_LOGIN_REF_ID: any) => { }), setQuickShareData: assign({ quickShareData: (_, event) => - JSON.parse(RNPixelpassModule.decode(event.params.split(DEFAULT_QR_HEADER)[1])), + JSON.parse( + RNPixelpassModule.decode(event.params.split(DEFAULT_QR_HEADER)[1]), + ), }), loadMetaDataToMemory: send( (context: any) => { diff --git a/machines/bleShare/scan/scanMachine.typegen.ts b/machines/bleShare/scan/scanMachine.typegen.ts index 94e01d33..eac4e373 100644 --- a/machines/bleShare/scan/scanMachine.typegen.ts +++ b/machines/bleShare/scan/scanMachine.typegen.ts @@ -1,121 +1,310 @@ +// This file was automatically generated. Edits will be overwritten - // This file was automatically generated. Edits will be overwritten - - export interface Typegen0 { - '@@xstate/typegen': true; - internalEvents: { - "": { type: "" }; -"done.invoke.QrLogin": { type: "done.invoke.QrLogin"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." }; -"done.invoke.scan.checkStorage:invocation[0]": { type: "done.invoke.scan.checkStorage:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." }; -"xstate.after(DESTROY_TIMEOUT)#scan.clearingConnection": { type: "xstate.after(DESTROY_TIMEOUT)#scan.clearingConnection" }; -"xstate.init": { type: "xstate.init" }; - }; - invokeSrcNameMap: { - "checkBluetoothPermission": "done.invoke.scan.checkBluetoothPermission.checking:invocation[0]"; -"checkBluetoothState": "done.invoke.scan.checkBluetoothState.checking:invocation[0]" | "done.invoke.scan.recheckBluetoothState.checking:invocation[0]"; -"checkLocationPermission": "done.invoke.scan.checkingLocationState.checkingPermissionStatus:invocation[0]"; -"checkLocationStatus": "done.invoke.scan.checkingLocationState.checkLocationService:invocation[0]"; -"checkNearByDevicesPermission": "done.invoke.scan.checkNearbyDevicesPermission.checking:invocation[0]"; -"checkStorageAvailability": "done.invoke.scan.checkStorage:invocation[0]"; -"disconnect": "done.invoke.scan.clearingConnection:invocation[0]" | "done.invoke.scan.disconnectDevice:invocation[0]" | "done.invoke.scan.reviewing.disconnect:invocation[0]"; -"monitorConnection": "done.invoke.scan:invocation[0]"; -"requestBluetooth": "done.invoke.scan.checkBluetoothState.requesting:invocation[0]"; -"requestNearByDevicesPermission": "done.invoke.scan.checkNearbyDevicesPermission.requesting:invocation[0]"; -"requestToEnableLocationPermission": "done.invoke.scan.checkingLocationState.requestToEnableLocation:invocation[0]"; -"sendVc": "done.invoke.scan.reviewing.sendingVc:invocation[0]"; -"startConnection": "done.invoke.scan.connecting:invocation[0]"; - }; - missingImplementations: { - actions: "clearUri" | "enableLocation" | "getFaceAuthConsent" | "loadMetaDataToMemory" | "loadVCDataToMemory" | "logFailedVerification" | "logShared" | "openAppPermission" | "openBluetoothSettings" | "refreshVCs" | "registerLoggers" | "removeLoggers" | "resetFaceCaptureBannerStatus" | "resetFlowType" | "resetSelectedVc" | "resetShowQuickShareSuccessBanner" | "sendBLEConnectionErrorEvent" | "sendScanData" | "sendVCShareFlowCancelEndEvent" | "sendVCShareFlowTimeoutEndEvent" | "sendVcShareSuccessEvent" | "sendVcSharingStartEvent" | "setBleError" | "setChildRef" | "setFlowType" | "setLinkCode" | "setQuickShareData" | "setReadyForBluetoothStateCheck" | "setReceiverInfo" | "setSelectedVc" | "setSenderInfo" | "setShareLogTypeUnverified" | "setShareLogTypeVerified" | "setShowFaceAuthConsent" | "setShowQuickShareSuccessBanner" | "setUri" | "storeLoginItem" | "storeShowFaceAuthConsent" | "storingActivityLog" | "updateFaceCaptureBannerStatus" | "updateShowFaceAuthConsent"; - delays: never; - guards: "isFlowTypeMiniViewShare" | "isFlowTypeMiniViewShareWithSelfie" | "isFlowTypeSimpleShare" | "isIOS" | "isMinimumStorageRequiredForAuditEntryReached" | "isOpenIdQr" | "isQrLogin" | "isQuickShare" | "showFaceAuthConsentScreen" | "uptoAndroid11"; - services: "checkBluetoothPermission" | "checkBluetoothState" | "checkLocationPermission" | "checkLocationStatus" | "checkNearByDevicesPermission" | "checkStorageAvailability" | "disconnect" | "monitorConnection" | "requestBluetooth" | "requestNearByDevicesPermission" | "requestToEnableLocationPermission" | "sendVc" | "startConnection"; - }; - eventsCausingActions: { - "clearUri": "STORE_RESPONSE"; -"enableLocation": "ALLOWED" | "LOCATION_REQUEST"; -"getFaceAuthConsent": "DISCONNECT" | "DISMISS" | "xstate.after(DESTROY_TIMEOUT)#scan.clearingConnection"; -"loadMetaDataToMemory": "SCAN"; -"loadVCDataToMemory": "STORE_RESPONSE"; -"logFailedVerification": "FACE_INVALID"; -"logShared": "VC_ACCEPTED"; -"openAppPermission": "GOTO_SETTINGS" | "LOCATION_REQUEST"; -"openBluetoothSettings": "GOTO_SETTINGS"; -"refreshVCs": "STORE_RESPONSE"; -"registerLoggers": "STORE_RESPONSE"; -"removeLoggers": "DISCONNECT" | "DISMISS" | "DISMISS_QUICK_SHARE_BANNER" | "RESET" | "SCREEN_BLUR" | "STORE_RESPONSE" | "xstate.init"; -"resetFaceCaptureBannerStatus": "ACCEPT_REQUEST" | "CLOSE_BANNER"; -"resetFlowType": "DISCONNECT" | "DISMISS" | "DISMISS_QUICK_SHARE_BANNER" | "GOTO_HISTORY" | "RESET" | "SCREEN_BLUR" | "xstate.init"; -"resetSelectedVc": "DISCONNECT" | "DISMISS" | "DISMISS_QUICK_SHARE_BANNER" | "GOTO_HISTORY" | "RESET" | "SCREEN_BLUR" | "xstate.init"; -"resetShowQuickShareSuccessBanner": "DISMISS" | "DISMISS_QUICK_SHARE_BANNER"; -"sendBLEConnectionErrorEvent": "BLE_ERROR"; -"sendScanData": "SCAN"; -"sendVCShareFlowCancelEndEvent": "CANCEL"; -"sendVCShareFlowTimeoutEndEvent": "CANCEL" | "RETRY"; -"sendVcShareSuccessEvent": "VC_ACCEPTED"; -"sendVcSharingStartEvent": "SCAN"; -"setBleError": "BLE_ERROR"; -"setChildRef": "STORE_RESPONSE"; -"setFlowType": "SELECT_VC"; -"setLinkCode": "SCAN"; -"setQuickShareData": "SCAN"; -"setReadyForBluetoothStateCheck": "BLUETOOTH_PERMISSION_ENABLED"; -"setReceiverInfo": "CONNECTED"; -"setSelectedVc": "SELECT_VC"; -"setSenderInfo": "CONNECTED"; -"setShareLogTypeUnverified": "ACCEPT_REQUEST" | "CHECK_FLOW_TYPE"; -"setShareLogTypeVerified": "FACE_VALID"; -"setShowFaceAuthConsent": "FACE_VERIFICATION_CONSENT"; -"setShowQuickShareSuccessBanner": "STORE_RESPONSE"; -"setUri": "SCAN"; -"storeLoginItem": "done.invoke.QrLogin"; -"storeShowFaceAuthConsent": "FACE_VERIFICATION_CONSENT"; -"storingActivityLog": "STORE_RESPONSE"; -"updateFaceCaptureBannerStatus": "FACE_VALID"; -"updateShowFaceAuthConsent": "STORE_RESPONSE"; - }; - eventsCausingDelays: { - "CONNECTION_TIMEOUT": "SCAN"; -"DESTROY_TIMEOUT": "" | "DISMISS" | "LOCATION_ENABLED" | "RETRY"; -"SHARING_TIMEOUT": "ACCEPT_REQUEST" | "CHECK_FLOW_TYPE" | "FACE_VALID"; - }; - eventsCausingGuards: { - "isFlowTypeMiniViewShare": "CHECK_FLOW_TYPE"; -"isFlowTypeMiniViewShareWithSelfie": "CHECK_FLOW_TYPE" | "DISMISS"; -"isFlowTypeSimpleShare": "CANCEL" | "CHECK_FLOW_TYPE" | "DISMISS"; -"isIOS": "BLUETOOTH_STATE_DISABLED" | "START_PERMISSION_CHECK"; -"isMinimumStorageRequiredForAuditEntryReached": "done.invoke.scan.checkStorage:invocation[0]"; -"isOpenIdQr": "SCAN"; -"isQrLogin": "SCAN"; -"isQuickShare": "SCAN"; -"showFaceAuthConsentScreen": "" | "VERIFY_AND_ACCEPT_REQUEST"; -"uptoAndroid11": "" | "START_PERMISSION_CHECK"; - }; - eventsCausingServices: { - "QrLogin": "SCAN"; -"checkBluetoothPermission": "" | "BLUETOOTH_STATE_DISABLED" | "NEARBY_ENABLED" | "START_PERMISSION_CHECK"; -"checkBluetoothState": "" | "APP_ACTIVE"; -"checkLocationPermission": "LOCATION_ENABLED"; -"checkLocationStatus": "" | "APP_ACTIVE" | "LOCATION_REQUEST"; -"checkNearByDevicesPermission": "APP_ACTIVE" | "START_PERMISSION_CHECK"; -"checkStorageAvailability": "RESET" | "SCREEN_FOCUS" | "SELECT_VC"; -"disconnect": "" | "DISMISS" | "LOCATION_ENABLED" | "RETRY" | "SCREEN_BLUR"; -"monitorConnection": "DISMISS" | "SCREEN_BLUR" | "xstate.init"; -"requestBluetooth": "BLUETOOTH_STATE_DISABLED"; -"requestNearByDevicesPermission": "NEARBY_DISABLED"; -"requestToEnableLocationPermission": "LOCATION_DISABLED"; -"sendVc": "ACCEPT_REQUEST" | "CHECK_FLOW_TYPE" | "FACE_VALID"; -"startConnection": "SCAN"; - }; - matchesStates: "bluetoothDenied" | "bluetoothPermissionDenied" | "checkBluetoothPermission" | "checkBluetoothPermission.checking" | "checkBluetoothPermission.enabled" | "checkBluetoothState" | "checkBluetoothState.checking" | "checkBluetoothState.enabled" | "checkBluetoothState.requesting" | "checkFaceAuthConsent" | "checkNearbyDevicesPermission" | "checkNearbyDevicesPermission.checking" | "checkNearbyDevicesPermission.enabled" | "checkNearbyDevicesPermission.requesting" | "checkStorage" | "checkingLocationState" | "checkingLocationState.LocationPermissionRationale" | "checkingLocationState.checkLocationService" | "checkingLocationState.checkingPermissionStatus" | "checkingLocationState.denied" | "checkingLocationState.disabled" | "checkingLocationState.requestToEnableLocation" | "clearingConnection" | "connecting" | "connecting.inProgress" | "connecting.timeout" | "decodeQuickShareData" | "disconnectDevice" | "disconnected" | "findingConnection" | "handlingBleError" | "inactive" | "invalid" | "loadVCS" | "loadVCS.idle" | "loadVCS.navigatingToHome" | "nearByDevicesPermissionDenied" | "recheckBluetoothState" | "recheckBluetoothState.checking" | "recheckBluetoothState.enabled" | "restrictSharingVc" | "reviewing" | "reviewing.accepted" | "reviewing.cancelling" | "reviewing.checkFaceAuthConsentForMiniView" | "reviewing.disconnect" | "reviewing.faceVerificationConsent" | "reviewing.idle" | "reviewing.invalidIdentity" | "reviewing.navigateToHistory" | "reviewing.rejected" | "reviewing.selectingVc" | "reviewing.sendingVc" | "reviewing.sendingVc.inProgress" | "reviewing.sendingVc.sent" | "reviewing.sendingVc.timeout" | "reviewing.verifyingIdentity" | "showQrLogin" | "showQrLogin.idle" | "showQrLogin.navigatingToHistory" | "showQrLogin.storing" | "startPermissionCheck" | { "checkBluetoothPermission"?: "checking" | "enabled"; -"checkBluetoothState"?: "checking" | "enabled" | "requesting"; -"checkNearbyDevicesPermission"?: "checking" | "enabled" | "requesting"; -"checkingLocationState"?: "LocationPermissionRationale" | "checkLocationService" | "checkingPermissionStatus" | "denied" | "disabled" | "requestToEnableLocation"; -"connecting"?: "inProgress" | "timeout"; -"loadVCS"?: "idle" | "navigatingToHome"; -"recheckBluetoothState"?: "checking" | "enabled"; -"reviewing"?: "accepted" | "cancelling" | "checkFaceAuthConsentForMiniView" | "disconnect" | "faceVerificationConsent" | "idle" | "invalidIdentity" | "navigateToHistory" | "rejected" | "selectingVc" | "sendingVc" | "verifyingIdentity" | { "sendingVc"?: "inProgress" | "sent" | "timeout"; }; -"showQrLogin"?: "idle" | "navigatingToHistory" | "storing"; }; - tags: never; - } - \ No newline at end of file +export interface Typegen0 { + '@@xstate/typegen': true; + internalEvents: { + '': {type: ''}; + 'done.invoke.QrLogin': { + type: 'done.invoke.QrLogin'; + data: unknown; + __tip: 'See the XState TS docs to learn how to strongly type this.'; + }; + 'done.invoke.scan.checkStorage:invocation[0]': { + type: 'done.invoke.scan.checkStorage:invocation[0]'; + data: unknown; + __tip: 'See the XState TS docs to learn how to strongly type this.'; + }; + 'xstate.after(DESTROY_TIMEOUT)#scan.clearingConnection': { + type: 'xstate.after(DESTROY_TIMEOUT)#scan.clearingConnection'; + }; + 'xstate.init': {type: 'xstate.init'}; + }; + invokeSrcNameMap: { + checkBluetoothPermission: 'done.invoke.scan.checkBluetoothPermission.checking:invocation[0]'; + checkBluetoothState: + | 'done.invoke.scan.checkBluetoothState.checking:invocation[0]' + | 'done.invoke.scan.recheckBluetoothState.checking:invocation[0]'; + checkLocationPermission: 'done.invoke.scan.checkingLocationState.checkingPermissionStatus:invocation[0]'; + checkLocationStatus: 'done.invoke.scan.checkingLocationState.checkLocationService:invocation[0]'; + checkNearByDevicesPermission: 'done.invoke.scan.checkNearbyDevicesPermission.checking:invocation[0]'; + checkStorageAvailability: 'done.invoke.scan.checkStorage:invocation[0]'; + disconnect: + | 'done.invoke.scan.clearingConnection:invocation[0]' + | 'done.invoke.scan.disconnectDevice:invocation[0]' + | 'done.invoke.scan.reviewing.disconnect:invocation[0]'; + monitorConnection: 'done.invoke.scan:invocation[0]'; + requestBluetooth: 'done.invoke.scan.checkBluetoothState.requesting:invocation[0]'; + requestNearByDevicesPermission: 'done.invoke.scan.checkNearbyDevicesPermission.requesting:invocation[0]'; + requestToEnableLocationPermission: 'done.invoke.scan.checkingLocationState.requestToEnableLocation:invocation[0]'; + sendVc: 'done.invoke.scan.reviewing.sendingVc:invocation[0]'; + startConnection: 'done.invoke.scan.connecting:invocation[0]'; + }; + missingImplementations: { + actions: + | 'clearUri' + | 'enableLocation' + | 'getFaceAuthConsent' + | 'loadMetaDataToMemory' + | 'loadVCDataToMemory' + | 'logFailedVerification' + | 'logShared' + | 'openAppPermission' + | 'openBluetoothSettings' + | 'refreshVCs' + | 'registerLoggers' + | 'removeLoggers' + | 'resetFaceCaptureBannerStatus' + | 'resetFlowType' + | 'resetSelectedVc' + | 'resetShowQuickShareSuccessBanner' + | 'sendBLEConnectionErrorEvent' + | 'sendScanData' + | 'sendVCShareFlowCancelEndEvent' + | 'sendVCShareFlowTimeoutEndEvent' + | 'sendVcShareSuccessEvent' + | 'sendVcSharingStartEvent' + | 'setBleError' + | 'setChildRef' + | 'setFlowType' + | 'setLinkCode' + | 'setQuickShareData' + | 'setReadyForBluetoothStateCheck' + | 'setReceiverInfo' + | 'setSelectedVc' + | 'setSenderInfo' + | 'setShareLogTypeUnverified' + | 'setShareLogTypeVerified' + | 'setShowFaceAuthConsent' + | 'setShowQuickShareSuccessBanner' + | 'setUri' + | 'storeLoginItem' + | 'storeShowFaceAuthConsent' + | 'storingActivityLog' + | 'updateFaceCaptureBannerStatus' + | 'updateShowFaceAuthConsent'; + delays: never; + guards: + | 'isFlowTypeMiniViewShare' + | 'isFlowTypeMiniViewShareWithSelfie' + | 'isFlowTypeSimpleShare' + | 'isIOS' + | 'isMinimumStorageRequiredForAuditEntryReached' + | 'isOpenIdQr' + | 'isQrLogin' + | 'isQuickShare' + | 'showFaceAuthConsentScreen' + | 'uptoAndroid11'; + services: + | 'checkBluetoothPermission' + | 'checkBluetoothState' + | 'checkLocationPermission' + | 'checkLocationStatus' + | 'checkNearByDevicesPermission' + | 'checkStorageAvailability' + | 'disconnect' + | 'monitorConnection' + | 'requestBluetooth' + | 'requestNearByDevicesPermission' + | 'requestToEnableLocationPermission' + | 'sendVc' + | 'startConnection'; + }; + eventsCausingActions: { + clearUri: 'STORE_RESPONSE'; + enableLocation: 'ALLOWED' | 'LOCATION_REQUEST'; + getFaceAuthConsent: + | 'DISCONNECT' + | 'DISMISS' + | 'xstate.after(DESTROY_TIMEOUT)#scan.clearingConnection'; + loadMetaDataToMemory: 'SCAN'; + loadVCDataToMemory: 'STORE_RESPONSE'; + logFailedVerification: 'FACE_INVALID'; + logShared: 'VC_ACCEPTED'; + openAppPermission: 'GOTO_SETTINGS' | 'LOCATION_REQUEST'; + openBluetoothSettings: 'GOTO_SETTINGS'; + refreshVCs: 'STORE_RESPONSE'; + registerLoggers: 'STORE_RESPONSE'; + removeLoggers: + | 'DISCONNECT' + | 'DISMISS' + | 'DISMISS_QUICK_SHARE_BANNER' + | 'RESET' + | 'SCREEN_BLUR' + | 'STORE_RESPONSE' + | 'xstate.init'; + resetFaceCaptureBannerStatus: 'ACCEPT_REQUEST' | 'CLOSE_BANNER'; + resetFlowType: + | 'DISCONNECT' + | 'DISMISS' + | 'DISMISS_QUICK_SHARE_BANNER' + | 'GOTO_HISTORY' + | 'RESET' + | 'SCREEN_BLUR' + | 'xstate.init'; + resetSelectedVc: + | 'DISCONNECT' + | 'DISMISS' + | 'DISMISS_QUICK_SHARE_BANNER' + | 'GOTO_HISTORY' + | 'RESET' + | 'SCREEN_BLUR' + | 'xstate.init'; + resetShowQuickShareSuccessBanner: 'DISMISS' | 'DISMISS_QUICK_SHARE_BANNER'; + sendBLEConnectionErrorEvent: 'BLE_ERROR'; + sendScanData: 'SCAN'; + sendVCShareFlowCancelEndEvent: 'CANCEL'; + sendVCShareFlowTimeoutEndEvent: 'CANCEL' | 'RETRY'; + sendVcShareSuccessEvent: 'VC_ACCEPTED'; + sendVcSharingStartEvent: 'SCAN'; + setBleError: 'BLE_ERROR'; + setChildRef: 'STORE_RESPONSE'; + setFlowType: 'SELECT_VC'; + setLinkCode: 'SCAN'; + setQuickShareData: 'SCAN'; + setReadyForBluetoothStateCheck: 'BLUETOOTH_PERMISSION_ENABLED'; + setReceiverInfo: 'CONNECTED'; + setSelectedVc: 'SELECT_VC'; + setSenderInfo: 'CONNECTED'; + setShareLogTypeUnverified: 'ACCEPT_REQUEST' | 'CHECK_FLOW_TYPE'; + setShareLogTypeVerified: 'FACE_VALID'; + setShowFaceAuthConsent: 'FACE_VERIFICATION_CONSENT'; + setShowQuickShareSuccessBanner: 'STORE_RESPONSE'; + setUri: 'SCAN'; + storeLoginItem: 'done.invoke.QrLogin'; + storeShowFaceAuthConsent: 'FACE_VERIFICATION_CONSENT'; + storingActivityLog: 'STORE_RESPONSE'; + updateFaceCaptureBannerStatus: 'FACE_VALID'; + updateShowFaceAuthConsent: 'STORE_RESPONSE'; + }; + eventsCausingDelays: { + CONNECTION_TIMEOUT: 'SCAN'; + DESTROY_TIMEOUT: '' | 'DISMISS' | 'LOCATION_ENABLED' | 'RETRY'; + SHARING_TIMEOUT: 'ACCEPT_REQUEST' | 'CHECK_FLOW_TYPE' | 'FACE_VALID'; + }; + eventsCausingGuards: { + isFlowTypeMiniViewShare: 'CHECK_FLOW_TYPE'; + isFlowTypeMiniViewShareWithSelfie: 'CHECK_FLOW_TYPE' | 'DISMISS'; + isFlowTypeSimpleShare: 'CANCEL' | 'CHECK_FLOW_TYPE' | 'DISMISS'; + isIOS: 'BLUETOOTH_STATE_DISABLED' | 'START_PERMISSION_CHECK'; + isMinimumStorageRequiredForAuditEntryReached: 'done.invoke.scan.checkStorage:invocation[0]'; + isOpenIdQr: 'SCAN'; + isQrLogin: 'SCAN'; + isQuickShare: 'SCAN'; + showFaceAuthConsentScreen: '' | 'VERIFY_AND_ACCEPT_REQUEST'; + uptoAndroid11: '' | 'START_PERMISSION_CHECK'; + }; + eventsCausingServices: { + QrLogin: 'SCAN'; + checkBluetoothPermission: + | '' + | 'BLUETOOTH_STATE_DISABLED' + | 'NEARBY_ENABLED' + | 'START_PERMISSION_CHECK'; + checkBluetoothState: '' | 'APP_ACTIVE'; + checkLocationPermission: 'LOCATION_ENABLED'; + checkLocationStatus: '' | 'APP_ACTIVE' | 'LOCATION_REQUEST'; + checkNearByDevicesPermission: 'APP_ACTIVE' | 'START_PERMISSION_CHECK'; + checkStorageAvailability: 'RESET' | 'SCREEN_FOCUS' | 'SELECT_VC'; + disconnect: '' | 'DISMISS' | 'LOCATION_ENABLED' | 'RETRY' | 'SCREEN_BLUR'; + monitorConnection: 'DISMISS' | 'SCREEN_BLUR' | 'xstate.init'; + requestBluetooth: 'BLUETOOTH_STATE_DISABLED'; + requestNearByDevicesPermission: 'NEARBY_DISABLED'; + requestToEnableLocationPermission: 'LOCATION_DISABLED'; + sendVc: 'ACCEPT_REQUEST' | 'CHECK_FLOW_TYPE' | 'FACE_VALID'; + startConnection: 'SCAN'; + }; + matchesStates: + | 'bluetoothDenied' + | 'bluetoothPermissionDenied' + | 'checkBluetoothPermission' + | 'checkBluetoothPermission.checking' + | 'checkBluetoothPermission.enabled' + | 'checkBluetoothState' + | 'checkBluetoothState.checking' + | 'checkBluetoothState.enabled' + | 'checkBluetoothState.requesting' + | 'checkFaceAuthConsent' + | 'checkNearbyDevicesPermission' + | 'checkNearbyDevicesPermission.checking' + | 'checkNearbyDevicesPermission.enabled' + | 'checkNearbyDevicesPermission.requesting' + | 'checkStorage' + | 'checkingLocationState' + | 'checkingLocationState.LocationPermissionRationale' + | 'checkingLocationState.checkLocationService' + | 'checkingLocationState.checkingPermissionStatus' + | 'checkingLocationState.denied' + | 'checkingLocationState.disabled' + | 'checkingLocationState.requestToEnableLocation' + | 'clearingConnection' + | 'connecting' + | 'connecting.inProgress' + | 'connecting.timeout' + | 'decodeQuickShareData' + | 'disconnectDevice' + | 'disconnected' + | 'findingConnection' + | 'handlingBleError' + | 'inactive' + | 'invalid' + | 'loadVCS' + | 'loadVCS.idle' + | 'loadVCS.navigatingToHome' + | 'nearByDevicesPermissionDenied' + | 'recheckBluetoothState' + | 'recheckBluetoothState.checking' + | 'recheckBluetoothState.enabled' + | 'restrictSharingVc' + | 'reviewing' + | 'reviewing.accepted' + | 'reviewing.cancelling' + | 'reviewing.checkFaceAuthConsentForMiniView' + | 'reviewing.disconnect' + | 'reviewing.faceVerificationConsent' + | 'reviewing.idle' + | 'reviewing.invalidIdentity' + | 'reviewing.navigateToHistory' + | 'reviewing.rejected' + | 'reviewing.selectingVc' + | 'reviewing.sendingVc' + | 'reviewing.sendingVc.inProgress' + | 'reviewing.sendingVc.sent' + | 'reviewing.sendingVc.timeout' + | 'reviewing.verifyingIdentity' + | 'showQrLogin' + | 'showQrLogin.idle' + | 'showQrLogin.navigatingToHistory' + | 'showQrLogin.storing' + | 'startPermissionCheck' + | { + checkBluetoothPermission?: 'checking' | 'enabled'; + checkBluetoothState?: 'checking' | 'enabled' | 'requesting'; + checkNearbyDevicesPermission?: 'checking' | 'enabled' | 'requesting'; + checkingLocationState?: + | 'LocationPermissionRationale' + | 'checkLocationService' + | 'checkingPermissionStatus' + | 'denied' + | 'disabled' + | 'requestToEnableLocation'; + connecting?: 'inProgress' | 'timeout'; + loadVCS?: 'idle' | 'navigatingToHome'; + recheckBluetoothState?: 'checking' | 'enabled'; + reviewing?: + | 'accepted' + | 'cancelling' + | 'checkFaceAuthConsentForMiniView' + | 'disconnect' + | 'faceVerificationConsent' + | 'idle' + | 'invalidIdentity' + | 'navigateToHistory' + | 'rejected' + | 'selectingVc' + | 'sendingVc' + | 'verifyingIdentity' + | {sendingVc?: 'inProgress' | 'sent' | 'timeout'}; + showQrLogin?: 'idle' | 'navigatingToHistory' | 'storing'; + }; + tags: never; +} diff --git a/package-lock.json b/package-lock.json index 661b93b2..e13cab2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,6 @@ "expo-local-authentication": "~13.3.0", "expo-localization": "~14.1.1", "expo-modules-autolinking": "~1.5.0", - "expo-splash-screen": "^0.22.0", "expo-updates": "^0.18.17", "expo-web-browser": "^12.5.0", "i18next": "^21.6.16", @@ -14362,210 +14361,6 @@ "expo": "*" } }, - "node_modules/expo-splash-screen": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.22.0.tgz", - "integrity": "sha512-+iKesrtp8s3IQDXPgCwI6PZzQwhSGR/LLND1wOux8HrCmtveJQpomKBIdvwTb26GNKZiN1EtiQbnBZhn3EiKaA==", - "dependencies": { - "@expo/prebuild-config": "6.4.0" - }, - "peerDependencies": { - "expo": "*" - } - }, - "node_modules/expo-splash-screen/node_modules/@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/expo-splash-screen/node_modules/@expo/config": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/@expo/config/-/config-8.3.1.tgz", - "integrity": "sha512-5fNGAw5h/MDOc8Ulv9nonafPtOT042B7dF6vrVxSP3CY5qiVu0tCsmbL412wEcrAZ8MY7UMv9e6IzpGTgleYgg==", - "dependencies": { - "@babel/code-frame": "~7.10.4", - "@expo/config-plugins": "~7.5.0", - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/json-file": "^8.2.37", - "getenv": "^1.0.0", - "glob": "7.1.6", - "require-from-string": "^2.0.2", - "resolve-from": "^5.0.0", - "semver": "7.5.3", - "slugify": "^1.3.4", - "sucrase": "^3.20.0" - } - }, - "node_modules/expo-splash-screen/node_modules/@expo/config-plugins": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.4.0.tgz", - "integrity": "sha512-/BwYRl6QQ9ZKYpVaIqHE5sSPqNZI9CUtfLfYHhpnShQUA1KHRMi6y9zjb3IXJisk0/fcrtRm2yP3A7F0l304sQ==", - "dependencies": { - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/json-file": "~8.2.37", - "@expo/plist": "^0.0.20", - "@expo/sdk-runtime-versions": "^1.0.0", - "@react-native/normalize-color": "^2.0.0", - "chalk": "^4.1.2", - "debug": "^4.3.1", - "find-up": "~5.0.0", - "getenv": "^1.0.0", - "glob": "7.1.6", - "resolve-from": "^5.0.0", - "semver": "^7.5.3", - "slash": "^3.0.0", - "xcode": "^3.0.1", - "xml2js": "0.6.0" - } - }, - "node_modules/expo-splash-screen/node_modules/@expo/config-types": { - "version": "50.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-50.0.0-alpha.2.tgz", - "integrity": "sha512-eAUMUg4wnw0bYovs+isibq4l9ssMacS/r0NolDxDdIX/N+ZjIEZ5DEl5GO8dnD0dKbN/DPWwUln7SG/nSYHfmw==" - }, - "node_modules/expo-splash-screen/node_modules/@expo/config/node_modules/@expo/config-plugins": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.5.0.tgz", - "integrity": "sha512-qOKjmgbddLh1vj9ytUT6AduhEans2cHgS42nopVgh5Wz8X+QUvPcCr1Yc8MvLM3OlbswBMCJceeosZa463i0uA==", - "dependencies": { - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/fingerprint": "^0.2.0", - "@expo/json-file": "~8.2.37", - "@expo/plist": "^0.0.20", - "@expo/sdk-runtime-versions": "^1.0.0", - "@react-native/normalize-color": "^2.0.0", - "chalk": "^4.1.2", - "debug": "^4.3.1", - "find-up": "~5.0.0", - "getenv": "^1.0.0", - "glob": "7.1.6", - "resolve-from": "^5.0.0", - "semver": "^7.5.3", - "slash": "^3.0.0", - "xcode": "^3.0.1", - "xml2js": "0.6.0" - } - }, - "node_modules/expo-splash-screen/node_modules/@expo/prebuild-config": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-6.4.0.tgz", - "integrity": "sha512-RjKK7rd2H9P1pTcAcZFUd9tpxCwFNyyrlTdHZWlvZvZnBJWIyUZex7P3q7db7KLJ6UrVPmlM+B7OSc0Mxs4uoQ==", - "dependencies": { - "@expo/config": "~8.3.0", - "@expo/config-plugins": "~7.4.0", - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/image-utils": "0.3.22", - "@expo/json-file": "^8.2.37", - "debug": "^4.3.1", - "fs-extra": "^9.0.0", - "resolve-from": "^5.0.0", - "semver": "7.5.3", - "xml2js": "0.6.0" - }, - "peerDependencies": { - "expo-modules-autolinking": ">=0.8.1" - } - }, - "node_modules/expo-splash-screen/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/expo-splash-screen/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/expo-splash-screen/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/expo-splash-screen/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/expo-splash-screen/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/expo-splash-screen/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/expo-splash-screen/node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/expo-splash-screen/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/expo-structured-headers": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/expo-structured-headers/-/expo-structured-headers-3.3.0.tgz", @@ -40302,175 +40097,6 @@ "base64-js": "^1.3.0" } }, - "expo-splash-screen": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.22.0.tgz", - "integrity": "sha512-+iKesrtp8s3IQDXPgCwI6PZzQwhSGR/LLND1wOux8HrCmtveJQpomKBIdvwTb26GNKZiN1EtiQbnBZhn3EiKaA==", - "requires": { - "@expo/prebuild-config": "6.4.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@expo/config": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/@expo/config/-/config-8.3.1.tgz", - "integrity": "sha512-5fNGAw5h/MDOc8Ulv9nonafPtOT042B7dF6vrVxSP3CY5qiVu0tCsmbL412wEcrAZ8MY7UMv9e6IzpGTgleYgg==", - "requires": { - "@babel/code-frame": "~7.10.4", - "@expo/config-plugins": "~7.5.0", - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/json-file": "^8.2.37", - "getenv": "^1.0.0", - "glob": "7.1.6", - "require-from-string": "^2.0.2", - "resolve-from": "^5.0.0", - "semver": "7.5.3", - "slugify": "^1.3.4", - "sucrase": "^3.20.0" - }, - "dependencies": { - "@expo/config-plugins": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.5.0.tgz", - "integrity": "sha512-qOKjmgbddLh1vj9ytUT6AduhEans2cHgS42nopVgh5Wz8X+QUvPcCr1Yc8MvLM3OlbswBMCJceeosZa463i0uA==", - "requires": { - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/fingerprint": "^0.2.0", - "@expo/json-file": "~8.2.37", - "@expo/plist": "^0.0.20", - "@expo/sdk-runtime-versions": "^1.0.0", - "@react-native/normalize-color": "^2.0.0", - "chalk": "^4.1.2", - "debug": "^4.3.1", - "find-up": "~5.0.0", - "getenv": "^1.0.0", - "glob": "7.1.6", - "resolve-from": "^5.0.0", - "semver": "^7.5.3", - "slash": "^3.0.0", - "xcode": "^3.0.1", - "xml2js": "0.6.0" - } - } - } - }, - "@expo/config-plugins": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.4.0.tgz", - "integrity": "sha512-/BwYRl6QQ9ZKYpVaIqHE5sSPqNZI9CUtfLfYHhpnShQUA1KHRMi6y9zjb3IXJisk0/fcrtRm2yP3A7F0l304sQ==", - "requires": { - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/json-file": "~8.2.37", - "@expo/plist": "^0.0.20", - "@expo/sdk-runtime-versions": "^1.0.0", - "@react-native/normalize-color": "^2.0.0", - "chalk": "^4.1.2", - "debug": "^4.3.1", - "find-up": "~5.0.0", - "getenv": "^1.0.0", - "glob": "7.1.6", - "resolve-from": "^5.0.0", - "semver": "^7.5.3", - "slash": "^3.0.0", - "xcode": "^3.0.1", - "xml2js": "0.6.0" - } - }, - "@expo/config-types": { - "version": "50.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-50.0.0-alpha.2.tgz", - "integrity": "sha512-eAUMUg4wnw0bYovs+isibq4l9ssMacS/r0NolDxDdIX/N+ZjIEZ5DEl5GO8dnD0dKbN/DPWwUln7SG/nSYHfmw==" - }, - "@expo/prebuild-config": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-6.4.0.tgz", - "integrity": "sha512-RjKK7rd2H9P1pTcAcZFUd9tpxCwFNyyrlTdHZWlvZvZnBJWIyUZex7P3q7db7KLJ6UrVPmlM+B7OSc0Mxs4uoQ==", - "requires": { - "@expo/config": "~8.3.0", - "@expo/config-plugins": "~7.4.0", - "@expo/config-types": "^50.0.0-alpha.1", - "@expo/image-utils": "0.3.22", - "@expo/json-file": "^8.2.37", - "debug": "^4.3.1", - "fs-extra": "^9.0.0", - "resolve-from": "^5.0.0", - "semver": "7.5.3", - "xml2js": "0.6.0" - } - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", - "requires": { - "lru-cache": "^6.0.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "expo-structured-headers": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/expo-structured-headers/-/expo-structured-headers-3.3.0.tgz", diff --git a/package.json b/package.json index 52ac5a9a..4f1996e9 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "expo-local-authentication": "~13.3.0", "expo-localization": "~14.1.1", "expo-modules-autolinking": "~1.5.0", - "expo-splash-screen": "^0.22.0", "expo-updates": "^0.18.17", "expo-web-browser": "^12.5.0", "i18next": "^21.6.16", diff --git a/routes/index.ts b/routes/index.ts index abb38585..c4d105a8 100644 --- a/routes/index.ts +++ b/routes/index.ts @@ -12,9 +12,17 @@ import {NotificationsScreen} from '../screens/NotificationsScreen'; import {SetupLanguageScreen} from '../screens/SetupLanguageScreen'; import {IntroSlidersScreen} from '../screens/Home/IntroSlidersScreen'; import {RequestLayout} from '../screens/Request/RequestLayout'; -import {RequestStackParamList} from './routesConstants'; +import {RequestStackParamList} from '../screens/Request/RequestLayoutController'; +import {SplashScreen} from '../screens/SplashScreen'; export const baseRoutes: Screen[] = [ + { + name: 'SplashScreen', + component: SplashScreen, + options: { + headerShown: false, + }, + }, { name: 'Language', component: SetupLanguageScreen, diff --git a/screens/AppLayout.tsx b/screens/AppLayout.tsx index 01b8ed37..e080e702 100644 --- a/screens/AppLayout.tsx +++ b/screens/AppLayout.tsx @@ -28,15 +28,7 @@ export const AppLayout: React.FC = () => { return ( - + {baseRoutes.map(route => ( ))} diff --git a/screens/Home/IntroSlidersScreen.tsx b/screens/Home/IntroSlidersScreen.tsx index c850674a..9c50194b 100644 --- a/screens/Home/IntroSlidersScreen.tsx +++ b/screens/Home/IntroSlidersScreen.tsx @@ -9,6 +9,7 @@ import {useWelcomeScreen} from '../WelcomeScreenController'; import LinearGradient from 'react-native-linear-gradient'; import {SvgImage} from '../../components/ui/svg'; import testIDProps from '../../shared/commonUtil'; +import {INTRO_SLIDER_LOGO_MARGIN} from '../../shared/constants'; export const IntroSlidersScreen: React.FC = props => { const slider = useRef(); @@ -56,7 +57,7 @@ export const IntroSlidersScreen: React.FC = props => { - + {SvgImage.InjiSmallLogo()} diff --git a/screens/HomeScreenLayout.tsx b/screens/HomeScreenLayout.tsx index 0bacf986..5f04be7b 100644 --- a/screens/HomeScreenLayout.tsx +++ b/screens/HomeScreenLayout.tsx @@ -69,10 +69,15 @@ export const HomeScreenLayout: React.FC = props => { const [isRTL] = useState(I18nManager.isRTL); var HomeScreenOptions = { - headerLeft: () => (isIOS() || !isRTL ? SvgImage.InjiLogo() : screenOptions), + headerLeft: () => + isIOS() || !isRTL + ? SvgImage.InjiLogo(Theme.Styles.injiLogo) + : screenOptions, headerTitle: '', headerRight: () => - isIOS() || !isRTL ? screenOptions : SvgImage.InjiLogo(), + isIOS() || !isRTL + ? screenOptions + : SvgImage.InjiLogo(Theme.Styles.injiLogo), }; return ( diff --git a/screens/QrLogin/QrConsent.tsx b/screens/QrLogin/QrConsent.tsx index d7f923f3..5bb19a16 100644 --- a/screens/QrLogin/QrConsent.tsx +++ b/screens/QrLogin/QrConsent.tsx @@ -40,7 +40,8 @@ export const QrConsent: React.FC = props => { style={Theme.TextStyles.small} weight="bold" margin={'10 0 0 0'}> - {getClientNameForCurrentLanguage(controller.clientName)} {t('access')} + {getClientNameForCurrentLanguage(controller.clientName)}{' '} + {t('access')} diff --git a/screens/SetupLanguageScreen.tsx b/screens/SetupLanguageScreen.tsx index a33683d9..45b301ef 100644 --- a/screens/SetupLanguageScreen.tsx +++ b/screens/SetupLanguageScreen.tsx @@ -8,7 +8,7 @@ import {Icon} from 'react-native-elements'; import {RootRouteProps} from '../routes'; import {useWelcomeScreen} from './WelcomeScreenController'; import {changeLanguage} from '../components/LanguageSelector'; -import {Dimensions} from 'react-native'; +import {BackHandler, Dimensions} from 'react-native'; import {useBackupRestoreScreen} from './Settings/BackupRestoreController'; export const SetupLanguageScreen: React.FC = props => { @@ -23,6 +23,20 @@ export const SetupLanguageScreen: React.FC = props => { backupRestoreController.DOWNLOAD_UNSYNCED_BACKUP_FILES(); }, []); + useEffect(() => { + const backAction = () => { + BackHandler.exitApp(); + return true; + }; + + const backHandler = BackHandler.addEventListener( + 'hardwareBackPress', + backAction, + ); + + return () => backHandler.remove(); + }, []); + return ( = props => { + const imageResource = + APPLICATION_THEME?.toLowerCase() === 'purple' + ? require('../assets/purpleSplashScreen.png') + : require('../assets/orangeSplashScreen.png'); + const controller = useAppLayout(); + useEffect(() => { + setTimeout(() => { + if (controller.isLanguagesetup) { + props.navigation.navigate('Language'); + } else if (controller.isUnAuthorized) { + props.navigation.navigate('Welcome'); + } else { + props.navigation.navigate('IntroSliders'); + } + }, 3000); + }, []); + + return ( + + + + ); +}; diff --git a/screens/WelcomeScreen.tsx b/screens/WelcomeScreen.tsx index 48af3cd5..1f9844ea 100644 --- a/screens/WelcomeScreen.tsx +++ b/screens/WelcomeScreen.tsx @@ -16,7 +16,7 @@ export const WelcomeScreen: React.FC = props => { padding="32 32 0" backgroundColor={Theme.Colors.whiteBackgroundColor}> - {SvgImage.MosipLogo(Theme.Styles.welcomeLogo)} + {SvgImage.InjiLogo(Theme.Styles.welcomeLogo)}