Merge branch 'master' into nx

apps/remix-ide/src/assets/js/loader.js

@@ -11,6 +11,7 @@ if (domains[window.location.hostname]) {
   _paq.push(['enableJSErrorTracking']);
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
+  _paq.push(['enableHeartBeatTimer']);
   (function () {
     var u = "https://matomo.ethereum.org/";
     _paq.push(['setTrackerUrl', u + 'matomo.php'])

libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx

@@ -158,10 +158,10 @@ export const ContractSelection = (props: ContractSelectionProps) => {
       swarmLocation: 'Swarm url where all metadata information can be found (contract needs to be published first)',
       web3Deploy: 'Copy/paste this code to any JavaScript/Web3 console to deploy this contract'
     }
-    let contractProperties = contractsDetails[selectedContract] || {}
-    contractProperties.compilerInput = compilerInput
+    let contractProperties:any = {}
     // Make 'compilerInput' first field to display it as first item in 'Compilation Details' modal
-    contractProperties = JSON.parse(JSON.stringify(contractProperties, ["compilerInput", ...Object.keys(contractProperties)], 4))
+    if (compilerInput) contractProperties.compilerInput = compilerInput
+    contractProperties = Object.assign(contractProperties, contractsDetails[selectedContract])
     const log = <div className="remixui_detailsJSON">
       <TreeView>
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.30.0",
+  "version": "0.31.0-dev",
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "keywords": [