diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d68d488a..b4f9796b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - 'release/**' + - 'master' - 'develop' workflow_dispatch: diff --git a/CHANGELOG b/CHANGELOG index 1d94f8e6..6b21d2c9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,312 @@ -* 3728c204 - (HEAD -> release/3.8.2, origin/release_3.8.2, release_3.8.2) AND-3539 added the ability to set custom image on the scan dialog -* 955ebb8a - AND-3533 Clear SDK keys in localise -* 858519a5 - AND-3579 Error code is missed for several backup's error -* 0fee41e8 - AND-3577: add Schnorr and BLS (allow to create wallets) -* 197cfadf - AND-3578: allow to select any available curve in DemoApp -* daf86eea - AND-3542 Fix handling of biometric authentication cancellation exception -* bc88434b - AND-3525 There is no error code in CardSDK bottom sheet dialog on scan or biometric -* e9cfa83d - AND-3557 Fix CardSDK upload.gradle -* a239d0ab - AND-3542 Biometry and Save cards: biometry appears again and again when trying to enter app via scanning the card \ No newline at end of file +* d3ed048b - (HEAD -> release/3.9.0, tag: develop-326, origin/develop, develop) Merge pull request #346 from tangem/merge_master_to_dev +|\ +| * ee4fd3d6 - Merge branch 'develop' into merge_master_to_dev +|/ +* bad0ad49 - (tag: release-app_5.6-325, tag: develop-324, origin/release-app_5.6) Merge pull request #344 from tangem/merge-5.5-dev +|\ +| * 854ce946 - Merge branch 'develop' into merge-5.5-dev +| |\ +| |/ +|/| +* | a44db4b2 - (tag: develop-322) Merge pull request #342 from tangem/tech/change-codeowners +|\ \ +| * | ba1b24c2 - Changed CODEOWNERS +|/ / +| * 2d16cfc1 - (tag: release-app_5.5-323, origin/release-app_5.5) Merge pull request #343 from tangem/bugfix/AND-5905-certificate_is_requested_for_dev_wallets +| |\ +| | * 1b27beed - AND-5905 fixed certificate is requested for dev wallets +| |/ +| * f21579ad - Changed CODEOWNERS +| * 1dc53e48 - Changed CODEOWNERS +|/ +* 52a963d0 - (tag: release-app_5.5-321, tag: develop-320) AND-5865 Fix detekt warnings in card sdk +* 5ea5fe63 - (tag: develop-319) Merge pull request #340 from tangem/feature/AND-5855_TangemSDK_Implemented_method_to_return_error_description_resources +|\ +| * f9bb331d - AND-5855 [TangemSDK] Implemented method to return error description resources +| * bb44bea3 - AND-5855 [TangemSDK] Implemented method to return error description resources +|/ +* 945f409d - (tag: develop-318) Merge pull request #339 from tangem/feature/AND-4928-online-attestation-on-backup +|\ +| * 3fd66be7 - AND-4928 move online attestation on backup flow +|/ +* a89cfbec - (tag: develop-317) Merge pull request #333 from tangem/bugfix/AND-4628_move_nfc_enabled_check +|\ +| * 6c5ceac7 - Merge branch 'develop' into bugfix/AND-4628_move_nfc_enabled_check +| |\ +| |/ +|/| +* | d86f1e00 - (tag: release-app_5.4-315, tag: develop-316, tag: develop-314, origin/release-app_5.4) Merge pull request #337 from tangem/fix/AND-5492 +|\ \ +| * | 1ee031f2 - AND-5492 Show progress while signing hashes +|/ / +| * 4b61d0b6 - Fixed detekt. +| * a015decd - Merge branch 'develop' into bugfix/AND-4628_move_nfc_enabled_check +| |\ +| |/ +|/| +* | 7a731526 - (tag: release-app_5.3-313, tag: release-app_5.2-311, tag: develop-312, tag: develop-310, origin/release-app_5.3, origin/release-app_5.2) Merge pull request #335 from tangem/merge_5.0_to_dev +|\ \ +| * | e35aa4ed - (tag: release-app_5.0-309, origin/release-app_5.0) AND-4988 and AND-4990 [Biometrics Storage] Improved errors handling +| * | 33b73695 - (tag: release-app_5.0-308) AND-5014 added visibility primaryPublicKey from BackupService +| * | e2c3db41 - (tag: release-app_5.0-307, tag: release-app_5.0-306) AND-4972 Fixed user wallets unlocking after using face unlock on device +| * | 01b68a83 - (tag: release-app_5.0-304) Merge pull request #330 from tangem/feature/AND-4843-image-to-scan-dialog +|/| | +| * | c38a1c2f - AND-4843 added image to scan dialog +|/ / +| * 1c36afa4 - AND-4628 Fixed CE. +| * 08405dc5 - AND-4628 Fixed detekt. +| * 9befbbcc - AND-4628 Moved NFC enable check. +|/ +* fa291b2f - (tag: release-app_5.0-303, tag: develop-302) AND-4784 Improved the biometrics feature initialization +* 3e21a683 - (tag: develop-301) Merge pull request #328 from tangem/feature/AND-4743_accent_color +|\ +| * b84e8329 - AND-4743: change accent color +|/ +* 9957c72b - (tag: develop-300) Merge pull request #326 from tangem/feature/AND-4167_refactor_biometrics +|\ +| * 4096699e - Merge branch 'develop' into feature/AND-4167_refactor_biometrics +| |\ +| |/ +|/| +* | cc5c68a1 - (tag: develop-299) Merge pull request #324 from tangem/bugfix/AND-3724_fixed_error_state +|\ \ +| * | 07c269ae - AND-3724 Fixed detekt. +| * | a51b6705 - Merge branch 'develop' into bugfix/AND-3724_fixed_error_state +| |\ \ +| |/ / +|/| | +* | | 52c0b514 - (tag: develop-298) Merge pull request #304 from tangem/bugifx/AND-3723-extra_sign_on_scant_bottom_sheet +|\ \ \ +| * | | 076d75a2 - AND-3723 improvement: removed redundant getter method +| * | | 83932ca6 - AND-3723 fixed extra sign '#' before card number +|/ / / +| * | 34c4f8d7 - AND-3724 Fixed handling error state. +| | * b04d9d21 - AND-4167 Improved logic for working with encrypted user data +| |/ +|/| +* | bc810b60 - (tag: develop-297) Merge pull request #325 from tangem/merge_4.11 +|\ \ +| * \ 0b7ffed0 - Merge branch 'develop' into merge_4.11 +| |\ \ +| |/ / +|/| | +* | | 6800e3d4 - (tag: develop-296) Merge pull request #322 from tangem/feature/AND-4324_add_theme_switching +|\ \ \ +| |_|/ +|/| | +| * | 5a5be549 - AND-4324 Added a theme mode selector to the demo application +|/ / +| * 82520930 - (tag: release-app_4.11-295) Merge pull request #323 from tangem/bugfix/AND-4529-hide-warning +|/| +| * b32c84ca - AND-4529 hide warning if already exist when show new +|/ +* 6692ab01 - (tag: release-app_4.11-294, tag: develop-293) Merge pull request #321 from tangem/release-app_4.10 +|\ +| * 424af8a8 - (origin/release-app_4.10) Merge branch 'develop' into release-app_4.10 +| |\ +| |/ +|/| +* | c4e52887 - (tag: develop-291) Merge pull request #319 from tangem/feature/AND-4319-update-codeowners +|\ \ +| * | d6c3c3de - AND-4319 updated CODEOWNERS +|/ / +| * 3ce61b45 - (tag: release-app_4.10-292) Merge pull request #320 from tangem/bugfix/AND-4315_settings_for_access_code_recovery_fix +|/| +| * 62a6acd3 - AND-4315 fix settings access code +|/ +* bd7640df - (tag: release-app_4.10-290, tag: develop-289) Merge pull request #318 from tangem/feature/AND-4258-refactor_chunking_hashes +|\ +| * fa6d8bca - AND-4258: calculate chunk size depending on size of hashes +|/ +* edbe2f25 - (tag: develop-288) Merge pull request #317 from tangem/feature/AND-4256-fix-backup-multiple-wallets +|\ +| * 14698b7a - AND-4256 fixed walletIndex for readData backup +|/ +* 717a2459 - (tag: develop-287) Merge pull request #316 from tangem/feature/AND-4249-change-jvm-opt +|\ +| * 32d1e9ab - AND-4249 change permSize on metaspaceSize +|/ +* 8dbe6524 - (tag: develop-286) Merge pull request #315 from tangem/feature/AND-4243-ignore-error +|\ +| * 436260e0 - Merge branch 'develop' into feature/AND-4243-ignore-error +| |\ +| |/ +|/| +* | 5d105c01 - (tag: develop-285) Merge pull request #313 from tangem/feature/AND-4235-bump-java-version +|\ \ +| * | 5107131d - AND-4235 bump java build version +|/ / +| * 00f07cd2 - AND-4243 ignore UnsupportedCurve error when private key size 32+ +|/ +* d15a1b52 - (tag: develop-284) Merge pull request #310 from tangem/feature/AND-4145_support_Ed25519Slip0010 +|\ +| * 64215091 - AND-4145: add support for new Ed25519Slip0010 +|/ +* ab860864 - (tag: develop-283) Merge pull request #312 from tangem/feature/AND-4219-increase-fw-version +|\ +| * 31c0d094 - AND-4219 added Ed25519Slip0010Available +|/ +* be84c5a9 - (tag: develop-282) Merge pull request #311 from tangem/feature/AND-4219-increase-fw-version +|\ +| * 1357b8ae - AND-4219 increase KeysImportAvailable version +|/ +* e43b8cf7 - (tag: release-app_4.10-281, tag: develop-280) Merge pull request #309 from tangem/AND-4106-deploy-to-gh-registry +|\ +| * 33795ff6 - (tag: AND-4106-deploy-to-gh-registry-279) AND-4106 configured deployments to registry +|/ +* d49656bf - (tag: develop-278) Merge pull request #308 from tangem/release-app_4.9 +|\ +| * dac6313f - Merge branch 'develop' into release-app_4.9 +| |\ +| |/ +|/| +* | ca445856 - (tag: develop-275) Merge pull request #305 from tangem/feature/AND-4031-codeowners +|\ \ +| * | 7b1ac5b3 - AND-4031 actual CODEOWNERS +|/ / +* | 414ecc07 - (tag: develop-273) Merge pull request #302 from tangem/task/AND-3701_backup_active_check +|\ \ +| * \ a3f11ced - Merge branch 'develop' into task/AND-3701_backup_active_check +| |\ \ +| |/ / +|/| | +* | | f3d7e582 - (tag: develop-272) Merge pull request #303 from tangem/task/AND-3711_empty_backed_up +|\ \ \ +| * \ \ 62640ed3 - Merge branch 'develop' into task/AND-3711_empty_backed_up +| |\ \ \ +| |/ / / +|/| | | +* | | | a7cd658f - (tag: develop-271) Merge pull request #301 from tangem/AND-3778-replace_ok +|\ \ \ \ +| | * | | 3ee46339 - AND-3711: filter empty backed up wallet status +| |/ / / +|/| | | +| | * | 4d00dcb9 - AND-3701: fix checks for BackupStatus.isActive +| |/ / +|/| | +| | * d8b889c3 - (tag: release-app_4.9-277) Merge pull request #307 from tangem/bugfix/AND-4071-fix-request-access-code +| | |\ +| | | * 592c7074 - AND-4071 fix request access code on backup +| | |/ +| | * d602ee1d - (tag: release-app_4.9-276, origin/release-app_4.9) Merge pull request #306 from tangem/feature/AND-4063-pin-allowance +| |/| +| | * 90dcfa02 - AND-4063 forbid reset fix +| |/ +| * 43d6dcd4 - (tag: release-app_4.9-274) AND-3778 fixed ru translation +|/ +* 9bb19ab8 - (tag: release-app_4.8-270, tag: develop-269, origin/release-app_4.8) AND-3420 Move detect rules in common repo +* f585b280 - (tag: release-app_4.7-268, tag: develop-267, origin/release-app_4.7) Merge pull request #296 from tangem/bugfix/AND-3705_fix_reset_access_code_fields +|\ +| * eae9cc98 - AND-3705 Reset text input fields after new state received on user code change widget +|/ +* 628b0ffd - (tag: develop-266) Merge pull request #298 from tangem/AND-3748_Fix_neutral_build_action_in_card_sdk +|\ +| * 7d908227 - (tag: AND-3748_Fix_neutral_build_action_in_card_sdk-265) AND-3748 Fix neutral build action in card sdk +|/ +* ff67c988 - (tag: develop-258) Merge pull request #295 from tangem/task/AND-3562_bls_validation +|\ +| * 4e2d8406 - (tag: task/AND-3562_bls_validation-257) AND-3562: add verification for BLS +|/ +* 3e3eade7 - (tag: develop-256) Merge pull request #292 from tangem/AND-3561_bls_master_key +|\ +| * 7d6d1fb3 - Merge branch 'develop' into AND-3561_bls_master_key +| |\ +| |/ +|/| +* | fc10d273 - (tag: develop-255) Merge pull request #294 from tangem/release-app_4.6 +|\ \ +| * | 2d28279f - (origin/release-app_4.6) AND-3688 Fix card firmware version moshi adapter +|/ / +| * 7abcfbc0 - AND-3561: add master key creation for BLS +|/ +* cba0bb6c - (tag: develop-253) Merge pull request #291 from tangem/task/AND-3563_schnorr_bip0340 +|\ +| * 08f34ba9 - AND-3563, AND-3560: add full Schnorr (BIP0340) support +|/ +* 44fd31a1 - (tag: develop-252) Merge pull request #289 from tangem/task/AND-3608_finalize_backup_primary +|\ +| * a91a4152 - AND-3608: implement FinalizeReadBackupDataCommand +|/ +* 14101504 - (tag: release-app_4.6-251, tag: develop-250) Merge pull request #290 from tangem/task/AND-3626_normalized +|\ +| * b6a272c8 - AND-3626: add tests for normalized derivation paths support +|/ +* 2e2d404f - (tag: develop-249) Merge pull request #285 from tangem/task/AND-3607_error_returns_cardid +|\ +| * e8bcb891 - Merge branch 'develop' into task/AND-3607_error_returns_cardid +| |\ +| |/ +|/| +* | d1aaddd8 - (tag: develop-248) Merge pull request #288 from tangem/AND-3585_Sync_strings_in_CardSDK_with_ios_team +|\ \ +| * | 3a1496ca - AND-3585 Sync strings in CardSDK with ios team +|/ / +| * 2aee7ab1 - AND-3607: return cardID in BackupFailedNotEmptyWallets error +|/ +* 1977347c - (tag: develop-247) Merge pull request #283 from tangem/task/AND-3559_verify_card_wallet2 +|\ +| * a543fd0c - AND-3559: update card verification command for Wallet 2.0 +|/ +* 5a76da21 - (tag: develop-246) Merge pull request #278 from tangem/task/AND-3578_add_curve_selection +|\ +| * 21c95e79 - Merge branch 'develop' into task/AND-3578_add_curve_selection +| |\ +| |/ +|/| +* | e3437c53 - (tag: develop-245) Merge pull request #282 from tangem/AND-3539-custom_card_image +|\ \ +| * | 1fb5a51b - AND-3539 added the ability to set custom image on the scan dialog +|/ / +| * 783afcc9 - Merge branch 'develop' into task/AND-3578_add_curve_selection +| |\ +| |/ +|/| +* | 54a8c4fd - (tag: develop-244) Merge pull request #281 from tangem/AND-3533_Clear_SDK_keys_in_localise +|\ \ +| * | 35b1448b - AND-3533 Clear SDK keys in localise +|/ / +| * 005c73ba - Merge branch 'develop' into task/AND-3578_add_curve_selection +| |\ +| |/ +|/| +* | 91ffdd49 - (tag: develop-243) Merge pull request #279 from tangem/bugfix/AND-3579_Error_code_is_missed_for_several_backup's_error +|\ \ +| * | edb2dd2d - AND-3579 Error code is missed for several backup's error +|/ / +* | d8bd4371 - (tag: develop-242) Merge pull request #280 from tangem/release_4.5 +|\ \ +| * \ 94c3ad0e - (origin/release_4.5) Merge branch 'develop' into release_4.5 +| |\ \ +| |/ / +|/| | +| * | a54b58a6 - (tag: release_4.5-240, tag: release/4.5-239) Merge pull request #276 from tangem/bugfix/AND-3542_cherrypick_fix_biometric_auth_canceled_exception_handling +| |\ \ +| | * | fdf8ed8c - AND-3542 Fix handling of biometric authentication cancellation exception +| |/ / +| | * be626117 - Merge branch 'develop' into task/AND-3578_add_curve_selection +| | |\ +| |_|/ +|/| | +* | | e1fbdb14 - (tag: develop-241) Merge pull request #277 from tangem/task/AND-3577_add_curves +|\ \ \ +| * | | 6cc59d74 - AND-3577: add Schnorr and BLS (allow to create wallets) +|/ / / +| | * 5c112c17 - AND-3578: allow to select any available curve in DemoApp +| |/ +|/| +* | 3a81ebdc - (tag: develop-237) Merge pull request #275 from tangem/bugfix/AND-3542_fix_biometric_auth_canceled_exception_handling +|\ \ +| * | 7065389b - AND-3542 Fix handling of biometric authentication cancellation exception +|/ / +* | f70eb25a - (tag: develop-236) Merge pull request #274 from tangem/bugfix/AND-3525_There_is_no_error_code_in_CardSDK_bottom_sheet_dialog_on_scan_or_biometric +|\ \ +| |/ +|/| +| * 304f3a46 - AND-3525 There is no error code in CardSDK bottom sheet dialog on scan or biometric +|/ +* b70d8269 - (tag: release/4.5-238, tag: develop-235) Merge pull request #273 from tangem/AND-3557_Fix_CardSDK_upload.gradle +|\ +| * 759ad800 - AND-3557 Fix CardSDK upload.gradle +|/ +* c0f282c7 - (tag: develop-234) Merge pull request #272 from tangem/bugfix/AND-3542_Biometry_and_Save_cards_biometry_appears_again_and_again_when_trying_to_enter_app_via_scanning_the_card +* ef152641 - AND-3542 Biometry and Save cards: biometry appears again and again when trying to enter app via scanning the card \ No newline at end of file diff --git a/VERSION b/VERSION index a08ffae0..a5c4c763 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.2 +3.9.0