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

fix navigation reset #9208

Merged
merged 1 commit into from
Oct 16, 2019
Merged

fix navigation reset #9208

merged 1 commit into from
Oct 16, 2019

Conversation

yenda
Copy link
Contributor

@yenda yenda commented Oct 14, 2019 •
edited by StatusWrike
Loading

currently navigation-reset only works properly if you reset to a simple route

this fix allows us to use navigation reset with more complex routes, by
ensuring that the navigation stack is populated properly so that navigate
back doesn't end up emptying the stack.

this is temporary as the proper way to do navigation in general would be
to get rid of view id and navigation-stack entirely, since it is a duplication
of the state of react-navigation

status: ready

@yenda yenda requested review from vitvly, rasom and flexsurfer October 14, 2019 17:52
@yenda yenda requested a review from a team as a code owner October 14, 2019 17:52
@yenda yenda self-assigned this Oct 14, 2019
@auto-assign auto-assign bot removed the request for review from a team October 14, 2019 17:52
@ghost
Copy link

ghost commented Oct 14, 2019 •
edited by yenda
Loading

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 Oct 14, 2019 •
edited
Loading

Jenkins Builds

❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ e17ac85 #1 2019-10-14 18:04:30 ~11 min android 📦apk 📲
✔️ e17ac85 #1 2019-10-14 18:05:14 ~12 min linux 📦App
✔️ e17ac85 #1 2019-10-14 18:05:54 ~12 min android-e2e 📦apk 📲
✔️ e17ac85 #1 2019-10-14 18:06:41 ~13 min windows 📦exe
✔️ e17ac85 #1 2019-10-14 18:12:48 ~19 min ios 📦ipa 📲
✔️ e17ac85 #1 2019-10-14 18:17:51 ~24 min macos 📦dmg

vitvly
vitvly approved these changes Oct 14, 2019
View reviewed changes
Copy link
Contributor

@vitvly vitvly left a comment

Choose a reason for hiding this comment

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

Thanks @yenda! This means that in all places we use navigate-reset currently, we have to modify the params map passed so as not to have issues with navigate-back, is that the case?

@yenda
Copy link
Contributor Author

yenda commented Oct 14, 2019

@siphiuel no it just means that now you can have more than one item in the actions vector, previously you could basically only reset to one of the top routes, there is an example in my ens PR

@statustestbot
Copy link

99% of end-end tests have passed

Total executed tests: 97
Failed tests: 1
Passed tests: 96

Failed tests (1)

Click to expand
1. test_decline_invitation_to_group_chat

Device 1: Tap on PlusButton
Device 1: Wait for StartNewChatButton

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

Device sessions

Passed tests (96)

Click to expand
1. test_user_can_switch_network
Device sessions

2. test_block_user_from_public_chat
Device sessions

3. test_filters_from_daap
Device sessions

4. test_copy_and_paste_messages
Device sessions

5. test_send_transaction_from_daap
Device sessions

6. test_onboarding_screen_when_requesting_tokens_for_recovered_account
Device sessions

7. test_connection_is_secure
Device sessions

8. test_deploy_contract_from_daap
Device sessions

9. test_redirect_to_public_chat_tapping_tag_message
Device sessions

10. test_remove_member_from_group_chat
Device sessions

11. test_delete_one_to_one_chat_via_delete_button
Device sessions

12. test_mobile_data_usage_popup_continue_syncing
Device sessions

13. test_clear_history_of_group_chat_via_group_view
Device sessions

14. test_open_transaction_on_etherscan
Device sessions

15. test_pass_phrase_validation
Device sessions

16. test_open_blocked_site
Device sessions

17. test_public_chat_messaging
Device sessions

18. test_open_chat_by_pasting_public_key
Device sessions

19. test_add_custom_token
Device sessions

20. test_long_press_to_delete_1_1_chat
Device sessions

21. test_password_in_logcat_sign_in
Device sessions

22. test_set_profile_picture
Device sessions

23. test_text_message_1_1_chat
Device sessions

24. test_add_to_contacts
Device sessions

25. test_sign_typed_message
Device sessions

26. test_home_view
Device sessions

27. test_send_and_open_links
Device sessions

28. test_unread_messages_counter_1_1_chat
Device sessions

29. test_can_use_purchased_stickers_on_recovered_account
Device sessions

30. test_ens_in_public_chat
Device sessions

31. test_logcat_send_transaction_from_daap
Device sessions

32. test_copy_contact_code_and_wallet_address
Device sessions

33. test_collectible_from_wallet_opens_in_browser_view
Device sessions

34. test_send_message_in_group_chat
Device sessions

35. test_logcat_send_transaction_from_wallet
Device sessions

36. test_account_recovery_with_uppercase_recovery_phrase
Device sessions

37. test_send_token_with_7_decimals
Device sessions

38. test_offline_messaging_1_1_chat
Device sessions

39. test_fetch_more_history_in_empty_chat
Device sessions

40. test_modify_transaction_fee_values
Device sessions

