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

"send" label changed to "next" in wallet #10160

Merged
merged 1 commit into from
Mar 18, 2020
Merged

"send" label changed to "next" in wallet #10160

merged 1 commit into from
Mar 18, 2020

Conversation

vkjr
Copy link
Contributor

@vkjr vkjr commented Mar 12, 2020 •
edited by StatusWrike
Loading

fixes #9974

Summary

Label changed

Platforms

  • Android
  • iOS

status: ready

@vkjr vkjr requested a review from a team March 12, 2020 12:50
@vkjr vkjr self-assigned this Mar 12, 2020
@ghost
Copy link

ghost commented Mar 12, 2020 •
edited by vkjr
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 Mar 12, 2020 •
edited
Loading

Jenkins Builds

Click to see older builds (7)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 2883e76 #1 2020-03-12 12:58:54 ~8 min ios 📦ipa 📲
✔️ 2883e76 #1 2020-03-12 13:01:18 ~10 min android-e2e 📦apk 📲
✔️ 2883e76 #1 2020-03-12 13:05:06 ~14 min android 📦apk 📲
✔️ 285ad24 #2 2020-03-12 14:39:53 ~8 min ios 📦ipa 📲
✔️ 285ad24 #2 2020-03-12 14:48:56 ~17 min android-e2e 📦apk 📲
✔️ 285ad24 #2 2020-03-12 14:49:05 ~17 min android 📦apk 📲
✔️ 285ad24 #3 2020-03-16 12:11:12 ~8 min ios 📦ipa 📲
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ cd4326c #4 2020-03-17 10:43:39 ~9 min ios 📦ipa 📲
✔️ cd4326c #3 2020-03-17 10:47:12 ~12 min android-e2e 📦apk 📲
✔️ cd4326c #3 2020-03-17 10:47:18 ~12 min android 📦apk 📲
✔️ e63d5d8 #5 2020-03-18 13:12:06 ~8 min ios 📦ipa 📲
✔️ e63d5d8 #4 2020-03-18 13:12:40 ~9 min android-e2e 📦apk 📲
✔️ e63d5d8 #4 2020-03-18 13:16:20 ~12 min android 📦apk 📲

