feat(bridge-ui): remove fee padding (#18546)

taikoxyz · Dec 10, 2024 · 3966bb1 · 3966bb1
1 parent 0ef7fd6
commit 3966bb1
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 613 deletions.
diff --git a/packages/bridge-ui/src/components/Transactions/Dialogs/DesktopDetailsDialog.svelte b/packages/bridge-ui/src/components/Transactions/Dialogs/DesktopDetailsDialog.svelte
@@ -227,7 +227,7 @@
               </span>
 
               <span class="font-bold text-positive-sentiment">Waiting for transaction to be processed</span>
-              <span class="text-secondary-content">Depending on your direction, this can take up to 24hs</span>
+              <span class="text-secondary-content">Depending on your direction, this can take up to 4hs</span>
             </div>
 
             <div class="f-col">

diff --git a/packages/bridge-ui/src/components/Transactions/Rows/FungibleTransactionRow.svelte b/packages/bridge-ui/src/components/Transactions/Rows/FungibleTransactionRow.svelte
@@ -103,7 +103,7 @@
       : mobileContainerClasses;
 
   $: commonColumnClasses = classNames(' relative items-end');
-  $: desktopColumnClasses = classNames(commonColumnClasses, 'w-1/6 f-row justify-center items-center');
+  $: desktopColumnClasses = classNames(commonColumnClasses, 'w-1/6 f-row justify-center md:justify-start items-center');
   $: tabletColumnClasses = classNames(
     commonColumnClasses,
     'w-1/4 f-row  text-left start items-center text-sm space-y-[10px]',

diff --git a/packages/bridge-ui/src/i18n/en.json b/packages/bridge-ui/src/i18n/en.json
@@ -40,7 +40,7 @@
     },
     "alerts": {
       "not_enough_funds": "You do not have enough ETH to cover the processing fee and transaction fee. Please add more ETH to your wallet (>= 0.0015 ETH).",
-      "slow_bridging": "Please note: Bridging to L1 will take around 24hrs!",
+      "slow_bridging": "Please note: Bridging to L1 will take around 4hs!",
       "smart_contract_wallet": "It seems you are using a smart contract wallet. Please double check that the recipient matches your wallet on the destination or change it accordingly.",
       "wrapped_eth": "You are bridging wrapped ETH. Please be aware that un-wrapping will only work on the original chain of the token, <span class=\"font-bold\">NOT</span> on the destination."
     },

diff --git a/packages/bridge-ui/src/libs/fee/recommendProcessingFee.ts b/packages/bridge-ui/src/libs/fee/recommendProcessingFee.ts
@@ -94,20 +94,20 @@ export async function recommendProcessingFee({
   if (!estimatedMsgGaslimit) throw new Error('Unable to calculate fee');
 
   // Initial fee multiplicator and add fallback
-  let feeMultiplicator: number = parseInt(PUBLIC_FEE_MULTIPLIER);
-
-  if (gasPrice <= parseGwei('0.05')) {
-    feeMultiplicator = 4;
-    log(`gasPrice {formatGwei(gasPrice)} is less than 0.5 gwei, setting feeMultiplicator to 4`);
-  } else if (gasPrice <= parseGwei('0.1') && gasPrice > parseGwei('0.05')) {
-    feeMultiplicator = 3;
-    log(
-      `gasPrice ${formatGwei(gasPrice)} is less than 0.1 gwei and more than 0.05 gwei, setting feeMultiplicator to 3`,
-    );
-  } else {
-    feeMultiplicator = 2;
-    log(`gasPrice ${formatGwei(gasPrice)} is more than 0.1 gwei, setting feeMultiplicator to 2`);
-  }
+  const feeMultiplicator: number = parseInt(PUBLIC_FEE_MULTIPLIER) || 1;
+
+  // if (gasPrice <= parseGwei('0.05')) {
+  //   feeMultiplicator = 4;
+  //   log(`gasPrice {formatGwei(gasPrice)} is less than 0.5 gwei, setting feeMultiplicator to 4`);
+  // } else if (gasPrice <= parseGwei('0.1') && gasPrice > parseGwei('0.05')) {
+  //   feeMultiplicator = 3;
+  //   log(
+  //     `gasPrice ${formatGwei(gasPrice)} is less than 0.1 gwei and more than 0.05 gwei, setting feeMultiplicator to 3`,
+  //   );
+  // } else {
+  //   feeMultiplicator = 2;
+  //   log(`gasPrice ${formatGwei(gasPrice)} is more than 0.1 gwei, setting feeMultiplicator to 2`);
+  // }
 
   const fee = estimatedMsgGaslimit * Number(gasPrice) * feeMultiplicator;
   return BigInt(fee);