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

feat(@desktop/wallet): Swap modal launch flows #14740

Merged
merged 1 commit into from
May 28, 2024
Merged

feat(@desktop/wallet): Swap modal launch flows #14740

merged 1 commit into from
May 28, 2024

Conversation

Khushboo-dev-cpp
Copy link
Contributor

@Khushboo-dev-cpp Khushboo-dev-cpp commented May 13, 2024 •
edited

fixes #14628

What does the PR do

Created a new skeleton of SwapModal which only has placeholder text for now.
Added new Qml file called SwapFormData.qml which will be the interface to fill in swap modal before its launched from anywhere in the app.
Also added approach to only share account index, network chainid and token keys in order to indentify any of these inputs.

Affected areas

SwapModal

StatusQ checklist

  • add documentation if necessary (new component, new feature)
  • update sandbox app
    • in case of new component, add new component page
    • in case of new features, add variation to existing component page
    • nice to have: add it to the demo application as well
  • test changes in both light and dark theme?

Screenshot of functionality (including design for comparison)

  • I've checked the design and this PR matches it
Screen.Recording.2024-05-13.at.7.25.36.PM.mov
Screen.Recording.2024-05-13.at.7.26.36.PM.mov

@status-im-auto
Copy link
Member

status-im-auto commented May 13, 2024 •
edited

Jenkins Builds

Click to see older builds (29)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 8133469 #1 2024-05-13 17:37:52 ~6 min tests/nim 📄log
✔️ 8133469 #1 2024-05-13 17:38:32 ~7 min macos/aarch64 🍎dmg
❌ 8133469 #1 2024-05-13 17:42:30 ~10 min tests/ui 📄log
✔️ 8133469 #1 2024-05-13 17:44:47 ~13 min macos/x86_64 🍎dmg
✔️ 8133469 #1 2024-05-13 17:51:01 ~19 min linux/x86_64 📦tgz
✔️ 710ec36 #2 2024-05-13 17:58:21 ~7 min macos/x86_64 🍎dmg
✔️ 710ec36 #2 2024-05-13 17:58:35 ~7 min tests/nim 📄log
✔️ 710ec36 #2 2024-05-13 18:00:13 ~8 min macos/aarch64 🍎dmg
✔️ 710ec36 #2 2024-05-13 18:07:03 ~15 min tests/ui 📄log
✔️ 710ec36 #2 2024-05-13 18:10:08 ~18 min linux/x86_64 📦tgz
✔️ 710ec36 #2 2024-05-13 18:25:51 ~34 min windows/x86_64 💿exe
✔️ 1cfe49c #3 2024-05-14 09:16:52 ~4 min macos/aarch64 🍎dmg
✔️ 1cfe49c #3 2024-05-14 09:17:52 ~5 min tests/nim 📄log
✔️ 1cfe49c #3 2024-05-14 09:20:28 ~8 min macos/x86_64 🍎dmg
✔️ 1cfe49c #3 2024-05-14 09:27:06 ~14 min tests/ui 📄log
✔️ 1cfe49c #3 2024-05-14 09:28:47 ~16 min linux/x86_64 📦tgz
✔️ 1cfe49c #3 2024-05-14 09:47:10 ~34 min windows/x86_64 💿exe
✔️ dad4f9c #4 2024-05-14 13:44:43 ~6 min macos/aarch64 🍎dmg
✔️ dad4f9c #4 2024-05-14 13:45:32 ~7 min macos/x86_64 🍎dmg
✔️ dad4f9c #4 2024-05-14 13:45:45 ~7 min tests/nim 📄log
✔️ dad4f9c #4 2024-05-14 13:50:46 ~12 min tests/ui 📄log
✔️ dad4f9c #4 2024-05-14 13:54:00 ~15 min linux/x86_64 📦tgz
✔️ dad4f9c #4 2024-05-14 14:11:05 ~32 min windows/x86_64 💿exe
✔️ daa652c #5 2024-05-15 14:44:04 ~6 min tests/nim 📄log
✔️ daa652c #5 2024-05-15 14:44:55 ~7 min macos/aarch64 🍎dmg
✔️ daa652c #5 2024-05-15 14:45:48 ~7 min macos/x86_64 🍎dmg
✔️ daa652c #5 2024-05-15 14:49:16 ~11 min tests/ui 📄log
✔️ daa652c #5 2024-05-15 14:53:15 ~15 min linux/x86_64 📦tgz
✔️ daa652c #5 2024-05-15 15:10:44 ~32 min windows/x86_64 💿exe
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 515d1f0 #6 2024-05-27 17:06:22 ~6 min macos/aarch64 🍎dmg
✔️ 515d1f0 #6 2024-05-27 17:06:35 ~6 min tests/nim 📄log
✔️ 515d1f0 #6 2024-05-27 17:08:48 ~8 min macos/x86_64 🍎dmg
✔️ 515d1f0 #6 2024-05-27 17:11:43 ~11 min tests/ui 📄log
✔️ 515d1f0 #6 2024-05-27 17:16:12 ~16 min linux/x86_64 📦tgz
✔️ 515d1f0 #6 2024-05-27 17:33:47 ~33 min windows/x86_64 💿exe
✔️ 21f43ea #7 2024-05-28 07:10:36 ~5 min macos/aarch64 🍎dmg
✔️ 21f43ea #7 2024-05-28 07:11:40 ~6 min tests/nim 📄log
✔️ 21f43ea #7 2024-05-28 07:14:00 ~8 min macos/x86_64 🍎dmg
✔️ 21f43ea #7 2024-05-28 07:16:22 ~10 min tests/ui 📄log
✔️ 21f43ea #7 2024-05-28 07:21:07 ~15 min linux/x86_64 📦tgz
✔️ 21f43ea #7 2024-05-28 07:40:33 ~35 min windows/x86_64 💿exe

@Khushboo-dev-cpp Khushboo-dev-cpp marked this pull request as draft May 13, 2024 19:11
caybro
caybro reviewed May 14, 2024
View reviewed changes
ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml Show resolved Hide resolved
ui/app/AppLayouts/Wallet/views/RightTabView.qml Show resolved Hide resolved
ui/imports/utils/Global.qml Outdated Show resolved Hide resolved
ui/imports/shared/views/AssetsView.qml Outdated Show resolved Hide resolved
@Khushboo-dev-cpp Khushboo-dev-cpp marked this pull request as ready for review May 14, 2024 16:28
IvanBelyakoff
IvanBelyakoff approved these changes May 27, 2024
View reviewed changes
Copy link
Contributor

@IvanBelyakoff IvanBelyakoff left a comment •
edited

Choose a reason for hiding this comment

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

LGTM aside from Global.featureFlag thing that Lukas mentioned (Would like to know as well, what is the approach we agreed on)
Please have a look at my comment about ERC1155

ui/app/AppLayouts/Wallet/panels/WalletFooter.qml Outdated Show resolved Hide resolved
caybro
caybro approved these changes May 27, 2024
View reviewed changes
Copy link
Member

@caybro caybro left a comment

Choose a reason for hiding this comment

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

LGTM

Probably needs a rebase to fix the e2e tests

@anastasiyaig
Copy link
Contributor

@caybro @Khushboo-dev-cpp there is a problem with Left Settings pane, my suspect is that is scrolls infinite (test wants to scroll down to the Sign out and Quit option)

image

I recently made a commit that impacts this area (status-im/desktop-qa-automation#681) , the test was not scrolling at all on my mac

I launched the tests before merging this and it was okay ish (even yesterday in nightly). I can revert the commit , but from UI perspective, did we change anything recently to this Left Pane?

@Khushboo-dev-cpp
Copy link
Contributor Author

@caybro @Khushboo-dev-cpp there is a problem with Left Settings pane, my suspect is that is scrolls infinite (test wants to scroll down to the Sign out and Quit option)

image

I recently made a commit that impacts this area (status-im/desktop-qa-automation#681) , the test was not scrolling at all on my mac

I launched the tests before merging this and it was okay ish (even yesterday in nightly). I can revert the commit , but from UI perspective, did we change anything recently to this Left Pane?

@anastasiyaig thanks for looking into this. Nothings changed on the left panel afaik, maybe @caybro knows something?

@anastasiyaig
Copy link
Contributor

I suspect amazing Squish. For now i will just revert my change and will look into it later properly

@anastasiyaig
Copy link
Contributor

@Khushboo-dev-cpp tests passed, sorry about that

@Khushboo-dev-cpp
Copy link
Contributor Author

@Khushboo-dev-cpp tests passed, sorry about that

no thank you fixing :)

@Khushboo-dev-cpp Khushboo-dev-cpp merged commit 81d7ca3 into master May 28, 2024
8 checks passed
@Khushboo-dev-cpp Khushboo-dev-cpp deleted the feat/14628 branch May 28, 2024 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caybro caybro caybro approved these changes

@IvanBelyakoff IvanBelyakoff IvanBelyakoff approved these changes

@saledjenic saledjenic Awaiting requested review from saledjenic

@dlipicar dlipicar Awaiting requested review from dlipicar

@Cuteivist Cuteivist Awaiting requested review from Cuteivist

@stefandunca stefandunca Awaiting requested review from stefandunca

@micieslak micieslak Awaiting requested review from micieslak

@alexjba alexjba Awaiting requested review from alexjba

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Swap modal launch flows
6 participants
@Khushboo-dev-cpp @status-im-auto @anastasiyaig @caybro @IvanBelyakoff @stefandunca