From 7256894f51e3ef3073d7c5d8ab7b745ee5d36d2b Mon Sep 17 00:00:00 2001 From: Alex Lunyov Date: Thu, 21 Sep 2017 15:13:53 +0800 Subject: Fix CORS issues in FireFox --- app/manifest.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/manifest.json b/app/manifest.json index 67fb543b9..05e8d30de 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -57,7 +57,11 @@ "permissions": [ "storage", "clipboardWrite", - "http://localhost:8545/" + "http://localhost:8545/", + "https://rinkeby.infura.io/metamask/", + "https://mainnet.infura.io/metamask/", + "https://ropsten.infura.io/metamask/", + "https://kovan.infura.io/metamask/" ], "web_accessible_resources": [ "scripts/inpage.js" -- cgit From bfaacd311806b9ff902f0b5178469b5ef9133358 Mon Sep 17 00:00:00 2001 From: Alex Lunyov Date: Fri, 22 Sep 2017 12:14:04 +0800 Subject: Wildcard for infura.io permissions, added permission for cryptonator api --- app/manifest.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/manifest.json b/app/manifest.json index 05e8d30de..83a967a26 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -58,10 +58,8 @@ "storage", "clipboardWrite", "http://localhost:8545/", - "https://rinkeby.infura.io/metamask/", - "https://mainnet.infura.io/metamask/", - "https://ropsten.infura.io/metamask/", - "https://kovan.infura.io/metamask/" + "https://*.infura.io/", + "https://api.cryptonator.com" ], "web_accessible_resources": [ "scripts/inpage.js" -- cgit From 36bc8f3c60ffbcc3789a683a6a74a52e355c0c2b Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 2 Oct 2017 10:59:15 -0700 Subject: Update manifest.json --- app/manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app') diff --git a/app/manifest.json b/app/manifest.json index 83a967a26..5f8cf6979 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -58,8 +58,7 @@ "storage", "clipboardWrite", "http://localhost:8545/", - "https://*.infura.io/", - "https://api.cryptonator.com" + "https://*.infura.io/" ], "web_accessible_resources": [ "scripts/inpage.js" -- cgit From d29b5f10ef5137ab56ecc9615e5e894082db9803 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 2 Oct 2017 13:14:42 -0700 Subject: tx state history - fix bug where initial snapshot was mutated on updateTx --- app/scripts/lib/tx-state-history-helper.js | 3 ++- app/scripts/lib/tx-state-manager.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app') 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) } diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js index abb9d7910..4493889bf 100644 --- a/app/scripts/lib/tx-state-manager.js +++ b/app/scripts/lib/tx-state-manager.js @@ -97,7 +97,7 @@ module.exports = class TransactionStateManger extends EventEmitter { const previousState = txStateHistoryHelper.replayHistory(txMeta.history) // generate history entry and add to history const entry = txStateHistoryHelper.generateHistoryEntry(previousState, currentState) - txMeta.history.push(entry) + txMeta.history.push(entry) // commit txMeta to state const txId = txMeta.id -- cgit