linting & fix test

Author: yann300

apps/remix-ide-e2e/src/tests/transactionExecution.test.ts

@@ -370,7 +370,6 @@ module.exports = {
             'decoded output': { '0':'bool: true' }
           }).perform(() => done())
       })
-      .click('*[data-id="universalDappUiUdappPin"]') // pin the contract for later use by a forked state.
       // Should fork the mainnet VM fork and execute some transaction
       .click('*[data-id="fork-state-icon"]')
       .waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
@@ -385,7 +384,15 @@ module.exports = {
         }
       )
       .pause(2000)
+      .perform((done) => {
+        browser.createContract((currentBlockNumber) + '')
+        .waitForElementPresent('*[data-shared="universalDappUiInstance"]')
+        .perform(() => {
+          done()
+        })
+      })
       .clickInstance(0)
+      .click('*[data-id="universalDappUiUdappPin"]') // pin the contract for later use by a forked state.
       .clickFunction('getB - call')
       .clickFunction('checkBlockNumberIsAdvancing - transact (not payable)')
       .perform((done) => {
@@ -442,20 +449,20 @@ module.exports = {
         console.log('Test Fork Mainnet', address)
         addressRef = address
       })
-      // from Mainnet fork 2, check that block number is at `currentBlockNumber` + 6
-      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '6'})
+      // from Mainnet fork 2, check that block number is at `currentBlockNumber` + 4
+      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '3'})
       .perform((done) => {
         browser.testFunction('last',
           {
             status: '0x1 Transaction mined and execution succeed',
             'decoded output': { '0':'bool: true' }
           }).perform(() => done())
       })
-      // switch back to Mainnet fork 1 and check that block number is at `currentBlockNumber` + 4
+      // switch back to Mainnet fork 1 and check that block number is at `currentBlockNumber` + 2
       .switchEnvironment('vm-fs-Mainnet fork 1')
       .pause(2000)
       .clickInstance(0)
-      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '4'})
+      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '1'})
       .perform((done) => {
         browser.testFunction('last',
           {

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -1024,7 +1024,7 @@ export class Blockchain extends Plugin {
                 let stateDetails = await this.call('fileManager', 'readFile', provider.config.statePath)
                 stateDetails = JSON.parse(stateDetails)
                 state = JSON.parse(state)
-                state = JSON.stringify({...stateDetails, ...(state as any)}, null, 2)
+                state = JSON.stringify({ ...stateDetails, ...(state as any) }, null, 2)
               }
               this.call('fileManager', 'writeFile', provider.config.statePath, state)
             } else if (isBasicVMState && !isForkedRpcState && !isForkedRpcState) {