Merge branch 'develop' into release

src/gui/qt-daemon/application/mainwindow.cpp

@@ -239,6 +239,28 @@ QString MainWindow::get_tx_pool_info()
   CATCH_ENTRY_FAIL_API_RESPONCE();
 }
 
+QString MainWindow::request_dummy()
+{
+  static int code_ = 0;
+  TRY_ENTRY();
+  LOG_API_TIMING();
+  PREPARE_RESPONSE(currency::COMMAND_RPC_GET_POOL_INFO::response, ar);
+  if (code_ == 2)
+  {
+    code_ = -1;
+    ar.error_code = API_RETURN_CODE_CORE_BUSY;
+  }
+  else
+  {
+    ar.error_code = API_RETURN_CODE_OK;
+  }
+
+  ++code_;
+  return MAKE_RESPONSE(ar);
+  CATCH_ENTRY_FAIL_API_RESPONCE();
+}
+
+
 QString MainWindow::get_default_fee()
 {
   TRY_ENTRY();

src/gui/qt-daemon/application/mainwindow.h

@@ -159,6 +159,9 @@ public:
   QString is_remnotenode_mode_preconfigured();
   QString start_backend(const QString& params);
 
+  //for test purposes onlys
+  QString request_dummy();
+
 signals:
   void quit_requested(const QString str);
   void update_daemon_state(const QString str);

src/gui/qt-daemon/html/assets/icons/receive-green.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 384 384" style="enable-background:new 0 0 384 384;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5cda9d;}
+</style>
+  <path id="receive" class="st0" d="M64.2,309.6l58.2-210.4l48.1,71.6L178,182l12.7,4.7l81.9,30.4L64.2,309.6 M0,384l384-170.3
+	l-178.7-66.4L106.3,0L0,384L0,384z"/>
+</svg>

src/gui/qt-daemon/html/assets/icons/send-red.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 384 384" style="enable-background:new 0 0 384 384;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ff5252;}
+</style>
+  <path id="send" class="st0" d="M319.8,74.4l-58.2,210.4l-48.1-71.6L206,202l-12.7-4.7l-81.9-30.4L319.8,74.4 M384,0L0,170.3
+	l178.7,66.4L277.7,384L384,0L384,0z"/>
+</svg>

src/gui/qt-daemon/html/polyfills.js

@@ -5800,8 +5800,8 @@ __webpack_require__.r(__webpack_exports__);
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! /Users/mekasan/Projects/Projects/zano/src/gui/qt-daemon/html_source/src/polyfills.ts */"./src/polyfills.ts");
-module.exports = __webpack_require__(/*! /Users/mekasan/Projects/Projects/zano/src/gui/qt-daemon/html_source/node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
+__webpack_require__(/*! /Users/mekasan/Projects/Projects/zano_v2/src/gui/qt-daemon/html_source/src/polyfills.ts */"./src/polyfills.ts");
+module.exports = __webpack_require__(/*! /Users/mekasan/Projects/Projects/zano_v2/src/gui/qt-daemon/html_source/node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
 
 
 /***/ })

src/gui/qt-daemon/html/receive-green.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 384 384" style="enable-background:new 0 0 384 384;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#5cda9d;}
+</style>
+  <path id="receive" class="st0" d="M64.2,309.6l58.2-210.4l48.1,71.6L178,182l12.7,4.7l81.9,30.4L64.2,309.6 M0,384l384-170.3
+	l-178.7-66.4L106.3,0L0,384L0,384z"/>
+</svg>

src/gui/qt-daemon/html_source/src/app/_helpers/services/backend.service.ts

@@ -198,6 +198,7 @@ export class BackendService {
       };
     }
 
+    const core_busy = Result.error_code === 'CORE_BUSY';
     const Status = (Result.error_code === 'OK' || Result.error_code === 'TRUE');
 
     if (!Status && Status !== undefined && Result.error_code !== undefined) {
@@ -207,18 +208,26 @@ export class BackendService {
 
     let res_error_code = false;
     if (typeof Result === 'object' && 'error_code' in Result && Result.error_code !== 'OK' && Result.error_code !== 'TRUE' && Result.error_code !== 'FALSE') {
-      this.informerRun(Result.error_code, params, command);
-      res_error_code = Result.error_code;
+      if (core_busy) {
+        setTimeout( () => {
+          this.runCommand(command, params, callback);
+        }, 50);
+      } else {
+        this.informerRun(Result.error_code, params, command);
+        res_error_code = Result.error_code;
+      }
     }
 
     // if ( command === 'get_offers_ex' ){
     //   Service.printLog( "get_offers_ex offers count "+((data.offers)?data.offers.length:0) );
     // }
 
-    if (typeof callback === 'function') {
-      callback(Status, data, res_error_code);
-    } else {
-      return data;
+    if (!core_busy) {
+      if (typeof callback === 'function') {
+        callback(Status, data, res_error_code);
+      } else {
+        return data;
+      }
     }
   }