diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-12 20:33:22 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-12 20:33:22 -0500 |
| commit | 8bbc2e87bc19b6cbdf4cb2fe54395cb95290dfeb (patch) | |
| tree | 582248aa527a77b0bc7e5821af1fde864b654510 | |
| parent | c10ea20f83b3b4d78baa16eb80dec9e2b8637f88 (diff) | |
| parent | c34a2b43fc0be8ba9ca0a3019c0cb99e2cd26d5d (diff) | |
| download | monzero-gui-8bbc2e87bc19b6cbdf4cb2fe54395cb95290dfeb.tar.gz monzero-gui-8bbc2e87bc19b6cbdf4cb2fe54395cb95290dfeb.tar.xz monzero-gui-8bbc2e87bc19b6cbdf4cb2fe54395cb95290dfeb.zip | |
Merge pull request #2246
c34a2b4 QML: fix warnings (selsta)
| -rw-r--r-- | js/TxUtils.js | 4 | ||||
| -rw-r--r-- | pages/Keys.qml | 3 | ||||
| -rw-r--r-- | wizard/WizardCreateWallet1.qml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/js/TxUtils.js b/js/TxUtils.js index de4197d9..31f8553c 100644 --- a/js/TxUtils.js +++ b/js/TxUtils.js @@ -12,13 +12,13 @@ function destinationsToAddress(destinations){ } function addressTruncate(address, range){ - if(typeof(address) === "undefined") return; + if(typeof(address) === "undefined") return ""; if(typeof(range) === "undefined") range = 8; return address.substring(0, range) + "..." + address.substring(address.length-range); } function addressTruncatePretty(address, blocks){ - if(typeof(address) === "undefined") return; + if(typeof(address) === "undefined") return ""; if(typeof(blocks) === "undefined") blocks = 2; blocks = blocks <= 1 ? 1 : blocks >= 23 ? 23 : blocks; var ret = ""; diff --git a/pages/Keys.qml b/pages/Keys.qml index b913314b..a8f62a19 100644 --- a/pages/Keys.qml +++ b/pages/Keys.qml @@ -116,11 +116,11 @@ Rectangle { MoneroComponents.LineEdit { Layout.fillWidth: true + id: walletCreationHeight readOnly: true copyButton: true labelText: qsTr("Block #") + translationManager.emptyString fontSize: 16 - text: currentWallet.walletCreationHeight } } @@ -261,6 +261,7 @@ Rectangle { function onPageCompleted() { console.log("keys page loaded"); + walletCreationHeight.text = currentWallet.walletCreationHeight secretViewKey.text = currentWallet.secretViewKey publicViewKey.text = currentWallet.publicViewKey secretSpendKey.text = (!currentWallet.viewOnly) ? currentWallet.secretSpendKey : "" diff --git a/wizard/WizardCreateWallet1.qml b/wizard/WizardCreateWallet1.qml index 577243c3..f5090114 100644 --- a/wizard/WizardCreateWallet1.qml +++ b/wizard/WizardCreateWallet1.qml @@ -151,7 +151,7 @@ Rectangle { labelFontSize: 14 copyButton: false readOnly: true - text: Utils.roundDownToNearestThousand(wizardController.m_wallet.walletCreationHeight) + text: Utils.roundDownToNearestThousand(wizardController.m_wallet ? wizardController.m_wallet.walletCreationHeight : 0) } MoneroComponents.WarningBox { |