From bb59e83179015c19eb98f50086e14c19aa847c8f Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Sat, 1 Jul 2017 17:29:38 +0800
Subject: [PATCH] error msg for recent block import added

---
 html/js/controllers/import_wallet.js |  4 ++++
 src/YourMoneroRequests.cpp           | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/html/js/controllers/import_wallet.js b/html/js/controllers/import_wallet.js
index 955c5d7..4c6dd4a 100755
--- a/html/js/controllers/import_wallet.js
+++ b/html/js/controllers/import_wallet.js
@@ -83,6 +83,10 @@ thinwalletCtrls.controller("ImportWalletCtrl", function($scope, $location, $http
                 $scope.success = "Request successful. Import will start shortly. This window will close in few seconds.";
                 $timeout(function(){ModalService.hide('imported-account')}, 5000);
             }
+            else
+            {
+                $scope.error = data.Error || "An unexpected server error occurred";
+            }
         }).error(function(err) {
             $scope.error = err.Error || err || "An unexpected server error occurred";
         });
diff --git a/src/YourMoneroRequests.cpp b/src/YourMoneroRequests.cpp
index 7f52cca..ac17f2f 100755
--- a/src/YourMoneroRequests.cpp
+++ b/src/YourMoneroRequests.cpp
@@ -848,10 +848,16 @@ YourMoneroRequests::import_recent_wallet_request(const shared_ptr< Session > ses
     json j_response;
     json j_request;
 
+    bool request_fulfilled {false};
+
+    j_response["request_fulfilled"] = false;
+
     vector<string> requested_values {"address" , "view_key", "no_blocks_to_import"};
 
     if (!parse_request(body, requested_values, j_request, j_response))
     {
+
+        j_response["Error"] = "Cant parse json body";
         session_close(session, j_response.dump());
         return;
     }
@@ -867,15 +873,19 @@ YourMoneroRequests::import_recent_wallet_request(const shared_ptr< Session > ses
     }
     catch (boost::bad_lexical_cast& e)
     {
-        cerr << "Cant cast " << j_request["no_blocks_to_import"] << " into number."
-             << " Using default value of " << no_blocks_to_import << '\n';
+        string msg = "Cant parse " + j_request["no_blocks_to_import"].get<string>() + " into number";
+
+        cerr << msg << '\n';
+
+        j_response["Error"] = msg;
+        session_close(session, j_response.dump());
+        return;
     }
 
     // make sure that we dont import more that the maximum alowed no of blocks
     no_blocks_to_import = std::min(no_blocks_to_import,
                                    CurrentBlockchainStatus::max_number_of_blocks_to_import);
 
-    bool request_fulfilled {false};
 
     XmrAccount acc;
 
@@ -900,11 +910,11 @@ YourMoneroRequests::import_recent_wallet_request(const shared_ptr< Session > ses
                                                                       updated_acc.scanned_block_height))
                 {
                     cerr << "Updating searched_blk_no failed!" << endl;
-                    j_response["status"] = "Updating searched_blk_no failed!";
+                    j_response["Error"]  = "Updating searched_blk_no failed!";
                 }
                 else
                 {
-                    // if success, set acc to updated_acc;
+                    // if success, makre that request was successful;
                     request_fulfilled = true;
                 }
             }