Merge remote-tracking branch 'origin/develop' into get-upstream
viktor
|
|
@ -101,14 +101,13 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
keys:
|
||||
- dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Install npm 6 + deps via npm
|
||||
command: |
|
||||
sudo npm install -g npm@6.1.0 && npm install --no-save
|
||||
- save_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
paths:
|
||||
- node_modules
|
||||
prep-deps-firefox:
|
||||
|
|
@ -119,7 +118,7 @@ jobs:
|
|||
- restore_cache:
|
||||
key: v1.0-dependency-cache-firefox-
|
||||
- run:
|
||||
name: Download Firefox If needed
|
||||
name: Download Firefox
|
||||
command: ./.circleci/scripts/firefox-download.sh
|
||||
- save_cache:
|
||||
key: v1.0-dependency-cache-firefox-
|
||||
|
|
@ -132,7 +131,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: build:dist
|
||||
command: npm run dist
|
||||
|
|
@ -151,7 +150,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: build:dist
|
||||
command: npm run doc
|
||||
|
|
@ -166,7 +165,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Get Scss Cache key
|
||||
# this allows us to checksum against a whole directory
|
||||
|
|
@ -185,7 +184,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Test
|
||||
command: npm run lint
|
||||
|
|
@ -196,7 +195,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Test
|
||||
command: npx nsp check
|
||||
|
|
@ -207,7 +206,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- run:
|
||||
|
|
@ -228,7 +227,7 @@ jobs:
|
|||
name: Install firefox
|
||||
command: ./.circleci/scripts/firefox-install.sh
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- run:
|
||||
|
|
@ -244,7 +243,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- run:
|
||||
|
|
@ -265,7 +264,7 @@ jobs:
|
|||
name: Install firefox
|
||||
command: ./.circleci/scripts/firefox-install.sh
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- run:
|
||||
|
|
@ -281,7 +280,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- run:
|
||||
|
|
@ -298,7 +297,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
|
|
@ -325,7 +324,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
key: build-cache-{{ .Revision }}
|
||||
- restore_cache:
|
||||
|
|
@ -348,7 +347,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: test:coverage
|
||||
command: npm run test:coverage
|
||||
|
|
@ -366,7 +365,7 @@ jobs:
|
|||
name: Install firefox
|
||||
command: ./.circleci/scripts/firefox-install.sh
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Get Scss Cache key
|
||||
# this allows us to checksum against a whole directory
|
||||
|
|
@ -385,7 +384,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Get Scss Cache key
|
||||
# this allows us to checksum against a whole directory
|
||||
|
|
@ -409,7 +408,7 @@ jobs:
|
|||
name: Install firefox
|
||||
command: ./.circleci/scripts/firefox-install.sh
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Get Scss Cache key
|
||||
# this allows us to checksum against a whole directory
|
||||
|
|
@ -428,7 +427,7 @@ jobs:
|
|||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
key: dependency-cache-
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
- run:
|
||||
name: Get Scss Cache key
|
||||
# this allows us to checksum against a whole directory
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 20 KiB |
|
|
@ -1298,8 +1298,9 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||
const { networkController, recentBlocksController } = this
|
||||
const { recentBlocks } = recentBlocksController.store.getState()
|
||||
|
||||
const networkId = networkController.store.getState().network
|
||||
const isPOA = networkId === '77' || networkId === '99'
|
||||
const networkIdStr = networkController.store.getState().network
|
||||
const networkId = parseInt(networkIdStr)
|
||||
const isPOA = networkId === 77 || networkId === 99
|
||||
|
||||
// Return 1 gwei if using a POA network of if there are no blocks have been observed:
|
||||
if (isPOA || recentBlocks.length === 0) {
|
||||
|
|
|
|||