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

backend: show estimated conversions for unconfirmed ETH txs and remove skeleton when conversions are missing. #3235

Merged
merged 2 commits into from
Mar 24, 2025
Merged

backend: show estimated conversions for unconfirmed ETH txs and remove skeleton when conversions are missing. #3235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc5c2d
backend: show estimated conversions for unconfirmed ETH txs.
bznein Mar 6, 2025
ec60bad
frontend: do not show skeleton when conversion is missing.
bznein Mar 13, 2025
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
30 changes: 19 additions & 11 deletions backend/coins/btc/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,27 @@ func (handlers *Handlers) formatAmountAsJSON(amount coin.Amount, isFee bool) For

func (handlers *Handlers) formatAmountAtTimeAsJSON(amount coin.Amount, timeStamp *time.Time) FormattedAmount {
accountCoin := handlers.account.Coin()
conversions := map[string]string{}
estimated := false
if timeStamp != nil {
rateUpdater := handlers.account.Config().RateUpdater
formatBtcAsSat := util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit)
var conversions map[string]string
var estimated bool

if timeStamp == nil {
conversions = coin.Conversions(
amount,
accountCoin,
false,
rateUpdater,
formatBtcAsSat,
)
estimated = true
} else {
conversions, estimated = coin.ConversionsAtTime(
amount,
handlers.account.Coin(),
accountCoin,
false,
handlers.account.Config().RateUpdater,
util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit),
rateUpdater,
formatBtcAsSat,
timeStamp,
)
}
Expand Down Expand Up @@ -189,22 +201,18 @@ func (handlers *Handlers) getTxInfoJSON(txInfo *accounts.TransactionData, detail
feeString = handlers.formatAmountAsJSON(*txInfo.Fee, true)
}
amount := handlers.formatAmountAsJSON(txInfo.Amount, false)
amountAtTime := FormattedAmount{
Amount: amount.Amount,
Unit: amount.Unit,
}
var formattedTime *string
timestamp := txInfo.Timestamp
if timestamp == nil {
timestamp = txInfo.CreatedTimestamp
}

deductedAmountAtTime := handlers.formatAmountAtTimeAsJSON(txInfo.DeductedAmount, timestamp)
amountAtTime := handlers.formatAmountAtTimeAsJSON(txInfo.Amount, timestamp)

if timestamp != nil {
t := timestamp.Format(time.RFC3339)
formattedTime = &t
amountAtTime = handlers.formatAmountAtTimeAsJSON(txInfo.Amount, timestamp)
}

addresses := []string{}
Expand Down
12 changes: 5 additions & 7 deletions frontends/web/src/components/amount/conversion-amount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { Arrow } from '@/components/transactions/components/arrows';
import { Amount } from '@/components/amount/amount';
import { getTxSign } from '@/utils/transaction';
import styles from './conversion-amount.module.css';
import { Skeleton } from '@/components/skeleton/skeleton';

type TConversionAmountProps = {
amount: IAmount;
Expand Down Expand Up @@ -69,13 +68,12 @@ export const ConversionAmount = ({
amount={sendToSelf ? amountToShow.amount : conversion || ''}
unit={conversionUnit}
/>
<span className={styles.txUnit}>
{' '}
{conversionUnit}
</span>
</>
) : (
<div className={styles.skeletonContainer}>
<Skeleton />
</div>
)}
<span className={styles.txUnit}>{' '}{conversionUnit}</span>
) : null }
</span>
);
};