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.

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

Edit button appears below TO section on bridge screen when entering Invalid amount #20809 #20874

Merged
merged 4 commits into from
Jul 29, 2024

Conversation

mmilad75
Copy link
Contributor

@mmilad75 mmilad75 commented Jul 24, 2024

fixes #20809

Summary

RPReplay_Final1721835511.MP4

@mmilad75 mmilad75 self-assigned this Jul 24, 2024
@status-im-auto
Copy link
Member

status-im-auto commented Jul 24, 2024

Jenkins Builds

Click to see older builds (16)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 74014f0 #1 2024-07-24 14:53:31 ~4 min tests 📄log
✔️ 74014f0 #1 2024-07-24 14:57:40 ~8 min android-e2e 🤖apk 📲
✔️ 74014f0 #1 2024-07-24 14:57:44 ~8 min android 🤖apk 📲
✔️ 74014f0 #1 2024-07-24 14:58:47 ~9 min ios 📱ipa 📲
✔️ b8418fe #2 2024-07-24 15:46:39 ~5 min tests 📄log
✔️ b8418fe #2 2024-07-24 15:50:07 ~8 min android-e2e 🤖apk 📲
✔️ b8418fe #2 2024-07-24 15:50:17 ~8 min android 🤖apk 📲
✔️ b8418fe #2 2024-07-24 15:51:52 ~10 min ios 📱ipa 📲
✔️ 4cbbb12 #3 2024-07-26 12:53:12 ~4 min tests 📄log
✔️ 4cbbb12 #3 2024-07-26 12:54:37 ~6 min android-e2e 🤖apk 📲
✔️ 4cbbb12 #3 2024-07-26 12:56:36 ~8 min android 🤖apk 📲
✔️ 4cbbb12 #3 2024-07-26 13:02:13 ~13 min ios 📱ipa 📲
✔️ f277618 #5 2024-07-26 13:33:30 ~22 min ios 📱ipa 📲
✔️ f277618 #5 2024-07-26 13:42:26 ~31 min android-e2e 🤖apk 📲
✔️ f277618 #5 2024-07-26 13:42:33 ~31 min tests 📄log
✔️ f277618 #5 2024-07-26 13:46:01 ~35 min android 🤖apk 📲
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ dd1eca2 #6 2024-07-29 14:27:37 ~4 min tests 📄log
✔️ dd1eca2 #6 2024-07-29 14:31:31 ~8 min android-e2e 🤖apk 📲
✔️ dd1eca2 #6 2024-07-29 14:31:56 ~9 min android 🤖apk 📲
dd1eca2 #6 2024-07-29 14:34:01 ~11 min ios 📄log
dd1eca2 #7 2024-07-29 14:52:49 ~13 sec ios 📄log
✔️ 07f08d1 #7 2024-07-29 15:53:34 ~4 min tests 📄log
✔️ 07f08d1 #7 2024-07-29 15:57:19 ~8 min android-e2e 🤖apk 📲
✔️ 07f08d1 #7 2024-07-29 15:57:40 ~9 min android 🤖apk 📲
✔️ 07f08d1 #8 2024-07-29 16:00:19 ~11 min ios 📱ipa 📲

@mmilad75 mmilad75 requested review from vkjr, briansztamfater, ilmotta, J-Son89 and ulisesmac and removed request for vkjr July 24, 2024 15:39
Copy link
Contributor

@ulisesmac ulisesmac left a comment

Choose a reason for hiding this comment

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

Hi @mmilad75

Thanks for the PR

Comment on lines 85 to 90
(let [updated-values
(send-utils/reset-loading-network-amounts-to-zero
receiver-network-values)]
(if (not= tx-type :tx/bridge)
(-> updated-values vec (conj {:type :edit}))
updated-values)))
Copy link
Contributor

Choose a reason for hiding this comment

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

We are already in a let, so better to use it instead of nesting a new one.

Edit: consider using cond-> to solve the logic here, not sure but it may be cleaner

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done @ulisesmac

Copy link
Member

@briansztamfater briansztamfater left a comment

Choose a reason for hiding this comment

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

LGTM, but also agree with @ulisesmac suggestion, though is not a blocker

@mmilad75 mmilad75 force-pushed the milad/20809-remove-edit-routes-in-bridging branch from 4cbbb12 to 2e1e765 Compare July 26, 2024 13:08
@status-im-auto
Copy link
Member

75% of end-end tests have passed

Total executed tests: 8
Failed tests: 1
Expected to fail tests: 1
Passed tests: 6
IDs of failed tests: 727229 
IDs of expected to fail tests: 727232 

Failed tests (1)

