Merge branch 'main' into feat/bump-assets-package

Author: salimtb

test/e2e/page-objects/pages/dialog/confirm-alert.ts

@@ -24,17 +24,17 @@ class ConfirmAlertModal {
   }
 
   async rejectFromAlertModal() {
-    this.driver.clickElement(this.alertModalCancelButton);
+    await this.driver.clickElement(this.alertModalCancelButton);
   }
 
   async confirmFromAlertModal() {
-    this.driver.clickElement(this.alertModalAcknowledgeCheckBox);
-    this.driver.clickElement(this.alertModalSubmitButton);
+    await this.driver.clickElement(this.alertModalAcknowledgeCheckBox);
+    await this.driver.clickElement(this.alertModalSubmitButton);
   }
 
   async acknowledgeAlert() {
-    this.driver.clickElement(this.alertModalAcknowledgeCheckBox);
-    this.driver.clickElement(this.alertModalButton);
+    await this.driver.clickElement(this.alertModalAcknowledgeCheckBox);
+    await this.driver.clickElement(this.alertModalButton);
   }
 
   async verifyNetworkDisplay(networkName: string): Promise<void> {

test/e2e/page-objects/pages/send/send-token-page.ts

@@ -239,10 +239,19 @@ class SendTokenPage {
     await this.driver.pasteIntoField(this.hexInput, hex);
   }
 
-  async getHexInputValue(): Promise<string> {
+  async waitForHexDataCleared(): Promise<string> {
     console.log('Getting value from hex input');
     const hexInputElement = await this.driver.waitForSelector(this.hexInput);
-    this.driver.waitForNonEmptyElement(hexInputElement);
+    await this.driver.waitUntil(
+      async () => {
+        const value = await hexInputElement.getAttribute('value');
+        return value === '';
+      },
+      {
+        timeout: 5000,
+        interval: 500,
+      },
+    );
     const value = await hexInputElement.getAttribute('value');
     console.log(`Hex input value: ${value}`);
     return value;

test/e2e/tests/transaction/change-assets.spec.ts

@@ -1,4 +1,3 @@
-import assert from 'assert/strict';
 import { withFixtures } from '../../helpers';
 import FixtureBuilder from '../../fixtures/fixture-builder';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
@@ -232,12 +231,7 @@ describe('Change assets', function () {
         await sendTokenPage.fillAmount('2');
 
         // Make sure hex data is cleared after switching assets
-        const hexDataValue = await sendTokenPage.getHexInputValue();
-        assert.equal(
-          hexDataValue,
-          '',
-          'Hex data has not been cleared after switching assets.',
-        );
+        await sendTokenPage.waitForHexDataCleared();
 
         // Make sure gas is updated by resetting amount and hex data
         // Note: this is needed until the race condition is fixed on the wallet level (issue #25243)

ui/pages/bridge/quotes/multichain-bridge-quote-card.tsx

@@ -45,6 +45,7 @@ import { useRewards } from '../../../hooks/bridge/useRewards';
 import { RewardsBadge } from '../../../components/app/rewards/RewardsBadge';
 import AddRewardsAccount from '../../../components/app/rewards/AddRewardsAccount';
 import { Skeleton } from '../../../components/component-library/skeleton';
+import { getGasFeesSponsoredNetworkEnabled } from '../../../selectors/selectors';
 import { BridgeQuotesModal } from './bridge-quotes-modal';
 
 const getTimerColor = (timeInSeconds: number) => {
@@ -87,6 +88,9 @@ export const MultichainBridgeQuoteCard = ({
   const dispatch = useDispatch();
 
   const isToOrFromNonEvm = useSelector(getIsToOrFromNonEvm);
+  const gasFeesSponsoredNetworkEnabled = useSelector(
+    getGasFeesSponsoredNetworkEnabled,
+  );
 
   const [showAllQuotes, setShowAllQuotes] = useState(false);
 
@@ -97,7 +101,43 @@ export const MultichainBridgeQuoteCard = ({
   const gasIncluded = activeQuote?.quote?.gasIncluded ?? false;
   const gasIncluded7702 = activeQuote?.quote?.gasIncluded7702 ?? false;
   const gasSponsored = activeQuote?.quote?.gasSponsored ?? false;
-  const isGasless = gasIncluded7702 || gasIncluded || gasSponsored;
+
+  const isCurrentNetworkGasSponsored = useMemo(() => {
+    if (!fromChain?.chainId || !gasFeesSponsoredNetworkEnabled) {
+      return false;
+    }
+    return Boolean(
+      gasFeesSponsoredNetworkEnabled[
+        fromChain.chainId as keyof typeof gasFeesSponsoredNetworkEnabled
+      ],
+    );
+  }, [fromChain?.chainId, gasFeesSponsoredNetworkEnabled]);
+
+  const shouldShowGasSponsored = useMemo(() => {
+    if (gasSponsored) {
+      return true;
+    }
+
+    // For the insufficientBal workaround, validate it's a same-chain swap
+    if (insufficientBal && isCurrentNetworkGasSponsored) {
+      // Gas sponsorship only applies to same-chain swaps, not cross-chain bridges
+      const isSameChain =
+        fromToken?.chainId &&
+        toToken?.chainId &&
+        fromToken.chainId === toToken.chainId;
+      return Boolean(isSameChain);
+    }
+
+    return false;
+  }, [
+    gasSponsored,
+    insufficientBal,
+    isCurrentNetworkGasSponsored,
+    fromToken?.chainId,
+    toToken?.chainId,
+  ]);
+
+  const isGasless = gasIncluded7702 || gasIncluded || shouldShowGasSponsored;
 
   const nativeTokenSymbol = fromChain
     ? getNativeAssetForChainId(fromChain.chainId).symbol
@@ -266,7 +306,7 @@ export const MultichainBridgeQuoteCard = ({
                 {t('networkFeeExplanation')}
               </Tooltip>
             </Row>
-            {gasSponsored && (
+            {shouldShowGasSponsored && (
               <Row gap={1} data-testid="network-fees-sponsored">
                 <Text
                   variant={TextVariant.bodySm}
@@ -283,7 +323,7 @@ export const MultichainBridgeQuoteCard = ({
                 </Tooltip>
               </Row>
             )}
-            {!gasSponsored && activeQuote.quote.gasIncluded && (
+            {!shouldShowGasSponsored && activeQuote.quote.gasIncluded && (
               <Row gap={1} data-testid="network-fees-included">
                 <Text
                   variant={TextVariant.bodySm}
@@ -308,7 +348,7 @@ export const MultichainBridgeQuoteCard = ({
                 </Text>
               </Row>
             )}
-            {!gasSponsored && !activeQuote.quote.gasIncluded && (
+            {!shouldShowGasSponsored && !activeQuote.quote.gasIncluded && (
               <Text
                 variant={TextVariant.bodySm}
                 color={TextColor.textAlternative}