Merge branch 'develop' into jl/bump-provider-17.2.0

test/e2e/tests/transaction/navigate-transactions.spec.js

@@ -239,11 +239,19 @@ describe('Navigate transactions', function () {
       async ({ driver, ganacheServer }) => {
         await unlockWallet(driver);
 
-        // Wait until total amount is loaded to mitigate flakiness on reject
+        // Wait until the confirmation screen is stabilized to mitigate flakiness on reject:
+        // 1. Total amount is loaded
         await driver.findElement({
           tag: 'span',
           text: '3.0000315',
         });
+        // 2. Gas timing is loaded
+        await driver.findElement('[data-testid="gas-timing-time"]');
+        // 3. Insufficient funds warning is not present
+        await driver.assertElementNotPresent({
+          text: 'You do not have enough ETH',
+          tag: 'p',
+        });
 
         // reject transactions
         await driver.clickElement({ text: 'Reject 4', tag: 'a' });