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

Handle back button special cases, popover and bottom sheet #10173

Merged
merged 1 commit into from
Mar 19, 2020
Merged

Handle back button special cases, popover and bottom sheet #10173

merged 1 commit into from
Mar 19, 2020

Conversation

Ferossgp
Copy link
Contributor

No description provided.

@Ferossgp Ferossgp requested a review from a team as a code owner March 17, 2020 07:59
@Ferossgp Ferossgp self-assigned this Mar 17, 2020
@ghost
Copy link

ghost commented Mar 17, 2020

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

@status-im-auto
Copy link
Member

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

Jenkins Builds

Click to see older builds (3)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
❌ 9614f66 #1 2020-03-17 07:59:34 ~20 sec android 📄log
❌ 9614f66 #1 2020-03-17 07:59:35 ~19 sec ios 📄log
❌ 9614f66 #1 2020-03-17 07:59:36 ~24 sec android-e2e 📄log
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 734bd46 #2 2020-03-17 08:10:59 ~9 min ios 📦ipa 📲
✔️ 734bd46 #2 2020-03-17 08:14:36 ~13 min android 📦apk 📲
✔️ 734bd46 #2 2020-03-17 08:17:38 ~16 min android-e2e 📦apk 📲
✔️ 76a15c6 #3 2020-03-18 15:02:10 ~8 min ios 📦ipa 📲
✔️ 76a15c6 #3 2020-03-18 15:02:54 ~9 min android 📦apk 📲
✔️ 76a15c6 #3 2020-03-18 15:06:33 ~13 min android-e2e 📦apk 📲

