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

always reset when asked

Browse source
This commit is contained in:
howard-stearns 2018-02-23 15:11:08 -08:00
parent 432e647f7a
commit 34253082d4
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -177,6 +177,7 @@ Rectangle {
proceedFunction: function (isReset) { proceedFunction: function (isReset) {
console.log(isReset ? "Reset wallet." : "Trying again with new wallet."); console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
if (isReset) { if (isReset) {
walletSetup();
} else { } else {
root.activeView = "initialize"; root.activeView = "initialize";
Commerce.getWalletStatus(); Commerce.getWalletStatus();

5
interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
View file

@ -197,7 +197,6 @@ Item {
"CREATE NEW WALLET" : "CREATE NEW WALLET" :
"CONTINUE WITH THESE KEYS" "CONTINUE WITH THESE KEYS"
onClicked: { onClicked: {
if (root.activeView === "preexisting") {
lightboxPopup.titleText = "Are you sure?"; lightboxPopup.titleText = "Are you sure?";
lightboxPopup.bodyText = "Taking this step will abandon your old wallet and you will no " + lightboxPopup.bodyText = "Taking this step will abandon your old wallet and you will no " +
"longer be able to access your money and your past purchases.<br><br>" + "longer be able to access your money and your past purchases.<br><br>" +
@ -208,9 +207,7 @@ Item {
lightboxPopup.button2text = "CLOSE"; lightboxPopup.button2text = "CLOSE";
lightboxPopup.button2method = "root.visible = false;" lightboxPopup.button2method = "root.visible = false;"
lightboxPopup.visible = true; lightboxPopup.visible = true;
} else {
console.log('FIXME');
}
} }
} }