Click to expand
  • Rerun failed tests

  • Class TestWalletMultipleDevice:

    1. test_wallet_send_eth, id: 727229

    Device 2: Find `Text` by `xpath`: `//android.view.ViewGroup[@content-desc='container']/android.widget.TextView[@text='Ether']/../android.widget.TextView[3]`
    Device 2: `Text` is `0.02359 ETH`

    critical/test_wallet.py:156: in test_wallet_send_eth
        self.errors.verify_no_errors()
    base_test_case.py:191: in verify_no_errors
        pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
     Sender balance is not updated on Etherscan, it is 0.4708 but expected to be 0.4709
    



    Expected to fail tests (1)

    Click to expand

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_watch_only_account, id: 727232

    Device 1: Find EditBox by accessibility id: add-address-to-watch
    Device 1: Type 0x8d2413447ff297d30bdc475f6d5cb00254685aae to EditBox

    critical/test_wallet.py:249: in test_wallet_add_remove_watch_only_account
        self.wallet_view.add_watch_only_account(address=address_to_watch, account_name=new_account_name)
    ../views/wallet_view.py:163: in add_watch_only_account
        self.account_has_activity_label.wait_for_visibility_of_element()
    ../views/base_element.py:147: in wait_for_visibility_of_element
        raise TimeoutException(
     Device 1: Text by accessibility id:`account-has-activity` is not found on the screen after wait_for_visibility_of_element 
    

    [[Missing networks in account address, https://github.com//issues/20166]]

    Device sessions

    Passed tests (6)

    Click to expand

    Class TestWalletOneDevice:

    1. test_wallet_add_remove_regular_account, id: 727231
    Device sessions

    Class TestCommunityOneDeviceMerged:

    1. test_community_copy_and_paste_message_in_chat_input, id: 702742
    Device sessions

    2. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
    Device sessions

    Class TestWalletMultipleDevice:

    1. test_wallet_send_asset_from_drawer, id: 727230

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_message_edit, id: 702843
    Device sessions

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
    Device sessions

    @VolodLytvynenko
    Copy link
    Contributor

    Hi @mmilad75 thank you for PR. No issues from my side. PR is ready to be merged

    @mmilad75 mmilad75 merged commit 67c83b1 into develop Jul 29, 2024
    5 checks passed
    @mmilad75 mmilad75 deleted the milad/20809-remove-edit-routes-in-bridging branch July 29, 2024 16:10
    ilmotta pushed a commit that referenced this pull request Jul 29, 2024
    Co-authored-by: Jamie Caprani <jamiecaprani@gmail.com>
    ilmotta added a commit that referenced this pull request Jul 30, 2024
    Revisions from develop:
    
    - 59ceddb develop origin/develop fix(wallet): fix bridge transactions (#20902)
    - 99ccbc3 Cover wallet send events with tests Part 2 #20411 #20533 (#20721)
    - 8c2d539 Enabling WalletConnect feature flag (#20906)
    - 67c83b1 fix(wallet): remove edit routes button in bridging (#20874)
    - 11a84ba feat(wallet): disable complex routing (#20901)
    - 1f5bb57 chore(wallet): disable bridging on unsupported tokens (#20846)
    - 4586f80 Add toggle in advanced settings for mobile data
    - 55c620e fix: create password for small screen (#20645)
    - 525609f Wallet Activity: transactions are not sorted by time #20808 (#20862)
    - 9065395 chore(settings): Disable telemetry option (#20881)
    - d27ab75 fix_:display group message using the new ui (#20787)
    - c6a1db6 ci: enable split apks & build only for arm64-v8a (#20683)
    - 73777e0 Ensure keycard account can send transaction after upgrading from v1 to v2 #20552 (#20845)
    - a6d3fc3 [#20524] fix: the missed keypairs are shown in the key pair list screen (#20888)
    - a671c70 fix broken screen and navigation when syncing fails (#20887)
    - a45991b 🥅 Filter connected dapps based on testnet mode, reject proposals and requests gracefully (#20799)
    - 2e9fa22 feat: wallet router v2 (#20631)
    - 737d8c4 rename sub to fix error when requesting to join community (#20868)
    - 3aa7e10 Sync process is blocked on Enabled notifications screen (#20883)
    - c1d2d44 perf: Fix app freeze after login (#20729)
    - 0fed811 e2e: updated testnet switching and added one test into smoke
    - 53c35cb fix(wallet): Linear gradient exception on invalid colors for watched account cards (#20854)
    - be82365 chore(settings)_: Remove testnet toggle from legacy advanced settings (#20875)
    - eae8a65 feat(wallet)_: Add beta info box in activity tab (#20873)
    - fe54a25 fix: not clearing network & web3-wallet on logout (#20886)
    - 15a4219 Reject wallet-connect request by dragging the modal down (#20763) (#20836)
    - 2ffbdac WalletConnect show expired toast (#20857)
    - 402eb83 fix Issue with scrolling WalletConnect transaction on Android (#20867)
    - ff88049 Fix WalletConnect header alignment on Android (#20860)
    - cee2124 WalletConnect no internet edge-cases (#20826)
    - 60ad7c8 chore(tests): New match-strict? cljs.test directive (#20825)
    - 4989c92 fix_: Adding own address as saved addresses (#20839)
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    Archived in project
    Development

    Successfully merging this pull request may close these issues.

    Edit button appears below TO section on bridge screen when entering Invalid amount
    8 participants