Merge pull request #2861

4b0dcb9 StandardDialog: reset button text on close (selsta)

3 files changed, 4 insertions, 2 deletions

diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index 38f0d369..df1aa2f4 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -90,6 +90,10 @@ Rectangle {
 
     function close() {
         root.visible = false;
+        // reset button text
+        okButton.text = qsTr("OK")
+        cancelButton.text = qsTr("Cancel")
+
         closeCallback();
     }
 
diff --git a/main.qml b/main.qml
index c8f5f67a..3c046e64 100644
--- a/main.qml
+++ b/main.qml
@@ -1475,7 +1475,6 @@ ApplicationWindow {
                     confirmationDialog.text  += qsTr("Note: lmdb folder not found. A new folder will be created.") + "\n\n"
 
                 confirmationDialog.icon = StandardIcon.Question
-                confirmationDialog.cancelText = qsTr("Cancel")
 
                 // Continue
                 confirmationDialog.onAcceptedCallback = function() {
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index 909822f5..7fbb45e6 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -213,7 +213,6 @@ Rectangle {
                                                                 + "The old wallet cache file will be renamed and can be restored later.\n"
                                                                 );
                                 confirmationDialog.icon = StandardIcon.Question
-                                confirmationDialog.cancelText = qsTr("Cancel")
                                 confirmationDialog.onAcceptedCallback = function() {
                                     appWindow.closeWallet(function() {
                                         walletManager.clearWalletCache(persistentSettings.wallet_path);