Merge branch 'develop'

Author: gabmontes

.gitignore

@@ -3,10 +3,7 @@
 
 # environment variables
 .env
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
+.env.*
 
 # building
 /build

.nvmrc

@@ -0,0 +1 @@
+8.15

.travis.yml

@@ -1,8 +1,6 @@
-branches:
-  only: travis-build
-
 language: node_js
-node_js: "8"
+node_js:
+  - "8.15"
 
 notifications:
   email: false
@@ -23,6 +21,9 @@ matrix:
         - ELECTRON_CACHE=$HOME/.cache/electron
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
 cache:
   directories:
   - node_modules
@@ -38,6 +39,7 @@ before_install:
     fi
 
 install:
+  - nvm install
   - npm i
 
 before_script:
@@ -46,14 +48,12 @@ before_script:
 script:
   - |
     if [ "$TRAVIS_BRANCH" == "develop" ]; then
-      npm test && npm run dist
+      npm run dist
     elif [ "$TRAVIS_BRANCH" == "master" ]; then
-      npm test && npm run release
+      npm run env
+      npm run release
     fi
 
-before_cache:
-  - rm -rf $HOME/.cache/electron-builder/wine
-
 branches:
   except:
     - "/^v\\d+\\.\\d+\\.\\d+$/"

README.md

@@ -43,39 +43,6 @@ More info [github.com/megahertz/electron-log](https://github.com/megahertz/elect
 
 To completely remove the application and start over, remove the settings file too.
 
-### Run in Ropsten Testnet
-
-Modify the `Settings` file replacing the following properties:
-
-```json
-{
-  "app": {
-    "chain": "ropsten",
-    "node": {
-      "jsonRpcApiUrl": "https://eth.bloqrock.net:8545",
-      "websocketApiUrl": "wss://eth.bloqrock.net:8546"
-    },
-    "indexerApiUrl": "https://indexer.bloqrock.net",
-    "tracerApiUrl": "https://tracer.bloqrock.net"
-  },
-  "tokens": {
-    "0xf3e9a687fdf24112745d4d7dee150ba87a07ecc3": {
-      "decimals": 18,
-      "name": "Metronome",
-      "symbol": "MET"
-    }
-  }
-}
-```
-
-Then, start the wallet setting the proper environment variable as follows:
-
-```bash
-REACT_APP_ETH_CHAIN=ropsten npm run dev
-```
-
-Alternatively, a `.env` file can also be used to set the chain variable.
-
 ### Production Build
 
 ```bash
@@ -86,8 +53,10 @@ npm run dist
 npm run release
 ```
 
-To sign the macOS installers, execute `npm run dist:mac`. The signing certificate shall be in the root folder and be named `met.p12`. The certificate password will be required before signing.
+To sign the macOS installers, execute `npm run dist:mac`.
+The signing certificate shall be in the root folder and be named `met.p12`.
+The certificate password will be required before signing.
 
-## LICENSE
+## License
 
 MIT

appveyor.yml

@@ -7,16 +7,13 @@ init:
 
 shallow_clone: true
 
-environment:
-  DEBUG: electron-builder
-
 cache:
   - node_modules
   - '%USERPROFILE%\.electron'
 
 install:
-  - ps: Install-Product node LTS x64
-  - npm i --global --production windows-build-tools
+  - ps: Install-Product node 8.15
+  - npm i --global --production windows-build-tools@4
   - npm i
 
 platform:
@@ -25,7 +22,7 @@ platform:
 build_script:
   - npm run dist
 
-test: off
+test: "off"
 
 for:
 -
@@ -35,4 +32,5 @@ for:
 
   configuration: Release
   build_script:
-    - npm run release
+    - npm run env
+    - npm run release