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

Two-pane UI on large screens #8444

Merged
merged 1 commit into from
Jul 5, 2019
Merged

Two-pane UI on large screens #8444

merged 1 commit into from
Jul 5, 2019

Conversation

vkjr
Copy link
Contributor

@vkjr vkjr commented Jun 20, 2019 •
edited by StatusWrike
Loading

fixes #8168

Summary

UI switched to 2-pane format when device width is >640px.

Review notes

2-pane ui navigator implemented here:
https://github.com/status-im/react-native-navigation-twopane

Testing notes

Per discussion with @mandrigin: it would be good to merge 2-pane ui even if there are some discrepancies with designs. They can be solved as a separate issues.

Platforms

  • Android
  • iOS

Areas that maybe impacted

Navigation

Functional
  • 1-1 chats
  • public chats
  • group chats
  • wallet / transactions
  • dapps / app browsing
  • account recovery
  • new account

Steps to test

  • Open Status
  • check that it shows 2-pane UI when device width bigger than 640px
  • check that navigation between chats and inside right pane works correclty

status: ready

@vkjr vkjr requested a review from a team as a code owner June 20, 2019 10:10
@vkjr vkjr self-assigned this Jun 20, 2019
@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@status-github-bot
Copy link

status-github-bot bot commented Jun 20, 2019 •
edited by vkjr
Loading

Pull Request Checklist

  • Have you updated the documentation, if impacted (e.g. docs.status.im)?

@status-im-auto
Copy link
Member

status-im-auto commented Jun 20, 2019 •
edited
Loading

Jenkins Builds

