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

Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2

Browse source
This commit is contained in:
Howard Stearns 2018-09-19 16:46:09 -07:00
commit 391128ef77
2 changed files with 2 additions and 1 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

@ -829,6 +829,7 @@ Rectangle {
Commerce.getWalletAuthenticatedStatus(); // before writing security image, ensures that salt/account password is set. Commerce.getWalletAuthenticatedStatus(); // before writing security image, ensures that salt/account password is set.
Commerce.chooseSecurityImage(securityImagePath); Commerce.chooseSecurityImage(securityImagePath);
Commerce.generateKeyPair(); Commerce.generateKeyPair();
followReferrer({ referrer: walletSetup.referrer });
} }
function addLeadingZero(n) { function addLeadingZero(n) {

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

@ -28,7 +28,7 @@ Item {
property string activeView: "step_1"; property string activeView: "step_1";
property string lastPage; property string lastPage;
property bool hasShownSecurityImageTip: false; property bool hasShownSecurityImageTip: false;
property string referrer; property string referrer: '';
property string keyFilePath; property string keyFilePath;
property date startingTimestamp; property date startingTimestamp;
property string setupAttemptID; property string setupAttemptID;