DashPay: Send Payment - Pending Contact (NMA-373) #503
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
…dash-wallet into dashpay-pay-pending
previous code didn't show Add New Contact if we had sent a request, though we had no contacts.
…nd current contacts
… a contact/pending contact
… into dashpay-pay-pending
… into dashpay-pay-pending
…#509) * Simplified tracking of the progress of send contact request operation Removed some debug code * No need to derive encryption key one more time * Improved exception handling
Added tracking the progress after sending contact request.
…ndling status of contact requests. Fixed issues with sending payments to strangers.
# Conflicts: # wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
HashEngineering
commented
Sep 24, 2020
Comment on lines
20
to
25
| @Query("SELECT * FROM dashpay_profile where username = :username") | ||
| fun loadFromUsername(username: String): LiveData<DashPayProfile?> | ||
|
|
||
| fun loadFromUsernameDistinct(userId: String): | ||
| LiveData<DashPayProfile?> = loadFromUsername(userId).getDistinct() | ||
|
|
There was a problem hiding this comment.
This looks like my code. It doesn't match that of DashPayProfileDaoAsync which has better names.
These methods should be called loadByUsername and loadByUsernameDistinct
We are missing a loadByUserId here compared to DashPayProfileDaoAsync, it is still called load.
There was a problem hiding this comment.
Missing loadByUserId added
HashEngineering
commented
Sep 24, 2020
| import androidx.lifecycle.LiveData | ||
| import de.schildbach.wallet.WalletApplication | ||
|
|
||
| abstract class ContactsBasedLiveData<T>(val walletApplication: WalletApplication, |
There was a problem hiding this comment.
Good idea to refactor this code out to a new class, rather than have duplicate code in many classes.
HashEngineering
commented
Sep 24, 2020
There was a problem hiding this comment.
This was tested on a few devices, by clicking and scanning QR codes. Overall it works well:
Here are some bugs:
- When sending a contact request to a user, once the operation is completed "Activity" appears but there is no activity listed. The only item would be that the contact request was sent on a specific date/time. The activity_rv has the "Activity" row item, but not a Notification item. This problem also existed before you work on this story, though the "Activity" Row was also missing.
- The Accept button on a contact or notification row on other screens (Contacts, Notifications, Add a Contact) does nothing when pressed.
- One comment was added to the code to align method names between the
DashPayProfileDao*classes - Merge with
evonet-developand fix one compile issue related toloadDistinctandloadByUserNameDistinct- this is from merging NMA-431 | Settings | View DashPay Profile #512. - Sending to a regular address (not a contact or a user), may not allow the close button to work on the TransactionResultActivity.
Mostly changed the naming convention for Room DAOs (the `Async` suffix should not be used in coroutine based / suspended versions)
…tivity and UsernameSearchResultsAdapter
…ResultsAdapter and NotificationsAdapter
# Conflicts: # wallet/src/de/schildbach/wallet/ui/dashpay/ContactSearchResultsAdapter.kt # wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
HashEngineering
commented
Sep 29, 2020
Comment on lines
42
to
49
| // val userLiveData by lazy { | ||
| // AppDatabase.getAppDatabase().dashPayProfileDaoAsync().loadByUserIdDistinct(userData.dashPayProfile.userId).switchMap { | ||
| // return@switchMap liveData(Dispatchers.IO) { | ||
| // userData = platformRepo.loadContactRequestsAndReturn(it)!! | ||
| // emit(userData) | ||
| // } | ||
| // } | ||
| // } |
There was a problem hiding this comment.
Can this be removed?
HashEngineering
commented
Sep 29, 2020
Comment on lines
63
to
65
| // val userLiveDataObservable by lazy { | ||
| // AppDatabase.getAppDatabase().dashPayProfileDaoAsync().loadDistinct(userData.dashPayProfile.userId) | ||
| // } |
There was a problem hiding this comment.
Can this be removed?
HashEngineering
commented
Sep 29, 2020
Comment on lines
81
to
98
| // fun sendContactRequest(refreshUserData: Boolean) { | ||
| // viewModelScope.launch(Dispatchers.IO) { | ||
| // try { | ||
| // val toUserId = userLiveData.value!!.dashPayProfile.userId | ||
| // val username = userLiveData.value!!.username | ||
| // val result = platformRepo.sendContactRequest(toUserId) | ||
| // if (refreshUserData) { | ||
| // userLiveData.postValue(platformRepo.getUser(userData.username).first()) | ||
| // } else { | ||
| // userLiveData.value!!.toContactRequest = result | ||
| // userLiveData.postValue(userLiveData.value) //notify observers | ||
| // } | ||
| // } catch (ex: Exception) { | ||
| // log.error(ex.message, ex) | ||
| // userLiveData.postValue(userLiveData.value) //notify observers | ||
| // } | ||
| // } | ||
| // } |
There was a problem hiding this comment.
Can this be removed?
HashEngineering
commented
Sep 29, 2020
| // AppDatabase.getAppDatabase().dashPayProfileDaoAsync().loadDistinct(userData.dashPayProfile.userId) | ||
| // } | ||
|
|
||
| fun a() { |
There was a problem hiding this comment.
is there a better name for this method?
There was a problem hiding this comment.
It was a test code.
Removed
HashEngineering
commented
Sep 29, 2020
Comment on lines
108
to
115
| // background color alternates based on first letter | ||
| val colorResId = if (item.usernameSearchResult.dashPayProfile.username[0].toLowerCase().toInt() % 2 != 0) { | ||
| R.color.white | ||
| } else { | ||
| R.color.dash_lighter_gray | ||
| } | ||
| val color = ResourcesCompat.getColor(holder.itemView.resources, colorResId, null) | ||
| setBackgroundColor(color) |
There was a problem hiding this comment.
This alternating background color code was removed in a merged PR from last week:
There was a problem hiding this comment.
This explains my confusion when merging evonet-develop into my code.
Fixed
|
Review: Other issues in my previous "Review" were addressed. Only things that remain are commented code and the |
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
NMA-373
This must be merged (and preferably rebased) after #501 .
This PR is not complete:
Contacts Screen, show Add New Contact if there are no contacts or pending contact requests. Previously, if a contact request was sent, then the Contacts Screen was blank even though there were no pending/contacts to display.
Layout issues addressed on DashPay User Screen for a user that has sent a contact request
Related PR's and Dependencies
none
Screenshots / Videos
How Has This Been Tested?
Checklist: