aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE40
-rw-r--r--app/scripts/background.js3
-rw-r--r--ui/index.js1
3 files changed, 16 insertions, 28 deletions
diff --git a/LICENSE b/LICENSE
index 429f4eaee..ddfbecf90 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,34 +1,20 @@
-Copyright (c) 2016 MetaMask
+MIT License
-The Ethereum Project Contributor Asset Distribution Terms ( MIT + Share-alike )
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-
-associated documentation files (the "Software"), to deal in the Software without restriction,
-
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+Copyright (c) 2018 MetaMask
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial
-
-portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-These licence terms have been adapted from the MIT licence. \ No newline at end of file
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 71ada8405..476d073d1 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -86,7 +86,8 @@ function setupController (initState) {
controller.txController.on(`tx:status-update`, (txId, status) => {
if (status !== 'failed') return
const txMeta = controller.txController.txStateManager.getTx(txId)
- raven.captureMessage('Transaction Failed', {
+ const errorMessage = `Transaction Failed: ${txMeta.err.message}`
+ raven.captureMessage(errorMessage, {
// "extra" key is required by Sentry
extra: txMeta,
})
diff --git a/ui/index.js b/ui/index.js
index bc3676c1f..fdb2f23e0 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -25,6 +25,7 @@ function launchMetamaskUi (opts, cb) {
function startApp (metamaskState, accountManager, opts) {
// parse opts
+ if (!metamaskState.featureFlags) metamaskState.featureFlags = {}
const store = configureStore({
// metamaskState represents the cross-tab state