merge

.gitignore

@@ -20,6 +20,6 @@ selenium-debug.log
 release
 
 # Generated files
-/src/contracts/
-/src/tokens/
-/src/darklist/
+src/contracts/*.json
+src/tokens/*.json
+src/darklist/*.json

CHANGELOG.md

@@ -1,8 +1,14 @@
+### Devop
+
+- Update Send offline helper UI [#663](https://github.com/MyEtherWallet/MyEtherWallet/pull/663)
+- Multiple Sentry fixes, custom paths, Safari worker fix [#680](https://github.com/MyEtherWallet/MyEtherWallet/pull/680)
+- Add Missing nodes from v3 [#672](https://github.com/MyEtherWallet/MyEtherWallet/pull/672)
+- Update hdkey 1.1.1 & imagemin-webpack-plugin 2.4.2 [#668](https://github.com/MyEtherWallet/MyEtherWallet/pull/668)
+
 ### Release v5.0.2
 
 ### Bug
 
-- Update Send offline helper UI [#663](https://github.com/MyEtherWallet/MyEtherWallet/pull/663)
 - Fix mobile settings [#651](https://github.com/MyEtherWallet/MyEtherWallet/pull/651)
 - Mandatory password input for Get a New Wallet -> Mnemonic Phrase [#649](https://github.com/MyEtherWallet/MyEtherWallet/pull/649)
 - fix data copy error on FF, and MEWconnect disconnect modal [#648](https://github.com/MyEtherWallet/MyEtherWallet/pull/648)

README.md

@@ -27,7 +27,7 @@ MyEtherWallet is a doorway to the Ethereum blockchain, allowing users to manage
 1. Open terminal
 2. Clone the repo: `git clone [email protected]:MyEtherWallet/MyEtherWallet.git`
 3. run `npm i` to install node packages.
-4. run `npm build`. You can also use the offline version by opening the index file from the dist folder with your preferred browser
+4. run `npm run build`. You can also use the offline version by opening the index file from the dist folder with your preferred browser
 5. start `npm start`
 6. App should be running in `https://localhost:8080`
 

fetchEthListData.js

@@ -37,7 +37,7 @@ async function fetchTokens() {
   }
 }
 
-async function fetchDarkList () {
+async function fetchDarkList() {
   try {
     if (!fs.existsSync(darklistFolder)) {
       fs.mkdirSync(darklistFolder)
@@ -46,8 +46,8 @@ async function fetchDarkList () {
     const darkList = await fetch(
       'https://raw.githubusercontent.com/MyEtherWallet/ethereum-lists/master/src/addresses/addresses-darklist.json'
     )
-    .then(res => res.json())
-    .catch(console.log);
+      .then(res => res.json())
+      .catch(console.log);
     const jsonToStore = {
       'data': darkList,
       'timestamp': Date.now()
@@ -75,7 +75,7 @@ async function fetchContracts() {
       contractList.forEach(async contractFile => {
         let contractsCollection = await fetch(
           `${contractFileURL + contractFile.name}/contract-abi-${
-            contractFile.name
+          contractFile.name
           }.json`
         )
           .then(res => res.json())
@@ -93,10 +93,17 @@ async function fetchContracts() {
   }
 }
 
-function run() {
-  fetchTokens();
-  fetchContracts();
-  fetchDarkList();
+const run = async () => {
+  await fetchTokens();
+  await fetchContracts();
+  await fetchDarkList();
 }
 
-run();
+(async () => {
+  try {
+    await run();
+    console.log("Done");
+  } catch (e) {
+    console.error(e)
+  }
+})();

jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  collectCoverage:process.env.NODE_ENV === 'production' ? true : false,
+  collectCoverage: process.env.NODE_ENV === 'production' ? true : false,
   globals: {
     WITH_NETWORK: false,
     VERSION: 'test',
@@ -30,5 +30,6 @@ module.exports = {
     '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
   ],
   testEnvironmentOptions: {},
-  testURL: 'http://localhost/'
+  testURL: 'http://localhost/',
+  setupTestFrameworkScriptFile: '<rootDir>/tests/unit/__mocks__/mocks.js'
 };