Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes

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 ecf0d076e..db6e3bc9f 100644
--- a/app/scripts/lib/tx-state-history-helper.js
+++ b/app/scripts/lib/tx-state-history-helper.js
@@ -27,7 +27,8 @@ function generateHistoryEntry(previousState, newState, note) {
   return entry
 }
 
-function replayHistory(shortHistory) {
+function replayHistory(_shortHistory) {
+  const shortHistory = clone(_shortHistory)
   return shortHistory.reduce((val, entry) => jsonDiffer.applyPatch(val, entry).newDocument)
 }