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(bridge-ui): small fixes #17375

Merged
merged 4 commits into from
May 28, 2024
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
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const processingFeeComponent = {
};

export const pendingTransaction = {
waitTimeout: 30_000,
waitTimeout: 90_000,
};

export const storageService = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
await pendingTransactions.add(txHash, currentChain);

successToast({
title: $t('bridge.actions.approve.success.title'),
message: $t('bridge.actions.approve.success.message', {
title: $t('bridge.actions.bridge.success.title'),
message: $t('bridge.actions.bridge.success.message', {
values: {
token: $selectedToken.symbol,
},
Expand Down Expand Up @@ -146,22 +146,31 @@
});

refreshUserBalance();
await pendingTransactions.add(approveTxHash, currentChain);
statusTitle = $t('bridge.actions.approve.success.title');
statusDescription = $t('bridge.step.confirm.approve.success.message', {
values: { url: `${explorer}/tx/${txHash}` },
});
try {
await pendingTransactions.add(approveTxHash, currentChain);

statusTitle = $t('bridge.actions.approve.success.title');
statusDescription = $t('bridge.step.confirm.approve.success.message', {
values: { url: `${explorer}/tx/${txHash}` },
});

await getTokenApprovalStatus($selectedToken);
await getTokenApprovalStatus($selectedToken);

successToast({
title: $t('bridge.actions.approve.success.title'),
message: $t('bridge.actions.approve.success.message', {
values: {
token: $selectedToken.symbol,
},
}),
});
successToast({
title: $t('bridge.actions.approve.success.title'),
message: $t('bridge.actions.approve.success.message', {
values: {
token: $selectedToken.symbol,
},
}),
});
} catch (error) {
if (error instanceof TransactionTimeoutError) {
handleTimeout(txHash);
} else {
handleBridgeError(error as Error);
}
}
};

async function approve() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { tick } from 'svelte';
import { t } from 'svelte-i18n';
import { formatEther } from 'viem';
import { formatEther, formatGwei } from 'viem';

import FlatAlert from '$components/Alert/FlatAlert.svelte';
import { processingFee, processingFeeMethod } from '$components/Bridge/state';
Expand Down Expand Up @@ -90,6 +90,10 @@
if (tempProcessingFeeMethod !== ProcessingFeeMethod.CUSTOM) return;

const { value } = event.target as HTMLInputElement;
if (parseToWei(value) <= 0) {
// If the user tries to input 0 or less, we set it to 1 gwei
inputBox?.setValue(formatGwei(1n));
}
tempprocessingFee = parseToWei(value);
}

Expand Down
4 changes: 4 additions & 0 deletions packages/bridge-ui/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@
"message": "Please try again",
"title": "Failed to send"
},
"transaction_timeout": {
"message": "Transaction timed out. Try refreshing the page and retry",
"title": "Timed out"
},
"unknown_error": {
"message": "An unexpected error has occurred. Please try again.",
"title": "Unknown error"
Expand Down
8 changes: 7 additions & 1 deletion packages/bridge-ui/src/libs/bridge/handleBridgeErrors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { t } from 'svelte-i18n';
import { TransactionExecutionError, UserRejectedRequestError } from 'viem';

import { errorToast, warningToast } from '$components/NotificationToast';
import { InsufficientAllowanceError, SendERC20Error, SendMessageError } from '$libs/error';
import { InsufficientAllowanceError, SendERC20Error, SendMessageError, TransactionTimeoutError } from '$libs/error';

export const handleBridgeError = (error: Error) => {
switch (true) {
Expand Down Expand Up @@ -39,6 +39,12 @@ export const handleBridgeError = (error: Error) => {
title: get(t)('bridge.errors.approve_rejected.title'),
});
break;
case error instanceof TransactionTimeoutError:
warningToast({
title: get(t)('bridge.errors.transaction_timeout.title'),
message: get(t)('bridge.errors.transaction_timeout.message'),
});
break;
default:
errorToast({
title: get(t)('bridge.errors.unknown_error.title'),
Expand Down