feat: merge release/0.25.1 to master #1019
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Version update * Hotfix * Init UI * Data collection * sentry fix * sentry new server * New wallet info * more ui * feat: chat UI (#983) * Init UI * Data collection * sentry fix * sentry new server * New wallet info * more ui * Bitrise * Lint fix * Test fix * Sentry fix * Yat sandbox * feat: passcode (#984) * Passphrase feature * Security rep and fraud protection * Few fixes * Rise build number * Onboarding fix * Bug Fix * New proguard rules * Added more logs * Fixed bypassing auth, but in fact just changed to more common logic * Update yat lib FFi update Deeplink fixes Erica issues Adrian issues Black theme fixes * Test fixes
# Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/tari/android/wallet/application/baseNodes/BaseNodes.kt # app/src/main/java/com/tari/android/wallet/application/deeplinks/DeepLink.kt # app/src/main/java/com/tari/android/wallet/application/deeplinks/DeeplinkFormatter.kt # app/src/main/java/com/tari/android/wallet/ui/common/CommonActivity.kt # app/src/main/java/com/tari/android/wallet/ui/common/gyphy/repository/GiphyRESTRetrofitRepository.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/auth/AuthActivity.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/auth/FeatureAuthFragment.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/home/HomeActivity.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/onboarding/localAuth/LocalAuthFragment.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/qr/QRScannerActivity.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/restore/activity/WalletRestoreActivity.kt # app/src/main/java/com/tari/android/wallet/ui/fragment/settings/bugReporting/BugsReportingViewModel.kt # build.gradle # libwallet/arm64-v8a/libcrypto.a # libwallet/arm64-v8a/libssl.a # libwallet/x86_64/libcrypto.a # libwallet/x86_64/libssl.a
chore: align develop to master
feat: logger config
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.