Merge pull request #155 from stratisproject/ui

Fix tray error, add copy button to transaction details, fix send component error handling

Breeze.UI/main.ts

@@ -56,7 +56,7 @@ function createWindow() {
 
   // Emitted when the window is going to close.
   mainWindow.on('close', function () {
-    if (process.platform !== 'darwin') {
+    if (process.platform !== 'darwin' && !serve) {
       var http = require('http');
       const options = {
         hostname: 'localhost',
@@ -141,9 +141,18 @@ function createTray() {
 
 var iconPath
 if (os.platform() === 'win32') {
-  iconPath = __dirname + '/assets/images/breeze-logo-tray.ico';
+  if (serve) {
+    iconPath = '.\src\assets\images\breeze-logo-tray.ico';
+  } else {
+    iconPath = path.join(__dirname + '\\assets\\images\\breeze-logo-tray.png');
+  }
+
 } else {
-  iconPath = __dirname + '/assets/images/breeze-logo-tray.png';
+  if (serve) {
+    iconPath = './src/assets/images/breeze-logo-tray.png';
+  } else {
+    iconPath = path.join(__dirname + '//assets//images//breeze-logo-tray.png');
+  }
 }
 
   appIcon = new Tray(iconPath);

Breeze.UI/src/app/wallet/send/send.component.ts

@@ -97,12 +97,19 @@ export class SendComponent {
           }
         },
         error => {
-          if (error.status >= 400) {
-            this.errorMessage = error;
-            console.log(this.errorMessage);
+          console.log(error);
+          if (error.status === 0) {
+            alert("Something went wrong while connecting to the API. Please restart the application.");
+          } else if (error.status >= 400) {
+            if (!error.json().errors[0]) {
+              console.log(error);
+            }
+            else {
+              alert(error.json().errors[0].message);
+            }
           }
         },
-        () => this.sendTransaction(this.responseMessage.hex)
+        () => this.sendTransaction("123")
       )
     ;
   };
@@ -127,7 +134,6 @@ export class SendComponent {
       .subscribe(
         response => {
           if (response.status >= 200 && response.status < 400){
-            console.log(response.status);
             this.activeModal.close("Close clicked");
           }
         },
@@ -140,7 +146,7 @@ export class SendComponent {
               console.log(error);
             }
             else {
-              alert(error.json().errors[0].description);
+              alert(error.json().errors[0].message);
             }
           }
         }

Breeze.UI/src/app/wallet/transaction-details/transaction-details.component.html

@@ -29,6 +29,8 @@
         <ul class="list-inline row">
           <li class="list-inline-item col blockLabel">Transaction ID</li>
           <li class="list-inline-item col-9 blockText blockID"><code>{{ transaction.id }}</code></li>
+          <span class="float-right"><a ngxClipboard [cbContent]="transaction.id" (click)="onCopiedClick()">copy</a></span>
+          <span class="badge badge-success list-inline-item col blockLabel" *ngIf="copied">The transaction ID has been copied to your clipboard.</span>
         </ul>
       </div>
       <div class="modal-footer">

Breeze.UI/src/app/wallet/transaction-details/transaction-details.component.ts

@@ -10,12 +10,15 @@ import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 export class TransactionDetailsComponent implements OnInit {
 
   @Input() transaction;
+  constructor(public activeModal: NgbActiveModal) {}
 
-  constructor(public activeModal: NgbActiveModal) {
+  private copied: boolean = false;
 
+  ngOnInit() {
   }
 
-  ngOnInit() {
+  private onCopiedClick() {
+    this.copied = true;
   }
 
 }