diff --git a/apps/api/src/api/services/ramp/quote.service/gross-output.ts b/apps/api/src/api/services/ramp/quote.service/gross-output.ts index a9f6759ef..310ba1e01 100644 --- a/apps/api/src/api/services/ramp/quote.service/gross-output.ts +++ b/apps/api/src/api/services/ramp/quote.service/gross-output.ts @@ -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) diff --git a/apps/api/src/api/services/ramp/quote.service/index.ts b/apps/api/src/api/services/ramp/quote.service/index.ts index b818e186e..2f02a5761 100644 --- a/apps/api/src/api/services/ramp/quote.service/index.ts +++ b/apps/api/src/api/services/ramp/quote.service/index.ts @@ -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) diff --git a/apps/frontend/src/components/ExchangeRate/index.tsx b/apps/frontend/src/components/ExchangeRate/index.tsx deleted file mode 100644 index 550ea45a7..000000000 --- a/apps/frontend/src/components/ExchangeRate/index.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import { FiatTokenDetails, OnChainTokenDetails } from "@packages/shared"; -import { FC } from "react"; -import { getTokenSymbol } from "../../helpers/getTokenSymbol"; - -interface ExchangeRateProps { - inputToken: OnChainTokenDetails | FiatTokenDetails; - outputToken: OnChainTokenDetails | FiatTokenDetails; - exchangeRate?: number; -} - -export const ExchangeRate: FC = ({ exchangeRate, inputToken, outputToken }) => { - const exchangeRateElement = - inputToken !== undefined && exchangeRate ? ( - <>{`1 ${getTokenSymbol(inputToken)} = ${Number(exchangeRate).toFixed(4)} ${getTokenSymbol(outputToken)}`} - ) : ( - "-" - ); - - return {exchangeRateElement}; -}; diff --git a/apps/frontend/src/components/RampSummaryDialog/FeeDetails.tsx b/apps/frontend/src/components/RampSummaryDialog/FeeDetails.tsx index 2794a8705..14e491000 100644 --- a/apps/frontend/src/components/RampSummaryDialog/FeeDetails.tsx +++ b/apps/frontend/src/components/RampSummaryDialog/FeeDetails.tsx @@ -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 { @@ -32,6 +31,8 @@ export const FeeDetails: FC = ({ 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 (
@@ -50,10 +51,11 @@ export const FeeDetails: FC = ({

{t("components.dialogs.RampSummaryDialog.quote")}

-

diff --git a/apps/frontend/src/pages/progress/index.tsx b/apps/frontend/src/pages/progress/index.tsx index 71642ec04..eedeac4d5 100644 --- a/apps/frontend/src/pages/progress/index.tsx +++ b/apps/frontend/src/pages/progress/index.tsx @@ -273,6 +273,9 @@ const ProgressContent: FC = ({
{showIsDelayedWarning && } +

+ {t("pages.progress.closeProgressScreenText")} +

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", diff --git a/apps/frontend/src/translations/pt.json b/apps/frontend/src/translations/pt.json index e0cc2e73f..123e97778 100644 --- a/apps/frontend/src/translations/pt.json +++ b/apps/frontend/src/translations/pt.json @@ -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", @@ -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", diff --git a/bun.lockb b/bun.lockb index 3496de526..ba3c454b3 100755 Binary files a/bun.lockb and b/bun.lockb differ