Merge branch 'bright_boson_2.1RC' into mainnet

BeamMW · May 15, 2019 · 3ad661b · 3ad661b
2 parents c8423bc + bbcf8cb
commit 3ad661b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ui/viewmodel/statusbar_view.cpp b/ui/viewmodel/statusbar_view.cpp
@@ -69,10 +69,14 @@ int StatusbarViewModel::getNodeSyncProgress() const
 
 QString StatusbarViewModel::getBranchName() const
 {
+#ifdef BEAM_MAINNET
+    return QString();
+#else
     if (BRANCH_NAME.empty())
         return QString();
 
     return QString::fromStdString(" (" + BRANCH_NAME + ")");
+#endif
 }
 
 QString StatusbarViewModel::getWalletStatusErrorMsg() const

diff --git a/wallet/unittests/wallet_test.cpp b/wallet/unittests/wallet_test.cpp
@@ -1979,7 +1979,7 @@ namespace
 
         {
             // create cold wallet
-            TestWalletRig privateSender("receiver", createReceiverWalletDB(true), f, true);
+            TestWalletRig privateReceiver("receiver", createReceiverWalletDB(true), f, true);
         }
 
         string publicPath = "receiver_public.db";
@@ -2014,7 +2014,7 @@ namespace
             TestWalletRig publicReceiver("public_receiver", publicDB, f, false, true);
 
             mainReactor->run();
-            mainReactor->run(); // to allow receiver complete his transaction
+            mainReactor->run(); // to allow receiver complete this transaction
         }
 
         // hot -> cold

diff --git a/wallet/wallet_transaction.cpp b/wallet/wallet_transaction.cpp
@@ -326,7 +326,8 @@ namespace beam { namespace wallet
 
         bool hasPeersInputsAndOutputs = builder.GetPeerInputsAndOutputs();
 
-        if (!builder.LoadKernel() && !builder.HasKernelID())
+        if ((isSender && !builder.LoadKernel())
+         || (!isSender && !builder.HasKernelID()))
         {
             if (!m_WalletDB->get_MasterKdf())
             {