@Ferossgp Ferossgp force-pushed the handle-back-button-special-cases branch from 9614f66 to 734bd46 Compare March 17, 2020 08:01
flexsurfer
flexsurfer approved these changes Mar 17, 2020
View reviewed changes
src/status_im/hardwallet/common.cljs Outdated
{:view {:show-handle? false
:backdrop-dismiss? false
:disable-drag? true
:back-button-cancel true
Copy link
Member

Choose a reason for hiding this comment

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

true by default, so we can omit it here

@Serhy Serhy mentioned this pull request Mar 17, 2020
Merged
12 tasks
@status-im-auto
Copy link
Member

100% of end-end tests have passed

Total executed tests: 96
Failed tests: 0
Passed tests: 96

Passed tests (96)

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 (TestRail link is not found)
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_private_key
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_unread_messages_counter_public_chat
Device sessions

33. test_delete_one_to_one_chat_via_delete_button
Device sessions

34. test_long_press_to_delete_public_chat (TestRail link is not found)
Device sessions

35. test_text_message_1_1_chat
Device sessions

36. test_delete_public_chat_via_delete_button (TestRail link is not found)
Device sessions

37. test_can_use_purchased_stickers_on_recovered_account
Device sessions

38. test_open_transaction_on_etherscan
Device sessions

39. test_onboarding_screen_when_requesting_tokens_for_recovered_account
Device sessions

40. test_contact_profile_view
Device sessions

41. test_logcat_backup_recovery_phrase
Device sessions

42. test_delete_group_chat_via_delete_button
Device sessions

43. test_start_chat_with_ens
Device sessions

44. test_add_and_remove_contact_from_public_chat
Device sessions

45. test_add_account_to_multiaccount_instance_seed_phrase
Device sessions

46. test_open_blocked_site
Device sessions

47. test_open_chat_by_pasting_public_key
Device sessions

48. test_ens_username_recipient
Device sessions

49. test_token_with_more_than_allowed_decimals
Device sessions

50. test_fetch_more_history_in_empty_chat
Device sessions

51. test_switch_users_and_add_new_account
Device sessions

52. test_add_account_to_multiaccount_instance_generate_new
Device sessions

53. test_copy_contact_code_and_wallet_address
Device sessions

54. test_send_transaction_from_daap
Device sessions

55. test_send_two_transactions_one_after_another_in_dapp
Device sessions

56. test_message_marked_as_sent_in_1_1_chat
Device sessions

57. test_long_press_delete_clear_all_dapps
Device sessions

58. test_copy_and_paste_messages
Device sessions

59. test_deploy_contract_from_daap
Device sessions

60. test_back_forward_buttons_browsing_website
Device sessions

61. test_password_in_logcat_creating_account
Device sessions

62. test_add_custom_token
Device sessions

63. test_sign_message_from_daap
Device sessions

64. test_group_chat_system_messages
Device sessions

65. test_dapps_permissions
Device sessions

66. test_request_public_key_status_test_daap
Device sessions

67. test_logcat_send_transaction_from_wallet
Device sessions

68. test_log_level_and_fleet
Device sessions

69. test_add_and_delete_watch_only_account_to_multiaccount_instance
Device sessions

70. test_recover_account_from_new_user_seedphrase (TestRail link is not found)
Device sessions

71. test_user_can_complete_tx_to_dapp_when_onboarding_via_dapp_completed (TestRail link is not found)
Device sessions

72. test_send_two_transactions_in_batch_in_dapp
Device sessions

73. test_ens_in_public_and_1_1_chats
Device sessions

74. test_block_user_from_public_chat
Device sessions

75. test_fetching_balance_after_offline
Device sessions

76. test_logcat_sign_message_from_daap
Device sessions

77. test_offline_status
Device sessions

78. test_wallet_set_up
Device sessions

79. test_manage_assets
Device sessions

80. test_add_new_group_chat_member
Device sessions

81. test_offline_messaging_1_1_chat
Device sessions

82. test_decline_invitation_to_group_chat
Device sessions

83. test_account_recovery_with_uppercase_recovery_phrase
Device sessions

84. test_send_token_with_7_decimals
Device sessions

85. test_user_can_see_all_own_assets_after_account_recovering
Device sessions

86. test_pass_phrase_validation
Device sessions

87. test_send_emoji
Device sessions

88. test_filters_from_daap
Device sessions

89. test_redirect_to_public_chat_tapping_tag_message
Device sessions

90. test_pair_devices_sync_one_to_one_contacts
Device sessions

91. test_logcat_send_transaction_from_daap
Device sessions

92. test_send_eth_from_wallet_to_address
Device sessions

93. test_send_stt_from_wallet
Device sessions

94. test_messaging_in_different_networks
Device sessions

95. test_collectible_from_wallet_opens_in_browser_view
Device sessions

96. test_insufficient_funds_wallet_positive_balance
Device sessions

@churik
Copy link
Member

churik commented Mar 18, 2020 •
edited
Loading

Tested on IOS (briefly installing / rocovering / input fields / popuops in porfile / wallet)
On Android:

  • most of bottom sheets and popover can be closed via "back" button (i. e "Share profile", signing phrase, bottom menu in chat) - but not "Send transaction" dialog.

@Ferossgp is it intended?

So far I can trigger and issue due to this:

  • open 1-1 chat
  • tap on request
  • several times tap on Back button - you will be on "Home" instead of 1-1 with opened "Request transaction" dialog

@Ferossgp
Copy link
Contributor Author

@churik Request transaction is using a different component "Bottom panel" (it is similar to the bottom sheet but does not have drag and can't be closed on background press) which should be replaced with the bottom sheet which is used in the keycard. Not sure if I should do it here or in a separate PR

@Serhy
Copy link
Contributor

Serhy commented Mar 18, 2020 •
edited
Loading

Originally the main issue was tapping back button while QR code pop-up on screen
It's cool that we cover it here + some of bottom sheets. Also it's issue is present in Release1.1
Taking that into account, I'd proceed then with what we have now and create separate issue for tapping hardware back button while Send/Request bottom panes is opened.
I'll create an issue then.

@Ferossgp Ferossgp force-pushed the handle-back-button-special-cases branch from 734bd46 to 76a15c6 Compare March 18, 2020 14:53
@status-im-auto
Copy link
Member

98% of end-end tests have passed

Total executed tests: 94
Failed tests: 2
Passed tests: 92

Failed tests (2)

Click to expand
1. test_open_public_chat_using_deep_link

Device 1: Type 'https://join.status.im/chat/public/pvddxuz' to SearchEditBox
Device 1: Tap 'Confirm' on native keyboard

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

Device sessions

2. test_connection_is_secure

Device 1: Looking for full text: 'Connection is secure. Make sure you really trust this site before signing transactions or entering personal data.'
Device 1: Tap on CrossIcon

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

Device sessions

Passed tests (92)

Click to expand
1. test_request_public_key_status_test_daap
Device sessions

2. test_decline_invitation_to_group_chat
Device sessions

3. test_ens_username_recipient
Device sessions

4. test_offline_status
Device sessions

5. test_open_transaction_on_etherscan
Device sessions

6. test_open_chat_by_pasting_public_key
Device sessions

7. test_back_forward_buttons_browsing_website
Device sessions

8. test_password_in_logcat_creating_account
Device sessions

9. test_can_use_purchased_stickers_on_recovered_account
Device sessions

10. test_modify_transaction_fee_values
Device sessions

11. test_insufficient_funds_wallet_positive_balance
Device sessions

12. test_mobile_data_usage_settings
Device sessions

13. test_delete_group_chat_via_delete_button
Device sessions

14. test_open_google_com_via_open_dapp
Device sessions

15. test_logcat_backup_recovery_phrase
Device sessions

16. test_unread_messages_counter_public_chat
Device sessions

17. test_send_two_transactions_one_after_another_in_dapp
Device sessions

18. test_message_marked_as_sent_in_1_1_chat
Device sessions

19. test_user_can_switch_network
Device sessions

20. test_public_chat_clear_history (TestRail link is not found)
Device sessions

21. test_wallet_set_up
Device sessions

22. test_timestamp_in_chats
Device sessions

23. test_delete_chats_via_delete_button
Device sessions

24. test_add_account_to_multiaccount_instance_seed_phrase
Device sessions

25. test_group_chat_system_messages
Device sessions

26. test_fetch_more_history_in_empty_chat
Device sessions

27. test_mobile_data_usage_popup_continue_syncing
Device sessions

28. test_add_to_contacts
Device sessions

29. test_dapps_permissions
Device sessions

30. test_long_press_delete_clear_all_dapps
Device sessions

31. test_need_help_section
Device sessions

32. test_transaction_wrong_password_wallet
Device sessions

33. test_offline_messaging_1_1_chat
Device sessions

34. test_token_with_more_than_allowed_decimals
Device sessions

35. test_add_account_to_multiaccount_instance_private_key
Device sessions

36. test_text_message_1_1_chat
Device sessions

37. test_install_pack_and_send_sticker
Device sessions

38. test_make_admin_member_of_group_chat
Device sessions

39. test_pair_devices_sync_one_to_one_contacts_public_chat
Device sessions

40. test_send_emoji
Device sessions

41. test_copy_and_paste_messages
Device sessions

42. test_clear_history_of_group_chat_via_group_view
Device sessions

43. test_add_account_to_multiaccount_instance_generate_new
Device sessions

44. test_send_eth_from_wallet_to_address
Device sessions

45. test_messaging_in_different_networks
Device sessions

46. test_start_chat_with_ens
Device sessions

47. test_logcat_recovering_account
Device sessions

48. test_user_can_see_all_own_assets_after_account_recovering
Device sessions

49. test_add_new_group_chat_member
Device sessions

50. test_long_press_to_delete_chat
Device sessions

51. test_add_and_remove_contact_from_public_chat
Device sessions

52. test_send_transaction_from_daap
Device sessions

53. test_onboarding_screen_when_requesting_tokens_for_recovered_account
Device sessions

54. test_add_and_delete_watch_only_account_to_multiaccount_instance
Device sessions

55. test_open_blocked_site
Device sessions

56. test_refresh_button_browsing_app_webview
Device sessions

57. test_public_chat_messaging
Device sessions

58. test_pass_phrase_validation
Device sessions

59. test_send_token_with_7_decimals
Device sessions

60. test_sign_message_from_daap
Device sessions

61. test_send_message_in_group_chat
Device sessions

62. test_deploy_contract_from_daap
Device sessions

63. test_recover_account_from_new_user_seedphrase (TestRail link is not found)
Device sessions

64. test_add_custom_token
Device sessions

65. test_send_and_open_links
Device sessions

66. test_manage_assets
Device sessions

67. test_share_contact_code_and_wallet_address
Device sessions

68. test_redirect_to_public_chat_tapping_tag_message
Device sessions

69. test_block_user_from_public_chat
Device sessions

70. test_ens_in_public_and_1_1_chats
Device sessions

71. test_sign_typed_message
Device sessions

72. test_create_new_group_chat
Device sessions

73. test_password_in_logcat_sign_in
Device sessions

74. test_account_recovery_with_uppercase_recovery_phrase
Device sessions

75. test_send_message_to_newly_added_contact
Device sessions

76. test_logcat_sign_message_from_daap
Device sessions

77. test_mobile_data_usage_popup_stop_syncing
Device sessions

78. test_collectible_from_wallet_opens_in_browser_view
Device sessions

79. test_logcat_send_transaction_from_daap
Device sessions

80. test_contact_profile_view
Device sessions

81. test_switch_users_and_add_new_account
Device sessions

82. test_logcat_send_transaction_from_wallet
Device sessions

83. test_send_two_transactions_in_batch_in_dapp
Device sessions

84. test_filters_from_daap
Device sessions

85. test_send_stt_from_wallet
Device sessions

86. test_login_with_new_account
Device sessions

87. test_home_view
Device sessions

88. test_log_level_and_fleet
Device sessions

89. test_can_add_existing_ens
Device sessions

90. test_copy_contact_code_and_wallet_address
Device sessions

91. test_fetching_balance_after_offline
Device sessions

92. test_can_see_all_transactions_in_history
Device sessions

@churik
Copy link
Member

churik commented Mar 19, 2020

Failed e2e are not related to PR.
Ready to merge.

@Ferossgp
Handle hardware back on popover and bottom sheet
ed8b5b2 
Closes all popovers. Fixes #9992

Add hardware back button on bottom sheet

Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
@Ferossgp Ferossgp force-pushed the handle-back-button-special-cases branch from 76a15c6 to ed8b5b2 Compare March 19, 2020 10:21
@Ferossgp Ferossgp merged commit ed8b5b2 into develop Mar 19, 2020
@delete-merged-branch delete-merged-branch bot deleted the handle-back-button-special-cases branch March 19, 2020 10:21
@Serhy
Copy link
Contributor

Serhy commented Mar 19, 2020

@churik Request transaction is using a different component "Bottom panel" (it is similar to the bottom sheet but does not have drag and can't be closed on background press) which should be replaced with the bottom sheet which is used in the keycard. Not sure if I should do it here or in a separate PR

Follow up issue for that is #10187 (covers back gesture and hardware back button)

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

@flexsurfer flexsurfer flexsurfer approved these changes

@Serhy Serhy Awaiting requested review from Serhy

Assignees

@Ferossgp Ferossgp

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.
5 participants
@Ferossgp @status-im-auto @churik @Serhy @flexsurfer