diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-10-03 04:44:15 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-10-03 04:44:15 +0800 |
| commit | e08a727d449fb35a1cc5eeed8510e615f8fecb20 (patch) | |
| tree | 9006bc7956eef2f1fbbeff99e95d940214c14fb9 /app | |
| parent | 833da191c37db5b5b470c69a6d4d438ff4719fec (diff) | |
| parent | bf390bd63d7642d5a4975c572eb928252122a79b (diff) | |
| download | tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.tar tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.tar.gz tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.tar.bz2 tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.tar.lz tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.tar.xz tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.tar.zst tangerine-wallet-browser-e08a727d449fb35a1cc5eeed8510e615f8fecb20.zip | |
Merge branch 'master' into history-notes
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 3 | ||||
| -rw-r--r-- | app/scripts/lib/tx-state-history-helper.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json index e71018211..0fc43c7d4 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -57,7 +57,8 @@ "permissions": [ "storage", "clipboardWrite", - "http://localhost:8545/" + "http://localhost:8545/", + "https://*.infura.io/" ], "web_accessible_resources": [ "scripts/inpage.js" diff --git a/app/scripts/lib/tx-state-history-helper.js b/app/scripts/lib/tx-state-history-helper.js index 304069d57..5ebd78689 100644 --- a/app/scripts/lib/tx-state-history-helper.js +++ b/app/scripts/lib/tx-state-history-helper.js @@ -24,7 +24,8 @@ function generateHistoryEntry(previousState, newState) { return jsonDiffer.compare(previousState, newState) } -function replayHistory(shortHistory) { +function replayHistory(_shortHistory) { + const shortHistory = clone(_shortHistory) return shortHistory.reduce((val, entry) => jsonDiffer.applyPatch(val, entry).newDocument) } |