Skip to content

Commit

Permalink
Merge pull request #967 from tw-mosip/inji-505-release
Browse files Browse the repository at this point in the history
* feat(INJI-403): add events in the VC download flow for success scenario

* refactor(INJI-403): updates logic to capture preferred language in telemetry

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): revert changes of google services and env added by mistake

Signed-off-by: Alka <[email protected]>

* refactor(INJI-403): extracts some methods of telemetry to a util file

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): fetch selected issuer's id from context instead of event

Signed-off-by: Alka <[email protected]>

* feat(INJI-403): update telemetry package link to mosip org

Signed-off-by: Alka <[email protected]>

* Inji-406: tampered vc issue (#923)

* feat(inji-406): store vc before storing hmac to avoid race condition

Signed-off-by: Tilak Puli <[email protected]>

* feat(inji-406): waiting until vc saved completely before displaying VC card

Signed-off-by: Tilak Puli <[email protected]>

---------

Signed-off-by: Tilak Puli <[email protected]>

* feat(INJI-443): remove ellipse from QR login flow (#922)

Signed-off-by: Pooja Babusingh <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* feat(INJI-403): making language code mapping fail safe and removing unwanted code

Signed-off-by: Alka <[email protected]>

* feat[INJI-403]: Add events in the VC download flow for success scenario (#908)

* feat(INJI-403): add events in the VC download flow for success scenario

* refactor(INJI-403): updates logic to capture preferred language in telemetry

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): revert changes of google services and env added by mistake

Signed-off-by: Alka <[email protected]>

* refactor(INJI-403): extracts some methods of telemetry to a util file

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): fetch selected issuer's id from context instead of event

Signed-off-by: Alka <[email protected]>

* feat(INJI-403): update telemetry package link to mosip org

Signed-off-by: Alka <[email protected]>

* feat(INJI-403): making language code mapping fail safe and removing unwanted code

Signed-off-by: Alka <[email protected]>

---------

Signed-off-by: Alka Prasad <[email protected]>
Signed-off-by: Alka <[email protected]>

* fix(INJI-403): update commit id of telemetry sdk

Signed-off-by: Alka <[email protected]>

* Update Telemetry SDK commit Id (#925)

* feat(INJI-403): add events in the VC download flow for success scenario

* refactor(INJI-403): updates logic to capture preferred language in telemetry

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): revert changes of google services and env added by mistake

Signed-off-by: Alka <[email protected]>

* refactor(INJI-403): extracts some methods of telemetry to a util file

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): fetch selected issuer's id from context instead of event

Signed-off-by: Alka <[email protected]>

* feat(INJI-403): update telemetry package link to mosip org

Signed-off-by: Alka <[email protected]>

* feat(INJI-403): making language code mapping fail safe and removing unwanted code

Signed-off-by: Alka <[email protected]>

* fix(INJI-403): update commit id of telemetry sdk

Signed-off-by: Alka <[email protected]>

---------

Signed-off-by: Alka Prasad <[email protected]>
Signed-off-by: Alka <[email protected]>
Signed-off-by: Swati Goel <[email protected]>
Co-authored-by: Swati Goel <[email protected]>

