From f0d46d6ed8e0196fea33e526701f7d6d135f5b63 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 19 Apr 2021 10:50:24 +0400
Subject: [PATCH] Don't reload after setting graph preference setting. refs
 #365

---
 .../statistics/statistics.component.html      |  3 ++-
 .../statistics/statistics.component.ts        | 25 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/components/statistics/statistics.component.html b/frontend/src/app/components/statistics/statistics.component.html
index b83cb129b..e0b1ec90a 100644
--- a/frontend/src/app/components/statistics/statistics.component.html
+++ b/frontend/src/app/components/statistics/statistics.component.html
@@ -14,7 +14,8 @@
       <div class="card mb-3" *ngIf="mempoolStats.length">
         <div class="card-header">
           <i class="fa fa-area-chart"></i> <span i18n="statistics.memory-by-vBytes">Mempool by vBytes (sat/vByte)</span>
-          <form [formGroup]="radioGroupForm" style="float: right;" (click)='saveGraphPreference()'>
+
+          <form [formGroup]="radioGroupForm" style="float: right;" (click)="saveGraphPreference()">
             <div class="spinner-border text-light bootstrap-spinner" *ngIf="spinnerLoading"></div>
             <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
               <label ngbButtonLabel class="btn-primary btn-sm">
diff --git a/frontend/src/app/components/statistics/statistics.component.ts b/frontend/src/app/components/statistics/statistics.component.ts
index 8557913a1..39350c247 100644
--- a/frontend/src/app/components/statistics/statistics.component.ts
+++ b/frontend/src/app/components/statistics/statistics.component.ts
@@ -46,17 +46,13 @@ export class StatisticsComponent implements OnInit {
     private stateService: StateService,
     private seoService: SeoService,
     private storageService: StorageService,
-  ) {
-    this.graphWindowPreference = this.storageService.getValue('graphWindowPreference') ? this.storageService.getValue('graphWindowPreference').trim() : '2h';
-    this.radioGroupForm = this.formBuilder.group({
-      dateSpan: this.graphWindowPreference
-    });
-   }
+  ) { }
 
   ngOnInit() {
     this.seoService.setTitle($localize`:@@5d4f792f048fcaa6df5948575d7cb325c9393383:Graphs`);
     this.stateService.networkChanged$.subscribe((network) => this.network = network);
     this.inverted = this.storageService.getValue('inverted-graph') === 'true';
+    this.graphWindowPreference = this.storageService.getValue('graphWindowPreference') ? this.storageService.getValue('graphWindowPreference').trim() : '2h';
     const isMobile = window.innerWidth <= 767.98;
     let labelHops = isMobile ? 48 : 24;
 
@@ -64,6 +60,10 @@ export class StatisticsComponent implements OnInit {
       labelHops = 96;
     }
 
+    this.radioGroupForm = this.formBuilder.group({
+      dateSpan: this.graphWindowPreference
+    });
+
     const labelInterpolationFnc = (value: any, index: any) => {
       switch (this.graphWindowPreference) {
         case '2h':
@@ -116,24 +116,24 @@ export class StatisticsComponent implements OnInit {
     .pipe(
       switchMap(() => {
         this.spinnerLoading = true;
-        if (this.graphWindowPreference === '2h') {
+        if (this.radioGroupForm.controls.dateSpan.value === '2h') {
           this.websocketService.want(['blocks', 'live-2h-chart']);
           return this.apiService.list2HStatistics$();
         }
         this.websocketService.want(['blocks']);
-        if (this.graphWindowPreference === '24h') {
+        if (this.radioGroupForm.controls.dateSpan.value === '24h') {
           return this.apiService.list24HStatistics$();
         }
-        if (this.graphWindowPreference === '1w') {
+        if (this.radioGroupForm.controls.dateSpan.value === '1w') {
           return this.apiService.list1WStatistics$();
         }
-        if (this.graphWindowPreference === '1m') {
+        if (this.radioGroupForm.controls.dateSpan.value === '1m') {
           return this.apiService.list1MStatistics$();
         }
-        if (this.graphWindowPreference === '3m') {
+        if (this.radioGroupForm.controls.dateSpan.value === '3m') {
           return this.apiService.list3MStatistics$();
         }
-        if (this.graphWindowPreference === '6m') {
+        if (this.radioGroupForm.controls.dateSpan.value === '6m') {
           return this.apiService.list6MStatistics$();
         }
         return this.apiService.list1YStatistics$();
@@ -171,6 +171,5 @@ export class StatisticsComponent implements OnInit {
 
   saveGraphPreference() {
     this.storageService.setValue('graphWindowPreference', this.radioGroupForm.controls.dateSpan.value);
-    document.location.reload();
   }
 }