Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#20513] Fix last mesage overlapped with "join community" button #21370

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

ulisesmac
Copy link
Contributor

@ulisesmac ulisesmac commented Oct 3, 2024

fixes #20513

Summary

This PR fixes the "join community to post" overlapped.

Fixed on iOS:

Screen.Recording.2024-10-02.at.6.50.24.p.m.mov

Still working on Android:

Screencast.from.2024-10-02.19-12-25.mp4

Review notes

I changed the way we applied the spacing, previously we created a white space behind the "join community to post" drawer, so the blur wasn't properly applied on iOS. If it was increased, the blur wouldn't be noticeable.

The paddings are now applied as part of :content-container-style of flat-list.

Platforms

  • Android
  • iOS

Areas that maybe impacted

Please check that these

  • 1-1 chats
  • Community chats
  • Group chats

Still look as expected.

Steps to test

You will need two communities:
1- where the user is joined, and
2- where the user is still not joined.

You can use this one to test the NOT joined case:

https://status.app/c/G00AAGS9TbI9mSR-ZNmFrhRjNuEeXAAbcAIUaLLJyjMOG3ACJQ12oIHD78QhzO9s_T5bUeU7rnATWJg3mGgTUemrAg==#zQ3shjkJRet5c6BEspn9Y4UT4ZCU3LqnAt1rMmoVMuPwJRWCM

  • Open Status
  • Go to the not joined community
  • Open the general chat (or any chat with more messages)
  • Scroll to bottom and see that the message is no longer overlapped
  • For the joined community, a 1-1 chat, and a group chat:
    • Scroll to the bottom and check nothing is cropped or overlapped.

status: ready

@ulisesmac ulisesmac self-assigned this Oct 3, 2024
Comment on lines -79 to -82
(defn permission-context-sheet
[margin-bottom?]
{:flex 3 ;; Pushes composer to bottom
:margin-bottom (when margin-bottom? permission-context-height)})
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved the margins here to inner paddings, as mentioned in the PR description

Comment on lines -27 to -82
(defn header-bottom-container
[bottom top-margin]
(reanimated/apply-animations-to-style
{:bottom bottom}
{:margin-top top-margin}))

(defn header-bottom-part
[theme]
{:background-color (colors/theme-colors colors/white colors/neutral-95 theme)
:padding-horizontal 20
:border-radius 20})

(defn header-bottom-shadow
[theme]
(assoc
(shadows/get 2 theme :inverted)
:left 0
:right 0
:height 40
:position :absolute
:border-radius 20))

(defn header-image
[scale top left theme]
(reanimated/apply-animations-to-style
{:transform [{:scale scale}]
:top top
:left left}
{:position :absolute
:border-width 4
:border-radius 50
:background-color (colors/theme-colors colors/white colors/neutral-95 theme)
:border-color (colors/theme-colors colors/white colors/neutral-95 theme)}))

(defn user-name-container
[top left]
(reanimated/apply-animations-to-style
{:top top
:left left}
{:z-index -1}))

(def user-name
{:align-items :center
:flex-direction :row
:margin-top 52})

(defn bio-and-actions
[top]
(reanimated/apply-animations-to-style
{:top top}
{:row-gap 16}))

(defn permission-context-sheet
[margin-bottom?]
{:flex 3 ;; Pushes composer to bottom
:margin-bottom (when margin-bottom? permission-context-height)})
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed unused functions, these weren't removed in

So I'm removing them now

@status-im-auto
Copy link
Member

status-im-auto commented Oct 3, 2024

Jenkins Builds

