Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:47:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More improvements

Browse source
This commit is contained in:
Zach Fox 2018-01-31 12:32:54 -08:00
parent 90c2371f0c
commit bd26c9dfc0
3 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/qml/hifi/commerce/common/images/loader.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 58 KiB

34
interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
View file

@ -57,6 +57,9 @@ Item {
if (result.status === 'success') { if (result.status === 'success') {
root.nextActiveView = 'paymentSuccess'; root.nextActiveView = 'paymentSuccess';
if (sendPubliclyCheckbox.checked && sendMoneyStep.referrer === "nearby") {
sendSignalToWallet({method: 'sendMoney_sendPublicly', recipient: sendMoneyStep.selectedRecipientNodeID, amount: parseInt(amountTextField.text)});
}
} else { } else {
root.nextActiveView = 'paymentFailure'; root.nextActiveView = 'paymentFailure';
} }
@ -308,22 +311,6 @@ Item {
} }
} }
} }
// "Particle" button
HifiControlsUit.Button {
id: particle;
color: hifi.buttons.blue;
colorScheme: hifi.colorSchemes.dark;
anchors.horizontalCenter: parent.horizontalCenter;
anchors.top: nearbyButton.bottom;
anchors.topMargin: 24;
height: 50;
width: 160;
text: "Try Particles";
onClicked: {
sendSignalToWallet({method: 'sendMoney_sendPublicly', recipient: "{09f76bc2-c108-41e9-9a94-18bbda228ed2}", amount: 2});
}
}
} }
} }
// Send Money Home END // Send Money Home END
@ -983,7 +970,8 @@ Item {
HifiControlsUit.CheckBox { HifiControlsUit.CheckBox {
id: sendPubliclyCheckbox; id: sendPubliclyCheckbox;
visible: true; visible: sendMoneyStep.referrer === "nearby";
checked: Settings.getValue("sendMoneyNearbyPublicly", true);
text: "Send Publicly" text: "Send Publicly"
// Anchors // Anchors
anchors.top: messageContainer.bottom; anchors.top: messageContainer.bottom;
@ -992,7 +980,10 @@ Item {
anchors.leftMargin: 20; anchors.leftMargin: 20;
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 16; anchors.rightMargin: 16;
boxSize: 24; boxSize: 28;
onCheckedChanged: {
Settings.setValue("sendMoneyNearbyPublicly", checked);
}
} }
Item { Item {
@ -1051,11 +1042,7 @@ Item {
if (sendMoneyStep.referrer === "connections") { if (sendMoneyStep.referrer === "connections") {
Commerce.transferHfcToUsername(sendMoneyStep.selectedRecipientUserName, parseInt(amountTextField.text), optionalMessage.text); Commerce.transferHfcToUsername(sendMoneyStep.selectedRecipientUserName, parseInt(amountTextField.text), optionalMessage.text);
} else if (sendMoneyStep.referrer === "nearby") { } else if (sendMoneyStep.referrer === "nearby") {
var transferAmount = parseInt(amountTextField.text); Commerce.transferHfcToNode(sendMoneyStep.selectedRecipientNodeID, parseInt(amountTextField.text), optionalMessage.text);
Commerce.transferHfcToNode(sendMoneyStep.selectedRecipientNodeID, transferAmount, optionalMessage.text);
if (sendPubliclyCheckbox.checked) {
sendSignalToWallet({method: 'sendMoney_sendPublicly', recipient: sendMoneyStep.selectedRecipientNodeID, amount: transferAmount});
}
} }
} }
} }
@ -1554,6 +1541,7 @@ Item {
amountTextField.text = ""; amountTextField.text = "";
optionalMessage.text = ""; optionalMessage.text = "";
sendPubliclyCheckbox.checked = false; sendPubliclyCheckbox.checked = false;
sendMoneyStep.referrer = "";
} }
// //

2
scripts/system/commerce/wallet.js
View file

@ -684,9 +684,7 @@
sendMoneyRecipient = message.recipient; sendMoneyRecipient = message.recipient;
var amount = message.amount; var amount = message.amount;
var props = SEND_MONEY_PARTICLE_PROPERTIES; var props = SEND_MONEY_PARTICLE_PROPERTIES;
if (sendMoneyParticleEffect) {
deleteSendMoneyParticleEffect(); deleteSendMoneyParticleEffect();
}
props.parentID = MyAvatar.sessionUUID; props.parentID = MyAvatar.sessionUUID;
props.position = MyAvatar.position; props.position = MyAvatar.position;
props.position.y += 0.2; props.position.y += 0.2;