m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

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

Browse Source
This commit is contained in:
kumavis 2017-10-02 13:45:47 -07:00
commit 167ad729fd
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/manifest.json
View File

@ -57,7 +57,8 @@
"permissions": [ "permissions": [
"storage", "storage",
"clipboardWrite", "clipboardWrite",
"http://localhost:8545/" "http://localhost:8545/",
"https://*.infura.io/"
], ],
"web_accessible_resources": [ "web_accessible_resources": [
"scripts/inpage.js" "scripts/inpage.js"

3
app/scripts/lib/tx-state-history-helper.js
View File

@ -27,7 +27,8 @@ function generateHistoryEntry(previousState, newState, note) {
return entry return entry
} }
function replayHistory(shortHistory) { function replayHistory(_shortHistory) {
const shortHistory = clone(_shortHistory)
return shortHistory.reduce((val, entry) => jsonDiffer.applyPatch(val, entry).newDocument) return shortHistory.reduce((val, entry) => jsonDiffer.applyPatch(val, entry).newDocument)
} }

2
package.json
View File

@ -141,7 +141,7 @@
"valid-url": "^1.0.9", "valid-url": "^1.0.9",
"vreme": "^3.0.2", "vreme": "^3.0.2",
"web3": "^0.20.1", "web3": "^0.20.1",
"web3-provider-engine": "^13.2.12", "web3-provider-engine": "^13.3.1",
"web3-stream-provider": "^3.0.1", "web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },

3
test/unit/tx-state-history-helper.js
View File

@ -20,8 +20,6 @@ describe('tx-state-history-helper', function () {
}) })
}) })
}) })
<<<<<<< Updated upstream
=======
it('replaying history does not mutate the original obj', function () { it('replaying history does not mutate the original obj', function () {
const initialState = { test: true, message: 'hello', value: 1 } 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') assert.equal(beforeStateSnapshot, afterStateSnapshot, 'initial state is not modified during run')
}) })
>>>>>>> Stashed changes
}) })