backend: show estimated conversions for unconfirmed ETH txs.

Author: bznein

backend/coins/btc/handlers/handlers.go

@@ -121,18 +121,18 @@ 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 {
-		conversions, estimated = coin.ConversionsAtTime(
-			amount,
-			handlers.account.Coin(),
-			false,
-			handlers.account.Config().RateUpdater,
-			util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit),
-			timeStamp,
-		)
-	}
+	if timeStamp == nil {
+		now := time.Now()
+		timeStamp = &now
+	}
+	conversions, estimated := coin.ConversionsAtTime(
+		amount,
+		handlers.account.Coin(),
+		false,
+		handlers.account.Config().RateUpdater,
+		util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit),
+		timeStamp,
+	)
 	return FormattedAmount{
 		Amount:      accountCoin.FormatAmount(amount, false),
 		Unit:        accountCoin.GetFormatUnit(false),
@@ -200,11 +200,11 @@ func (handlers *Handlers) getTxInfoJSON(txInfo *accounts.TransactionData, detail
 	}
 
 	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{}