Click to see older builds (116)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
❌ 2ae9fc7 #1 2019-06-20 10:14:18 ~4 min macos 📄 log
❌ 2ae9fc7 #1 2019-06-20 10:15:34 ~5 min windows 📄 log
❌ 2ae9fc7 #1 2019-06-20 10:16:24 ~6 min linux 📄 log
❌ 2ae9fc7 #1 2019-06-20 10:21:22 ~11 min ios 📄 log
❌ 2ae9fc7 #1 2019-06-20 10:22:23 ~12 min android-e2e 📄 log
❌ 2ae9fc7 #1 2019-06-20 10:26:37 ~16 min android 📄 log
❌ 4a2cc97 #2 2019-06-20 13:46:42 ~33 sec android 📄 log
❌ 4a2cc97 #2 2019-06-20 13:46:46 ~33 sec linux 📄 log
❌ 4a2cc97 #2 2019-06-20 13:46:46 ~31 sec windows 📄 log
❌ 4a2cc97 #2 2019-06-20 13:46:46 ~32 sec macos 📄 log
❌ 4a2cc97 #2 2019-06-20 13:46:46 ~35 sec ios 📄 log
❌ 4a2cc97 #2 2019-06-20 13:58:22 ~12 min android-e2e 📄 log
❌ f52681b #3 2019-06-20 14:42:23 ~3 min macos 📄 log
❌ f52681b #3 2019-06-20 14:43:25 ~4 min linux 📄 log
❌ f52681b #3 2019-06-20 14:43:47 ~4 min windows 📄 log
❌ f52681b #3 2019-06-20 14:49:38 ~10 min ios 📄 log
❌ f52681b #3 2019-06-20 14:57:31 ~18 min android 📄 log
❌ f52681b #3 2019-06-20 18:29:32 ~13 min android-e2e 📄 log
❌ 0754f96 #4 2019-06-21 12:43:19 ~3 min windows 📄 log
❌ 0754f96 #4 2019-06-21 12:43:59 ~4 min macos 📄 log
❌ 0754f96 #4 2019-06-21 12:45:03 ~5 min linux 📄 log
❌ 3cabb25 #5 2019-06-21 12:58:58 ~10 min ios 📄 log
❌ 3cabb25 #5 2019-06-21 12:59:06 ~10 min macos 📄 log
❌ 3cabb25 #5 2019-06-21 13:00:09 ~11 min windows 📄 log
❌ 3cabb25 #5 2019-06-21 13:01:40 ~13 min linux 📄 log
❌ 3cabb25 #5 2019-06-21 13:03:31 ~15 min android-e2e 📄 log
❌ 3cabb25 #5 2019-06-21 13:05:11 ~16 min android 📄 log
❌ 62fb5a0 #6 2019-06-23 16:41:24 ~7 min macos 📄 log
❌ 62fb5a0 #6 2019-06-23 16:44:29 ~10 min linux 📄 log
❌ 62fb5a0 #6 2019-06-23 16:44:32 ~10 min windows 📄 log
✔️ 62fb5a0 #6 2019-06-23 16:45:16 ~11 min ios 📦 ipa
✔️ 62fb5a0 #6 2019-06-23 16:54:49 ~20 min android 📦 apk
❌ 62fb5a0 #6 2019-06-23 16:58:51 ~25 min android-e2e 📄 log
❌ 62fb5a0 #7 2019-06-23 17:21:06 ~7 min macos 📄 log
✔️ c93e19e #7 2019-06-23 19:50:00 ~11 min ios 📦 ipa
✔️ c93e19e #8 2019-06-23 19:51:20 ~12 min macos 📦 dmg
✔️ c93e19e #7 2019-06-23 19:53:55 ~15 min linux 📦 App
✔️ c93e19e #7 2019-06-23 19:55:19 ~16 min windows 📦 exe
✔️ c93e19e #7 2019-06-23 19:59:32 ~20 min android 📦 apk
✔️ c93e19e #7 2019-06-23 19:59:53 ~21 min android-e2e 📦 apk
✔️ cb2498f #9 2019-06-24 07:38:23 ~11 min macos 📦 dmg
✔️ cb2498f #8 2019-06-24 07:38:29 ~11 min ios 📦 ipa
✔️ cb2498f #8 2019-06-24 07:44:13 ~17 min linux 📦 App
✔️ cb2498f #8 2019-06-24 07:44:44 ~17 min windows 📦 exe
✔️ cb2498f #8 2019-06-24 07:49:04 ~22 min android 📦 apk
✔️ cb2498f #8 2019-06-24 07:49:17 ~22 min android-e2e 📦 apk
❌ ea1ef7d #9 2019-06-25 08:55:01 ~15 sec android 📄 log
❌ ea1ef7d #9 2019-06-25 08:55:02 ~14 sec ios 📄 log
❌ ea1ef7d #9 2019-06-25 08:55:02 ~14 sec linux 📄 log
❌ ea1ef7d #10 2019-06-25 08:55:03 ~14 sec macos 📄 log
❌ ea1ef7d #9 2019-06-25 08:55:04 ~13 sec windows 📄 log
✔️ 2aa9a17 #10 2019-06-25 09:13:14 ~12 min ios 📦 ipa
✔️ 2aa9a17 #10 2019-06-25 09:14:16 ~13 min android 📦 apk
✔️ 2aa9a17 #11 2019-06-25 09:15:36 ~14 min macos 📦 dmg
✔️ 2aa9a17 #10 2019-06-25 09:16:19 ~15 min linux 📦 App
✔️ 2aa9a17 #10 2019-06-25 09:17:51 ~16 min android-e2e 📦 apk
✔️ 2aa9a17 #10 2019-06-25 09:18:24 ~17 min windows 📦 exe
❌ 57632c4 #11 2019-06-26 09:03:23 ~15 sec ios 📄 log
❌ 57632c4 #11 2019-06-26 09:03:24 ~17 sec android 📄 log
❌ 57632c4 #11 2019-06-26 09:03:24 ~15 sec linux 📄 log
❌ 57632c4 #12 2019-06-26 09:03:25 ~14 sec macos 📄 log
❌ 57632c4 #11 2019-06-26 09:03:30 ~18 sec windows 📄 log
✔️ 57632c4 #11 2019-06-26 09:16:51 ~13 min android-e2e 📦 apk
❌ 75a555f #12 2019-06-26 12:01:41 ~17 sec android 📄 log
❌ 75a555f #13 2019-06-26 12:01:41 ~14 sec macos 📄 log
❌ 75a555f #12 2019-06-26 12:01:42 ~13 sec windows 📄 log
❌ 75a555f #12 2019-06-26 12:01:42 ~16 sec linux 📄 log
❌ 75a555f #12 2019-06-26 12:01:44 ~18 sec ios 📄 log
✔️ 75a555f #12 2019-06-26 12:15:20 ~13 min android-e2e 📦 apk
❌ 4f60af5 #13 2019-06-26 13:01:39 ~15 sec android 📄 log
❌ 4f60af5 #13 2019-06-26 13:01:41 ~16 sec ios 📄 log
❌ 4f60af5 #13 2019-06-26 13:01:42 ~14 sec windows 📄 log
❌ 4f60af5 #13 2019-06-26 13:01:42 ~16 sec linux 📄 log
❌ 4f60af5 #14 2019-06-26 13:01:42 ~15 sec macos 📄 log
✔️ 4f60af5 #13 2019-06-26 13:14:09 ~12 min android-e2e 📦 apk
❌ 91896e2 #14 2019-06-27 12:38:29 ~20 sec linux 📄 log
❌ 91896e2 #14 2019-06-27 12:38:29 ~22 sec android 📄 log
❌ 91896e2 #14 2019-06-27 12:38:29 ~21 sec ios 📄 log
❌ 91896e2 #15 2019-06-27 12:38:29 ~19 sec macos 📄 log
✔️ 91896e2 #14 2019-06-27 12:52:51 ~14 min android-e2e 📦 apk
❌ f3d7062 #15 2019-07-01 09:57:49 ~24 sec android 📄 log
❌ f3d7062 #15 2019-07-01 09:57:50 ~24 sec linux 📄 log
❌ f3d7062 #15 2019-07-01 09:57:50 ~22 sec windows 📄 log
❌ f3d7062 #16 2019-07-01 09:57:50 ~23 sec macos 📄 log
❌ f3d7062 #15 2019-07-01 09:57:50 ~25 sec ios 📄 log
✔️ f3d7062 #15 2019-07-01 10:10:10 ~12 min android-e2e 📦 apk
❌ 057af07 #16 2019-07-02 08:40:13 ~23 sec linux 📄 log
❌ 057af07 #16 2019-07-02 08:40:13 ~21 sec windows 📄 log
❌ 057af07 #16 2019-07-02 08:40:14 ~25 sec android 📄 log
❌ 057af07 #16 2019-07-02 08:40:14 ~24 sec ios 📄 log
❌ 057af07 #17 2019-07-02 08:40:14 ~22 sec macos 📄 log
✔️ 057af07 #16 2019-07-02 08:52:20 ~12 min android-e2e 📦 apk
❌ a0c424a #18 2019-07-03 09:31:44 ~3 min windows 📄 log
❌ a0c424a #19 2019-07-03 09:31:44 ~3 min macos 📄 log
❌ a0c424a #18 2019-07-03 09:31:52 ~3 min ios 📄 log
❌ a0c424a #18 2019-07-03 09:32:26 ~4 min linux 📄 log
❌ a0c424a #18 2019-07-03 09:35:00 ~7 min android-e2e 📄 log
✔️ 281db89 #19 2019-07-03 09:54:58 ~11 min ios 📦 ipa
❌ 281db89 #19 2019-07-03 09:55:03 ~11 min android-e2e 📄 log
✔️ 281db89 #20 2019-07-03 09:55:17 ~11 min macos 📦 dmg
✔️ 281db89 #19 2019-07-03 09:58:43 ~14 min linux 📦 App
✔️ 281db89 #19 2019-07-03 09:59:06 ~15 min android 📦 apk
✔️ 281db89 #19 2019-07-03 09:59:33 ~15 min windows 📦 exe
✔️ 281db89 #20 2019-07-03 10:17:21 ~11 min android-e2e 📦 apk
❌ 85b0605 #20 2019-07-04 13:04:16 ~20 sec android 📄 log
❌ 85b0605 #20 2019-07-04 13:04:16 ~18 sec linux 📄 log
❌ 85b0605 #20 2019-07-04 13:04:17 ~17 sec windows 📄 log
❌ 85b0605 #20 2019-07-04 13:04:17 ~20 sec ios 📄 log
❌ 85b0605 #21 2019-07-04 13:04:17 ~18 sec macos 📄 log
✔️ 85b0605 #21 2019-07-04 13:19:38 ~15 min android-e2e 📦 apk
❌ 7e28da2 #21 2019-07-04 14:16:00 ~1 min linux 📄 log
❌ 7e28da2 #21 2019-07-04 14:16:11 ~1 min ios 📄 log
❌ 7e28da2 #22 2019-07-04 14:16:25 ~2 min macos 📄 log
❌ 7e28da2 #21 2019-07-04 14:18:34 ~4 min windows 📄 log
❌ 7e28da2 #22 2019-07-04 14:21:06 ~6 min android-e2e 📄 log
❌ 7e28da2 #21 2019-07-04 14:27:56 ~13 min android 📄 log
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
❌ 8112155 #22 2019-07-04 14:50:09 ~3 min linux 📄 log
❌ 8112155 #22 2019-07-04 14:50:22 ~3 min windows 📄 log
❌ 8112155 #23 2019-07-04 14:50:59 ~4 min macos 📄 log
❌ 8112155 #22 2019-07-04 14:53:52 ~7 min ios 📄 log
❌ 8112155 #23 2019-07-04 14:54:33 ~7 min android-e2e 📄 log
❌ 8112155 #22 2019-07-04 15:06:05 ~19 min android 📄 log
✔️ 8bb05a3 #23 2019-07-05 09:17:35 ~11 min ios 📦 ipa
✔️ 8bb05a3 #24 2019-07-05 09:17:57 ~11 min macos 📦 dmg
✔️ 8bb05a3 #24 2019-07-05 09:18:25 ~12 min android-e2e 📦 apk
✔️ 8bb05a3 #23 2019-07-05 09:19:43 ~13 min android 📦 apk
✔️ 8bb05a3 #23 2019-07-05 09:21:27 ~15 min windows 📦 exe
✔️ 8bb05a3 #23 2019-07-05 09:21:39 ~15 min linux 📦 App

