Merge branch 'amount'

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()
-	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,
 		)
 	}
@@ -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{}

frontends/web/src/components/amount/conversion-amount.tsx

@@ -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;
@@ -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>
   );
 };