Merge pull request #118

12f2a2b Fix small amounts from being conflated with zero (moneromooo.monero)
This commit is contained in:
Riccardo Spagni
2016-11-11 12:40:48 +02:00
3 changed files with 3 additions and 3 deletions

View File

@@ -46,7 +46,7 @@ Rectangle {
property alias balanceText : balanceText.text; property alias balanceText : balanceText.text;
property alias unlockedBalanceText : availableBalanceText.text; property alias unlockedBalanceText : availableBalanceText.text;
// repeating signal to the outside world // repeating signal to the outside world
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, signal paymentClicked(string address, string paymentId, string amount, int mixinCount,
int priority, string description) int priority, string description)
Connections { Connections {

View File

@@ -50,7 +50,7 @@ Rectangle {
property Settings settingsView: Settings { } property Settings settingsView: Settings { }
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority, string description) signal paymentClicked(string address, string paymentId, string amount, int mixinCount, int priority, string description)
signal generatePaymentIdInvoked() signal generatePaymentIdInvoked()
signal checkPaymentClicked(string address, string txid, string txkey); signal checkPaymentClicked(string address, string txid, string txkey);

View File

@@ -33,7 +33,7 @@ import "../components"
Rectangle { Rectangle {
id: root id: root
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, signal paymentClicked(string address, string paymentId, string amount, int mixinCount,
int priority, string description) int priority, string description)
color: "#F0EEEE" color: "#F0EEEE"