Merge pull request #1172

65ea07a Add a shared ringdb management page - rings and blackballed outputs
22a1114 Add segregation key reuse mitigation options

1 files changed, 5 insertions, 0 deletions

diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index b543171f..38c9bb2c 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -54,6 +54,7 @@ Rectangle {
     property Transfer transferView: Transfer { }
     property Receive receiveView: Receive { }
     property TxKey txkeyView: TxKey { }
+    property SharedRingDB sharedringdbView: SharedRingDB { }
     property History historyView: History { }
     property Sign signView: Sign { }
     property Settings settingsView: Settings { }
@@ -118,6 +119,10 @@ Rectangle {
                PropertyChanges { target: root; currentView: txkeyView }
                PropertyChanges { target: mainFlickable; contentHeight: minHeight  }
             }, State {
+               name: "SharedRingDB"
+               PropertyChanges { target: root; currentView: sharedringdbView }
+               PropertyChanges { target: mainFlickable; contentHeight: minHeight  }
+            }, State {
                 name: "AddressBook"
                 PropertyChanges {  target: root; currentView: addressBookView  }
                 PropertyChanges { target: mainFlickable; contentHeight: minHeight }