aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/ducks
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/ducks')
-rw-r--r--ui/app/ducks/app/app.js10
-rw-r--r--ui/app/ducks/gas/gas-duck.test.js10
-rw-r--r--ui/app/ducks/gas/gas.duck.js30
-rw-r--r--ui/app/ducks/metamask/metamask.js2
4 files changed, 26 insertions, 26 deletions
diff --git a/ui/app/ducks/app/app.js b/ui/app/ducks/app/app.js
index 77d9116e5..10ed7d155 100644
--- a/ui/app/ducks/app/app.js
+++ b/ui/app/ducks/app/app.js
@@ -160,7 +160,7 @@ function reduceApp (state, action) {
transForward: false,
})
- // intialize
+ // intialize
case actions.SHOW_CREATE_VAULT:
return extend(appState, {
@@ -262,7 +262,7 @@ function reduceApp (state, action) {
transForward: true,
})
- case actions.CREATE_NEW_VAULT_IN_PROGRESS:
+ case actions.CREATE_NEW_VAULT_IN_PROGRESS:
return extend(appState, {
currentView: {
name: 'createVault',
@@ -310,7 +310,7 @@ function reduceApp (state, action) {
transForward: true,
})
- // unlock
+ // unlock
case actions.UNLOCK_METAMASK:
return extend(appState, {
@@ -347,7 +347,7 @@ function reduceApp (state, action) {
name: 'UnlockScreen',
},
})
- // reveal seed words
+ // reveal seed words
case actions.REVEAL_SEED_CONFIRMATION:
return extend(appState, {
@@ -358,7 +358,7 @@ function reduceApp (state, action) {
warning: null,
})
- // accounts
+ // accounts
case actions.SET_SELECTED_ACCOUNT:
return extend(appState, {
diff --git a/ui/app/ducks/gas/gas-duck.test.js b/ui/app/ducks/gas/gas-duck.test.js
index e97ef2d9f..82a91d5e7 100644
--- a/ui/app/ducks/gas/gas-duck.test.js
+++ b/ui/app/ducks/gas/gas-duck.test.js
@@ -465,7 +465,7 @@ describe('Gas Duck', () => {
initState,
{ basicPriceAndTimeEstimatesLastRetrieved: 1000000 }
),
- metamask: { provider: { type: 'ropsten' } },
+ metamask: { provider: { type: 'ropsten' } },
}))
assert.deepEqual(
mockDistpatch.getCall(0).args,
@@ -542,7 +542,7 @@ describe('Gas Duck', () => {
initState,
{}
),
- metamask: { provider: { type: 'ropsten' } },
+ metamask: { provider: { type: 'ropsten' } },
}))
assert.deepEqual(
mockDistpatch.getCall(0).args,
@@ -586,7 +586,7 @@ describe('Gas Duck', () => {
initState,
{}
),
- metamask: { provider: { type: 'ropsten' } },
+ metamask: { provider: { type: 'ropsten' } },
}))
assert.deepEqual(
mockDistpatch.getCall(0).args,
@@ -647,7 +647,7 @@ describe('Gas Duck', () => {
initState,
{ priceAndTimeEstimatesLastRetrieved: 1000000 }
),
- metamask: { provider: { type: 'ropsten' } },
+ metamask: { provider: { type: 'ropsten' } },
}))
assert.deepEqual(
mockDistpatch.getCall(0).args,
@@ -701,7 +701,7 @@ describe('Gas Duck', () => {
}],
}
),
- metamask: { provider: { type: 'ropsten' } },
+ metamask: { provider: { type: 'ropsten' } },
}))
assert.deepEqual(
mockDistpatch.getCall(0).args,
diff --git a/ui/app/ducks/gas/gas.duck.js b/ui/app/ducks/gas/gas.duck.js
index d57e825c4..e272455fc 100644
--- a/ui/app/ducks/gas/gas.duck.js
+++ b/ui/app/ducks/gas/gas.duck.js
@@ -372,13 +372,13 @@ export function fetchGasEstimates (blockTime) {
const promiseToFetch = Date.now() - timeLastRetrieved > 75000
? fetch('https://ethgasstation.info/json/predictTable.json', {
- 'headers': {},
- 'referrer': 'http://ethgasstation.info/json/',
- 'referrerPolicy': 'no-referrer-when-downgrade',
- 'body': null,
- 'method': 'GET',
- 'mode': 'cors'}
- )
+ 'headers': {},
+ 'referrer': 'http://ethgasstation.info/json/',
+ 'referrerPolicy': 'no-referrer-when-downgrade',
+ 'body': null,
+ 'method': 'GET',
+ 'mode': 'cors'}
+ )
.then(r => r.json())
.then(r => {
const estimatedPricesAndTimes = r.map(({ expectedTime, expectedWait, gasprice }) => ({ expectedTime, expectedWait, gasprice }))
@@ -429,14 +429,14 @@ export function fetchGasEstimates (blockTime) {
return timeMappedToSeconds
})
: Promise.resolve(priceAndTimeEstimates.length
- ? priceAndTimeEstimates
- : loadLocalStorageData('GAS_API_ESTIMATES')
- )
-
- return promiseToFetch.then(estimates => {
- dispatch(setPricesAndTimeEstimates(estimates))
- dispatch(gasEstimatesLoadingFinished())
- })
+ ? priceAndTimeEstimates
+ : loadLocalStorageData('GAS_API_ESTIMATES')
+ )
+
+ return promiseToFetch.then(estimates => {
+ dispatch(setPricesAndTimeEstimates(estimates))
+ dispatch(gasEstimatesLoadingFinished())
+ })
}
}
diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js
index 64f983606..35de947b4 100644
--- a/ui/app/ducks/metamask/metamask.js
+++ b/ui/app/ducks/metamask/metamask.js
@@ -275,7 +275,7 @@ function reduceMetamask (state, action) {
},
})
- case actions.UPDATE_SEND_ENS_RESOLUTION:
+ case actions.UPDATE_SEND_ENS_RESOLUTION:
return extend(metamaskState, {
send: {
...metamaskState.send,