Merge branch 'master' into ui-work
This commit is contained in:
commit
a9d290fadf
@ -64,7 +64,6 @@ a {
|
||||
a:focus-visible {
|
||||
box-shadow: 0 0 0 0.1rem rgba(var(--text-color), 1) inset;
|
||||
}
|
||||
|
||||
a.button {
|
||||
padding: 0.4rem 0.6rem;
|
||||
border-radius: 0.3rem;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
FLO: ['https://flosight.duckdns.org/', 'https://livenet.flocha.in/'],
|
||||
FLO_TEST: ['https://testnet-flosight.duckdns.org/', 'https://testnet.flocha.in/']
|
||||
},
|
||||
adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf",
|
||||
adminID: "FH64hLqB71e6i11rnZZW7hvzoH8daCwy1J",
|
||||
sendAmt: 0.001,
|
||||
fee: 0.0005,
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
//for cloud apps
|
||||
subAdmins: [],
|
||||
application: "TEST_MODE",
|
||||
application: "blockchainUPI",
|
||||
appObjects: {},
|
||||
generalData: {},
|
||||
lastVC: {}
|
||||
@ -1277,6 +1277,7 @@
|
||||
floGlobals.savedUserData = {
|
||||
upiIds: {}
|
||||
}
|
||||
|
||||
console.log(`Welcome ${myFloID}`);
|
||||
getRef('logged_in_user_id').value = myFloID;
|
||||
floGlobals.isSubAdmin = floGlobals.subAdmins.includes(myFloID)
|
||||
@ -1297,6 +1298,7 @@
|
||||
}).catch(error => console.error(error))
|
||||
} else {
|
||||
userUI.renderSavedIds()
|
||||
|
||||
userUI.renderCashierRequests(User.cashierRequests);
|
||||
userUI.renderMoneyRequests(User.moneyRequests);
|
||||
User.init().then(result => {
|
||||
|
||||
7
qrcode-scanner.min.js
vendored
7
qrcode-scanner.min.js
vendored
File diff suppressed because one or more lines are too long
1
qrcode.min.js
vendored
1
qrcode.min.js
vendored
File diff suppressed because one or more lines are too long
@ -713,7 +713,7 @@ function getSignedIn() {
|
||||
showPage('loading');
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function signOut() {
|
||||
getConfirmation('Sign out?', 'You are about to sign out of the app, continue?', 'Stay', 'Leave')
|
||||
.then(async (res) => {
|
||||
|
||||
@ -664,7 +664,6 @@ class LazyLoader {
|
||||
this.intersectionObserver.observe(this.lazyContainer.firstElementChild)
|
||||
else
|
||||
this.intersectionObserver.observe(this.lazyContainer.lastElementChild)
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user