RanchiMall/flopay
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.9

Browse Source 
fix (dev): broadcastTx issue
This commit is contained in:
sairaj mote 2020-11-15 23:18:57 +05:30
parent a91ef68c83
commit 0e1c28f7fe
4 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/main.css
View File

@ -1525,6 +1525,17 @@ sm-panel {
animation-delay: 0.7s; animation-delay: 0.7s;
} }
.cashier-message {
display: flex;
flex-direction: column;
background: rgba(var(--text-color), 0.06);
border-radius: 0.6rem;
padding: 1rem 1.2rem;
}
.cashier-message .time {
margin-bottom: 0.5rem;
}
.back-arrow { .back-arrow {
stroke-width: 10; stroke-width: 10;
margin-right: 0.5rem; margin-right: 0.5rem;
@ -2052,7 +2063,7 @@ sm-panel {
padding-right: 0; padding-right: 0;
} }
.activity { .activity, .cashier-message {
width: 60ch; width: 60ch;
} }

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

12
css/main.scss
View File

@ -1564,6 +1564,16 @@ sm-panel{
} }
} }
} }
.cashier-message{
display: flex;
flex-direction: column;
background: rgba(var(--text-color), 0.06);
border-radius: 0.6rem;
padding: 1rem 1.2rem;
.time{
margin-bottom: 0.5rem;
}
}
.back-arrow{ .back-arrow{
stroke-width: 10; stroke-width: 10;
margin-right: 0.5rem; margin-right: 0.5rem;
@ -2089,7 +2099,7 @@ sm-panel{
padding-right: 0; padding-right: 0;
} }
} }
.activity{ .activity, .cashier-message{
width: 60ch; width: 60ch;
} }
.request{ .request{

22
index.html
View File

@ -1539,10 +1539,14 @@
</div>` </div>`
return card; return card;
}, },
cashierMessage(message) { cashierMessage(obj) {
let card = document.createElement('div') let card = document.createElement('div'),
{message, sender, vectorClock} = obj
card.classList.add('cashier-message') card.classList.add('cashier-message')
card.innerHTML = `<p>${message}</p>`; card.innerHTML = `
<h5 class="time">${formatedTime(vectorClock)}</h5>
<p>${message}</p>
`;
return card; return card;
}, },
depositComplaint(userData, cashierData, udc) { depositComplaint(userData, cashierData, udc) {
@ -2703,6 +2707,7 @@
if(isHapticOn) if(isHapticOn)
window.navigator.vibrate(200) window.navigator.vibrate(200)
transactionSuccessSection.classList.remove('hide-completely') transactionSuccessSection.classList.remove('hide-completely')
refreshBalance()
} }
else { else {
if(isHapticOn) if(isHapticOn)
@ -10873,7 +10878,7 @@
console.log('Going to sleep state for 2 seconds') console.log('Going to sleep state for 2 seconds')
await new Promise(r => setTimeout(r, 2000)); await new Promise(r => setTimeout(r, 2000));
if (temp_counter % 3 === 0) { if (temp_counter % 3 === 0) {
if (url_index != len(flosight_url) - 1) { if (url_index != flosight_url.length - 1) {
url_index = url_index + 1 url_index = url_index + 1
} }
else { else {
@ -13353,7 +13358,7 @@
return; return;
} }
notify("Please transfer INR " + amount_to_transfer + " to " + input_data["withdrawer_upi"], '', notify("Please transfer ₹ " + amount_to_transfer + " to " + input_data["withdrawer_upi"], '',
true, true); true, true);
let transfer_upi_txid = await askPrompt("Enter the UPI txid for transferred amount.", ''); let transfer_upi_txid = await askPrompt("Enter the UPI txid for transferred amount.", '');
@ -13374,7 +13379,7 @@
receiverID: myFloID receiverID: myFloID
}); });
floCloudAPI.sendGeneralData(`Your withdrawal request of INR ${amount_to_transfer} is approved. floCloudAPI.sendGeneralData(`Your withdrawal request of ₹ ${amount_to_transfer} is approved.
Please check reference number ${transfer_upi_txid} in your UPI ${withdraw_upi}`, Please check reference number ${transfer_upi_txid} in your UPI ${withdraw_upi}`,
token_app.master_configurations.TYPE_MSGES, { token_app.master_configurations.TYPE_MSGES, {
receiverID: input_data['withdrawer_flo_id'] receiverID: input_data['withdrawer_flo_id']
@ -13457,7 +13462,6 @@
hidePopup() hidePopup()
showTransactionStatus('success', 'Rupee Sent', 'It may take upto 48 working hours for transaction to be completed.', flo_txid); showTransactionStatus('success', 'Rupee Sent', 'It may take upto 48 working hours for transaction to be completed.', flo_txid);
sentActivityContainer.prepend(render.activityCard({ type: 'sent', processed: false, amount: token_amount, timeStamp: `${Date.now()}_${myFloID}`, tokenTxId: flo_txid, receiver: token_receiver })) sentActivityContainer.prepend(render.activityCard({ type: 'sent', processed: false, amount: token_amount, timeStamp: `${Date.now()}_${myFloID}`, tokenTxId: flo_txid, receiver: token_receiver }))
refreshBalance()
return true; return true;
} }
} }
@ -13566,7 +13570,7 @@
}); });
notify(`Transaction successful: ${flo_txid}. notify(`Transaction successful: ${flo_txid}.
INR ${amount_to_pay} sent to ${vendor_flo_id}`, 'success', '', true); ₹ ${amount_to_pay} sent to ${vendor_flo_id}`, 'success', '', true);
return true; return true;
} }
} }
@ -13888,7 +13892,6 @@
} = usr_deposits.message; } = usr_deposits.message;
let deposit_request_processed = false; let deposit_request_processed = false;
if (processed_deposits_upis.includes(upi_txid)) deposit_request_processed = true; if (processed_deposits_upis.includes(upi_txid)) deposit_request_processed = true;
console.info(upi_txid, deposit_request_processed)
frag.append(render.activityCard({ frag.append(render.activityCard({
type: 'deposit', amount: deposit_amount, timeStamp: usr_deposits.vectorClock, type: 'deposit', amount: deposit_amount, timeStamp: usr_deposits.vectorClock,
upi_txid, receiver: cashier_upi, deposit_request_processed, processed: deposit_request_processed upi_txid, receiver: cashier_upi, deposit_request_processed, processed: deposit_request_processed
@ -13954,7 +13957,6 @@
payCashierActivityContainer.append(frag) payCashierActivityContainer.append(frag)
for (msg of user_msg) { for (msg of user_msg) {
console.log(msg)
frag.append(render.cashierMessage(msg)) frag.append(render.cashierMessage(msg))
} }