aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/migrations
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
commit28c509914bf09850dd9aaef52b212f6271633e93 (patch)
tree049373cf51ae16580a5f18dd29e195e68d4f7b53 /app/scripts/migrations
parent94a4f99115cf549a3014d29d828e7a432bf36a62 (diff)
parentf6de948e42ae633d40aef72595a01caa622a280d (diff)
downloadtangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.gz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.bz2
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.lz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.xz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.zst
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.zip
Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896
Diffstat (limited to 'app/scripts/migrations')
-rw-r--r--app/scripts/migrations/013.js2
-rw-r--r--app/scripts/migrations/023.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/migrations/013.js b/app/scripts/migrations/013.js
index 15a9b28d4..fb7131f8e 100644
--- a/app/scripts/migrations/013.js
+++ b/app/scripts/migrations/013.js
@@ -28,7 +28,7 @@ module.exports = {
function transformState (state) {
const newState = state
const { config } = newState
- if ( config && config.provider ) {
+ if (config && config.provider) {
if (config.provider.type === 'testnet') {
newState.config.provider.type = 'ropsten'
}
diff --git a/app/scripts/migrations/023.js b/app/scripts/migrations/023.js
index 151496b06..18493a789 100644
--- a/app/scripts/migrations/023.js
+++ b/app/scripts/migrations/023.js
@@ -35,10 +35,10 @@ function transformState (state) {
if (transactions.length <= 40) return newState
- let reverseTxList = transactions.reverse()
+ const reverseTxList = transactions.reverse()
let stripping = true
while (reverseTxList.length > 40 && stripping) {
- let txIndex = reverseTxList.findIndex((txMeta) => {
+ const txIndex = reverseTxList.findIndex((txMeta) => {
return (txMeta.status === 'failed' ||
txMeta.status === 'rejected' ||
txMeta.status === 'confirmed' ||