@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

1 similar comment
@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@vkjr vkjr changed the title [WIP] Two-pane UI on large screens Two-pane UI on large screens Jun 21, 2019
@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

1 similar comment
@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@weekly-digest weekly-digest bot mentioned this pull request Jun 23, 2019
Closed
@dependency-lockfile-snitch
Copy link

mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@vkjr vkjr requested a review from hesterbruikman June 24, 2019 08:00
@vkjr
Copy link
Contributor Author

vkjr commented Jul 4, 2019

@asemiankevich, thanks for testing! Will check.

@asemiankevich
Copy link
Contributor

also on iPad Pro 3d gen there is no any delimiter between panes, can we add one?
image

@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

1 similar comment
@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@asemiankevich
Copy link
Contributor

@vkjr as we discussed please resolve conflicts and rebase, then we can run e2e and merge, the issues i mentioned we can fix separately

@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@vkjr
Copy link
Contributor Author

vkjr commented Jul 5, 2019

@asemiankevich, ready, please check

@statustestbot
Copy link

100% of end-end tests have passed

Total executed tests: 44
Failed tests: 0
Passed tests: 44

Passed tests (44)

Click to expand
1. test_block_user_from_public_chat
Device sessions

2. test_filters_from_daap
Device sessions

3. test_copy_and_paste_messages
Device sessions