Click to see older builds (8)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ dd817c4 #1 2024-10-03 01:24:34 ~4 min tests 📄log
✔️ dd817c4 #1 2024-10-03 01:26:49 ~6 min android 🤖apk 📲
✔️ dd817c4 #1 2024-10-03 01:27:34 ~7 min android-e2e 🤖apk 📲
✔️ dd817c4 #1 2024-10-03 01:33:34 ~13 min ios 📱ipa 📲
✔️ 2161798 #2 2024-10-03 18:48:43 ~4 min tests 📄log
✔️ 2161798 #2 2024-10-03 18:51:41 ~7 min android-e2e 🤖apk 📲
✔️ 2161798 #2 2024-10-03 18:51:59 ~8 min android 🤖apk 📲
✔️ 2161798 #2 2024-10-03 18:54:01 ~10 min ios 📱ipa 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ b6635c3 #3 2024-10-04 08:20:17 ~4 min tests 📄log
✔️ b6635c3 #3 2024-10-04 08:23:09 ~6 min android-e2e 🤖apk 📲
✔️ b6635c3 #3 2024-10-04 08:23:12 ~6 min android 🤖apk 📲
✔️ b6635c3 #3 2024-10-04 08:26:12 ~9 min ios 📱ipa 📲
✔️ ddb42e5 #4 2024-10-09 00:36:24 ~4 min tests 📄log
✔️ ddb42e5 #4 2024-10-09 00:38:14 ~6 min android-e2e 🤖apk 📲
✔️ ddb42e5 #4 2024-10-09 00:38:42 ~6 min android 🤖apk 📲
✔️ ddb42e5 #4 2024-10-09 00:41:59 ~9 min ios 📱ipa 📲

Copy link
Member

@clauxx clauxx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 👍

@Horupa-Olena Horupa-Olena self-assigned this Oct 4, 2024
@Horupa-Olena Horupa-Olena force-pushed the 20513-join-community-to-post-overlapped branch from 2161798 to b6635c3 Compare October 4, 2024 08:15
@status-im-auto
Copy link
Member

71% of end-end tests have passed

Total executed tests: 7
Failed tests: 2
Expected to fail tests: 0
Passed tests: 5
IDs of failed tests: 703133,727229 

Failed tests (2)

Click to expand
  • Rerun failed tests

  • Class TestCommunityOneDeviceMerged:

    1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133

    Device 1: Getting username card by 'first user'
    Device 1: Find `Button` by `xpath`: `//*[@text='first user']//ancestor::android.view.ViewGroup[@content-desc='profile-card']//*[@content-desc="profile-card-options"]`

    critical/chats/test_public_chat_browsing.py:232: in test_restore_multiaccount_with_waku_backup_remove_switch
        user_card.open_user_options()
    ../views/sign_in_view.py:140: in open_user_options
        Button(self.driver, xpath='%s//*[@content-desc="profile-card-options"]' % self.locator).click()
    ../views/base_element.py:90: in click
        element = self.find_element()
    ../views/base_element.py:79: in find_element
        raise NoSuchElementException(
     Device 1: Button by xpath: `//*[@text='first user']//ancestor::android.view.ViewGroup[@content-desc='profile-card']//*[@content-desc="profile-card-options"]` is not found on the screen; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#no-such-element-exception
    



    Device sessions

    Class TestWalletMultipleDevice:

    1. test_wallet_send_eth, id: 727229

    Device 2: Find Text by xpath: //android.view.ViewGroup[@content-desc='container']/android.widget.TextView[@text='Ether']/../android.widget.TextView[3]
    Device 2: Text is 0.07849 ETH

    critical/test_wallet.py:159: in test_wallet_send_eth
        self.errors.verify_no_errors()
    base_test_case.py:192: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Sender balance is not updated on Etherscan, it is 0.4034 but expected to be 0.4035
    



    Passed tests (5)

    Click to expand

    Class TestCommunityOneDeviceMerged:

    1. test_community_copy_and_paste_message_in_chat_input, id: 702742
    Device sessions

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_regular_account, id: 727231
    Device sessions

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
    Device sessions

    Class TestWalletMultipleDevice:

    1. test_wallet_send_asset_from_drawer, id: 727230

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_message_edit, id: 702843
    Device sessions

    @Horupa-Olena
    Copy link

    @ulisesmac Thanks for your fix. You can merge this PR

    @ulisesmac ulisesmac force-pushed the 20513-join-community-to-post-overlapped branch from b6635c3 to ddb42e5 Compare October 9, 2024 00:31
    @ulisesmac ulisesmac merged commit 131da5f into develop Oct 9, 2024
    6 checks passed
    @ulisesmac ulisesmac deleted the 20513-join-community-to-post-overlapped branch October 9, 2024 00:50
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    Archived in project
    Development

    Successfully merging this pull request may close these issues.

    "Join community to post" overlaps the last message in chat when there are pinned messages on IOS
    4 participants