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
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export async function calculateEvmBridgeAndNetworkFee(request: EvmBridgeRequest)

// Calculate network fee (Squidrouter fee)
// Parse final gross output amount
const finalGrossOutputAmount = routeData.route.estimate.toAmountMin;
const finalGrossOutputAmount = routeData.route.estimate.toAmount;
const finalGrossOutputAmountDecimal = parseContractBalanceResponse(
tokenDetails.decimals,
BigInt(finalGrossOutputAmount)
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/api/services/ramp/quote.service/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class QuoteService extends BaseRampService {

const routeResult = await getRoute(routeParams);
const { route } = routeResult.data;
const finalGrossOutputAmount = route.estimate.toAmountMin;
const finalGrossOutputAmount = route.estimate.toAmount;
const finalGrossOutputAmountDecimal = parseContractBalanceResponse(
outputTokenDetails.decimals,
BigInt(finalGrossOutputAmount)
Expand Down
20 changes: 0 additions & 20 deletions apps/frontend/src/components/ExchangeRate/index.tsx

This file was deleted.

14 changes: 8 additions & 6 deletions apps/frontend/src/components/RampSummaryDialog/FeeDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { FiatTokenDetails, isFiatTokenDetails, OnChainTokenDetails, QuoteFeeStructure } from "@packages/shared";
import { FC } from "react";
import { useTranslation } from "react-i18next";

import { ExchangeRate } from "../ExchangeRate";
import { InterbankExchangeRate } from "../InterbankExchangeRate";
import { RampDirection } from "../RampToggle";

interface FeeDetailsProps {
Expand Down Expand Up @@ -32,6 +31,8 @@ export const FeeDetails: FC<FeeDetailsProps> = ({
if (!isFiatTokenDetails(fiatToken)) {
throw new Error("Invalid fiat token details");
}
const inputCurrency = isOfframp ? fromToken.assetSymbol : fiatToken.fiat.symbol;
const outputCurrency = isOfframp ? fiatToken.fiat.symbol : toToken.assetSymbol;

return (
<section className="mt-6">
Expand All @@ -50,10 +51,11 @@ export const FeeDetails: FC<FeeDetailsProps> = ({
<div className="mb-2 flex justify-between">
<p>{t("components.dialogs.RampSummaryDialog.quote")}</p>
<p>
<ExchangeRate
exchangeRate={Number(exchangeRate)}
inputToken={isOfframp ? fromToken : toToken}
outputToken={isOfframp ? toToken : fromToken}
<InterbankExchangeRate
asSpan={true}
inputCurrency={inputCurrency}
outputCurrency={outputCurrency}
rate={Number(exchangeRate)}
/>
</p>
</div>
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/pages/progress/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ const ProgressContent: FC<ProgressContentProps> = ({
<Box className="mt-4 flex flex-col items-center justify-center">
<div className="flex max-w-[400px] flex-col items-center justify-center">
{showIsDelayedWarning && <TransactionStatusBanner />}
<p className="mb-4 text-lg text-gray-600">
{t("pages.progress.closeProgressScreenText")}
</p>
<ProgressCircle circumference={circumference} displayedPercentage={displayedPercentage} showCheckmark={showCheckmark} />
<motion.h1
animate={{ opacity: 1, y: 0 }}
Expand Down
5 changes: 3 additions & 2 deletions apps/frontend/src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@
"title": "Bank Transfer Details"
},
"headerText": {
"buy": "You're buying",
"sell": "You're selling"
"buy": "Payment Summary",
"sell": "Payment Summary"
},
"offrampFee": "Offramp fee",
"onrampFee": "Onramp fee",
Expand Down Expand Up @@ -350,6 +350,7 @@
"bridgingEVM": "Bridging {{assetSymbol}} from {{network}} --> Moonbeam",
"brlaTeleport": "Your payment is being processed. This can take up to 5 minutes.",
"createStellarAccount": "Creating Stellar account",
"closeProgressScreenText": "💡 You’re all set! You can now close this tab or grab a coffee while we finish up in the background.",
"estimatedTimeAssetHub": "This usually takes 4-6 minutes.",
"estimatedTimeEVM": "This usually takes 6-8 minutes.",
"executeSpacewalkRedeem": "Bridging {{assetSymbol}} to Stellar via Spacewalk",
Expand Down
5 changes: 3 additions & 2 deletions apps/frontend/src/translations/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
"title": "Detalhes da Transferência Bancária"
},
"headerText": {
"buy": "Você está comprando",
"sell": "Você está vendendo"
"buy": "Resumo do pagamento",
"sell": "Resumo do pagamento"
},
"offrampFee": "Taxa de saque",
"onrampFee": "Taxa de compra",
Expand Down Expand Up @@ -349,6 +349,7 @@
"bridgingEVM": "Transferindo {{assetSymbol}} de {{network}} --> Moonbeam",
"brlaTeleport": "Seu pagamento está sendo processado. Isso pode levar até 5 minutos.",
"createStellarAccount": "Criando conta Stellar",
"closeProgressScreenText": "💡 Tudo pronto! Você já pode fechar esta aba ou pegar um café enquanto finalizamos o processo em segundo plano.",
"estimatedTimeAssetHub": "Isso geralmente leva de 4 a 6 minutos.",
"estimatedTimeEVM": "Isso geralmente leva de 6 a 8 minutos.",
"executeSpacewalkRedeem": "Transferindo {{assetSymbol}} para Stellar via Spacewalk",
Expand Down
Binary file modified bun.lockb
Binary file not shown.