backend: show estimated conversions for unconfirmed ETH txs.

Author: bznein

backend/coins/btc/handlers/handlers.go

@@ -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()
+	rateUpdater := handlers.account.Config().RateUpdater
+	formatBtcAsSat := util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit)
 	conversions := map[string]string{}
 	estimated := false
-	if timeStamp != nil {
+
+	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,
 		)
 	}
@@ -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{}