Merge with Origin

src/app/order/order.component.css

@@ -51,9 +51,10 @@ img.icon{
 }
 
 .buttons-class {
+	font-family: 'Spartan', sans-serif;
 	background-color: #ff4722;
 	color: white;
-  font-weight: 700;
+	font-weight: 500;
 	height: 25px !important;
 	width: 80px !important;
 	display: flex;
@@ -64,7 +65,8 @@ img.icon{
 }
 
 .button-cancel-class {
-  font-weight: 700;
+	font-family: 'Spartan', sans-serif;
+	font-weight: 500;
 	height: 25px !important;
 	width: 80px !important;
 	display: flex;

src/app/settings/settings.component.css

@@ -1,9 +1,9 @@
 * {
-	font-family: Spartan;
+	font-family: 'Spartan', sans-serif;
 }
 
 .settings-title {
-	font-family: Spartan;
+	font-family: 'Spartan', sans-serif;
 	background: #ff4722;
 	color: white;
 	font-size: 30px;
@@ -13,6 +13,9 @@
 
 .settings_field {
 	width:  100%;
-	font-family: Spartan;
+	font-family: 'Spartan', sans-serif;
 }
 
+.mat-slide-toggle-content {
+	font-family: 'Spartan', sans-serif;
+}

src/app/settings/settings.component.html

@@ -23,9 +23,7 @@
 		                  (change)="onChange($event)">
 			Use zatoshis?
 		</mat-slide-toggle>
-
+		<mat-slide-toggle formControlName="useVKey" 
-			<pre></pre>
-			<mat-slide-toggle formControlName="VkeyOn" 
 						  (change)="onChangeVKeyOn($event)">
 			Activate payment confirmation?
 		</mat-slide-toggle>
@@ -33,10 +31,7 @@
 		<mat-form-field [style.width.%]="100">
 			<mat-label>Viewing key</mat-label>
 			<input matInput placeholder="Your wallet viewing key" 
-
+							formControlName="vKey">
-				       formControlName="VKey"
-				       [formControl]="viewkeyControl">
-				      
 		</mat-form-field>
 
 	</mat-dialog-content>

src/app/settings/settings.component.ts

@@ -36,8 +36,6 @@ export class SettingsComponent implements OnInit {
 		}
 	];
 
-    viewkeyControl = new FormControl({ value: null, disabled: false });
-
 	constructor(
 		private fb: UntypedFormBuilder,
 		private dialogRef: MatDialogRef<SettingsComponent>,
@@ -49,15 +47,12 @@ export class SettingsComponent implements OnInit {
 			name: [data.name, Validators.required],
 			currency: [data.currency, Validators.required],
 			useZats: [data.zats,  Validators.required],
-			VkeyOn: [data.payconf, Validators.required],
+			useVKey: [data.payconf, Validators.required],
-			VKey: [{value:data.viewkey, disabled: !this.useVKey }]
+			vKey: [data.viewkey]
 		});
-/*
+		if (data.payconf) {
-	    if ( data.payconf ) 
+			this.settingsForm.get('vKey')!.enable();
-	      this.viewkeyControl.enable()
+		}
-	    else 
-          this.viewkeyControl.disable();
-*/
 		this.owner = data;
 
  
@@ -71,9 +66,11 @@ export class SettingsComponent implements OnInit {
 	}
 
 	save() {
+		console.log('Settings', this.settingsForm.value.vKey);
 		this.owner.name = this.settingsForm.value.name;
 		this.owner.currency = this.settingsForm.value.currency;
 		this.owner.zats = this.settingsForm.value.useZats;
+
 		this.owner.payconf = this.useVKey;
 		if ( this.useVKey ) {
 		    this.owner.viewkey = this.settingsForm.value.VKey;
@@ -81,6 +78,7 @@ export class SettingsComponent implements OnInit {
 		  }
 		 else 
 		    this.owner.viewkey = '';                      	
+
 		this.dialogRef.close(this.owner);
 	}
 
@@ -95,11 +93,9 @@ export class SettingsComponent implements OnInit {
         this.useVKey = ob.checked;
 
 	    if ( ob.checked ) 
-	      this.viewkeyControl.enable()
+	      this.settingsForm.get('vKey')!.enable();
 	    else 
-	      {
+	      this.settingsForm.get('vKey')!.disable();
-	        this.viewkeyControl.disable();
-	      }  
 
 	}
 }