Merge remote-tracking branch 'origin/feat/gas-header-adjust' into tmp…

…/20241010
RabbyHub · Oct 11, 2024 · 6a1ef10 · 6a1ef10
2 parents 32cf172 + 352d093
commit 6a1ef10
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/ui/views/Approval/components/TxComponents/GasSelectorHeader.tsx b/src/ui/views/Approval/components/TxComponents/GasSelectorHeader.tsx
@@ -712,7 +712,7 @@ const GasSelectorHeader = ({
   const gasCostUsdStr = useMemo(() => {
     const bn = new BigNumber(modalExplainGas?.gasCostUsd);
 
-    return `$${formatGasCostUsd(bn)}`;
+    return formatUsdValue(bn.toString(10));
   }, [modalExplainGas?.gasCostUsd]);
 
   const gasCostAmountStr = useMemo(() => {
@@ -834,17 +834,11 @@ const GasSelectorHeader = ({
                           gasAccountCost?.gas_account_cost.total_cost || '0'
                         )}
                       </span>
+                      <span className="text-14 text-r-neutral-body font-normal pl-4">
+                        ~{gasAccountCost?.gas_account_cost.total_cost || '0'}
+                        USD
+                      </span>
                     </Tooltip>
-
-                    <span className="text-14 text-r-neutral-body font-normal pl-4">
-                      ~
-                      {formatUsdValue(
-                        gasAccountCost?.gas_account_cost.total_cost || '0'
-                      )
-                        ?.replace('$', '')
-                        .replace('<', '')}
-                      USD
-                    </span>
                   </div>
                 </div>
               </div>