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

fix(bridge-ui): custom and none fee selection overwritten by error fetching recommended fee #16737

Merged
merged 2 commits into from
Apr 16, 2024
Merged

fix(bridge-ui): custom and none fee selection overwritten by error fetching recommended fee #16737

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4be45d0
fee selection overriten by error fetching fee
CodeDragonVN Apr 15, 2024
0171b8b
ran lint
CodeDragonVN Apr 15, 2024
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
6 changes: 3 additions & 3 deletions ...bridge-ui/src/components/Bridge/SharedBridgeComponents/ProcessingFee/ProcessingFee.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<span class=" text-primary-content mt-[4px]">
{#if calculatingRecommendedAmount}
<LoadingText mask="0.0017730224073" /> ETH
{:else if errorCalculatingRecommendedAmount}
{:else if errorCalculatingRecommendedAmount && $processingFeeMethod === ProcessingFeeMethod.RECOMMENDED}
<FlatAlert type="warning" message={$t('processing_fee.recommended.error')} />
{:else}
{formatEther($processingFee ?? BigInt(0))} ETH {#if $processingFee !== recommendedAmount}
Expand All @@ -152,7 +152,7 @@
<span class="text-primary-content mt-[4px] {$$props.class}">
{#if calculatingRecommendedAmount}
<LoadingText mask="0.0017730224073" />
{:else if errorCalculatingRecommendedAmount}
{:else if errorCalculatingRecommendedAmount && $processingFeeMethod === ProcessingFeeMethod.RECOMMENDED}
<span class="text-warning-sentiment">{$t('processing_fee.recommended.error')}</span>
{:else}
{formatEther($processingFee ?? BigInt(0))} ETH {#if $processingFee !== recommendedAmount}
Expand All @@ -178,7 +178,7 @@
<span class="body-small-regular text-secondary-content mt-[4px]">
{#if calculatingRecommendedAmount}
<LoadingText mask="0.0001" /> ETH
{:else if errorCalculatingRecommendedAmount}
{:else if errorCalculatingRecommendedAmount && $processingFeeMethod === ProcessingFeeMethod.RECOMMENDED}
<FlatAlert type="warning" message={$t('processing_fee.recommended.error')} />
{:else}
{formatEther($processingFee ?? BigInt(0))} ETH {#if $processingFee !== recommendedAmount}
Expand Down
Loading