mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 12:09:57 +00:00
Processing splash bug fixed;
Receive page: wrong reference to the wallet fixed;
This commit is contained in:
parent
db965e1265
commit
4706379079
3 changed files with 6 additions and 6 deletions
|
@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1
|
|||
Window {
|
||||
id: splash
|
||||
modality: Qt.ApplicationModal
|
||||
flags: Qt.SplashScreen
|
||||
flags: Qt.Window | Qt.FramelessWindowHint
|
||||
property alias message: message.text
|
||||
width: 200
|
||||
height: 100
|
||||
|
|
2
main.qml
2
main.qml
|
@ -324,7 +324,7 @@ ApplicationWindow {
|
|||
|
||||
function hideProcessingSplash() {
|
||||
console.log("Hiding processing splash")
|
||||
splash.hide()
|
||||
splash.close()
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue