feat(dashpay): merge dashpay #1308
Merged
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
# Conflicts: # wallet/AndroidManifest.xml # wallet/src/de/schildbach/wallet/ui/MoreActivity.kt
# Conflicts: # .travis.yml # wallet/AndroidManifest.xml # wallet/src/de/schildbach/wallet/ui/CheckPinDialog.kt # wallet/src/de/schildbach/wallet/ui/DecryptSeedWithPinDialog.kt # wallet/src/de/schildbach/wallet/ui/OnboardingActivity.kt
# Conflicts: # common/build.gradle # sample-integration-android/build.gradle # wallet/src/de/schildbach/wallet/WalletApplication.java # wallet/src/de/schildbach/wallet/ui/BuyAndSellLiquidUpholdActivity.kt # wallet/src/de/schildbach/wallet/ui/MoreActivity.kt # wallet/src/de/schildbach/wallet/ui/send/PaymentProtocolFragment.kt
# Conflicts: # build.gradle # common/src/main/java/org/dash/wallet/common/InteractionAwareActivity.java # common/src/main/res/values/colors.xml # wallet/AndroidManifest.xml # wallet/androidTest/de/schildbach/wallet/ui/WalletActivityTest.java # wallet/src/de/schildbach/wallet/ui/AbstractWalletActivity.java
# Conflicts: # build.gradle # common/src/main/java/org/dash/wallet/common/InteractionAwareActivity.java # common/src/main/res/values/colors.xml # wallet/AndroidManifest.xml # wallet/androidTest/de/schildbach/wallet/ui/WalletActivityTest.java # wallet/src/de/schildbach/wallet/ui/AbstractWalletActivity.java
…' into master-v7.3.2-into-dashpay-merge
…' into master-v7.3.2-into-dashpay-merge
[NMA-991] Dash Wallet Merge | v7.3.2
* feat: added Hilt as dependency injection and AnalyticsService for firebase events * fix: change some synthetics -> view bindings * fix: firebase crashlytics dependency inversion * fix: nullable binding for ContactsFragment * chore: move analytics constants to a separate file * fix: hilt injection for coroutineWorkers
… invite (#733) * fix: capturing click events on 'please wait' screen * fix: only show 'please wait' screen until identity is resolved'
* [NMA-977] DashPay GitHub Actions * chore: move version info to gradle * chore: install fastlane * fix: remove report file * feat: dashpay and manual workflows, checksum script for caching * fix: change comment for dashpay build * fix: re-encode some secrets, adding more * fix: versioning for PR builds * Create manual_qa.yml * fix: removing duplicate manual QA workflow * fix: github run_id and test group alias * fix: reversing back to run_number and setting base build number for dashpay push
* [NMA-987] Portal | DashPay Alpha Program * feat: testnet alpha program explore screen * fix: sticky 'get test dash' button and small device adaptations
…on for invites (#739) * refactor: rename clearBlockchainData to ClearBlockchainIdentityData * fix: close the activity after Step 3 * fix: finish entire back stack after setting pin (onboarding with invite) * fix: finish task hijacking fix by using taskAffinity="" at application level * refactor: simplify finishing of the back stack during onboarding * fix: prevent Invite While Onboarding * fix: create MainActivity first, then activate invite if wallet exists * fix: close AcceptInviteActivity when autologout occurs * fix: on step 3, back button goes to the next activity * fix: handle invites after unlocking * (NMA-990, 886)
* refactor: remove obsolete flavors/networks * chore: set staging and schnapps config for integration keys
* dev mode no longer dictates invitation functionality
…ug (#763) * feat: add users-contacts event names * fix: turn off events for debug builds and fix namespaces * feat: users & contacts events, view bindings * fix: fix camera event and gallery bug * [NMA-1019] Firebase events for users and contacts
* feat: use 0.21 platform libraries * chore: move crashlytics plugin to google-services.gradle * fix: update to use 0.21 error codes * refactor: update to use newer methods (Converters) * build: use 0.21-SNAPSHOT libs for dashj-merk
* fix: hide hello card when clicked and when entering contacts screen * feat: for the purpose of QA. reset the state of the hello card when restarting the app * fix: eliminate IndexOutOfBoundsException * fix: eliminate IndexOutOfBoundsException (II) and show username creation status * fix: fix another problem with the hello card * Revert "feat: for the purpose of QA. reset the state of the hello card when restarting the app" This reverts commit 2dee294 * fix: fix another problem with the card not showing if there was an error NMA-772
fix: handle InvalidIdentityAssetLockProofSignatureExceptions properly
* chore: update firebase BOM to 28.4.2 * fix: remove duplicate instance (task) when starting the app * ensure that Rescan Blockchain returns to the home screen * fix: improve retry function for invites
* chore: remove jcenter * chore: update flexbox to 3.0.0 * chore: update dotsindicator to 4.2 * chore: update textdrawable and obtain using jitpack * chore: move OrbitView into common instead of external dependency * chore: remove kotlin-aep repository
* feat: support for making DAPI calls via dash sdk * fix: keep sdk classes * fix: update KeyType fields and functions * fix: remove test queries for getIdentity * fix: add ContextProvider to PlatformService * fix: call DAPI functions after masternode list sync * fix: updates for DAPI call changes * fix: account for failures in registration * fix: create username fixes * fix: fix passing of arguments via view model if others are missing * fix: updates based on rust sdk contact request items * fix: remove private settings step on invites * fix: simplify the end of sending contact request * fix: simplify send invite operation * fix: isPlatformAvailable * style: improve InviteFriendFragment * style: improve MainViewModel * style: remove unused imports * refactor: improve CreateIdentityService * refactor: improve PlatformRepo * fix: update dependencies for dash-sdk * fix: minor changes * refactor: simplify callbacks for contact view holders * refactor: make some fields private * refactor: remove ? * refactor: remove StatusRuntimeException uses * fix: fix UI on Contacts Screen * refactor: use DomainDocument instead of ["*"] * fix: use label instead of normalizedLabel for the display of usernames * fix: ignore alias usernames * chore: bump version code and name
…1296) * refactor: remove extra code and fix context issues with callbacks * feat: add topup ui warning * feat: add balance warning dialogs for contact requests * fix: enable balance checking for credits * fix: fix infinite loop if not wanting to save profile * fix: fix issues with UserAlerts after app upgrade * style: fix formatting
* chore: use dashj 21.0.0-CJ-SNAPSHOT * chore: move dashpay strings to strings-dashpay.xml * feat: move balance requirement to WelcomeToDashPayFragment * feat: update Username Voting Info fragment * feat: update RequestUsernameFragment to new designs * feat: update the create your username page and confirm dialog * fix: implement correct balance warnings on the WelcomeToDashPayFragment * fix: derive CreateUsernameActivity from LockScreenActivity * feat: add UsernameRegistrationFragment to track the full screen progress of username registration * feat: for uncontested usernames, trigger creation * feat: update username fee constants * fix: remove VOTE_DASH_PAY_ENABLED * fix: remove VOTE_DASH_PAY_ENABLED * fix: remove VOTE_DASH_PAY_ENABLED in Settings layout * fix: normalize getUsername search * fix: move some items from DashPayConfig to BlockchainIdentityConfig * feat: BlockchainIdentityData updates * feat: Confirm Username request updates * feat: update username creation / requests * feat: update the more menu, etc
* fix: align with Send Request functionality * feat: add broadcastIdentityVerify method to PlatformBroadcastService * feat: add identityVerify queries to Platform Services * feat: add identityVerify queries to CreateIdentityService * feat: add worker for broadcast identity verification * feat: update to support improved username requests * chore: remove commented code * fix: fix verify links saving to document * chore: fix or add license headers
* testnet and prod disable DashPay features
Merge Dash Wallet into DashPay * disable DashPay features for prod and testnet
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.
Issue being fixed or feature implemented
Related PR's and Dependencies
Screenshots / Videos
How Has This Been Tested?
Checklist: