This commit is contained in:
sairaj mote 2020-10-03 13:32:53 +05:30
parent afc1ac087a
commit 3210b3d50c
5 changed files with 10 additions and 7 deletions

View File

@ -44,7 +44,7 @@ smButton.innerHTML = `
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
width: 100%; width: 100%;
padding: 0.6rem 1rem; padding: 0.6rem 1.2rem;
cursor: pointer; cursor: pointer;
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;

View File

@ -107,7 +107,7 @@ button:focus {
} }
button:disabled { button:disabled {
cursor: default; cursor: default;
background: rgba(var(--text-color), 0.5); background: rgba(var(--text-color), 0.4);
} }
button:disabled ~ .loader { button:disabled ~ .loader {
opacity: 0; opacity: 0;

2
css/main.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -104,7 +104,7 @@ button {
&:disabled { &:disabled {
cursor: default; cursor: default;
background: rgba(var(--text-color), 0.5); background: rgba(var(--text-color), 0.4);
} }
&:disabled~.loader { &:disabled~.loader {

View File

@ -958,7 +958,7 @@
</div> </div>
<h4>Sign Out</h4> <h4>Sign Out</h4>
<p>Signing out will erase all the data stored in local storage and Indexed DB. This will remove <p>Signing out will erase all the data stored in local storage and Indexed DB. This will remove
saved private key, UPI addresses.</p> saved private key, UPI addresses and contacts.</p>
<sm-button variant="primary" onclick="signOut()">Sign out</sm-button> <sm-button variant="primary" onclick="signOut()">Sign out</sm-button>
</section> </section>
<section id="transaction_page" class="page"> <section id="transaction_page" class="page">
@ -1640,9 +1640,11 @@
if (typeof btn === 'string') if (typeof btn === 'string')
btn = document.getElementById(btn); btn = document.getElementById(btn);
if (option === 'start') { if (option === 'start') {
btn.style.pointerEvents = 'none'
btn.children[0].classList.add('clip') btn.children[0].classList.add('clip')
btn.children[1].classList.add('animate-loader') btn.children[1].classList.add('animate-loader')
} else { } else {
btn.style.pointerEvents = 'all'
btn.children[0].classList.remove('clip') btn.children[0].classList.remove('clip')
btn.children[1].classList.remove('animate-loader') btn.children[1].classList.remove('animate-loader')
} }
@ -12775,6 +12777,7 @@
.TYPE_DEPOSITS, { .TYPE_DEPOSITS, {
receiverID: cashier receiverID: cashier
}).then(result => { }).then(result => {
console.log(result)
hidePopup() hidePopup()
showTransactionStatus('success', 'Deposit request sent.', 'It may take upto 48 hours for deposited amount to be reflected in your account.') showTransactionStatus('success', 'Deposit request sent.', 'It may take upto 48 hours for deposited amount to be reflected in your account.')
btnLoading('request_tokens_btn', 'stop') btnLoading('request_tokens_btn', 'stop')
@ -13337,7 +13340,7 @@
receiver = flodata.match(/\b\w{34,34}\b/), receiver = flodata.match(/\b\w{34,34}\b/),
timeStamp = transaction.transactionDetails.time * 1000 timeStamp = transaction.transactionDetails.time * 1000
if (receiver === '' || typeof receiver === undefined || receiver === null || token_app.master_configurations.cashiers[receiver]) continue; if (receiver === '' || typeof receiver === 'undefined' || receiver === null || token_app.master_configurations.cashiers[receiver]) continue;
frag.append(render.activityCard({ type: 'sent', amount: tokenAmount, receiver, timeStamp})) frag.append(render.activityCard({ type: 'sent', amount: tokenAmount, receiver, timeStamp}))
} }
sentActivityContainer.innerHTML = '' sentActivityContainer.innerHTML = ''
@ -13357,7 +13360,7 @@
sender = transaction.transactionDetails.vin[0].addr, sender = transaction.transactionDetails.vin[0].addr,
timeStamp = transaction.transactionDetails.time * 1000 timeStamp = transaction.transactionDetails.time * 1000
if (sender === '' || typeof sender === undefined || sender === null || token_app.master_configurations.cashiers[sender]) continue; if (sender === '' || typeof sender === 'undefined' || sender === null || token_app.master_configurations.cashiers[sender]) continue;
frag.append(render.activityCard({ type: 'received', amount: tokenAmount, receiver: sender, timeStamp })) frag.append(render.activityCard({ type: 'received', amount: tokenAmount, receiver: sender, timeStamp }))
} }
receivedActivityContainer.innerHTML = '' receivedActivityContainer.innerHTML = ''