Merge pull request #132 from NazarUsov/2.1.0

Fixes for 2.1.0
hyle-team · Nov 7, 2024 · a4e4f3e · a4e4f3e
2 parents 2feec9a + 00fb37f
commit a4e4f3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/html_source/src/app/pages/settings/settings.component.ts b/html_source/src/app/pages/settings/settings.component.ts
@@ -33,7 +33,7 @@ export class SettingsComponent implements OnInit {
     changeForm = this.fb.group(
         {
             password: this.fb.nonNullable.control('', Validators.compose([Validators.pattern(regExpPassword)])),
-            new_password: this.fb.nonNullable.control('', Validators.compose([Validators.required, Validators.pattern(regExpPassword)])),
+            new_password: this.fb.nonNullable.control('', Validators.compose([Validators.pattern(regExpPassword)])),
             new_confirmation: this.fb.nonNullable.control(''),
             appPass: this.fb.nonNullable.control(this.variablesService.appPass ?? ''),
         },
@@ -250,7 +250,7 @@ export class SettingsComponent implements OnInit {
                 }
             });
 
-            this.changeForm.reset();
+            this.changeForm.reset({ appPass: this.variablesService.appPass });
         }
     }
 

diff --git a/html_source/src/app/pages/wallet/tabs/history/history.component.ts b/html_source/src/app/pages/wallet/tabs/history/history.component.ts
@@ -46,7 +46,7 @@ export class HistoryComponent implements OnInit, OnDestroy {
 
         this.variablesService.currentWalletChangedEvent.pipe(filter(Boolean), takeUntil(this._destroy$)).subscribe({
             next: (wallet: Wallet) => {
-                // this.getRecentTransfers();
+                this.getRecentTransfers();
                 this.mining = wallet.exclude_mining_txs;
             },
         });