Merge pull request #17 from MERP-Solutions/master

Corrected messaging page GUI issue, re-enabled back button for message page GUI
CryptoCoderz · Mar 14, 2020 · b415930 · b415930
2 parents ea2103d + 76f42d9
commit b415930
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -8,6 +8,7 @@
 #include "clientmodel.h"
 #include "walletmodel.h"
 #include "optionsmodel.h"
+#include "messagemodel.h"
 #include "guiutil.h"
 #include "guiconstants.h"
 #include "init.h"
@@ -283,9 +284,11 @@ int main(int argc, char *argv[])
 
                 ClientModel clientModel(&optionsModel);
                 WalletModel walletModel(pwalletMain, &optionsModel);
+                MessageModel messageModel(pwalletMain, &walletModel);
 
                 window.setClientModel(&clientModel);
                 window.setWalletModel(&walletModel);
+                window.setMessageModel(&messageModel);
 
                 // If -min option passed, start window minimized.
                 if(GetBoolArg("-min", false))

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -479,7 +479,7 @@ void DigitalNoteGUI::createToolBars()
     toolbar->addAction(addressBookAction);
     toolbar->addAction(masternodeManagerAction);
     if (!fLiteMode){
-            toolbar->addAction(messageAction);
+        toolbar->addAction(messageAction);
     }
     toolbar->addAction(blockAction);
     netLabel = new QLabel();

diff --git a/src/qt/forms/messagepage.ui b/src/qt/forms/messagepage.ui
@@ -86,7 +86,7 @@
           <item>
            <widget class="QPushButton" name="backButton">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="text">
              <string>&amp;Back</string>