* fix(Inji 332): reset UIN field in add vc modal and set AddVcModal dropdown to VID (#864)

* fix(INJI-332): reset the UIN field in AddVcModal after downloading the VC using AID and show VID in dropdown

* refactor(INJI-332): remove unnecessary formatting changes

* fix(INJI-332): change default value of getIndividualId response to UIN in getVcModal

Signed-off-by: PuBHARGAVI <[email protected]>

* remove project.pbxproj changes

* Revert "remove project.pbxproj changes"

This reverts commit ba7d9ec.

* fix(INJI-332): reset the project.pbxproj file

Signed-off-by: PuBHARGAVI <[email protected]>

---------

Signed-off-by: PuBHARGAVI <[email protected]>

* Fix(INJI-431):  Resolved that UI would support all screen sizes(folded-devices) & fixed language translation issues. (#920)

* fix(MOSIP-29275): make usesCleartextTraffic to false for more secure communication (#886)

* fix(MOSIP-29275): make usesCleartextTraffic to false for more secure communications

* fix(MOSIP-29275): override usesCleartextTraffic to false in main manifest

---------

Signed-off-by: Swati Goel <[email protected]>
Co-authored-by: Swati Goel <[email protected]>
Signed-off-by: anil_majji <[email protected]>

* MOSIP-29698 (#891)

Signed-off-by: anil_majji <[email protected]>

* Inji-409: debugging setup fix (#893)

* feat(inji-400): update package-lock.json

* feat(inji-400): move flipper config to separate file from app.ts

Signed-off-by: anil_majji <[email protected]>

* feat(inji-398): enable cleartextTrafficPermitted in debug mode (#895)

Signed-off-by: anil_majji <[email protected]>

* fix(INJI-397)error message for deleted vcfile (#875)

* fix(INJI-397)error message for deleted vcfile

* fix(INJI-397)refactor:log activity event

* fix(INJI-397)refactor:log activity event

* fix(INJI-397)refactor:comparing VCMetadata

Signed-off-by: anil_majji <[email protected]>

* fix(MOSIP-29272): remove paste option for pin inputs (#894)

Signed-off-by: anil_majji <[email protected]>

* Test runner support to run jar MOSIP-29698 (#898)

* MOSIP-29698

* Test runner support to run jar MOSIP-29698

* Update TestData.json

Signed-off-by: neeharikatech <[email protected]>

---------

Signed-off-by: neeharikatech <[email protected]>
Signed-off-by: anil_majji <[email protected]>

* feat(inji-406): add logs for debugging tampered vc issues (#900)

Signed-off-by: anil_majji <[email protected]>

* Adjusted bottom tab for different screen sizes

Signed-off-by: anil_majji <[email protected]>

* Added responsive bottom line for ID input

Signed-off-by: anil_majji <[email protected]>

* Updated the missing texts with case sensitive

Signed-off-by: anil_majji <[email protected]>

* Removed unused button text in Welcome screen

Signed-off-by: anil_majji <[email protected]>

---------

Signed-off-by: Swati Goel <[email protected]>
Signed-off-by: anil_majji <[email protected]>
Signed-off-by: neeharikatech <[email protected]>
Co-authored-by: Sreenadh S <[email protected]>
Co-authored-by: Swati Goel <[email protected]>
Co-authored-by: neeharikatech <[email protected]>
Co-authored-by: Tilak Puli <[email protected]>
Co-authored-by: srikanth716 <[email protected]>

* talisman check for pre-commit and pre-push hooks (#915)

* feat(INJI-413): add talisman check for pre-commit and pre-push hooks

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-413): add yarn jetify to package.json

Signed-off-by: Pooja Babusingh <[email protected]>

---------

Signed-off-by: Pooja Babusingh <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* feat(INJI-366): display clientName as per app lang in QR login flow (#924)

* feat(INJI-366): display clientName as per app lang in QR login consent and success screen

In case the app language is not supported, fallback client name is displayed

Co-authored-by: Swati Goel <[email protected]>
Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* refactor(INJI-366): merge localized field function for different data types

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* refactor(INJI-366): fix type warnings while getting localized value

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* fix(INJI-366): modify type check in getLocalizedField

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

---------

Signed-off-by: Kiruthika Jeyashankar <[email protected]>
Signed-off-by: Swati Goel <[email protected]>
Co-authored-by: Swati Goel <[email protected]>

* feat(Inji-402): track login & onboarding flow events in telemetry (#918)

* feat(INJI-402): track different flows of login and onboarding features in telemetry

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): add missing events in the login flow

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): track hardware keystore not supported error in telemetry

Signed-off-by: PuBHARGAVI <[email protected]>

* fix(INJI-402): send biometric event only when biometrics are enrolled in device

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): send error event for every 5 passcode mismatch attempts

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): add telemetry events to track passcode screen flow when biometrics change

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): add subtype to impression and interact event

Signed-off-by: PuBHARGAVI <[email protected]>

* fix(INJI-402): remove additionalParamters in error event

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): remove extra impression events and fix the biometrics reenabling flow

Signed-off-by: PuBHARGAVI <[email protected]>

* refactor(INJI-402): change getData method name to getStartEventData in telemetry utils

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-402): don't show biometric failed alert message when user cancels the flow

Signed-off-by: PuBHARGAVI <[email protected]>

* refactor(INJI-402): change telemetry events name

Signed-off-by: PuBHARGAVI <[email protected]>

* fix(INJI-402): add missing functions in telemetry utils

Signed-off-by: PuBHARGAVI <[email protected]>

* refactor(INJI-402): add impression event in passcode screen and change Main to Home in event

Signed-off-by: PuBHARGAVI <[email protected]>

---------

Signed-off-by: PuBHARGAVI <[email protected]>

* feat(INJI-403): add interact and impression events in the VC download flow

Signed-off-by: Alka <[email protected]>

* feat(INJI-403): update interact and impression events in the VC download flow

Signed-off-by: Alka <[email protected]>

* Inji-411: vc load optimisation (#927)

* feat(inji-406): store vc before storing hmac to avoid race condition

Signed-off-by: Tilak Puli <[email protected]>

* feat(inji-406): waiting until vc saved completely before displaying VC card

Signed-off-by: Tilak Puli <[email protected]>

* feat(inji-411): read and cache vc files data on welcome screen

Signed-off-by: Tilak Puli <[email protected]>

* feat(inji-411): remove formatting for unnecessary files

Signed-off-by: Tilak Puli <[email protected]>

---------

Signed-off-by: Tilak Puli <[email protected]>

* refactor(INJI-403): update backend_error to const as it will not chnage

Signed-off-by: Alka <[email protected]>

* feat(INJI-471) - Update intro slide image with description. (#931)

Signed-off-by: Swati Goel <[email protected]>

* fix(INJI-260):refactor language setup and intro slider alignment in smaller display (#930)

Signed-off-by: Sri Kanth Kola <[email protected]>

* Fix(INJI-439)- Resolved while changing the language, VC detailes alignment not in proper (#935)

Signed-off-by: anil_majji <[email protected]>

* fix(INJI-403): update auto calling of download vc page on fresh launch (#934)

Signed-off-by: Alka <[email protected]>

* Inji 408 error popup after maximum retries vc download (#926)

* feat(INJI-408):Display error message after max retries of downloading vcs

Signed-off-by: Sri Kanth Kola <[email protected]>

* feat(INJI-408):refactor error message

Signed-off-by: Sri Kanth Kola <[email protected]>

* feat(INJI-408):refactor naming convention and remove empty space

Signed-off-by: Sri Kanth Kola <[email protected]>

* feat(INJI-408):refactor naming convention

Signed-off-by: Sri Kanth Kola <[email protected]>

---------

Signed-off-by: Sri Kanth Kola <[email protected]>

* Refactor(inji-429) : standardize issuers configuration (#937)

* refactor(inji-429): standardize the issuers configuration

Signed-off-by: Vijay <[email protected]>

* refactor(inji-249): optimise the issuers protocols implementations

Signed-off-by: Vijay <[email protected]>

* refactor(inji-249): remove unnecessary states and unused icons

Signed-off-by: Vijay <[email protected]>

---------

Signed-off-by: Vijay <[email protected]>

* Fix(INJI-439): Resolved warning from text style of MosipVCItemDetails component (#948)

* Fix(INJI-439)- Resolved while changing the language, VC detailes alignment not in proper

Signed-off-by: anil_majji <[email protected]>

* Fix(INJI-439): Resolved warning from text style of MosipVCItemDetails component

Signed-off-by: anil_majji <[email protected]>

---------

Signed-off-by: anil_majji <[email protected]>

* feat(INJI-458): show loading screen after closing of web view in OpenID4VCI flow (#932)

* perf(INJI-458): cache fixed result of custom keystore presence

Each call over the RN bridge can take significant user-visible time, and since
the result is used multiple times and cannot change for a device in runtime,
it can be computed once stored for later use.

Signed-off-by: Harsh Vardhan <[email protected]>

* feat(INJI-458): show loading for android h/w keystore check & generation

Signed-off-by: Harsh Vardhan <[email protected]>

* feat(INJI-472): show loader on issuer select

Co-authored-by: KiruthikaJeyashankar <[email protected]>
Signed-off-by: Harsh Vardhan <[email protected]>

* refactor(INJI-458): rename const name to isHardwareKeystoreExists

Signed-off-by: Harsh Vardhan <[email protected]>

---------

Signed-off-by: Harsh Vardhan <[email protected]>
Co-authored-by: KiruthikaJeyashankar <[email protected]>

* INJI-473) Code clean up and fixing metro errors/warnings (#947)

* feat(INJI-473) - Removed unused injiTourGuide action.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Removed unused logKey action.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Removed unused backendInfo api and state.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - simplify isPasscodeSet logic.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Move logState to commonUtil to remove cyclic dependency.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Delete unused code.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Refactor code to use util function for iOS or isAndroid.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Move Issuers_Key_Ref into utils.

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Remove profile related resource from setting screen

Signed-off-by: Swati Goel <[email protected]>

* feat(INJI-473) - Remove unused code for locales.

Signed-off-by: Swati Goel <[email protected]>

---------

Signed-off-by: Swati Goel <[email protected]>

* popup to cancel the download card (#944)

* feat(INJI-299): add popup component

Signed-off-by: Sreenadh S <[email protected]>

* feat(INJI-299): add language translations for the cancel dialog textfeilds

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): refactor confirmation dialog props

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): add cancel confirmation dialog in otp screen

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): refactor confirmation dialog flow

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): remove console logs

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): style confirmation dialog elements

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): refactor the cancel flow

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): refactor to show id modal when in not cancel download state

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): replace confirmation dialog with message overlay

Signed-off-by: Pooja Babusingh <[email protected]>

---------

Signed-off-by: Sreenadh S <[email protected]>
Signed-off-by: Pooja Babusingh <[email protected]>
Signed-off-by: PoojaBabusing <[email protected]>
Co-authored-by: Sreenadh S <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* refactor(INJI-472): update issuerScreen content (#942)

* refactor(INJI-472): update issuer screen content

modify IssuersScreen page description and issuer description

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* refactor(INJI-472): move loader component styles to LoaderStyles

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* fix(INJI-472): hindi text matras getting hidden

IssuersScreen was hiding matras in hindi text displayed, padding is added to resolve this

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* refactor(INJI-472): disable back action in loader

hardware back button press or gesture back action is disable in loader

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

---------

Signed-off-by: Kiruthika Jeyashankar <[email protected]>

* add missing imports and adjust buttons alignment (#953)

* feat(INJI-299): add missing imports and adjust buttons alignment

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): add gradient button type

Signed-off-by: Pooja Babusingh <[email protected]>

---------

Signed-off-by: Pooja Babusingh <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* feat(INJI-299): show otp screen while showing cancel Download popup (#954)

Signed-off-by: Pooja Babusingh <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* Refactor(inji-472): refactoring api usage, fix warnings, and fix fabicon ui issue (#952)

* refactor(inji-472): refactoring api usage, fix warnings, and fix fab icon ui issue

Signed-off-by: Vijay <[email protected]>

* refactor(inji-472): remove masking in vc details page, add the testid for the download FAB icon

Signed-off-by: Vijay <[email protected]>

---------

Signed-off-by: Vijay <[email protected]>

* feat(INJI-499) - Remove unused code for google near by and firebase. (#963)

Signed-off-by: Swati Goel <[email protected]>

* language text getting truncated (#960)

* feat(INJI-486): add correct kannada language labels

Signed-off-by: Pooja Babusingh <[email protected]>

* feat(INJI-486): add padding to prevent kan lang text getting truncated

Signed-off-by: Pooja Babusingh <[email protected]>

---------

Signed-off-by: Pooja Babusingh <[email protected]>
Signed-off-by: PoojaBabusing <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* Inji - 368 integrate iris scan android ios (#936)

* feat(INJI-368): Integrate irisScan for android and ios

Signed-off-by: adityankannan-tw <[email protected]>

* feat(INJI-368): Add path to the model file

Signed-off-by: adityankannan-tw <[email protected]>

* feat(INJI-368): Integrate irisScan for android and ios

Signed-off-by: adityankannan-tw <[email protected]>

* feat(INJI-368): Update package lock json

Signed-off-by: adityankannan-tw <[email protected]>

---------

Signed-off-by: adityankannan-tw <[email protected]>
Signed-off-by: adityankannan-tw <[email protected]>
Signed-off-by: Swati Goel <[email protected]>
Co-authored-by: Swati Goel <[email protected]>

* feat(INJI-369): add height to skip button in intro sliders (#964)

Signed-off-by: Pooja Babusingh <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>

* revert(INJI-299): popup to cancel the download card

Co-authored-by: adityankannan-tw <[email protected]
.com>
Signed-off-by: Kiruthika Jeyashankar <[email protected]>

---------

Signed-off-by: Alka Prasad <[email protected]>
Signed-off-by: Alka <[email protected]>
Signed-off-by: Tilak Puli <[email protected]>
Signed-off-by: Pooja Babusingh <[email protected]>
Signed-off-by: Swati Goel <[email protected]>
Signed-off-by: PuBHARGAVI <[email protected]>
Signed-off-by: anil_majji <[email protected]>
Signed-off-by: neeharikatech <[email protected]>
Signed-off-by: Kiruthika Jeyashankar <[email protected]>
Signed-off-by: Sri Kanth Kola <[email protected]>
Signed-off-by: Vijay <[email protected]>
Signed-off-by: Harsh Vardhan <[email protected]>
Signed-off-by: Sreenadh S <[email protected]>
Signed-off-by: PoojaBabusing <[email protected]>
Signed-off-by: adityankannan-tw <[email protected]>
Signed-off-by: adityankannan-tw <[email protected]>
Co-authored-by: Alka <[email protected]>
Co-authored-by: Alka Prasad <[email protected]>
Co-authored-by: Tilak Puli <[email protected]>
Co-authored-by: PoojaBabusing <[email protected]>
Co-authored-by: Pooja Babusingh <[email protected]>
Co-authored-by: Swati Goel <[email protected]>
Co-authored-by: PuBHARGAVI <[email protected]>
Co-authored-by: Anil kumar M <[email protected]>
Co-authored-by: Sreenadh S <[email protected]>
Co-authored-by: neeharikatech <[email protected]>
Co-authored-by: srikanth716 <[email protected]>
Co-authored-by: vijay151096 <[email protected]>
Co-authored-by: Harsh Vardhan <[email protected]>
Co-authored-by: adityankannan-tw <[email protected]>
  • Loading branch information
14 people authored Oct 26, 2023
2 parents 46ac4aa + 697947e commit f615adc
Show file tree
Hide file tree
Showing 166 changed files with 2,352 additions and 2,741 deletions.
5 changes: 0 additions & 5 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ MIMOTO_HOST=https://api.qa-inji.mosip.net

ESIGNET_HOST=https://api.qa-inji.mosip.net

GOOGLE_NEARBY_MESSAGES_API_KEY=

OBSRV_HOST = https://dataset-api.obsrv.mosip.net

#Application Theme can be ( orange | purple )
Expand All @@ -19,6 +17,3 @@ DEBUG_MODE=false

#supported languages( en, fil, ar, hi, kn, ta)
APPLICATION_LANGUAGE=en

#Toggle for openID for VC
ENABLE_OPENID_FOR_VC=true
7 changes: 0 additions & 7 deletions .github/workflows/android-beta-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ jobs:
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
- name: Setup Firebase
run: |
cd android
if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];then rm -f app/google-services.json;gpg2 --quiet --batch --passphrase=$FIREBASE_SECRET --pinentry-mode loopback --decrypt --output app/google-services.json app/mosip-google-services.json.gpg;fi
env:
FIREBASE_SECRET: ${{ secrets.GPG_SECRET }}

- name: Generate keystore
run: |
echo "$ANDROID_KEYSTORE_FILE" > release.keystore.b64
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/android-build-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,6 @@ jobs:
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
- name: Setup Firebase
run: |
cd android
if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];
then
rm -f app/google-services.json;gpg2 --quiet --batch --passphrase=$FIREBASE_SECRET --pinentry-mode loopback --decrypt --output app/google-services.json app/mosip-google-services.json.gpg;
else
echo "Using Dummy Google Service JSON for firebase"
echo "$DUMMY_GOOGLE_SERVICE_JSON" > app/google-services.json
fi
env:
FIREBASE_SECRET: ${{ secrets.GPG_SECRET }}

- name: Generate keystore
run: |
keytool \
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/android-internal-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,6 @@ jobs:
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
- name: Setup Firebase
run: |
cd android
if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];then rm -f app/google-services.json;gpg2 --quiet --batch --passphrase=$FIREBASE_SECRET --pinentry-mode loopback --decrypt --output app/google-services.json app/mosip-google-services.json.gpg;fi
env:
FIREBASE_SECRET: ${{ secrets.GPG_SECRET }}

- name: Generate keystore
run: |
echo "$ANDROID_KEYSTORE_FILE" > release.keystore.b64
Expand Down Expand Up @@ -182,13 +175,6 @@ jobs:
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
- name: Setup Firebase
run: |
cd android
if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];then rm -f app/google-services.json;gpg2 --quiet --batch --passphrase=$FIREBASE_SECRET --pinentry-mode loopback --decrypt --output app/google-services.json app/mosip-google-services.json.gpg;fi
env:
FIREBASE_SECRET: ${{ secrets.GPG_SECRET }}

- name: Generate keystore
run: |
echo "$ANDROID_KEYSTORE_FILE" > release.keystore.b64
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ios-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ jobs:
SLACK_URL: '${{ secrets.SLACK_WEBHOOK_DEVOPS }}'
MATCH_PASSWORD: '${{ secrets.INJI_IOS_MATCH_PASSWORD }}'
APPLICATION_THEME: ${{ github.event.inputs.theme }}
CREDENTIAL_REGISTRY_EDIT: ${{ github.event.inputs.registry_edit }}
MIMOTO_HOST: ${{ github.event.inputs.mimotoBackendServiceUrl }}
ESIGNET_HOST: ${{ github.event.inputs.esignetBackendServiceUrl }}
TESTFLIGHT_INTERNAL_TESTERS_GROUP: ${{ github.event.inputs.internal-testers }}
TESTFLIGHT_BETA_APP_DESCRIPTION: ${{ github.event.inputs.buildDescription }}

Expand Down
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
.git/hooks/bin/talisman ${DEBUG_OPTS} --githook pre-commit
59 changes: 59 additions & 0 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
fileignoreconfig:
- filename: package.json
checksum: e0b34f1a1efbdf07b40a3e9e9ecd8884dd7d6835f45c57850e30988d2c6371a2
- filename: package-lock.json
checksum: fc26d97edecbacd0b7507032c6fc1acfcea9f01f5dbe66a2a0341506e2f0daca
- filename: components/PasscodeVerify.tsx
checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703
- filename: i18n.ts
checksum: 75dd5536038ba198aa7b12eb6d2c2e7042c9ce292e5a0d5c90883ae5b2312b1e
- filename: screens/BiometricScreenController.ts
checksum: b3d0184fb894f4a9ffa1a4d277d2975495dbc47771593895bf1999deabafeb94
- filename: screens/Home/MyVcs/IdInputModal.tsx
checksum: ec48ebeaf46b8fbc756f19ef8ffe8901ce0528aef164f3c7ffdeec36fb53ffc6
- filename: components/Passcode.tsx
checksum: db4a18001be8c63bf7ffb389359861401fa1d22261b10ad729a76fd431c019a7
- filename: screens/PasscodeScreen.tsx
checksum: 0cc5b91350e491a058ee8a1878a496c16b65f14969e989bdb1c354f6e9b8c03c
- filename: locales/spa.json
checksum: 981103ff872d6f54610468c7ead65873d9294a11092649b105c552f770f0214b
- filename: screens/AuthScreen.tsx
checksum: 2c1183b2ad8ec27adf8f389a2511805493f229fdda674064e2579d2032119d1c
- filename: screens/BiometricScreen.tsx
checksum: 7a730731aaa7540eec9d05d73de277a665dc06425666280842e0f9ba6e5b8514
- filename: screens/AuthScreenController.ts
checksum: 18af825821bc95e1056050623b804a5a8e7435b9e3383916a5d63024eeba9553
- filename: screens/WelcomeScreenController.ts
checksum: 71917c8c543a4a5b7ab61df259b785d233a80718123b0c8edf6ec81e1b3a81e0
- filename: shared/telemetry/TelemetryUtils.js
checksum: 9a61cd59a3718adf1f14faf3024fec66a3295ef373878a878a28e5cb1287afaa
- filename: ios/Podfile.lock
checksum: cc123c3e1f04d41b394ceb16843b15c08bac3ba619ae853ff322717739761a85
- filename: ios/Podfile.lock
checksum: cc123c3e1f04d41b394ceb16843b15c08bac3ba619ae853ff322717739761a85
- filename: screens/Home/IntroSlidersScreen.tsx
checksum: 72ef913857448ef05763e52e32356faa2d1f3de8130a1c638d1897f44823031f
- filename: shared/commonUtil.ts
checksum: 01c3fdcd2f1c1757eae0c6a27fe04eb70c2aaf8660c604f3301997484592b66c
- filename: screens/Home/MyVcs/GetIdInputModal.tsx
checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746
- filename: shared/openId4VCI/Utils.ts
checksum: 2bd39d84099d700e5bddeebe87dfb3b0e3075edc0a4d06ce48b428b0a85e238f
- filename: machines/issuersMachine.ts
checksum: b925df13236145867fc7a1a2a703faca854e8c937dac9451008399e3937592fb
- filename: machines/issuersMachine.typegen.ts
checksum: f5e2c89f9029b1e590173e37b2cf6586d5229ecb7d4dfd4c5f050f9416d3c1cd
- filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.ts
checksum: eec77ca61540327ff7cab3489ebdfd47aa373fd20b3ff87a6c322cd48d35fe8f
- filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
checksum: f1f504bd8c14496ee71f8eb7f40d54411cc05be03347d644dcc2cca187a20678
- filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts
checksum: 237a2640b7db70770d65da67c79f2929581e32f1162517e50b8d37e409f3387d
- filename: shared/cryptoutil/cryptoUtil.ts
checksum: b785ff3f01ab9530119072c4d38195048bfeee6155c54ea7dd031559acb722f3
- filename: package.json
checksum: 1a9d02d94424c1266503d58038cae2318ab71261ab50cf930c5f98e07c0f3ccd
- filename: machines/store.typegen.ts
checksum: 6d22bc5c77398316b943c512c208ce0846a9fff674c1ccac79e07f21962acd5f
- filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
checksum: 10889302ca05646a283386be1bbe7a5fb510c02bb62a308ee45f3c2a872ae64e
16 changes: 3 additions & 13 deletions App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,10 @@ import {
import {DualMessageOverlay} from './components/DualMessageOverlay';
import {useApp} from './screens/AppController';
import {Alert} from 'react-native';
import {
getAppInfoData,
getTelemetryConfigData,
initializeTelemetry,
sendAppInfoEvent,
} from './shared/telemetry/TelemetryUtils';
import {configureTelemetry} from './shared/telemetry/TelemetryUtils';
import {MessageOverlay} from './components/MessageOverlay';
import SecureKeystore from 'react-native-secure-keystore';
import {isCustomSecureKeystore} from './shared/cryptoutil/cryptoUtil';
import {isHardwareKeystoreExists} from './shared/cryptoutil/cryptoUtil';
import i18n from './i18n';
import './shared/flipperConfig';

Expand All @@ -42,11 +37,6 @@ const DecryptErrorAlert = (controller, t) => {
},
]);
};
function configureTelemetry() {
const config = getTelemetryConfigData();
initializeTelemetry(config);
sendAppInfoEvent(getAppInfoData());
}

const AppLayoutWrapper: React.FC = () => {
const {appService} = useContext(GlobalContext);
Expand Down Expand Up @@ -101,7 +91,7 @@ const AppInitialization: React.FC = () => {
const {t} = useTranslation('common');

useEffect(() => {
if (isCustomSecureKeystore()) {
if (isHardwareKeystoreExists) {
SecureKeystore.updatePopup(
t('biometricPopup.title'),
t('biometricPopup.description'),
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,10 @@ Create a `.env.local` file using `.env` as your template:

```
MIMOTO_HOST=
GOOGLE_NEARBY_MESSAGES_API_KEY=
```

And `android/local.properties`:

```
GOOGLE_NEARBY_MESSAGES_API_KEY=
```

More info here: [Setup Google Nearby Messages in React](https://github.com/mrousavy/react-native-google-nearby-messages#usage)

### Android
Expand Down
18 changes: 2 additions & 16 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ plugins {
}

apply plugin: "com.android.application"
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: "com.facebook.react"

import com.android.build.OutputFile
Expand Down Expand Up @@ -121,7 +119,6 @@ android {

manifestPlaceholders = [
APP_NAME: APP_NAME_RELEASE,
GOOGLE_NEARBY_MESSAGES_API_KEY: "${properties.getProperty('GOOGLE_NEARBY_MESSAGES_API_KEY')}",
appAuthRedirectScheme: 'io.mosip.residentapp.inji'
]
}
Expand Down Expand Up @@ -219,6 +216,7 @@ dependencies {
if (isGifEnabled || isWebpEnabled) {
implementation 'com.facebook.fresco:fresco:2.0.0'
implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.0.0'
implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.4.1'
}

if (isGifEnabled) {
Expand Down Expand Up @@ -250,20 +248,8 @@ dependencies {
} else {
implementation jscFlavor
}
// Firebase
implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
implementation 'com.google.firebase:firebase-analytics:18.0.2'
implementation 'com.jakewharton.timber:timber:4.7.1'
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
apply from: "./eas-build.gradle"

try {
def servicesJSON = file('google-services.json')
if (servicesJSON.text) {
apply plugin: 'com.google.gms.google-services'
}
} catch(Exception e) {
logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
}
apply from: "./eas-build.gradle"
39 changes: 0 additions & 39 deletions android/app/google-services.json

This file was deleted.

Binary file removed android/app/google-services.json.gpg
Binary file not shown.
Binary file removed android/app/mosip-google-services.json.gpg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import timber.log.Timber;

import com.facebook.react.bridge.JSIModulePackage;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.google.firebase.crashlytics.FirebaseCrashlytics;

import java.lang.reflect.InvocationTargetException;
import java.util.List;
Expand Down Expand Up @@ -77,36 +75,9 @@ public void onCreate() {
if (BuildConfig.DEBUG) {
Timber.plant(new Timber.DebugTree());
}
// Setup Firebase
FirebaseAnalytics.getInstance(this);
Timber.plant(new CrashReportingTree());
ApplicationLifecycleDispatcher.onApplicationCreate(this);
}


/**
* A tree which logs important information for crash reporting.
*/
private static class CrashReportingTree extends Timber.Tree {
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
@Override
protected void log(int priority, String tag, @NonNull String message, Throwable t) {
if (priority == Log.VERBOSE || priority == Log.DEBUG) {
return;
}

crashlytics.setCustomKey("priority", priority);
crashlytics.setCustomKey("tag", tag);
crashlytics.log(message);

if (t != null) {
if (priority == Log.ERROR) {
crashlytics.recordException(t);
}
}
}
}

@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
Expand Down
2 changes: 0 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
classpath("com.facebook.react:react-native-gradle-plugin")
}
}
Expand Down
Binary file removed assets/Secure-Sharing2.png
Binary file not shown.
Binary file removed assets/digit-icon.png
Binary file not shown.
File renamed without changes
File renamed without changes
18 changes: 0 additions & 18 deletions components/ActivityLogText.strings.json

This file was deleted.

Loading

0 comments on commit f615adc

Please sign in to comment.