4. test_send_transaction_from_daap
Device sessions

5. test_request_and_receive_tokens_in_1_1_chat
Device sessions

6. test_deploy_contract_from_daap
Device sessions

7. test_open_transaction_on_etherscan
Device sessions

8. test_public_chat_messaging
Device sessions

9. test_long_press_to_delete_1_1_chat
Device sessions

10. test_password_in_logcat_sign_in
Device sessions

11. test_sign_typed_message
Device sessions

12. test_logcat_send_transaction_from_daap
Device sessions

13. test_send_message_in_group_chat
Device sessions

14. test_logcat_send_transaction_from_wallet
Device sessions

15. test_send_token_with_7_decimals
Device sessions

16. test_modify_transaction_fee_values
Device sessions

17. test_send_eth_from_wallet_to_address
Device sessions

18. test_manage_assets
Device sessions

19. test_logcat_send_transaction_in_1_1_chat
Device sessions

20. test_request_and_receive_eth_in_1_1_chat
Device sessions

21. test_long_press_to_delete_public_chat
Device sessions

22. test_send_emoji
Device sessions

23. test_search_chat_on_home
Device sessions

24. test_logcat_recovering_account
Device sessions

25. test_send_tokens_in_1_1_chat
Device sessions

26. test_network_mismatch_for_send_request_commands
Device sessions

