aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/popup-core.js4
-rw-r--r--ui/app/css/lib.css6
2 files changed, 9 insertions, 1 deletions
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index ae8539a30..e093d06f4 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -49,12 +49,14 @@ function setupControllerConnection (connectionStream, cb) {
}
function setupApp (err, accountManager) {
+ var container = document.getElementById('app-content')
if (err) {
+ container.innerHTML = '<div class="critical-error">The MetaMask app failed to load: please restart MetaMask</div>'
+ container.style.height = '80px'
log.error(err.stack)
throw err
}
- var container = document.getElementById('app-content')
MetaMaskUi({
container: container,
diff --git a/ui/app/css/lib.css b/ui/app/css/lib.css
index a8df1d115..99c6f1b9d 100644
--- a/ui/app/css/lib.css
+++ b/ui/app/css/lib.css
@@ -256,3 +256,9 @@ hr.horizontal-line {
text-overflow: ellipsis;
white-space: nowrap;
}
+
+.critical-error {
+ text-align: center;
+ margin-top: 20px;
+ color: red;
+}