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

get WalletChoice setup flow from My Purchases and confirmation. Still

Browse source 
not correct referrer.
This commit is contained in:
howard-stearns 2018-02-26 12:02:56 -08:00
parent 2de72c125d
commit 4e4aebc7ee
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -59,19 +59,11 @@ Rectangle {
if (root.activeView !== "needsLogIn") { if (root.activeView !== "needsLogIn") {
root.activeView = "needsLogIn"; root.activeView = "needsLogIn";
} }
} else if (walletStatus === 1) { } else if ((walletStatus === 1) || (walletStatus === 2) || (walletStatus === 3)) {
if (root.activeView !== "notSetUp") { if (root.activeView !== "notSetUp") {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
notSetUpTimer.start(); notSetUpTimer.start();
} }
} else if (walletStatus === 2) {
if (root.activeView != "preexisting") {
root.activeView = "preexisting";
}
} else if (walletStatus === 3) {
if (root.activeView != "conflicting") {
root.activeView = "conflicting";
}
} else if (walletStatus === 4) { } else if (walletStatus === 4) {
if (root.activeView !== "passphraseModal") { if (root.activeView !== "passphraseModal") {
root.activeView = "passphraseModal"; root.activeView = "passphraseModal";

10
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -47,19 +47,11 @@ Rectangle {
if (root.activeView !== "needsLogIn") { if (root.activeView !== "needsLogIn") {
root.activeView = "needsLogIn"; root.activeView = "needsLogIn";
} }
} else if (walletStatus === 1) { } else if ((walletStatus === 1) || (walletStatus === 2) || (walletStatus === 3)) {
if (root.activeView !== "notSetUp") { if (root.activeView !== "notSetUp") {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
notSetUpTimer.start(); notSetUpTimer.start();
} }
} else if (walletStatus === 2) {
if (root.activeView != "preexisting") {
root.activeView = "preexisting";
}
} else if (walletStatus === 3) {
if (root.activeView != "conflicting") {
root.activeView = "conflicting";
}
} else if (walletStatus === 4) { } else if (walletStatus === 4) {
if (root.activeView !== "passphraseModal") { if (root.activeView !== "passphraseModal") {
root.activeView = "passphraseModal"; root.activeView = "passphraseModal";