27. test_logcat_sign_message_from_daap
Device sessions

28. test_switch_users_and_add_new_account
Device sessions

29. test_send_stt_from_wallet
Device sessions

30. test_send_eth_in_1_1_chat
Device sessions

31. test_login_with_new_account
Device sessions

32. test_send_eth_from_wallet_to_contact
Device sessions

33. test_add_contact_from_public_chat
Device sessions

34. test_send_two_transactions_one_after_another_in_dapp
Device sessions

35. test_password_in_logcat_creating_account
Device sessions

36. test_backup_recovery_phrase
Device sessions

37. test_offline_status
Device sessions

38. test_open_google_com_via_open_dapp
Device sessions

39. test_unread_messages_counter_public_chat
Device sessions

40. test_sign_message_from_daap
Device sessions

41. test_user_can_remove_profile_picture
Device sessions

42. test_share_contact_code_and_wallet_address
Device sessions

43. test_refresh_button_browsing_app_webview
Device sessions

44. test_backup_recovery_phrase_warning_from_wallet
Device sessions

@asemiankevich
Copy link
Contributor

lets merge this one and i will address the issues separately, thanks for your patience and sorry for delays! @vkjr

@vkjr
Two pane ui on large screens
ea8bf40 
Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>
@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @mandrigin, and @corpetty

@vkjr vkjr merged commit ea8bf40 into develop Jul 5, 2019
@delete-merged-branch delete-merged-branch bot deleted the feature/2-pane-ui branch July 5, 2019 10:03
@vkjr
Copy link
Contributor Author

vkjr commented Jul 5, 2019

@asemiankevich, thanks, merged!

@dependency-lockfile-snitch
Copy link

desktop_files/yarn.lock and mobile_files/yarn.lock changed. Pinging @jakubgs, @pombeirp, and @corpetty

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cammellos cammellos cammellos approved these changes

@rasom rasom rasom approved these changes

@flexsurfer flexsurfer Awaiting requested review from flexsurfer

@mandrigin mandrigin Awaiting requested review from mandrigin

@antdanchenko antdanchenko Awaiting requested review from antdanchenko

@churik churik Awaiting requested review from churik

@hesterbruikman hesterbruikman Awaiting requested review from hesterbruikman

@errorists errorists Awaiting requested review from errorists

Assignees

@churik churik

Labels
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.

Two-pane Status UI on large screens