Merge branch 'master' into sc-wallet

.gitignore

@@ -245,6 +245,7 @@ ModelManifest.xml
 **/dist
 **/tmp
 **/build
+main.js
 
 # dependencies
 **/node_modules

.gitmodules

@@ -1,3 +1,8 @@
 [submodule "StratisBitcoinFullNode"]
 	path = StratisBitcoinFullNode
 	url = https://github.com/stratisproject/StratisBitcoinFullNode/
+
+[submodule "FederatedSidechains"]
+	path = FederatedSidechains
+	url = https://github.com/stratisproject/FederatedSidechains
+

StratisCore.UI/main.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, ipcMain, Menu, nativeImage, screen, Tray } from 'electron';
+import { app, BrowserWindow, ipcMain, Menu, nativeImage, screen, Tray, ClientRequest, net } from 'electron';
 import * as path from 'path';
 import * as url from 'url';
 import * as os from 'os';
@@ -114,33 +114,19 @@ app.on('activate', () => {
 });
 
 function closeStratisApi() {
-  // if (process.platform !== 'darwin' && !serve) {
-    if (process.platform !== 'darwin' && !serve && !testnet) {
-    var http2 = require('http');
-    const options1 = {
+  if (process.platform !== 'darwin' && !serve ) {
+    const portNumber = testnet ? 38221 : 37221
+    const request = net.request({
+      method: 'POST',
       hostname: 'localhost',
-      port: 37221,
+      port: portNumber,
       path: '/api/node/shutdown',
-      method: 'POST'
-    };
-
-   const req = http2.request(options1, (res) => {});
-   req.write('');
-   req.end();
-
-   } else if (process.platform !== 'darwin' && !serve && testnet) {
-     var http2 = require('http');
-     const options2 = {
-       hostname: 'localhost',
-       port: 38221,
-       path: '/api/node/shutdown',
-       method: 'POST'
-     };
-
-   const req = http2.request(options2, (res) => {});
-   req.write('');
-   req.end();
-   }
+    })
+
+    request.setHeader("content-type", "application/json-patch+json");
+    request.write('true');
+    request.end();
+  }
 };
 
 function startStratisApi() {

StratisCore.UI/package.json

@@ -1,10 +1,10 @@
 {
   "name": "stratis-core",
   "description": "Stratis Core Wallet",
-  "version": "0.2.0",
+  "version": "1.0.0",
   "author": {
-    "name": "Stratis Group",
-    "email": "info@stratisplatform.com"
+    "name": "Stratis Group Ltd.",
+    "email": "support@stratisplatform.com"
   },
   "license": "MIT",
   "homepage": "https://github.com/stratisproject/StratisCore",
@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "electron-context-menu": "0.9.1",
+    "ngx-pagination": "^3.2.1",
     "ngx-qrcode2": "0.1.0"
   },
   "devDependencies": {
@@ -66,13 +67,13 @@
     "@types/jasmine": "2.8.6",
     "@types/jasminewd2": "2.0.3",
     "@types/node": "7.0.7",
-    "bootstrap": "4.0.0",
+    "bootstrap": "4.1.3",
     "codelyzer": "4.2.1",
     "copyfiles": "2.0.0",
     "core-js": "2.5.4",
     "cross-env": "5.1.4",
     "dotenv": "5.0.1",
-    "electron": "1.8.4",
+    "electron": "1.8.8",
     "electron-builder": "20.2.1",
     "electron-reload": "1.2.2",
     "enhanced-resolve": "4.0.0",
@@ -85,7 +86,7 @@
     "karma-coverage-istanbul-reporter": "1.4.2",
     "karma-jasmine": "1.1.1",
     "karma-jasmine-html-reporter": "1.0.0",
-    "ngx-bootstrap": "2.0.3",
+    "ngx-bootstrap": "3.1.3",
     "ngx-clipboard": "10.0.0",
     "ngx-electron": "1.0.4",
     "node-sass": "4.8.3",