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(@desktop/wallet): Swap "Approve" button becomes enabled before Approve Tx succeeds/fails #15807

Merged
merged 1 commit into from
Jul 29, 2024
Merged

fix(@desktop/wallet): Swap "Approve" button becomes enabled before Approve Tx succeeds/fails #15807

merged 1 commit into from
Jul 29, 2024

Conversation

Khushboo-dev-cpp
Copy link
Contributor

fixes #15784

What does the PR do

The auto refresh occurred even though approval was pending

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-07-25.at.12.19.01.PM.mov

Cool Spaceship Picture

@status-im-auto
Copy link
Member

status-im-auto commented Jul 25, 2024 •
edited
Loading

Jenkins Builds

Click to see older builds (7)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 894ab72 #1 2024-07-25 12:32:37 ~7 min tests/nim 📄log
✔️ 894ab72 #1 2024-07-25 12:35:50 ~11 min macos/aarch64 🍎dmg
✔️ 894ab72 #1 2024-07-25 12:36:16 ~11 min macos/x86_64 🍎dmg
✔️ 894ab72 #1 2024-07-25 12:38:13 ~13 min tests/ui 📄log
✔️ 894ab72 #1 2024-07-25 12:39:34 ~15 min linux-nix/x86_64 📦tgz
✔️ 894ab72 #1 2024-07-25 12:41:18 ~16 min linux/x86_64 📦tgz
✔️ 894ab72 #1 2024-07-25 12:50:18 ~25 min windows/x86_64 💿exe
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 3d376ec #2 2024-07-25 16:01:54 ~7 min macos/aarch64 🍎dmg
✔️ 3d376ec #2 2024-07-25 16:02:10 ~7 min tests/nim 📄log
✔️ 3d376ec #2 2024-07-25 16:02:24 ~8 min macos/x86_64 🍎dmg
✔️ 3d376ec #2 2024-07-25 16:06:57 ~12 min linux-nix/x86_64 📦tgz
✔️ 3d376ec #2 2024-07-25 16:08:05 ~13 min tests/ui 📄log
✔️ 3d376ec #2 2024-07-25 16:11:45 ~17 min linux/x86_64 📦tgz
✔️ 3d376ec #2 2024-07-25 16:18:20 ~24 min windows/x86_64 💿exe
✔️ c613b47 #3 2024-07-29 11:34:11 ~6 min macos/aarch64 🍎dmg
✔️ c613b47 #3 2024-07-29 11:34:35 ~7 min tests/nim 📄log
✔️ c613b47 #3 2024-07-29 11:36:37 ~9 min macos/x86_64 🍎dmg
✔️ c613b47 #3 2024-07-29 11:39:35 ~12 min linux-nix/x86_64 📦tgz
✔️ c613b47 #3 2024-07-29 11:40:51 ~13 min tests/ui 📄log
✔️ c613b47 #3 2024-07-29 11:42:34 ~15 min linux/x86_64 📦tgz
✔️ c613b47 #3 2024-07-29 11:52:40 ~25 min windows/x86_64 💿exe

caybro
caybro reviewed Jul 25, 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

I'm missing some regression test for this though ;)

@Khushboo-dev-cpp
Copy link
Contributor Author

LGTM

I'm missing some regression test for this though ;)

Good point, I should be able to write. a test for this !! I'll do it..

@Khushboo-dev-cpp Khushboo-dev-cpp marked this pull request as draft July 25, 2024 12:46
@Khushboo-dev-cpp
Copy link
Contributor Author

LGTM
I'm missing some regression test for this though ;)

Good point, I should be able to write. a test for this !! I'll do it..

Added!

@Khushboo-dev-cpp Khushboo-dev-cpp marked this pull request as ready for review July 25, 2024 15:55
caybro
caybro reviewed Jul 26, 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.

Code LGTM, but pls adjust the tests

storybook/qmlTests/tests/tst_SwapModal.qml Outdated Show resolved Hide resolved
storybook/qmlTests/tests/tst_SwapModal.qml Show resolved Hide resolved
caybro
caybro approved these changes Jul 29, 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 👍

Reminder to also backport to the 2.30 release branch

alexjba
alexjba approved these changes Jul 29, 2024
View reviewed changes
Copy link
Contributor

@alexjba alexjba left a comment

Choose a reason for hiding this comment

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

LGTM!

storybook/qmlTests/tests/tst_SwapModal.qml Show resolved Hide resolved
@Khushboo-dev-cpp Khushboo-dev-cpp merged commit 354f2e4 into master Jul 29, 2024
9 checks passed
@Khushboo-dev-cpp Khushboo-dev-cpp deleted the fix/15784 branch July 29, 2024 12:30
@Khushboo-dev-cpp Khushboo-dev-cpp mentioned this pull request Jul 29, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexjba alexjba alexjba approved these changes

@caybro caybro caybro approved these changes

@dlipicar dlipicar Awaiting requested review from dlipicar

@stefandunca stefandunca Awaiting requested review from stefandunca

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

Successfully merging this pull request may close these issues.

Swap "Approve" button becomes enabled before Approve Tx succeeds/fails
4 participants
@Khushboo-dev-cpp @status-im-auto @caybro @alexjba