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

Merge pull request #12477 from Atlante45/new-master

Browse source 
Merge stable back into master
This commit is contained in:
Clément Brisset 2018-02-26 17:18:24 -08:00 committed by GitHub
commit 2a7a71db13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -441,7 +441,7 @@ Item {
} }
Item { Item {
id: choosePassphraseContainer; id: choosePassphraseContainer;
visible: root.activeView === "step_3"; visible: root.hasShownSecurityImageTip && root.activeView === "step_3";
// Anchors // Anchors
anchors.top: titleBarContainer.bottom; anchors.top: titleBarContainer.bottom;
anchors.topMargin: 30; anchors.topMargin: 30;
@ -451,7 +451,10 @@ Item {
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {
sendSignalToWallet({method: 'disableHmdPreview'});
Commerce.getWalletAuthenticatedStatus(); Commerce.getWalletAuthenticatedStatus();
} else {
sendSignalToWallet({method: 'maybeEnableHmdPreview'});
} }
} }