Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #9

Browse Source 
0455502 bitmonero comes from monero-project's repo (Ilya Kitaev)
4706379 Processing splash bug fixed; Receive page: wrong reference to the wallet fixed; (Ilya Kitaev)
db965e1 changes due updates in bitmonero (Ilya Kitaev)
This commit is contained in:
Riccardo Spagni
2016-09-01 23:32:09 +02:00
parent 40e8077bb5 c706040f64
commit a3fa1913a6
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages/Receive.qml
View File

@@ -46,11 +46,11 @@ Rectangle {
if (payment_id.length === 0) {
payment_id = appWindow.wallet.generatePaymentId()
appWindow.persistentSettings.payment_id = payment_id
appWindow.wallet.payment_id = payment_id
appWindow.currentWallet.payment_id = payment_id
}
paymentIdLine.text = payment_id
addressLine.text = appWindow.wallet.address
integratedAddressLine.text = appWindow.wallet.integratedAddress(payment_id)
addressLine.text = appWindow.currentWallet.address
integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
}
Clipboard { id: clipboard }
@@ -168,7 +168,7 @@ Rectangle {
text: qsTr("Generate")
anchors.right: parent.right
onClicked: {
appWindow.persistentSettings.payment_id = appWindow.wallet.generatePaymentId();
appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId();
updatePaymentId()
}
}