chore: merge feature-dashdirect #1160
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
* feat : move ResponseResource to common module * feat : Add dashdirect network layer * feat :Integrate api to ui * feat : move file to common * fix : code comment
* fix: ignore address assignment for intent with no address * feat : create payment header * feat : Refactor amount view * feat : create PurchaseGiftCardFragment * feat : create PurchaseGiftCardConfirmDialog * feat : create GiftCardDetailsDialog * feat : Add Strings * feat : create GiftCardDetailsDialog * feat : refactor ExploreViewModel.kt * feat : refactor isUserSignIn.kt * feat : remove mock data * feat : fix test * feat : check if the transaction id is empty * feat : mock login * feat : fix navigation * feat : fix the amount issue * feat : refactor purchaseGiftCardData * feat : fix the scope of ExploreViewModel * feat : fix Purchase gift card * feat : fix show currency picker Co-authored-by: Andrei Ashikhmin <synmcj>
* feat : add login and create account * feat : fix keyboard postion * feat : add masked email * feat : save email encrypted * feat : change windowSoftInputMode * feat : add getMerchantById * feat : fix error messages * feat : change error message
…urchase UI (#1083) * feat: support v2 explore DB with new columns * feat: use explore DB values or latest values from API for purchase limits * feat : add getMerchantById * refactor: remove some !! * fix: update PurchaseGiftCardConfirmDialog with discount % * fix: show pay button for DashDirect merchant or with a deeplink
* chore: upgrade to kotlin 1.7.10 * feat: add ktfmt gradle plugin * feat: add ktfmtCheck into CI * fix: remove code formatting check from manual distribution pipeline --------- Co-authored-by: Andrei Ashikhmin <synmcj>
* feat : add test merchent * style: update format --------- Co-authored-by: Andrei Ashikhmin <synmcj@gmail.com>
fix: retain gift card response in release builds
* feat : createSendingRequestFromDashUri * feat : fix sign issue * feat : get card details * feat : disable retry status * feat : add test merchent * feat : fix code issue * feat : handle error state * feat : remove comments * feat : fix code format * feat : fix code format * feat : remove unused import * feat : rename fun * feat : change function name * feat : format code * feat : enable debug on release * feat : revert debug * feat : fix proguard issue * feat : fix code comments
…1096) * feat : createSendingRequestFromDashUri * feat : fix sign issue * feat : fix sign issue * chore: upgrading to kotlin 1.7.10 * chore: add ktfmt and apply formatting to exploredash module * feat : get card details * chore: refactoring * feat : disable retry status * fix: UI fixes * feat: transaction filter dialog * feat: fetching presentable metadata to display * chore: replacing Glide with Coil * chore: database refactoring + migrations * feat: saving icon and metadata to DB * feat: icon in transaction rows and transaction details * feat: sorting by Gift Card * feat: gift card icon for transaction result view * fix: home screen UI * chore: optimizing bitmaps to only have one instance per icon * fix: performance / night mode improvements * fix: tests * fix: removing configuration cache * fix: renaming dash direct package * feat : add test merchent * feat : fix code issue * feat : handle error state * feat : remove comments * fix: QA fixes * feat : remove unused import * feat : rename fun * feat : change function name * feat : format code * feat : enable debug on release * feat : fix format * fix: send coins result crash * fix: preloading the devnet database * chore: enable logging * feat : revert debug * fix: retain gift card response in release builds * feat : fix proguard issue * feat : fix format * feat: fetching the icon separatelly in the metadata provider class * fix: broken flow due to NPE --------- Co-authored-by: hadia <hadiamohamed.iti@gmail.com> Co-authored-by: Andrei Ashikhmin <synmcj>
…#1098) * fix: home screen transaction fixes * feat: loading indicator and error message for the barcode * chore: refactor OffsetDialogFragment and descendants * chore: gradle changes * chore: refactoring Qr utility class to bring together all Qr functions * fix: gift card details UI fixes * chore: refactor monetary extensions * chore: refactor PaymentHeaderView and replace Send header with it * fix: apple pay icon for payment method picker * feat: gift cards table and migrations * chore: updating live data and removing unneeded extensions * feat: custom tx row titles * fix: icon sizes and date * fix: gift card UI fixes * chore: format code * fix: decoding in correct barcode size * feat: ktlint as a separate CI job * feat: disabling some rules * fix: extracting local.properties in ktlint pipeline * chore: apply ktlint
* chore: cleaning up merge leftovers * fix: check if icon url is empty * feat: dash direct events and refactoring * chore: code format
* feat : display loading indicator for Continue button on the auth screen * fix : change keyboard to use the same coinbase keyboard * chore: format code * fix : min/max update limit * fix : show keyboard with focus * fix : the keyboard cursor to end of text * fix : retry if gift card id is null
* feat: dash direct events and refactoring * chore: refactor package info out of the wallet application * chore: refactor direct pay flow * fix: authentication * fix: search results not displaying after come back from buy gift card screen * feat: polling API * feat: crowdnode warning * fix: tests * chore: apply ktlint * chore: cleanup
* fix: secure prefs, UUID and auth screen fixes * chore: refactoring EncryptionProvider * chore: reverse explore DB ver 2 changes * fix: UI fixes * feat: pre-load merchant details * feat: tracking sync state * feat: network and blockchain state observers for gift card screens * feat: migrating Explore prefs to the DataStore * chore: reverse disabling Buy button * fix: moving secure prefs login into BaseConfig and refactoring to encode with Base64 * fix: clear prefs if already initialized * fix: progress ring color * chore: apply code format
fix(dashdirect): restore tests
# Conflicts: # wallet/res/drawable/ic_shortcut_scan_to_pay.xml # wallet/src/de/schildbach/wallet/ui/widget/ShortcutButton.kt
chore(dashdirect): merge master into dashdirect
* fix : fix payment header to match design * fix : fix Ui Comments * fix : Revert Payment Header
feat(dashdirect): staging API
chore(dashdirect): retries in case of error
* feat: ionia terms and conditions * chore: cleanup * chore: apply ktlint
* chore: change text * chore: don't show info dialogs * chore: remove gift card filter and hide the filter button if necessary * chore: remove dd entry point * chore: apply ktlint * fix: append https to an url if there is no schema
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.
To keep the general refactorings/improvements made while implementing gift cards integration, we need to merge
feature-dashdirectintomaster.Issue being fixed or feature implemented
Related PR's and Dependencies
Screenshots / Videos
How Has This Been Tested?
Checklist: