From 2d54f102dcf6005577cb6824e67845103407bee7 Mon Sep 17 00:00:00 2001
From: wildkif <kif@zano.org>
Date: Mon, 6 May 2019 16:48:05 +0300
Subject: [PATCH] loading screen fix & move text in contracts time

---
 .../src/app/_helpers/services/variables.service.ts        | 2 +-
 src/gui/qt-daemon/html_source/src/app/app.component.ts    | 2 +-
 .../html_source/src/app/purchase/purchase.component.html  | 6 +++---
 .../html_source/src/app/purchase/purchase.component.scss  | 8 ++++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts b/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts
index cb73b9bd..22289c99 100644
--- a/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts
+++ b/src/gui/qt-daemon/html_source/src/app/_helpers/services/variables.service.ts
@@ -21,7 +21,7 @@ export class VariablesService {
   public exp_med_ts = 0;
   public height_app = 0;
   public last_build_available = '';
-  public daemon_state = 0;
+  public daemon_state = 3;
   public sync = {
     progress_value: 0,
     progress_value_text: '0'
diff --git a/src/gui/qt-daemon/html_source/src/app/app.component.ts b/src/gui/qt-daemon/html_source/src/app/app.component.ts
index a5adaf0b..686f67f1 100644
--- a/src/gui/qt-daemon/html_source/src/app/app.component.ts
+++ b/src/gui/qt-daemon/html_source/src/app/app.component.ts
@@ -32,7 +32,7 @@ export class AppComponent implements OnInit, OnDestroy {
     public translate: TranslateService,
     private backend: BackendService,
     private router: Router,
-    private variablesService: VariablesService,
+    public variablesService: VariablesService,
     private ngZone: NgZone,
     private intToMoneyPipe: IntToMoneyPipe,
     private modalService: ModalService
diff --git a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html
index 43f1d8de..400f5054 100644
--- a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html
+++ b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html
@@ -246,10 +246,9 @@
     </div>
   </div>
 
-  <div class="time-cancel-block-row" *ngIf="showTimeSelect && !newPurchase && currentContract.is_a && (currentContract.state == 201 || currentContract.state == 2 || currentContract.state == 120 || currentContract.state == 130)">
-    <div>{{ 'PURCHASE.WAITING_TIME_QUESTION' | translate }}</div>
+  <div class="time-cancel-block-row" *ngIf="'showTimeSelect && !newPurchase && currentContract.is_a && (currentContract.state == 201 || currentContract.state == 2 || currentContract.state == 120 || currentContract.state == 130)'">
+    <div class="time-cancel-block-question">{{ 'PURCHASE.WAITING_TIME_QUESTION' | translate }}</div>
     <div class="input-block">
-      <label for="purchase-timeCancel">{{ 'PURCHASE.WAITING_TIME' | translate }}</label>
       <ng-select id="purchase-timeCancel" class="lock-selection-select"
                  [clearable]="false"
                  [searchable]="false"
@@ -260,6 +259,7 @@
         </ng-option>
       </ng-select>
     </div>
+    <label for="purchase-timeCancel">{{ 'PURCHASE.WAITING_TIME' | translate }}</label>
     <div class="time-cancel-block-buttons">
       <button type="button" class="blue-button" (click)="showTimeSelect = false;">{{ 'PURCHASE.CANCEL' | translate }}</button>
       <button type="button" class="blue-button" (click)="dealsDetailsCancel();">{{ 'PURCHASE.BUTTON_CANCEL_BUYER' | translate }}</button>
diff --git a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.scss b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.scss
index 92673940..e43c1949 100644
--- a/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.scss
+++ b/src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.scss
@@ -136,10 +136,18 @@
     align-items: center;
     justify-content: center;
 
+    .time-cancel-block-question {
+      margin-bottom: 1rem;
+    }
+
     .input-block {
       width: 25%;
     }
 
+    label {
+      margin-bottom: 1rem;
+    }
+
     .time-cancel-block-buttons {
       display: flex;
       align-items: center;