Merge branch 'frontend-fix-estimate-symbol'

BitBoxSwiss · Nov 7, 2024 · 6077981 · 6077981
2 parents 183ebed + f4626d3
commit 6077981
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/frontends/web/src/components/amount/amount.tsx b/frontends/web/src/components/amount/amount.tsx
@@ -28,7 +28,6 @@ type TProps = {
   removeBtcTrailingZeroes?: boolean;
   alwaysShowAmounts?: boolean
   allowRotateCurrencyOnMobile?: boolean;
-  estimated?: boolean;
 };
 
 const formatSats = (amount: string): JSX.Element => {
@@ -99,7 +98,6 @@ export const Amount = ({
   removeBtcTrailingZeroes,
   alwaysShowAmounts = false,
   allowRotateCurrencyOnMobile = false,
-  estimated = false
 }: TProps) => {
   const { rotateDefaultCurrency } = useContext(RatesContext);
   const isMobile = useMediaQuery('(max-width: 768px)');
@@ -118,7 +116,6 @@ export const Amount = ({
         unit={unit}
         removeBtcTrailingZeroes={removeBtcTrailingZeroes}
         alwaysShowAmounts={alwaysShowAmounts}
-        estimated={estimated}
       />
     </span>
   );
@@ -129,7 +126,6 @@ export const FormattedAmount = ({
   unit,
   removeBtcTrailingZeroes,
   alwaysShowAmounts = false,
-  estimated = false,
 }: TProps) => {
   const { hideAmounts } = useContext(AppContext);
   const { decimal, group } = useContext(LocalizationContext);
@@ -161,9 +157,5 @@ export const FormattedAmount = ({
     return formatSats(amount);
   }
 
-  let prefix = '';
-  if (estimated) {
-    prefix = '\u2248'; //≈
-  }
-  return prefix + formatLocalizedAmount(amount, group, decimal);
+  return formatLocalizedAmount(amount, group, decimal);
 };
diff --git a/frontends/web/src/components/transactions/transaction.module.css b/frontends/web/src/components/transactions/transaction.module.css
@@ -95,6 +95,7 @@
   color: var(--color-green);
 }
 
+.txPrefix,
 .txUnit {
   color: var(--color-secondary);
   font-size: 14px;

diff --git a/frontends/web/src/components/transactions/transaction.tsx b/frontends/web/src/components/transactions/transaction.tsx
@@ -157,21 +157,34 @@ const Amounts = ({
   const conversion = amount?.conversions && amount?.conversions[defaultCurrency];
   const sign = getTxSign(type);
   const txTypeClass = `txAmount-${type}`;
+  const conversionPrefix = amount.estimated ? '\u2248' : null; // ≈
   return (
     <span className={`${styles.txAmountsColumn} ${styles[txTypeClass]}`}>
       {/* <data value={amount.amount}> */}
       <span className={styles.txAmount}>
         {sign}
-        <Amount amount={amount.amount} unit={amount.unit} />
+        <Amount
+          amount={amount.amount}
+          unit={amount.unit}
+        />
         <span className={styles.txUnit}>
           {' '}
           {amount.unit}
         </span>
       </span>
       {/* </data> */}
       <span className={styles.txConversionAmount}>
-        {sign}
-        <Amount amount={conversion || ''} unit={defaultCurrency} estimated={amount.estimated}/>
+        {conversionPrefix && (
+          <span className={styles.txPrefix}>
+            {conversionPrefix}
+            {' '}
+          </span>
+        )}
+        {conversion && sign}
+        <Amount
+          amount={conversion || ''}
+          unit={defaultCurrency}
+        />
         <span className={styles.txUnit}>
           {' '}
           {defaultCurrency}