Breeze changes

Breeze.UI/electron-builder.json

@@ -8,20 +8,20 @@
     "buildResources": "dist/assets/images"
   },
   "win": {
-    "icon": "dist/assets/images/icon",
+    "icon": "dist/assets/images/",
     "target": [
       "nsis"
     ],
     "artifactName": "${productName}-v${version}-setup-${os}-${env.arch}.${ext}"
   },
   "linux": {
+    "icon": "dist/assets/images/",
     "target": [
       "deb",
       "tar.gz"
     ],
     "synopsis": "Breeze Wallet: Stratis' dual-currency full block light wallet with a strong focus on privacy.",
     "category": "Utility",
-    "icon": "dist/assets/images/icons",
     "artifactName": "${productName}-v${version}-${os}-${arch}.${ext}"
   },
   "mac": {
@@ -38,12 +38,15 @@
     "deleteAppDataOnUninstall": true,
     "guid": "ed20df62-ff5a-4b83-a5e3-a361357c6e51",
     "createDesktopShortcut": true,
-    "createStartMenuShortcut": true
+    "createStartMenuShortcut": true,
+    "license": "../Licenses/breeze-license.txt"
   },
   "msi": {
     "warningsAsErrors": false
   },
   "extraResources": [
-    "daemon/**/*"
+    "daemon/**/*",
+    "src/assets/images/breeze-logo-tray.png",
+    "src/assets/images/license_en.txt"
   ]
 }

Breeze.UI/main.ts

@@ -13,8 +13,12 @@ const os = require('os');
 let serve;
 let testnet;
 const args = process.argv.slice(1);
-serve = args.some(val => val === "--serve");
-testnet = args.some(val => val === "--testnet");
+serve = args.some(val => val === "--serve" || val === "-serve");
+testnet = !args.some(val => val === "--testnet" || val === "-testnet");
+
+if (args.some(val => val === "--mainnet" || val === "-mainnet")) {
+  testnet = false;
+}
 
 if (serve) {
   require('electron-reload')(__dirname, {
@@ -31,13 +35,6 @@ require('electron-context-menu')({
 let mainWindow = null;
 
 function createWindow() {
-  let applicationIcon
-  if (serve) {
-    applicationIcon = nativeImage.createFromPath("./src/assets/images/breeze-logo-tray.png")
-  } else {
-    applicationIcon = nativeImage.createFromPath(path.join(__dirname + '/assets/images/breeze-logo-tray.png'))
-  }
-
   // Create the browser window.
   mainWindow = new BrowserWindow({
     width: 1200,
@@ -48,10 +45,6 @@ function createWindow() {
     title: "Breeze Wallet"
   });
 
-  if (os.platform() === "win32"){
-    mainWindow.setIcon(applicationIcon);
-  }
-
    // and load the index.html of the app.
   mainWindow.loadURL(url.format({
     pathname: path.join(__dirname, '/index.html'),
@@ -159,10 +152,10 @@ function startBitcoinApi() {
   if (os.platform() === 'win32') {
     apiPath = path.resolve(__dirname, '..\\..\\resources\\daemon\\Stratis.BreezeD.exe');
   } else if(os.platform() === 'linux') {
-	apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
-   } else {
-	 apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
-   }
+	  apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
+  } else {
+	  apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
+  }
 
 
   if(!testnet) {
@@ -190,10 +183,10 @@ function startStratisApi() {
   if (os.platform() === 'win32') {
     apiPath = path.resolve(__dirname, '..\\..\\resources\\daemon\\Stratis.BreezeD.exe');
   } else if(os.platform() === 'linux') {
-	apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
-   } else {
-	 apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
-   }
+	  apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
+  } else {
+	  apiPath = path.resolve(__dirname, '..//..//resources//daemon//Stratis.BreezeD');
+  }
 
   if (!testnet) {
     stratisProcess = spawnStratis(apiPath, ['stratis'], {
@@ -205,7 +198,6 @@ function startStratisApi() {
     });
   }
 
-
   stratisProcess.stdout.on('data', (data) => {
     writeLog(`Stratis: ${data}`);
   });
@@ -220,7 +212,7 @@ function createTray() {
   if (serve) {
     trayIcon = nativeImage.createFromPath('./src/assets/images/breeze-logo-tray.png');
   } else {
-    trayIcon = nativeImage.createFromPath(path.join(__dirname + '/assets/images/breeze-logo-tray.png'));
+    trayIcon = nativeImage.createFromPath(path.resolve(__dirname, '../../resources/src/assets/images/breeze-logo-tray.png'));
   }
 
   let systemTray = new Tray(trayIcon);

Breeze.UI/package.js

@@ -34,7 +34,7 @@ function pack(plat, arch, path, cb) {
     // there is no darwin ia32 electron
     if (plat === 'darwin' && arch === 'ia32') return;
 
-    let icon = 'src/assets/images/breeze-logo';
+    let icon = 'src/assets/images/icon';
 
     if (icon) {
         DEFAULT_OPTS.icon = icon + (() => {

Breeze.UI/package.json

@@ -12,7 +12,7 @@
     "breeze",
     "ui",
     "stratis",
-	"bitcoin",
+	  "bitcoin",
     "angular",
     "electron",
     "typescript",

Breeze.UI/src/app/wallet/history/history.component.html

@@ -32,8 +32,6 @@
                     <span *ngIf="transaction.transactionType == 'sent'" class="text-danger">-</span>
                     {{ transaction.transactionAmount + transaction.transactionFee | coinNotation }}
                     <small class="text-uppercase"> {{ coinUnit }} </small>
-                  </li>
-                  <li class="list-inline-item col amount text-left align-baseline">
                     <span *ngIf="transaction.transactionConfirmedInBlock" class="badge badge-success text-capitalize">Confirmed</span>
                     <span *ngIf="!transaction.transactionConfirmedInBlock" class="badge badge-warning text-capitalize">Pending</span>
                   </li>

appveyor.yml

@@ -3,7 +3,7 @@
 # you can use {branch} name in version format too
 # version: 1.0.{build}-{branch}
 
-version: 0.1.0.{build}
+version: 0.3.0.{build}
 pull_requests:
   do_not_increment_build_number: true