Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.0RC' into mainnet

Author: anatolse

wallet/api/cli/api_cli.cpp

@@ -366,7 +366,7 @@ namespace
                     auto data = msg.msg->get_body(size);
 
                     const auto asyncResult = _walletApi->executeAPIRequest(reinterpret_cast<const char*>(data), size);
-                    _keepalive = asyncResult == ApiSyncMode::RunningAsync;
+                    _keepalive = _keepalive || asyncResult == ApiSyncMode::RunningAsync;
                 }
 
                 if (!_keepalive)

wallet/core/base_transaction.cpp

@@ -182,15 +182,15 @@ namespace beam::wallet
 
     bool BaseTransaction::CanCancel() const
     {
-        TxStatus status = TxStatus::Failed;
+        TxStatus status = TxStatus::Pending;
         GetParameter(TxParameterID::Status, status);
 
         return status == TxStatus::InProgress || status == TxStatus::Pending;
     }
 
     void BaseTransaction::Cancel()
     {
-        TxStatus s = TxStatus::Failed;
+        TxStatus s = TxStatus::Pending;
         GetParameter(TxParameterID::Status, s);
         // TODO: add CanCancel() method
         if (s == TxStatus::Pending || s == TxStatus::InProgress)