Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tired-windows-clean.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

Improve pay error messages
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@

const uiErrorMessage = useMemo(() => {
if (step === "approval" && status === "error" && error) {
if (error.toLowerCase().includes("user rejected")) {
if (
error.toLowerCase().includes("user rejected") ||
error.toLowerCase().includes("user closed modal") ||
error.toLowerCase().includes("user denied")
) {

Check warning on line 75 in packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx#L71-L75

Added lines #L71 - L75 were not covered by tests
return {
title: "Failed to Approve",
message: "Your wallet rejected the approval request.",
Expand All @@ -82,7 +86,11 @@
}

if (step === "swap" && status === "error" && error) {
if (error.toLowerCase().includes("user rejected")) {
if (
error.toLowerCase().includes("user rejected") ||
error.toLowerCase().includes("user closed modal") ||
error.toLowerCase().includes("user denied")
) {

Check warning on line 93 in packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx#L89-L93

Added lines #L89 - L93 were not covered by tests
return {
title: "Failed to Confirm",
message: "Your wallet rejected the confirmation request.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@

const uiErrorMessage = useMemo(() => {
if (step === "approve" && status.id === "error" && status.error) {
if (status.error.toLowerCase().includes("user rejected")) {
if (
status.error.toLowerCase().includes("user rejected") ||
status.error.toLowerCase().includes("user closed modal") ||
status.error.toLowerCase().includes("user denied")
) {

Check warning on line 119 in packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx#L115-L119

Added lines #L115 - L119 were not covered by tests
return {
title: "Failed to Approve",
message: "Your wallet rejected the approval request.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,11 @@
return locale.transactionFailed;
}

if (message.includes("user rejected")) {
if (
message.includes("user rejected") ||
message.includes("user closed modal") ||
message.includes("user denied")
) {

Check warning on line 152 in packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx#L148-L152

Added lines #L148 - L152 were not covered by tests
return locale.transactionRejected;
}

Expand Down
Loading