diff options
| -rw-r--r-- | app/manifest.json | 3 | ||||
| -rw-r--r-- | app/scripts/lib/tx-state-history-helper.js | 3 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test/unit/tx-state-history-helper.js | 3 |
4 files changed, 5 insertions, 6 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) } diff --git a/package.json b/package.json index b9a38ac71..918531f15 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.2.12", + "web3-provider-engine": "^13.3.1", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, diff --git a/test/unit/tx-state-history-helper.js b/test/unit/tx-state-history-helper.js index 1590f83d0..79ee26d6e 100644 --- a/test/unit/tx-state-history-helper.js +++ b/test/unit/tx-state-history-helper.js @@ -20,8 +20,6 @@ describe('tx-state-history-helper', function () { }) }) }) -<<<<<<< Updated upstream -======= it('replaying history does not mutate the original obj', function () { const initialState = { test: true, message: 'hello', value: 1 } @@ -45,5 +43,4 @@ describe('tx-state-history-helper', function () { assert.equal(beforeStateSnapshot, afterStateSnapshot, 'initial state is not modified during run') }) ->>>>>>> Stashed changes }) |