added ERC-20 to ERC-20 and changes swipe to button

MetaMask · Oct 28, 2024 · 0d9048e · 0d9048e
1 parent 7531db0
commit 0d9048e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js
@@ -2157,7 +2157,7 @@ function SwapsQuotesView({
             </QuotesSummary.Body>
           </QuotesSummary>
         )}
-        <StyledButton type="confirm" onPress={handleCompleteSwap} disabled={unableToSwap || isHandlingSwap || isAnimating}>
+        <StyledButton testID={SwapsViewSelectors.SWAP_BUTTON} type="confirm" onPress={handleCompleteSwap} disabled={unableToSwap || isHandlingSwap || isAnimating}>
           {strings('swaps.swap')}
         </StyledButton>
         <TouchableOpacity onPress={handleTermsPress} style={styles.termsButton}>

diff --git a/e2e/pages/swaps/SwapView.js b/e2e/pages/swaps/SwapView.js
@@ -20,8 +20,8 @@ class SwapView {
     return Matchers.getElementByText(SwapViewSelectorsTexts.FETCHING_QUOTES);
   }
 
-  get swipeToSwapButton() {
-    return Matchers.getElementByID(SwapsViewSelectors.SWIPE_TO_SWAP_BUTTON);
+  get swapButton() {
+    return Matchers.getElementByID(SwapsViewSelectors.SWAP_BUTTON);
   }
 
   get iUnderstandLabel() {
@@ -41,19 +41,8 @@ class SwapView {
     return attributes.enabled === true; // Check if enabled is true
   }
 
-  async swipeToSwap() {
-    const percentage = device.getPlatform() === 'ios' ? 0.72 : 0.95;
-    const swapsSliderElement = await this.swipeToSwapButton;
-    const delay = 500; // Delay in milliseconds
-
-    // Wait until the button is enabled before performing swipe actions
-    while (!(await this.isButtonEnabled(swapsSliderElement))) {
-      await TestHelpers.delay(delay); // Wait for the specified delay
-    }
-
-    // Once enabled, perform the swipe actions
-    await Gestures.swipe(this.swipeToSwapButton, 'right', 'fast', percentage);
-    await Gestures.swipe(this.swipeToSwapButton, 'right', 'fast', percentage);
+  async tapSwapButton() {
+    await Gestures.waitAndTap(this.swapButton);
   }
 
   async swapCompleteLabel(sourceTokenSymbol, destTokenSymbol) {

diff --git a/e2e/selectors/swaps/SwapsView.selectors.js b/e2e/selectors/swaps/SwapsView.selectors.js
@@ -1,7 +1,7 @@
 import enContent from '../../../locales/languages/en.json';
 
 export const SwapsViewSelectors = {
-  SWIPE_TO_SWAP_BUTTON: 'swipe-to-swap-button',
+  SWAP_BUTTON: 'swap-button',
   QUOTE_SUMMARY: 'swap-quote-summary',
   GAS_FEE: 'swap-gas-fee',
 };

diff --git a/e2e/specs/swaps/swap-action-regression.spec.js b/e2e/specs/swaps/swap-action-regression.spec.js
@@ -142,7 +142,7 @@ describe(Regression('Multiple Swaps from Actions'), () => {
       await Assertions.checkIfVisible(SwapView.quoteSummary);
       await Assertions.checkIfVisible(SwapView.gasFee);
       await SwapView.tapIUnderstandPriceWarning();
-      await SwapView.swipeToSwap();
+      await SwapView.tapSwapButton();
       //Wait for Swap to complete
       await SwapView.swapCompleteLabel(sourceTokenSymbol, destTokenSymbol);
       await device.enableSynchronization();

diff --git a/e2e/specs/swaps/swap-action-smoke.spec.js b/e2e/specs/swaps/swap-action-smoke.spec.js
@@ -83,6 +83,8 @@ describe(SmokeSwaps('Swap from Actions'), () => {
     type             | quantity | sourceTokenSymbol | destTokenSymbol | network
     ${'native'}$     |${'.4'}   | ${'ETH'}          | ${'WETH'}       | ${CustomNetworks.Tenderly.Mainnet}
     ${'wrapped'}$    |${'.2'}   | ${'WETH'}         | ${'ETH'}        | ${CustomNetworks.Tenderly.Mainnet}
+    ${'native'}$     |${'.5'}   | ${'ETH'}          | ${'DAI'}        | ${CustomNetworks.Tenderly.Mainnet}
+    ${'unapproved'}$ |${'50'}   | ${'DAI'}          | ${'USDC'}       | ${CustomNetworks.Tenderly.Mainnet}
   `(
     "should swap $type token '$sourceTokenSymbol' to '$destTokenSymbol' on '$network.providerConfig.nickname'",
     async ({ type, quantity, sourceTokenSymbol, destTokenSymbol, network }) => {
@@ -140,7 +142,7 @@ describe(SmokeSwaps('Swap from Actions'), () => {
       await Assertions.checkIfVisible(SwapView.quoteSummary);
       await Assertions.checkIfVisible(SwapView.gasFee);
       await SwapView.tapIUnderstandPriceWarning();
-      await SwapView.swipeToSwap();
+      await SwapView.tapSwapButton();
       //Wait for Swap to complete
       await SwapView.swapCompleteLabel(sourceTokenSymbol, destTokenSymbol);
       await device.enableSynchronization();

diff --git a/e2e/specs/swaps/swap-token-chart.spec.js b/e2e/specs/swaps/swap-token-chart.spec.js
@@ -94,7 +94,7 @@ describe(Regression('Swap from Token view'), () => {
     await Assertions.checkIfVisible(SwapView.quoteSummary);
     await Assertions.checkIfVisible(SwapView.gasFee);
     await SwapView.tapIUnderstandPriceWarning();
-    await SwapView.swipeToSwap();
+    await SwapView.tapSwapButton();
     //Wait for Swap to complete
     await SwapView.swapCompleteLabel('ETH', 'DAI');
     await device.enableSynchronization();