flexsurfer
flexsurfer requested changes Mar 12, 2020
View reviewed changes
src/status_im/ui/screens/wallet/send/views.cljs Outdated
@@ -130,7 +130,7 @@
[render-contact to from-chat?]]]
[toolbar/toolbar
{:center
{:label :t/wallet-send
{:label :t/next
Copy link
Member

Choose a reason for hiding this comment

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

we can't just change label, because it can be "send" when you're sending request

Copy link
Member

Choose a reason for hiding this comment

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

when we send tx in chat

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated logic

@status-im-auto
Copy link
Member

94% of end-end tests have passed

Total executed tests: 96
Failed tests: 6
Passed tests: 90

Failed tests (6)

Click to expand
1. test_send_transaction_from_daap

Device 1: Wait for SignButton
Device 1: Tap on OkButton

Balance is not changed during 360 seconds, funds were not received!

Device sessions

2. test_deploy_contract_from_daap

Device 1: Tap on OkButton
Device 1: Looking for an element by text: 'Contract deployed at: '

Device 1: Contract was not created

Device sessions

3. test_fetching_balance_after_offline

Device 1: Tap on AirplaneModeButton
Device 1: Looking for an element by text part: 'MmsService'

Transaction with amount 0.0013104219 is not found in list of transactions, address is f184747445c3B85CEb147DfB136067CB93d95F1D

Device sessions

4. test_send_token_with_7_decimals

Device 1: Wait for SignButton
Device 1: Tap on OkButton

Transaction with amount 0.0850641 is not found in list of transactions, address is f184747445c3B85CEb147DfB136067CB93d95F1D

Device sessions

5. test_send_eth_from_wallet_to_address

Device 1: Wait for SignButton
Device 1: Tap on OkButton

Transaction with amount 0.0013104624 is not found in list of transactions, address is 9164f86170290ba3080e37d19d1953d3c5945913

Device sessions

6. test_send_stt_from_wallet

Device 1: Wait for SignButton
Device 1: Tap on OkButton

Transaction with amount 0.0013104538 is not found in list of transactions, address is 81e0b035fe73f4f1aefeb5c75537c7d9b423149f

Device sessions

Passed tests (90)

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_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
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_two_transactions_one_after_another_in_dapp
Device sessions

55. test_message_marked_as_sent_in_1_1_chat
Device sessions

56. test_long_press_delete_clear_all_dapps
Device sessions

57. test_copy_and_paste_messages
Device sessions

58. test_back_forward_buttons_browsing_website
Device sessions

59. test_password_in_logcat_creating_account
Device sessions

60. test_add_custom_token (TestRail link is not found)
Device sessions

61. test_sign_message_from_daap
Device sessions

62. test_group_chat_system_messages
Device sessions

63. test_dapps_permissions
Device sessions

64. test_request_public_key_status_test_daap
Device sessions

65. test_logcat_send_transaction_from_wallet
Device sessions

66. test_log_level_and_fleet
Device sessions

67. test_add_and_delete_watch_only_account_to_multiaccount_instance
Device sessions

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

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

70. test_send_two_transactions_in_batch_in_dapp
Device sessions

71. test_ens_in_public_and_1_1_chats
Device sessions

72. test_block_user_from_public_chat
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_user_can_see_all_own_assets_after_account_recovering
Device sessions

82. test_pass_phrase_validation
Device sessions

83. test_send_emoji
Device sessions

84. test_filters_from_daap
Device sessions

85. test_redirect_to_public_chat_tapping_tag_message
Device sessions

86. test_pair_devices_sync_one_to_one_contacts
Device sessions

87. test_logcat_send_transaction_from_daap
Device sessions

88. test_messaging_in_different_networks
Device sessions

89. test_collectible_from_wallet_opens_in_browser_view
Device sessions

90. test_insufficient_funds_wallet_positive_balance
Device sessions

@Serhy
Copy link
Contributor

Serhy commented Mar 16, 2020 •
edited
Loading

@vkjr All good when sending TX from Wallet and when sending TX in 1-1 chat to the user with ENS name set.

But there is one place where still 'Send' used instead of 'Next'. When sending TX from chat (after user shared address via 'Accept and share address' button).
To reproduce:

  1. Recover account with funds (UserA) on Device1
  2. Create new account on Device2 (UserB)
  3. UserB adds UserA in contacts and both open 1-1 chat
  4. UserB sends Request transaction request in 1-1 chat to UserA
  5. UserA taps Sign and send button in received messages
    Actual result:

Screenshot 2020-03-16 at 15 09 32

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

2. test_request_public_key_status_test_daap
Device sessions

3. test_decline_invitation_to_group_chat
Device sessions

4. test_ens_username_recipient
Device sessions

5. test_delete_one_to_one_chat_via_delete_button
Device sessions

6. test_offline_status
Device sessions

7. test_open_transaction_on_etherscan
Device sessions

8. test_open_chat_by_pasting_public_key
Device sessions

9. test_back_forward_buttons_browsing_website
Device sessions

10. test_password_in_logcat_creating_account
Device sessions

11. test_can_use_purchased_stickers_on_recovered_account
Device sessions

12. test_modify_transaction_fee_values
Device sessions

13. test_insufficient_funds_wallet_positive_balance
Device sessions

14. test_mobile_data_usage_settings
Device sessions

15. test_delete_group_chat_via_delete_button
Device sessions

16. test_open_google_com_via_open_dapp
Device sessions

17. test_logcat_backup_recovery_phrase
Device sessions

18. test_unread_messages_counter_public_chat
Device sessions

19. test_send_two_transactions_one_after_another_in_dapp
Device sessions

20. test_message_marked_as_sent_in_1_1_chat
Device sessions

21. test_user_can_switch_network
Device sessions

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

23. test_wallet_set_up
Device sessions

24. test_timestamp_in_chats
Device sessions

25. test_add_account_to_multiaccount_instance_seed_phrase
Device sessions

26. test_group_chat_system_messages
Device sessions

27. test_fetch_more_history_in_empty_chat
Device sessions

28. test_mobile_data_usage_popup_continue_syncing
Device sessions

29. test_add_to_contacts
Device sessions

30. test_dapps_permissions
Device sessions

31. test_long_press_delete_clear_all_dapps
Device sessions

32. test_need_help_section
Device sessions

33. test_transaction_wrong_password_wallet
Device sessions

34. test_offline_messaging_1_1_chat
Device sessions

35. test_token_with_more_than_allowed_decimals
Device sessions

36. test_add_account_to_multiaccount_instance_private_key
Device sessions

37. test_text_message_1_1_chat
Device sessions

38. test_install_pack_and_send_sticker
Device sessions

39. test_make_admin_member_of_group_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_complete_tx_to_dapp_when_onboarding_via_dapp_completed (TestRail link is not found)
Device sessions

49. test_connection_is_secure
Device sessions

50. test_user_can_see_all_own_assets_after_account_recovering
Device sessions

51. test_add_new_group_chat_member
Device sessions

52. test_pair_devices_sync_one_to_one_contacts
Device sessions

53. test_add_and_remove_contact_from_public_chat
Device sessions

54. test_send_transaction_from_daap
Device sessions

55. test_onboarding_screen_when_requesting_tokens_for_recovered_account
Device sessions

56. test_long_press_to_delete_1_1_chat
Device sessions

57. test_add_and_delete_watch_only_account_to_multiaccount_instance
Device sessions

58. test_open_blocked_site
Device sessions

59. test_refresh_button_browsing_app_webview
Device sessions

60. test_public_chat_messaging
Device sessions

61. test_pass_phrase_validation
Device sessions

62. test_send_token_with_7_decimals
Device sessions

63. test_sign_message_from_daap
Device sessions

64. test_send_message_in_group_chat
Device sessions

65. test_deploy_contract_from_daap
Device sessions

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

67. test_add_custom_token
Device sessions

68. test_send_and_open_links
Device sessions

69. test_manage_assets
Device sessions

70. test_share_contact_code_and_wallet_address
Device sessions

71. test_redirect_to_public_chat_tapping_tag_message
Device sessions

72. test_block_user_from_public_chat
Device sessions

73. test_ens_in_public_and_1_1_chats
Device sessions

74. test_sign_typed_message
Device sessions

75. test_create_new_group_chat
Device sessions

76. test_password_in_logcat_sign_in
Device sessions

77. test_account_recovery_with_uppercase_recovery_phrase
Device sessions

78. test_send_message_to_newly_added_contact
Device sessions

79. test_logcat_sign_message_from_daap
Device sessions

80. test_mobile_data_usage_popup_stop_syncing
Device sessions

81. test_collectible_from_wallet_opens_in_browser_view
Device sessions

82. test_logcat_send_transaction_from_daap
Device sessions

83. test_contact_profile_view
Device sessions

84. test_switch_users_and_add_new_account
Device sessions

85. test_logcat_send_transaction_from_wallet
Device sessions

86. test_send_two_transactions_in_batch_in_dapp
Device sessions

87. test_filters_from_daap
Device sessions

88. test_send_stt_from_wallet
Device sessions

89. test_login_with_new_account
Device sessions

90. test_home_view
Device sessions

91. test_log_level_and_fleet
Device sessions

92. test_can_add_existing_ens
Device sessions

93. test_copy_contact_code_and_wallet_address
Device sessions

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

95. test_fetching_balance_after_offline
Device sessions

96. test_can_see_all_transactions_in_history
Device sessions

@vkjr
Copy link
Contributor Author

vkjr commented Mar 17, 2020

@Serhy, thanks! Fixed that.

@churik
Copy link
Member

churik commented Mar 18, 2020

Issue is fixed, tested triggering transactions from 1-1 chat, dapp and wallet.
LGTM.

@churik
Copy link
Member

churik commented Mar 18, 2020

@vkjr you can merge

@vkjr
use 'next' label when sending transaction requires a sign
d2478bb 
Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>
@vkjr vkjr merged commit d2478bb into develop Mar 18, 2020
@delete-merged-branch delete-merged-branch bot deleted the fix/send_label branch March 18, 2020 14:43
@vkjr
Copy link
Contributor Author

vkjr commented Mar 18, 2020

done ;)

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

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.

Change wallet 'send' button to 'next'
5 participants
@vkjr @status-im-auto @Serhy @churik @flexsurfer