41. test_delete_group_chat_via_delete_button
Device sessions

42. test_token_with_more_than_allowed_decimals (TestRail link is not found)
Device sessions

43. test_send_eth_from_wallet_to_address
Device sessions

44. test_contact_profile_view
Device sessions

45. test_add_account_to_multiaccount_instance
Device sessions

46. test_send_funds_between_accounts_in_multiaccount_instance
Device sessions

47. test_request_eth_in_status_test_dapp
Device sessions

48. test_manage_assets
Device sessions

49. test_create_new_group_chat
Device sessions

50. test_wallet_set_up
Device sessions

51. test_long_press_to_delete_public_chat
Device sessions

52. test_send_emoji
Device sessions

53. test_search_chat_on_home
Device sessions

54. test_block_user_from_one_to_one_header
Device sessions

55. test_logcat_recovering_account
Device sessions

56. test_mobile_data_usage_popup_stop_syncing
Device sessions

57. test_can_add_existing_ens
Device sessions

58. test_transaction_wrong_password_wallet
Device sessions

59. test_pair_devices_sync_name_photo_public_group_chats
Device sessions

60. test_install_pack_and_send_sticker
Device sessions

61. test_pair_devices_sync_one_to_one_contacts
Device sessions

62. test_delete_public_chat_via_delete_button
Device sessions

63. test_messaging_in_different_networks
Device sessions

64. test_logcat_backup_recovery_phrase
Device sessions

65. test_add_new_group_chat_member
Device sessions

66. test_logcat_sign_message_from_daap
Device sessions

67. test_switch_users_and_add_new_account
Device sessions

68. test_mobile_data_usage_settings
Device sessions

69. test_make_admin_member_of_group_chat
Device sessions

70. test_long_press_delete_clear_all_dapps
Device sessions

71. test_send_stt_from_wallet
Device sessions

72. test_login_with_new_account
Device sessions

73. test_insufficient_funds_wallet_positive_balance
Device sessions

74. test_request_public_key_status_test_daap
Device sessions

75. test_start_chat_with_ens
Device sessions

76. test_add_contact_from_public_chat
Device sessions

77. test_user_can_see_all_own_assets_after_account_recovering
Device sessions

78. test_send_two_transactions_one_after_another_in_dapp
Device sessions

79. test_send_message_to_newly_added_contact
Device sessions

80. test_password_in_logcat_creating_account
Device sessions

81. test_user_can_complete_tx_to_dapp_when_onboarding_via_dapp_completed
Device sessions

82. test_backup_recovery_phrase
Device sessions

83. test_public_chat_clear_history
Device sessions

84. test_offline_status
Device sessions

85. test_open_google_com_via_open_dapp
Device sessions

86. test_unread_messages_counter_public_chat
Device sessions

87. test_sign_message_from_daap
Device sessions

88. test_user_can_remove_profile_picture
Device sessions

89. test_send_two_transactions_in_batch_in_dapp
Device sessions

90. test_share_contact_code_and_wallet_address
Device sessions

91. test_message_marked_as_sent_in_1_1_chat
Device sessions

92. test_need_help_section
Device sessions

93. test_refresh_button_browsing_app_webview
Device sessions

94. test_backup_recovery_phrase_warning_from_wallet
Device sessions

95. test_group_chat_system_messages
Device sessions

96. test_open_public_chat_using_deep_link
Device sessions

@yenda
Copy link
Contributor Author

yenda commented Oct 14, 2019

@churik is this e2e test suppose to pass?

@churik
Copy link
Member

churik commented Oct 15, 2019 •
edited
Loading

@yenda for next times: look at Failure screenshot in test_decline_invitation_to_group_chat.
In this case unexpected popup from SauceLab is shown : https://assets.saucelabs.com/jobs/f5fcbf3713d64d95a24ac21c3b35a371/0011screenshot.png?auth=40582f53f961936feecc5448191721c7
So this is infrastructure failure and not related to your PR.

fix navigation reset
500d2cc 
currently navigation-reset only works properly if you reset to a simple route

this fix allows us to use navigation reset with more complex routes, by
ensuring that the navigation stack is populated properly so that navigate
back doesn't end up emptying the stack.

this is temporary as the proper way to do navigation in general would be
to get rid of view id and navigation-stack entirely, since it is a duplication
of the state of react-navigation

Signed-off-by: yenda <[email protected]>
@yenda yenda force-pushed the fix/navigation-reset branch from e17ac85 to 500d2cc Compare October 16, 2019 13:02
@yenda yenda merged commit 500d2cc into develop Oct 16, 2019
@delete-merged-branch delete-merged-branch bot deleted the fix/navigation-reset branch October 16, 2019 13:02
@weekly-digest weekly-digest bot mentioned this pull request Oct 20, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flexsurfer flexsurfer flexsurfer left review comments

@vitvly vitvly vitvly approved these changes

@rasom rasom Awaiting requested review from rasom

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Legacy QA Automation Project
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@yenda @status-im-auto @statustestbot @churik @vitvly @flexsurfer