diff --git a/index.html b/index.html index 1abccca..3d284bc 100644 --- a/index.html +++ b/index.html @@ -2743,9 +2743,10 @@ // store user data in separate IDB async function organizeSyncedData(obsName) { const fetchedData = await floCloudAPI.requestApplicationData(obsName, { mostRecent: true, senderIDs: [floGlobals.myFloID], receiverID: floGlobals.myFloID }); - if (fetchedData.length && await compactIDB.readData(obsName, 'lastSyncTime') !== fetchedData[0].time) { + let vc = Object.keys(fetchedData).sort().pop(); + if (vc && await compactIDB.readData(obsName, 'lastSyncTime') !== fetchedData[vc].time) { await compactIDB.clearData(obsName); - const dataToDecrypt = floCloudAPI.util.decodeMessage(fetchedData[0].message); + const dataToDecrypt = fetchedData[vc].message; floDapps.user.private.then(privateKey => { if (!privateKey) return; const decryptedData = JSON.parse(Crypto.AES.decrypt(dataToDecrypt, privateKey)); @@ -2753,7 +2754,7 @@ floGlobals[obsName][key] = decryptedData[key]; compactIDB.addData(obsName, decryptedData[key], key); } - compactIDB.addData(obsName, fetchedData[0].time, 'lastSyncTime'); + compactIDB.addData(obsName, fetchedData[vc].time, 'lastSyncTime'); return true; }).catch(error => { console.log(error); diff --git a/scripts/fn_pay.js b/scripts/fn_pay.js index 6f64230..ffadc6a 100644 --- a/scripts/fn_pay.js +++ b/scripts/fn_pay.js @@ -63,9 +63,10 @@ User.getCashierUPI = function () { mostRecent: true }))).then(result => { for (let r of result) - if (r.status === "fulfilled" && r.value.length) { - cashierUPI[r.value[0].senderID] = floCloudAPI.util.decodeMessage(r.value[0].message).upi; - cashierPubKeys[r.value[0].senderID] = r.value[0].pubKey; //get pubKey of cashier from messages for encryption + if (r.status === "fulfilled" && Object.keys(r.value).length) { + let vc = Object.keys(r.value).sort().pop() + cashierUPI[r.value[vc].senderID] = r.value[vc].message.upi; + cashierPubKeys[r.value[vc].senderID] = r.value[vc].pubKey; //get pubKey of cashier from messages for encryption } resolve(cashierUPI); })