7 files changed, 20 insertions, 10 deletions
diff --git a/pages/Advanced.qml b/pages/Advanced.qml
index 17904e3b..68896079 100644
--- a/pages/Advanced.qml
+++ b/pages/Advanced.qml
@@ -53,6 +53,7 @@ ColumnLayout {
             active: state == "Mining"
             text: qsTr("Mining") + translationManager.emptyString
             onSelected: state = "Mining"
+            visible: !isAndroid
         }
         MoneroComponents.NavbarItem {
             active: state == "Prove"
@@ -82,7 +83,7 @@ ColumnLayout {
         Layout.fillWidth: true
         Layout.preferredHeight: panelHeight
         color: "transparent"
-        state: "Mining"
+        state: isAndroid ? "Prove" : "Mining"
 
         onCurrentViewChanged: {
             if (previousView) {
@@ -121,7 +122,7 @@ ColumnLayout {
 
         StackView {
             id: stackView
-            initialItem: stateView.miningView
+            initialItem: isAndroid ? stateView.prooveView : stateView.miningView
             anchors.fill: parent
             clip: false // otherwise animation will affect left panel
 
diff --git a/pages/History.qml b/pages/History.qml
index 48befeaa..88a2b767 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -1765,18 +1765,25 @@ Rectangle {
             var written = currentWallet.history.writeCSV(currentWallet.currentSubaddressAccount, dataDir);
 
             if(written !== ""){
-                informationPopup.title = qsTr("Success") + translationManager.emptyString;
+                confirmationDialog.title = qsTr("Success") + translationManager.emptyString;
                 var text = qsTr("CSV file written to: %1").arg(written) + "\n\n"
                 text += qsTr("Tip: Use your favorite spreadsheet software to sort on blockheight.") + "\n\n" + translationManager.emptyString;
-                informationPopup.text = text;
-                informationPopup.icon = StandardIcon.Information;
+                confirmationDialog.text = text;
+                confirmationDialog.icon = StandardIcon.Information;
+                confirmationDialog.cancelText = qsTr("Open folder") + translationManager.emptyString;
+                confirmationDialog.onAcceptedCallback = null;
+                confirmationDialog.onRejectedCallback = function() {
+                    oshelper.openContainingFolder(written);
+                }
+                confirmationDialog.open();
             } else {
                 informationPopup.title = qsTr("Error") + translationManager.emptyString;
                 informationPopup.text = qsTr("Error exporting transaction data.") + "\n\n" + translationManager.emptyString;
                 informationPopup.icon = StandardIcon.Critical;
+                informationPopup.onCloseCallback = null;
+                informationPopup.open();
+
             }
-            informationPopup.onCloseCallback = null;
-            informationPopup.open();
         }
         Component.onCompleted: {
             var _folder = 'file://' + appWindow.accountsDir;
diff --git a/pages/Mining.qml b/pages/Mining.qml
index 8d5a2522..e9ab1d07 100644
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -297,7 +297,7 @@ Rectangle {
                                             startP2Pool()
                                         }
                                         else {
-                                            daemonManager.stopAsync(persistentSettings.nettype, startP2PoolLocal)
+                                            daemonManager.stopAsync(persistentSettings.nettype, persistentSettings.blockchainDataDir, startP2PoolLocal)
                                         }
                                     }
                                     else {
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index a768538d..5719c744 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -51,7 +51,7 @@ Rectangle {
     color: "transparent"
     property alias transferHeight1: pageRoot.height
     property alias transferHeight2: advancedLayout.height
-    property int mixin: 10  // (ring size 11)
+    property int mixin: 15  // (ring size 16)
     property string warningContent: ""
     property string sendButtonWarning: {
         // Currently opened wallet is not view-only
diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml
index fdf03ce6..414b61a1 100644
--- a/pages/settings/Settings.qml
+++ b/pages/settings/Settings.qml
@@ -74,6 +74,7 @@ ColumnLayout {
             active: settingsStateView.state == "Log"
             text: qsTr("Log") + translationManager.emptyString
             onSelected: settingsStateView.state = "Log"
+            visible: !isAndroid
         }
         MoneroComponents.NavbarItem {
             active: settingsStateView.state == "Info"
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml
index 4c393ee9..d11201b0 100644
--- a/pages/settings/SettingsLog.qml
+++ b/pages/settings/SettingsLog.qml
@@ -254,7 +254,7 @@ Rectangle {
             onAccepted: {
                 if(text.length > 0) {
                     consoleArea.logCommand(">>> " + text)
-                    daemonManager.sendCommandAsync(text.split(" "), currentWallet.nettype, function(result) {
+                    daemonManager.sendCommandAsync(text.split(" "), currentWallet.nettype, persistentSettings.blockchainDataDir, function(result) {
                         if (!result) {
                             appWindow.showStatusMessage(qsTr("Failed to send command"), 3);
                         }
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index ab3d49f1..e0ae009a 100644
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -55,6 +55,7 @@ Rectangle{
             Layout.fillWidth: true
             Layout.preferredHeight: 90
             color: "transparent"
+            visible: !isAndroid
 
             Rectangle {
                 id: localNodeDivider