fixed overlapping last message by the composer when there is a pinned… #20606
+18
−6
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
Jenkins BuildsClick to see older builds (68)
|
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
from
79f3b31
to
e37afa0
Compare
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
2 times, most recently
from
ea97a4f
to
605355a
Compare
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
3 times, most recently
from
21839ae
to
d9feecc
Compare
ilmotta
reviewed
Jul 19, 2024
There was a problem hiding this comment.
@jo-mut, I tried to reproduce the issue as you can see from the screenshots. Apparently this bug doesn't always happen because I couldn't reproduce, but I'm sure it's there :)
But more importantly, the solution in this PR introduces a side-effect, the bottom margin is always being applied. There's probably a way to avoid this side-effect.
See screenshots, with or without pinned messages:
With pinned message (branch)
With pinned message (develop)
Without pinned message (branch)
Without pinned message (develop)
| @@ -401,8 +401,11 @@ | |||
| {window-height :height} (rn/get-window) | |||
| context (rf/sub [:chats/current-chat-message-list-view-context]) | |||
| messages (rf/sub [:chats/raw-chat-messages-stream chat-id]) | |||
| pinned (rf/sub [:chats/pinned-sorted-list chat-id]) | |||
| margin-bottom (and community-channel? (not (nil? pinned))) | |||
There was a problem hiding this comment.
Possibly just (not pinned) is sufficient.
| recording? (rf/sub [:chats/recording?])] | ||
| [rn/view {:style {:flex 3}} ;; Pushes composer to bottom | ||
| [rn/view | ||
| {:style (style/permission-context-sheet margin-bottom)} |
There was a problem hiding this comment.
margin-bottom needs a question mark because it's a boolean
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
from
d9feecc
to
d5258da
Compare
|
@ilmotta I have made some updates on this, so instead of checking on pinned messages, we instead check on if the user can post to community and if its a community chat. Screen.Recording.2024-07-19.at.17.19.28.mov |
|
@ilmotta something else I am noticing, if there is a pinned message and the message is unpinned, the app is killed and restarted and navigate to the current chat the message is still pinned. this behavior is inconsistent maybe its because i was using an old account or something. I am not reproducing it any more |
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
from
d5258da
to
d6096ec
Compare
Thanks @jo-mut. I'll check the PR again later today.
There's a delay for messages to propagate in the network. Maybe because of that, when you unpin and immediately close the app, when reopening, the deletion may not have fully propagated yet? Or do you mean you reopen and the message is never unpinned? |
|
I am also closing the following issue #20779, I think its because was using an old account. |
yeah, when I pin and unpin a message and restart the app, the message is still pinned but not its not reproducible, so maybe its because of message reliablity issues or could because i was using an old account in testing |
|
@ilmotta this is what I meant before, when there is a pinned message and its unpinned, on-reopening the community channel the message is still pinned and when the message is not pinned and I pin the message on-reopening the channel the message in not pinned. The behaviour is the opposite when the channel is closed and reopened. It could be message reliability Screen.Recording.2024-07-23.at.10.54.17.movScreen.Recording.2024-07-23.at.10.53.43.mov |
|
The referenced issue does not seem to happen because of a pinned message. It still happens in the case where there is not a pinned message and the user is not a community member and therefore cannot post. As tested on develop user is member v user has left community 
|
@jo-mut, in this example, I think the user can't unpin a message if they are not a member, that's why you see the message is still unpinned. If they could, anybody would be able to alter the list of pinned messages. The actual bug is that the user shouldn't be able to pin/unpin messages if they are not a member. This we should fix if possible. |
|
@ilmotta got you, I think that can be handled in a separate issues, it falls out of scope for this issue. As for this pr, the overlapping of the last-message is fixed |
shall I create an issue or have you already done so? I think we can do this one in this release |
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
from
d6096ec
to
ca53173
Compare
@ilmotta I added a commit to prevent a user who is not a member from pinning and un-pinning channel messages, I thinks its a small issue that can be bundled up in this pr. Once approved I will let the QA know so they can take this into account when testing. |
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
from
b753ce9
to
d46a9bb
Compare
|
@ilmotta I made last minute changes to check if user is a community member instead of using |
57% of end-end tests have passedFailed tests (2)Click to expandClass TestWalletMultipleDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Expected to fail tests (1)Click to expandClass TestWalletOneDevice:
Passed tests (4)Click to expandClass TestWalletMultipleDevice:
Class TestCommunityOneDeviceMerged:
Class TestWalletOneDevice:
|
Thanks @jo-mut. Let's also see the feedback from a QA about this point. I don't know the granularity at which pinning messages are controllable. Double-checking how the desktop app behaves is another sure way to verify how it should be or pinging a desktop dev. Being a community member may be correct, but might be too permissive too and still not the precise check we should do because the user is doing an operation at the channel level, not community level. |
53% of end-end tests have passedFailed tests (23)Click to expandClass TestActivityMultipleDevicePR:
Class TestWalletMultipleDevice:
Class TestDeepLinksOneDevice:
Class TestActivityMultipleDevicePRTwo:
Class TestCommunityMultipleDeviceMerged:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestActivityCenterContactRequestMultipleDevicePR:
Expected to fail tests (1)Click to expandClass TestWalletOneDevice:
Passed tests (27)Click to expandClass TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestWalletMultipleDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestCommunityOneDeviceMerged:
Class TestWalletOneDevice:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestActivityCenterContactRequestMultipleDevicePR:
|
jo-mut
force-pushed
the
fix/overlapping-last-message
branch
4 times, most recently
from
3261ac0
to
ced0506
Compare
mariia-skrypnyk
force-pushed
the
fix/overlapping-last-message
branch
from
ced0506
to
df32b17
Compare
|
Hi @ilmotta ! This PR touches some areas needed to be retested. Sorry for the delay.
and it is the way for user to be a member but NOT to have ability to post (so NOT being able to send a message) But this functionality should be retested as there are issues in token gated functionality and I can not clearly say will this |
|
@ilmotta will leave this PR in Testing status until 2.31 if you do not mind as we are not planning to include it in 2.30 |
100% of end-end tests have passedPassed tests (7)Click to expandClass TestWalletOneDevice:
Class TestCommunityOneDeviceMerged:
Class TestCommunityMultipleDeviceMerged:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestWalletMultipleDevice:
|
Agreed @mariia-skrypnyk. Better that way 👍🏼 |
|
also better to mind composer simlification, might be also affected #20125 |
It depends if the work in this PR is mostly done, if it is, we can just update/rebase and QA it. @mariia-skrypnyk You mentioned before |
|
I agree that in general pin logic is outside of scope of the PR; |
mariia-skrypnyk
force-pushed
the
fix/overlapping-last-message
branch
from
df32b17
to
92c3876
Compare
86% of end-end tests have passedFailed tests (1)Click to expandClass TestWalletMultipleDevice:
Passed tests (6)Click to expandClass TestCommunityMultipleDeviceMerged:
Class TestCommunityOneDeviceMerged:
Class TestWalletOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestWalletMultipleDevice:
|
|
Hi @ilmotta @ulisesmac ! Rebased PR and retested on iOS and Android. |
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.
fixes
#20513
Summary
This pr adds margin-bottom when the user is not allowed to post a message in a community channel because they are not a member. The margin-bottom is the height of the permission bottom sheet that is shown when the user is no longer a community member
A note to @status-im/mobile-qa, this pr also fixes a bug explained in this comment #20606 (comment). Its a small simple fix I bundled up in this pr
Before and after screenshots comparison
status: ready