4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 19:32:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2246

Browse Source 
c34a2b4 QML: fix warnings (selsta)
This commit is contained in:
luigi1111 2019-07-12 20:33:22 -05:00
commit 8bbc2e87bc
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/TxUtils.js
View File

@ -12,13 +12,13 @@ function destinationsToAddress(destinations){
} }
function addressTruncate(address, range){ function addressTruncate(address, range){
if(typeof(address) === "undefined") return; if(typeof(address) === "undefined") return "";
if(typeof(range) === "undefined") range = 8; if(typeof(range) === "undefined") range = 8;
return address.substring(0, range) + "..." + address.substring(address.length-range); return address.substring(0, range) + "..." + address.substring(address.length-range);
} }
function addressTruncatePretty(address, blocks){ function addressTruncatePretty(address, blocks){
if(typeof(address) === "undefined") return; if(typeof(address) === "undefined") return "";
if(typeof(blocks) === "undefined") blocks = 2; if(typeof(blocks) === "undefined") blocks = 2;
blocks = blocks <= 1 ? 1 : blocks >= 23 ? 23 : blocks; blocks = blocks <= 1 ? 1 : blocks >= 23 ? 23 : blocks;
var ret = ""; var ret = "";

3
pages/Keys.qml
View File

@ -116,11 +116,11 @@ Rectangle {
MoneroComponents.LineEdit { MoneroComponents.LineEdit {
Layout.fillWidth: true Layout.fillWidth: true
id: walletCreationHeight
readOnly: true readOnly: true
copyButton: true copyButton: true
labelText: qsTr("Block #") + translationManager.emptyString labelText: qsTr("Block #") + translationManager.emptyString
fontSize: 16 fontSize: 16
text: currentWallet.walletCreationHeight
} }
} }
@ -261,6 +261,7 @@ Rectangle {
function onPageCompleted() { function onPageCompleted() {
console.log("keys page loaded"); console.log("keys page loaded");
walletCreationHeight.text = currentWallet.walletCreationHeight
secretViewKey.text = currentWallet.secretViewKey secretViewKey.text = currentWallet.secretViewKey
publicViewKey.text = currentWallet.publicViewKey publicViewKey.text = currentWallet.publicViewKey
secretSpendKey.text = (!currentWallet.viewOnly) ? currentWallet.secretSpendKey : "" secretSpendKey.text = (!currentWallet.viewOnly) ? currentWallet.secretSpendKey : ""

2
wizard/WizardCreateWallet1.qml
View File

@ -151,7 +151,7 @@ Rectangle {
labelFontSize: 14 labelFontSize: 14
copyButton: false copyButton: false
readOnly: true readOnly: true
text: Utils.roundDownToNearestThousand(wizardController.m_wallet.walletCreationHeight) text: Utils.roundDownToNearestThousand(wizardController.m_wallet ? wizardController.m_wallet.walletCreationHeight : 0)
} }
MoneroComponents.WarningBox { MoneroComponents.WarningBox {