Skip to content

Fix subsidized Go Fast fee display #1602

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

Draft
wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft

Fix subsidized Go Fast fee display #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .changeset/fix-go-fast-fee-display.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
"@skip-go/widget": patch
---
fix fee display for subsidized Go Fast routes to show zero fees
12 changes: 6 additions & 6 deletions packages/widget/src/utils/fees.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { formatDisplayAmount } from "./number";
export type FeeDetail = {
assetAmount: number;
formattedAssetAmount: string;
usdAmount: number;
formattedUsdAmount?: string;
};
export type LabeledFee = {
Expand All @@ -23,6 +24,7 @@ const getFeeDetail = (estimatedFee: Fee): FeeDetail => {
return {
assetAmount: Number(humanReadableAmount),
formattedAssetAmount: `${formatDisplayAmount(humanReadableAmount)} ${estimatedFee.originAsset.symbol}`,
usdAmount: totalUsd,
formattedUsdAmount: formatUSD(totalUsd.toString()),
};
};
Expand Down Expand Up @@ -68,16 +70,14 @@ export function getTotalFees(fees: LabeledFee[]): FeeDetail | undefined {
if (!fees.length) return;

const totalAsset = fees.reduce((s, { fee }) => s + fee.assetAmount, 0);
const totalUsd = fees.reduce(
(s, { fee }) =>
s + (fee.formattedUsdAmount ? Number(fee.formattedUsdAmount.replace(/[^0-9.-]/g, "")) : 0),
0,
);
const totalUsd = fees.reduce((s, { fee }) => s + fee.usdAmount, 0);
if (totalUsd === 0) return;
const symbol = fees[0].fee.formattedAssetAmount.split(" ")[1];

return {
assetAmount: totalAsset,
formattedAssetAmount: `${totalAsset.toFixed(6)} ${symbol}`,
formattedUsdAmount: totalUsd > 0 ? formatUSD(totalUsd.toString()) : "< $0.01",
usdAmount: totalUsd,
formattedUsdAmount: formatUSD(totalUsd.toString()),
};
}