${mainHeader}
${issuersList.length ? html`
- ${isVerified ? html`${kycCompleteSection}` : html`${concurrentRequests < 100 ? fileUploadSection : tooManyRequestsSection}`}
+ ${isVerified ? html`${kycCompleteSection}` : html`${concurrentRequests < 4 ? fileUploadSection : tooManyRequestsSection}`}
${renderedRequests.length ? html`
- KYC requests
+
+
KYC requests
+
May take up to 48 hours to process requests
+
+
+
Loading ${senderID} ${docTypeNames[docType]}
+
+ `)
+ openPopup('view_file_popup').closed.then(() => {
+ URL.revokeObjectURL(objectURL);
+ renderElem(getRef('view_file_popup__content'), html``);
+ floGlobals.currentRequest = null;
+ })
const { file } = await floCloudAPI.downloadFile(docVC, {
decrypt: await floDapps.user.private,
});
const blob = new Blob([file], { type: file.type });
- const objectURL = URL.createObjectURL(blob);
+ objectURL = URL.createObjectURL(blob);
const details = html`
${senderID} (${docTypeNames[docType]})
@@ -993,16 +1028,9 @@
`)
}
- openPopup('view_file_popup').closed.then(() => {
- URL.revokeObjectURL(objectURL);
- renderElem(getRef('view_file_popup__content'), '');
- floGlobals.currentRequest = null;
- })
} catch (err) {
console.error(err)
notify('Error viewing file', 'error');
- } finally {
- buttonLoader(button, false)
}
}
async function downloadFile(e) {
@@ -1026,24 +1054,16 @@
buttonLoader(button, false)
}
}
+ floGlobals.approvalsToBeCommitted = new Map();
async function approveKyc(e) {
- const confirmation = await getConfirmation('Are you sure you want to verify this user?', {
- confirmText: 'Verify',
- });
- if (!confirmation) return;
const button = e.target.closest('button');
- buttonLoader(button, true)
- const { requestVC, docVC } = floGlobals.currentRequest;
- try {
- await floCloudAPI.tagApplicationData(requestVC, 'verified')
- await floCloudAPI.tagApplicationData(docVC, 'verified')
- notify('User verified successfully', 'success');
- } catch (err) {
- console.error(err)
- notify('Error verifying user', 'error');
- } finally {
- buttonLoader(button, false)
- }
+ const { requestVC, docVC, senderID } = floGlobals.currentRequest;
+ floGlobals.approvalsToBeCommitted.set(senderID, {
+ requestVC,
+ docVC,
+ })
+ closePopup()
+ floGlobals.currentRequest = null;
}
async function rejectKyc(e) {
const confirmation = await getConfirmation('Are you sure you want to reject this user?', {
@@ -1054,8 +1074,11 @@
buttonLoader(button, true)
const { requestVC, docVC } = floGlobals.currentRequest;
try {
- await floCloudAPI.noteApplicationData(requestVC, 'rejected')
+ // await floCloudAPI.noteApplicationData(requestVC, 'rejected')
+ floGlobals.generalData[floCloudAPI.util.filterKey('userKycRequests')][requestVC].note = 'rejected'
notify('User rejected successfully', 'success');
+ closePopup()
+ renderHome()
} catch (err) {
console.error(err)
notify('Error rejecting user', 'error');
@@ -1115,54 +1138,16 @@
getRef('aggregator_balance').classList.add('hidden')
}
}
- function processAddresses(addresses = []) {
- const uniqueAddresses = new Set()
- addresses.forEach(address => {
- let equivalentBtcAddress = address
- if (floCrypto.validateFloID(address))
- equivalentBtcAddress = getBtcAddress(address)
- uniqueAddresses.add(equivalentBtcAddress)
- })
- return [...uniqueAddresses]
- }
- function approveAddresses() {
- const manageType = getRef('manage_type').value
- const approverPrivateKey = getRef('approver_private_key').value.trim()
- if (!approverPrivateKey) {
- return notify(`Enter ${manageType} private key`, 'error')
+ async function approveAddresses() {
+ const approverPrivateKey = await floDapps.user.private
+ if (!floGlobals.isSubAdmin) {
+ return notify('You are not authorized to approve KYC', 'error')
}
- const approverAddress = floCrypto.getFloID(approverPrivateKey)
- if (manageType === 'aggregator') {
- if (!floGlobals.approvedKycAggregators.hasOwnProperty(approverAddress)) {
- return notify('KYC aggregator address is not approved', 'error')
- }
- } else {
- if (floGlobals.masterAddress !== approverAddress) {
- return notify(`Private key doesn't match admin`, 'error')
- }
- }
- const addressInputs = [...document.querySelectorAll('.kyc-address')]
- .filter(input => input.value.trim() !== '')
- .map(input => input.value.trim())
- let addressLabels = []
- if (manageType === 'admin') {
- addressLabels = [...document.querySelectorAll('.aggregator-label')]
- .filter(input => input.value.trim() !== '')
- .map(input => input.value.trim())
- }
- const addresses = processAddresses(addressInputs)
- if (addresses.length === 0) {
+ if (floGlobals.approvalsToBeCommitted.size === 0) {
return notify('Enter at least one address to approve', 'error')
}
- let floData
- if (manageType === 'aggregator')
- floData = `KYC|APPROVE_KYC|${addresses.join('+')}`
- else {
- const addressWithLabels = addresses.map((address, index) => {
- return `${address}:${addressLabels[index]}`
- })
- floData = `KYC|APPROVE_AGGREGATOR|${addressWithLabels.join('+')}`
- }
+ const addresses = [...floGlobals.approvalsToBeCommitted.keys()]
+ let floData = `KYC|APPROVE_KYC|${addresses.join('+')}`
console.log(floData)
if (floData.length > 1040) {
return notify('Too many addresses. Try removing one and resubmitting.', 'error')
@@ -1184,12 +1169,20 @@
}, 1000)
})
})
+ // try {
+ // await floCloudAPI.tagApplicationData(requestVC, 'verified')
+ // await floCloudAPI.tagApplicationData(docVC, 'verified')
+ // notify('User verified successfully', 'success');
+ // } catch (err) {
+ // console.error(err)
+ // notify('Error verifying user', 'error');
+ // }
}
async function revokeKycs() {
try {
const approverPrivateKey = await floDapps.user.private
if (!floGlobals.isSubAdmin) {
- return notify('You are not authorized to approve KYC', 'error')
+ return notify('You are not authorized to revoke KYC', 'error')
}
if (addressesToRevoke.size === 0) {
return notify('Select at least one address to revoke', 'error')
@@ -1272,8 +1265,8 @@
floDapps.launchStartUp().then(async result => {
console.log(result)
//App functions....
- floGlobals.myFloID = floCrypto.toFloID(myFloID);
- floGlobals.myBtcID = getBtcAddress(myFloID)
+ floGlobals.myFloID = getFloAddress(floDapps.user.id);
+ floGlobals.myBtcID = getBtcAddress(floGlobals.myFloID)
floGlobals.isSubAdmin = floGlobals.subAdmins.includes(floGlobals.myFloID)
try {
await floCloudAPI.requestObjectData('kycDocs')
@@ -1310,7 +1303,7 @@
} else[
// fetch user's kyc requests
await floCloudAPI.requestGeneralData('userKycRequests', {
- senderID: floGlobals.myFloID,
+ senderID: [floGlobals.myFloID, floGlobals.myBtcID],
})
]
if (['#/landing', '#/sign_in', '#/sign_up'].includes(window.location.hash)) {