Merge branch 'fix55'

CHANGELOG.md

@@ -3,7 +3,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.3.0]
+## [2.3.1] - 2023-06-26
+
+### Fixed
+
+- Broken wallet link for invoices
+
+## [2.3.0] - 2023-06-26
 
 ### Changed
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zgo",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

src/app/app.component.html

@@ -45,7 +45,7 @@
      style="margin-top: 10px;
             margin-bottom: 20px;">
   <div >&copy; 2023 Vergara Technologies LLC</div>
-  <div class="tiny">Version 2.3.0</div>
+  <div class="tiny">Version 2.3.1</div>
   <div class="tiny">{{ vE.mainPriceData }}</div>
 </div>
 <div></div>

src/app/invoice/invoice.component.ts

@@ -30,7 +30,7 @@ export class InvoiceComponent implements OnInit {
 	public nameUpdate: Observable<string>;
 	name: string = '';
 	error: boolean = false;
-	codeString: string = 'Test';
+	codeString: string = '';
 	invString: string = '';
 	public isWCOrder : boolean = false;
 	zcashUrl: SafeUrl = '';
@@ -120,6 +120,7 @@ export class InvoiceComponent implements OnInit {
 						correctLevel: QRCode.CorrectLevel.H
 					});
 					this.error = false;
+					this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
 				} else {
 					this.error = true;
 					this.codeString = 'Test';
@@ -134,7 +135,6 @@ export class InvoiceComponent implements OnInit {
 			if ( order.session.substring(0,1) == 'W') {
 				this.isWCOrder = true;
 			}
-			this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
 		});
 		this.nameUpdate.subscribe(name => {
 			this.name = name;

src/app/settings/settings.component.ts

@@ -224,7 +224,7 @@ export class SettingsComponent implements OnInit {
 		this.owner.zats = this.settingsForm.value.useZats;
 		this.owner.payconf = this.settingsForm.value.useVKey;
 		this.owner.viewkey = this.settingsForm.value.vKey;
-		console.log('Settings component key: ' + this.owner.viewkey);
+		//console.log('Settings component key: ' + this.owner.viewkey);
 		this.dialogRef.close(this.owner);
 	}
 

src/app/user.service.ts

@@ -162,7 +162,7 @@ export class UserService{
 	}
 
 	saveOwnerSettings(o: Owner) {
-		console.log('saveOwnerSettings: ' + o.viewkey);
+		//console.log('saveOwnerSettings: ' + o.viewkey);
 		if(o.viewkey.length > 20) {
 			this.saveOwnerViewingKey(o.viewkey).subscribe({
 				next: () => {