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

fix(@wallet/desktop): No feedback after token approval. Once the approval is confirmed the Swap dialog becomes editable again, with the Swap button enabled #16666

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

Khushboo-dev-cpp
Copy link
Contributor

fixes #16569, #16564

Go PR - status-im/status-go#5995

What does the PR do

his PR adds back missing Setting Spending Cap and Swapping... toasts with the correct token amounts.

The Spending cap set and Swapped... toasts are missing currently and perhaps should be addressed with new notifications design https://www.figma.com/design/FkFClTCYKf83RJWoifWgoX/Wallet-v2?node-id=25111-368170&node-type=instance&m=dev here.

Affected areas

Swap notifications

Architecture compliance

Screenshot of functionality (including design for comparison)

  • I've checked the design and this PR matches it
Screen.Recording.2024-10-28.at.1.25.13.PM.mov

@Khushboo-dev-cpp Khushboo-dev-cpp requested review from Cuteivist and removed request for a team October 30, 2024 16:33
@status-im-auto
Copy link
Member

status-im-auto commented Oct 30, 2024

Jenkins Builds

Click to see older builds (16)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 3874ec8 #1 2024-10-30 16:40:11 ~6 min macos/aarch64 🍎dmg
✔️ 3874ec8 #1 2024-10-30 16:40:29 ~6 min tests/nim 📄log
✔️ c8b8eb8 #2 2024-10-30 16:51:15 ~5 min macos/aarch64 🍎dmg
✔️ c8b8eb8 #2 2024-10-30 16:52:43 ~7 min tests/nim 📄log
✔️ c8b8eb8 #2 2024-10-30 16:58:59 ~13 min tests/ui 📄log
✔️ c8b8eb8 #2 2024-10-30 17:04:27 ~19 min linux/x86_64 📦tgz
✔️ c8b8eb8 #2 2024-10-30 17:05:45 ~20 min windows/x86_64 💿exe
✔️ c8b8eb8 #2 2024-10-30 17:07:49 ~22 min linux-nix/x86_64 📦tgz
✔️ c8b8eb8 #2 2024-10-30 17:08:17 ~22 min macos/x86_64 🍎dmg
✔️ 2387fab #3 2024-10-31 09:00:23 ~5 min macos/aarch64 🍎dmg
✔️ 2387fab #3 2024-10-31 09:01:39 ~7 min tests/nim 📄log
✔️ 2387fab #3 2024-10-31 09:06:34 ~12 min tests/ui 📄log
✔️ 2387fab #3 2024-10-31 09:07:24 ~12 min linux-nix/x86_64 📦tgz
✔️ 2387fab #3 2024-10-31 09:11:21 ~16 min macos/x86_64 🍎dmg
✔️ 2387fab #3 2024-10-31 09:11:26 ~16 min linux/x86_64 📦tgz
✔️ 2387fab #3 2024-10-31 09:18:19 ~23 min windows/x86_64 💿exe
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 3467ae6 #4 2024-10-31 13:20:15 ~7 min tests/nim 📄log
✔️ 3467ae6 #4 2024-10-31 13:20:55 ~8 min macos/aarch64 🍎dmg
✔️ 3467ae6 #4 2024-10-31 13:25:22 ~12 min tests/ui 📄log
✔️ 3467ae6 #4 2024-10-31 13:25:52 ~13 min linux-nix/x86_64 📦tgz
✔️ 3467ae6 #4 2024-10-31 13:27:22 ~14 min macos/x86_64 🍎dmg
✔️ 3467ae6 #4 2024-10-31 13:35:26 ~22 min linux/x86_64 📦tgz
✔️ cb27537 #6 2024-10-31 13:49:20 ~7 min tests/nim 📄log
✔️ cb27537 #6 2024-10-31 13:50:10 ~8 min macos/aarch64 🍎dmg
✔️ cb27537 #6 2024-10-31 13:55:10 ~13 min tests/ui 📄log
✔️ cb27537 #6 2024-10-31 13:57:13 ~15 min macos/x86_64 🍎dmg
✔️ cb27537 #6 2024-10-31 14:01:32 ~20 min linux-nix/x86_64 📦tgz
✔️ cb27537 #6 2024-10-31 14:04:56 ~23 min linux/x86_64 📦tgz
✔️ cb27537 #6 2024-10-31 14:05:21 ~23 min windows/x86_64 💿exe

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

@saledjenic
Copy link
Contributor

Agreed with @Khushboo-dev-cpp that since we are working on fixing ephemeral notifications in the desktop app, globally, these changes should go only to the release branch, and not land on the master branch.

@caybro
Copy link
Member

caybro commented Oct 31, 2024

Agreed with @Khushboo-dev-cpp that since we are working on fixing ephemeral notifications in the desktop app, globally, these changes should go only to the release branch, and not land on the master branch.

Why, we don't want them in master or next release(s)?

@anastasiyaig
Copy link
Contributor

@caybro because there is a bigger task that refactors and fixes all the toasts for the app , @saledjenic is on it. We will land it in 2.32 hopefully

@virginiabalducci virginiabalducci self-requested a review October 31, 2024 12:51
Copy link

@virginiabalducci virginiabalducci left a comment

Choose a reason for hiding this comment

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

Looks good on my end!

Screenshot 2024-10-31 at 9 52 39 AM Screenshot 2024-10-31 at 9 52 59 AM

@Khushboo-dev-cpp Khushboo-dev-cpp force-pushed the fix/Release16569 branch 2 times, most recently from 3467ae6 to c83cce1 Compare October 31, 2024 13:35
…oval is confirmed the Swap dialog becomes editable again, with the Swap button enabled

fixes #16569
@jrainville
Copy link
Member

Force merging with Nastya's blessing

@jrainville jrainville merged commit faa3a41 into release/2.31.x Oct 31, 2024
8 of 9 checks passed
@jrainville jrainville deleted the fix/Release16569 branch October 31, 2024 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
8 participants