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.

Sign up for GitHub

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

Jump to bottom

[#10089] Override the behaviour of public chat' unread messages indic… #10117

Merged
merged 2 commits into from
Mar 3, 2020
Merged

[#10089] Override the behaviour of public chat' unread messages indic… #10117

merged 2 commits into from
Mar 3, 2020

Conversation

flexsurfer
Copy link
Member

@flexsurfer flexsurfer commented Mar 2, 2020 •
edited by StatusWrike
Loading

fixes #10089

@flexsurfer flexsurfer requested a review from a team as a code owner March 2, 2020 13:32
@flexsurfer flexsurfer self-assigned this Mar 2, 2020
@auto-assign auto-assign bot removed the request for review from a team March 2, 2020 13:32
@status-github-bot
Copy link

Pull Request Checklist

  • Docs: Updated the documentation, if affected
  • Docs: Added or updated inline comments explaining intention of the code
  • Tests: Ensured that all new UI elements have been assigned accessibility IDs
  • Tests: Signaled need for E2E tests with label, if applicable
  • Tests: Briefly described what was tested and what platforms were used
  • UI: In case of UI changes, ensured that UI matches Figma
  • UI: In case of UI changes, requested review from a Core UI designer
  • UI: In case of UI changes, included screenshots of implementation

@flexsurfer flexsurfer requested a review from a team March 2, 2020 13:32
@status-im-auto
Copy link
Member

status-im-auto commented Mar 2, 2020 •
edited
Loading

Jenkins Builds

Click to see older builds (3)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ ed81be7 #1 2020-03-02 13:42:26 ~10 min ios 📦ipa 📲
✔️ ed81be7 #1 2020-03-02 13:54:59 ~22 min android-e2e 📦apk 📲
✔️ ed81be7 #1 2020-03-02 13:54:59 ~22 min android 📦apk 📲
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 7c55c55 #3 2020-03-03 10:20:15 ~10 min ios 📦ipa 📲
✔️ 7c55c55 #3 2020-03-03 10:29:11 ~19 min android-e2e 📦apk 📲
✔️ 7c55c55 #3 2020-03-03 10:29:26 ~19 min android 📦apk 📲
✔️ 4dbbd7e #4 2020-03-03 12:18:46 ~11 min ios 📦ipa 📲
✔️ 4dbbd7e #4 2020-03-03 12:26:31 ~19 min android 📦apk 📲
✔️ 4dbbd7e #4 2020-03-03 12:29:55 ~22 min android-e2e 📦apk 📲

rasom
rasom approved these changes Mar 2, 2020
View reviewed changes
src/status_im/subs.cljs
@@ -863,7 +856,9 @@
:chats/unread-messages-number
:<- [:chats/active-chats]
(fn [chats _]
(apply + (map :unviewed-messages-count (vals chats)))))
(let [grouped-chats (group-by :public? (vals chats))]
{:public (apply + (map :unviewed-messages-count (get grouped-chats true)))
Copy link
Contributor

Choose a reason for hiding this comment

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

(reduce + ...? :)

Copy link
Member Author

@flexsurfer flexsurfer Mar 2, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

what's the difference?

Copy link
Contributor

Choose a reason for hiding this comment

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

It just looks more idiomatic to me to use reduce here. But I've just found that this is an old debate topic https://stackoverflow.com/questions/3153396/clojure-reduce-vs-apply , not a big deal

Copy link
Contributor

Choose a reason for hiding this comment

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

on the second thought

(transduce (map :unviewed-messages-count) (completing +) (get grouped-chats true))

could do the same thing in one go, doesn't matter here though

@status-im-auto
Copy link
Member

99% of end-end tests have passed

Total executed tests: 94
Failed tests: 1
Passed tests: 93

Failed tests (1)

Click to expand
1. test_unread_messages_counter_public_chat

Device 2: Type 'test message' to ChatMessageInput
Device 2: Tap on SendMessageButton

Device 1: 'Counter' is not found on the screen

Device sessions

Passed tests (93)

Click to expand
1. test_can_see_all_transactions_in_history
Device sessions

2. test_install_pack_and_send_sticker
Device sessions

3. test_send_message_in_group_chat
Device sessions

4. test_login_with_new_account
Device sessions

5. test_clear_history_of_group_chat_via_group_view
Device sessions

6. test_timestamp_in_chats
Device sessions

7. test_password_in_logcat_sign_in
Device sessions

8. test_logcat_recovering_account
Device sessions

9. test_modify_transaction_fee_values
Device sessions

10. test_public_chat_clear_history
Device sessions

11. test_need_help_section
Device sessions

12. test_send_and_open_links
Device sessions

13. test_mobile_data_usage_popup_stop_syncing
Device sessions

14. test_mobile_data_usage_settings
Device sessions

15. test_create_new_group_chat
Device sessions

16. test_sign_typed_message
Device sessions

17. test_user_can_switch_network
Device sessions

18. test_mobile_data_usage_popup_continue_syncing
Device sessions

19. test_home_view
Device sessions

20. test_open_google_com_via_open_dapp
Device sessions

21. test_send_message_to_newly_added_contact
Device sessions

22. test_share_contact_code_and_wallet_address
Device sessions

23. test_make_admin_member_of_group_chat
Device sessions

24. test_connection_is_secure
Device sessions

25. test_add_to_contacts
Device sessions

26. test_add_account_to_multiaccount_instance
Device sessions

27. test_refresh_button_browsing_app_webview
Device sessions

28. test_long_press_to_delete_1_1_chat
Device sessions

29. test_can_add_existing_ens
Device sessions

30. test_transaction_wrong_password_wallet
Device sessions

31. test_public_chat_messaging
Device sessions

32. test_delete_one_to_one_chat_via_delete_button
Device sessions

33. test_long_press_to_delete_public_chat
Device sessions

34. test_text_message_1_1_chat
Device sessions

35. test_delete_public_chat_via_delete_button
Device sessions

36. test_can_use_purchased_stickers_on_recovered_account
Device sessions

37. test_open_transaction_on_etherscan
Device sessions

38. test_onboarding_screen_when_requesting_tokens_for_recovered_account
Device sessions

39. test_contact_profile_view
Device sessions

40. test_logcat_backup_recovery_phrase
Device sessions

41. test_delete_group_chat_via_delete_button
Device sessions

42. test_start_chat_with_ens
Device sessions

43. test_add_and_remove_contact_from_public_chat
Device sessions

44. test_open_blocked_site
Device sessions

45. test_open_chat_by_pasting_public_key
Device sessions

46. test_ens_username_recipient
Device sessions

47. test_token_with_more_than_allowed_decimals
Device sessions

48. test_fetch_more_history_in_empty_chat
Device sessions

49. test_switch_users_and_add_new_account
Device sessions

50. test_copy_contact_code_and_wallet_address
Device sessions

51. test_send_transaction_from_daap
Device sessions

52. test_send_two_transactions_one_after_another_in_dapp
Device sessions

53. test_message_marked_as_sent_in_1_1_chat
Device sessions

54. test_long_press_delete_clear_all_dapps
Device sessions

55. test_copy_and_paste_messages
Device sessions

56. test_deploy_contract_from_daap
Device sessions

57. test_back_forward_buttons_browsing_website
Device sessions

58. test_password_in_logcat_creating_account
Device sessions

59. test_add_custom_token
Device sessions

60. test_sign_message_from_daap
Device sessions

61. test_group_chat_system_messages
Device sessions

62. test_dapps_permissions
Device sessions

63. test_request_public_key_status_test_daap
Device sessions

64. test_logcat_send_transaction_from_wallet
Device sessions

65. test_log_level_and_fleet
Device sessions

66. test_add_and_delete_watch_only_account_to_multiaccount_instance
Device sessions

67. test_recover_account_from_new_user_seedphrase
Device sessions

68. test_user_can_complete_tx_to_dapp_when_onboarding_via_dapp_completed
Device sessions

69. test_send_two_transactions_in_batch_in_dapp
Device sessions

70. test_ens_in_public_and_1_1_chats
Device sessions

71. test_block_user_from_public_chat
Device sessions

72. test_fetching_balance_after_offline
Device sessions

73. test_logcat_sign_message_from_daap
Device sessions

74. test_offline_status
Device sessions

75. test_wallet_set_up
Device sessions

76. test_manage_assets
Device sessions

77. test_add_new_group_chat_member
Device sessions

78. test_offline_messaging_1_1_chat
Device sessions

79. test_decline_invitation_to_group_chat
Device sessions

80. test_account_recovery_with_uppercase_recovery_phrase
Device sessions

81. test_send_token_with_7_decimals
Device sessions

82. test_user_can_see_all_own_assets_after_account_recovering
Device sessions

83. test_pass_phrase_validation
Device sessions

84. test_send_emoji
Device sessions

85. test_filters_from_daap
Device sessions

86. test_redirect_to_public_chat_tapping_tag_message
Device sessions

87. test_pair_devices_sync_one_to_one_contacts
Device sessions

88. test_logcat_send_transaction_from_daap
Device sessions

89. test_send_eth_from_wallet_to_address
Device sessions

90. test_send_stt_from_wallet
Device sessions

91. test_messaging_in_different_networks
Device sessions

92. test_collectible_from_wallet_opens_in_browser_view
Device sessions

93. test_insufficient_funds_wallet_positive_balance
Device sessions

@flexsurfer
Copy link
Member Author

@churik @Serhy could you take a look so we can cut v1.1.

@flexsurfer
Copy link
Member Author

@errorists could you take a look

@errorists
Copy link
Contributor

tested on iOS

📏 perfect score for the list item indicator 10/10! 📐

however the one on the tab bar has a problem, it has a blue halo and the border is set to inside not outside

Screenshot 2020-03-03 at 09 29 33

I recall we had the same issue with the edit avatar picture button back when we still had it.
so likely you want to

(def counter-public {:right 1 :border-radius 8 :width 16 :height 16

to account for the larger size. I asked @Ferossgp how to get rid of the halo

also I'm quite sure it's not introduced in this PR but what the hell is with this empty space over here

IMG_1343

@Serhy Serhy self-assigned this Mar 3, 2020
@flexsurfer flexsurfer force-pushed the feature/unread-indicator-public-chat branch from 605fb98 to 7c55c55 Compare March 3, 2020 10:09
@status-im-auto
Copy link
Member

100% of end-end tests have passed

Total executed tests: 1
Failed tests: 0
Passed tests: 1

Passed tests (1)

Click to expand
1. test_unread_messages_counter_public_chat
Device sessions

@Serhy
Copy link
Contributor

Serhy commented Mar 3, 2020

With iOS 13.3 and Android 8.1 no bugs found.
@flexsurfer please mind my commit when merging.

flexsurfer and others added 2 commits March 3, 2020 14:27
@flexsurfer
[#10089] Override the behaviour of public chat' unread messages indic…
0e4c7a2 
…ator
@flexsurfer
Update e2e
f5488e1 
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
@flexsurfer flexsurfer force-pushed the feature/unread-indicator-public-chat branch from 4dbbd7e to f5488e1 Compare March 3, 2020 13:28
@flexsurfer flexsurfer merged commit f5488e1 into develop Mar 3, 2020
@delete-merged-branch delete-merged-branch bot deleted the feature/unread-indicator-public-chat branch March 3, 2020 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ferossgp Ferossgp Ferossgp left review comments

@rasom rasom rasom approved these changes

@errorists errorists errorists approved these changes

@vitvly vitvly Awaiting requested review from vitvly

@antdanchenko antdanchenko Awaiting requested review from antdanchenko

@churik churik Awaiting requested review from churik churik is a code owner

Assignees
No one assigned
Labels
request-manual-qa Tested - OK
Projects
No open projects
Legacy QA Automation Project
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Override the behaviour of public chat' unread messages indicator
6 participants
@flexsurfer @status-im-auto @errorists @Serhy @rasom @Ferossgp