Commit fe4592d2 authored by Pieterjan Vanhoof's avatar Pieterjan Vanhoof Committed by GitHub

Merge pull request #291 from stratisproject/ui

Update dependencies, subscribe to message instead of description
parents 57bd09cb 0d05476f
......@@ -41,43 +41,43 @@
},
"private": true,
"dependencies": {
"@angular/animations": "4.4.3",
"@angular/common": "4.4.3",
"@angular/compiler": "4.4.3",
"@angular/core": "4.4.3",
"@angular/forms": "4.4.3",
"@angular/http": "4.4.3",
"@angular/platform-browser": "4.4.3",
"@angular/platform-browser-dynamic": "4.4.3",
"@angular/platform-server": "4.4.3",
"@angular/router": "4.4.3",
"@angular/animations": "4.4.5",
"@angular/common": "4.4.5",
"@angular/compiler": "4.4.5",
"@angular/core": "4.4.5",
"@angular/forms": "4.4.5",
"@angular/http": "4.4.5",
"@angular/platform-browser": "4.4.5",
"@angular/platform-browser-dynamic": "4.4.5",
"@angular/platform-server": "4.4.5",
"@angular/router": "4.4.5",
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
"bootstrap": "4.0.0-beta",
"core-js": "2.5.1",
"electron-context-menu": "0.9.1",
"enhanced-resolve": "3.3.0",
"ngx-clipboard": "8.1.0",
"enhanced-resolve": "3.4.1",
"ngx-clipboard": "8.1.1",
"ngx-bootstrap": "1.9.3",
"rxjs": "5.4.3",
"zone.js": "0.8.17"
"zone.js": "0.8.18"
},
"devDependencies": {
"@angular/cli": "1.4.3",
"@angular/compiler-cli": "4.4.3",
"@angular/cli": "1.4.7",
"@angular/compiler-cli": "4.4.5",
"@types/core-js": "0.9.36",
"@types/jasmine": "2.5.54",
"@types/jasmine": "2.6.0",
"@types/node": "7.0.7",
"autoprefixer": "7.1.4",
"codelyzer": "3.2.0",
"autoprefixer": "7.1.5",
"codelyzer": "3.2.1",
"copyfiles": "1.2.0",
"cross-env": "5.0.5",
"cross-env": "5.1.0",
"css-loader": "0.28.7",
"cssnano": "3.10.0",
"electron": "1.7.8",
"electron": "1.7.9",
"electron-packager": "9.1.0",
"electron-reload": "1.2.1",
"electron-reload": "1.2.2",
"exports-loader": "0.6.4",
"file-loader": "0.11.2",
"file-loader": "1.1.5",
"html-loader": "0.5.1",
"istanbul-instrumenter-loader": "3.0.0",
"jasmine-core": "2.8.0",
......@@ -96,21 +96,21 @@
"mkdirp": "0.5.1",
"npm-run-all": "4.1.1",
"node-sass": "4.5.3",
"postcss-loader": "2.0.6",
"postcss-loader": "2.0.8",
"postcss-url": "7.1.2",
"protractor": "5.1.2",
"protractor": "5.2.0",
"raw-loader": "0.5.1",
"sass-loader": "6.0.6",
"script-loader": "0.7.1",
"source-map-loader": "0.2.1",
"style-loader": "0.18.2",
"script-loader": "0.7.2",
"source-map-loader": "0.2.2",
"style-loader": "0.19.0",
"stylus-loader": "3.0.1",
"ts-node": "3.3.0",
"tslint": "5.7.0",
"typescript": "2.5.2",
"url-loader": "0.5.9",
"typescript": "2.5.3",
"url-loader": "0.6.2",
"webdriver-manager": "12.0.6",
"webpack": "3.6.0",
"webpack-dev-server": "2.8.2"
"webpack": "3.8.1",
"webpack-dev-server": "2.9.2"
}
}
......@@ -76,7 +76,7 @@ export class DashboardComponent implements OnInit {
}
else {
if (error.json().errors[0].description) {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
} else {
this.cancelSubscriptions();
this.startSubscriptions();
......@@ -113,7 +113,7 @@ export class DashboardComponent implements OnInit {
}
else {
if (error.json().errors[0].description) {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
} else {
this.cancelSubscriptions();
this.startSubscriptions();
......
......@@ -66,7 +66,7 @@ export class HistoryComponent {
}
else {
if (error.json().errors[0].description) {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
} else {
this.cancelSubscriptions();
this.startSubscriptions();
......
......@@ -47,7 +47,7 @@ export class ReceiveComponent {
console.log(error);
}
else {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
}
}
}
......
......@@ -114,7 +114,7 @@ export class SendComponent implements OnInit {
console.log(error);
}
else {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
}
}
},
......@@ -154,7 +154,7 @@ export class SendComponent implements OnInit {
console.log(error);
}
else {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
}
}
},
......@@ -194,7 +194,7 @@ export class SendComponent implements OnInit {
console.log(error);
}
else {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
}
}
},
......
......@@ -70,7 +70,7 @@ export class StatusBarComponent implements OnInit {
}
else {
if (error.json().errors[0].description) {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
} else {
this.cancelSubscriptions();
this.startSubscriptions();
......
......@@ -59,7 +59,7 @@ export class TransactionDetailsComponent implements OnInit, OnDestroy {
}
else {
if (error.json().errors[0].description) {
this.genericModalService.openModal(null, error.json().errors[0].description);
this.genericModalService.openModal(null, error.json().errors[0].message);
} else {
this.cancelSubscriptions();
this.startSubscriptions();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment