monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1321

Browse source 
251db80 show correct address in wizard if remote node used
This commit is contained in:
luigi1111 2018-04-22 20:03:00 -05:00
commit d248e45563
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wizard/WizardFinish.qml
View file

@ -55,6 +55,12 @@ ColumnLayout {
networkText = nettype == NetworkType.TESTNET ? qsTr("Testnet") : nettype == NetworkType.STAGENET ? qsTr("Stagenet") : qsTr("Mainnet"),
restoreHeightEnabled = wizard.settings['restore_height'] !== undefined;
var daemonAddress = persistentSettings.daemon_address;
if(persistentSettings.useRemoteNode)
{
daemonAddress = persistentSettings.remoteNodeAddress;
}
return "<table>"
+ trStart + qsTr("Language") + trMiddle + wizard.settings["language"] + trEnd
+ trStart + qsTr("Wallet name") + trMiddle + wizard.settings["account_name"] + trEnd
@ -67,7 +73,7 @@ ColumnLayout {
// ? trStart + qsTr("Donation amount") + trMiddle + autoDonationAmount + trEnd
// : "")
// + trStart + qsTr("Background mining") + trMiddle + backgroundMiningText + trEnd
+ trStart + qsTr("Daemon address") + trMiddle + persistentSettings.daemon_address + trEnd
+ trStart + qsTr("Daemon address") + trMiddle + daemonAddress + trEnd
+ trStart + qsTr("Network Type") + trMiddle + networkText + trEnd
+ (restoreHeightEnabled
? trStart + qsTr("Restore height") + trMiddle + wizard.settings['restore_height'] + trEnd