From 3a2d5c97c9d7f6b102f56fae98d6c59f95d4f64c Mon Sep 17 00:00:00 2001 From: Vojtech Simetka Date: Thu, 21 Sep 2023 13:58:44 +0200 Subject: [PATCH] feat: add fiat estimation to split object --- src/lib/objects/payggy/views/choose-amount.svelte | 2 +- src/lib/objects/payggy/views/confirm-send.svelte | 2 +- src/lib/objects/payggy/views/details.svelte | 2 +- src/lib/objects/split/standalone.svelte | 2 ++ src/lib/objects/split/views/settle-now.svelte | 12 +++++++++++- src/lib/{objects/utils.ts => utils/fiat.ts} | 0 6 files changed, 16 insertions(+), 4 deletions(-) rename src/lib/{objects/utils.ts => utils/fiat.ts} (100%) diff --git a/src/lib/objects/payggy/views/choose-amount.svelte b/src/lib/objects/payggy/views/choose-amount.svelte index a447245f..7e213a43 100644 --- a/src/lib/objects/payggy/views/choose-amount.svelte +++ b/src/lib/objects/payggy/views/choose-amount.svelte @@ -18,7 +18,7 @@ import Layout from '$lib/components/layout.svelte' import { payggyDescriptor } from '..' import type { ExchangeRateRecord } from '$lib/stores/exchangeRates' - import { getFiatAmountText } from '$lib/objects/utils' + import { getFiatAmountText } from '$lib/utils/fiat' export let amount: string export let token: TokenAmount diff --git a/src/lib/objects/payggy/views/confirm-send.svelte b/src/lib/objects/payggy/views/confirm-send.svelte index cbf2f465..f47754cb 100644 --- a/src/lib/objects/payggy/views/confirm-send.svelte +++ b/src/lib/objects/payggy/views/confirm-send.svelte @@ -17,7 +17,7 @@ import Layout from '$lib/components/layout.svelte' import { payggyDescriptor } from '..' import type { ExchangeRateRecord } from '$lib/stores/exchangeRates' - import { getFiatAmountText } from '$lib/objects/utils' + import { getFiatAmountText } from '$lib/utils/fiat' export let toUser: User export let estimateTransaction: (to: string, token: TokenAmount) => Promise diff --git a/src/lib/objects/payggy/views/details.svelte b/src/lib/objects/payggy/views/details.svelte index 814f392f..58ceaccd 100644 --- a/src/lib/objects/payggy/views/details.svelte +++ b/src/lib/objects/payggy/views/details.svelte @@ -18,7 +18,7 @@ import type { User } from '$lib/types' import Layout from '$lib/components/layout.svelte' import { payggyDescriptor } from '..' - import { getFiatAmountText } from '$lib/objects/utils' + import { getFiatAmountText } from '$lib/utils/fiat' import type { ExchangeRateRecord } from '$lib/stores/exchangeRates' export let transaction: Transaction diff --git a/src/lib/objects/split/standalone.svelte b/src/lib/objects/split/standalone.svelte index 95d4242e..8fefc6fd 100644 --- a/src/lib/objects/split/standalone.svelte +++ b/src/lib/objects/split/standalone.svelte @@ -67,6 +67,8 @@ send={args.send} getContract={args.getContract} tokens={args.tokens} + fiatRates={args.exchangeRates} + fiatSymbol={args.fiatSymbol} /> {/if} {:else if args.view === 'accounting'} diff --git a/src/lib/objects/split/views/settle-now.svelte b/src/lib/objects/split/views/settle-now.svelte index 256ed484..e44daff3 100644 --- a/src/lib/objects/split/views/settle-now.svelte +++ b/src/lib/objects/split/views/settle-now.svelte @@ -17,6 +17,8 @@ import type { TokenAmount, Token } from '$lib/objects/schemas' import { formatAddress, toSignificant } from '$lib/utils/format' import Info from '../components/info.svelte' + import { getFiatAmountText } from '$lib/utils/fiat' + import type { ExchangeRateRecord } from '$lib/stores/exchangeRates' export let profile: UserType export let instanceId: string @@ -24,6 +26,8 @@ export let splitterAddress: string export let tokens: TokenAmount[] export let token: Token + export let fiatRates: Map + export let fiatSymbol: string | undefined export let getContract: GetContract export let exitObject: () => void @@ -129,7 +133,13 @@

{toSignificant(fee, nativeToken.decimals)} {nativeToken.symbol}

- {toSignificant(fee, nativeToken.decimals)} ≈ TODO DAI + {toSignificant(fee, nativeToken.decimals)} + {getFiatAmountText( + fiatRates, + fiatSymbol, + toSignificant(fee, nativeToken.decimals), + nativeToken.symbol, + )}

diff --git a/src/lib/objects/utils.ts b/src/lib/utils/fiat.ts similarity index 100% rename from src/lib/objects/utils.ts rename to src/lib/utils/fiat.ts