Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 23:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quick bugfix and code change for clarity

Browse source
This commit is contained in:
Zach Fox 2018-01-16 10:40:51 -08:00
parent f7ed8c10fa
commit 6b90ceaeb4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,6 @@ Item {
Connections { Connections {
target: GlobalServices target: GlobalServices
onMyUsernameChanged: { onMyUsernameChanged: {
transactionHistoryModel.clear();
usernameText.text = Account.username; usernameText.text = Account.username;
} }
} }
@ -91,14 +90,14 @@ Item {
root.currentActiveView = root.nextActiveView; root.currentActiveView = root.nextActiveView;
if (root.nextActiveView === 'chooseRecipientConnection') { if (root.currentActiveView === 'chooseRecipientConnection') {
// Refresh connections model // Refresh connections model
connectionsLoading.visible = false; connectionsLoading.visible = false;
connectionsLoading.visible = true; connectionsLoading.visible = true;
sendSignalToWallet({method: 'refreshConnections'}); sendSignalToWallet({method: 'refreshConnections'});
} else if (root.nextActiveView === 'sendMoneyHome') { } else if (root.currentActiveView === 'sendMoneyHome') {
Commerce.balance(); Commerce.balance();
} else if (root.nextActiveView === 'chooseRecipientNearby') { } else if (root.currentActiveView === 'chooseRecipientNearby') {
sendSignalToWallet({method: 'enable_ChooseRecipientNearbyMode'}); sendSignalToWallet({method: 'enable_ChooseRecipientNearbyMode'});
} }
} }
@ -848,7 +847,7 @@ Item {
FontLoader { id: firaSansSemiBold; source: "../../../../../fonts/FiraSans-SemiBold.ttf"; } FontLoader { id: firaSansSemiBold; source: "../../../../../fonts/FiraSans-SemiBold.ttf"; }
TextArea { TextArea {
id: optionalMessage; id: optionalMessage;
property int maximumLength: 255; property int maximumLength: 70;
property string previousText: text; property string previousText: text;
placeholderText: "Optional Message"; placeholderText: "Optional Message";
font.family: firaSansSemiBold.name; font.family: firaSansSemiBold.name;