Minor UI improvements
This commit is contained in:
parent
b17d3ca5bc
commit
9d6b52fc8b
@ -634,9 +634,11 @@
|
|||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
</sm-input>
|
</sm-input>
|
||||||
<sm-input id="tt_remark" placeholder="Add a message" animate></sm-input>
|
<sm-input id="token_transfer__remark" placeholder="Add a message" animate></sm-input>
|
||||||
<button id="tt_button" class="button button--primary cta" onclick="executeUserAction()"
|
<div class="multi-state-button">
|
||||||
type="submit">Send</button>
|
<button id="token_transfer__button" class="button button--primary cta" onclick="executeUserAction()"
|
||||||
|
type="submit">Send</button>
|
||||||
|
</div>
|
||||||
</sm-form>
|
</sm-form>
|
||||||
</section>
|
</section>
|
||||||
</sm-popup>
|
</sm-popup>
|
||||||
|
|||||||
@ -152,30 +152,6 @@ delegate(getRef('saved_upi_ids_list'), 'click', '.saved-upi', e => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
userUI.sendMoneyToUser = function (floID, amount, remark) {
|
|
||||||
getConfirmation('Confirm', { message: `Do you want to SEND ${amount} to ${floID}?` }).then(confirmation => {
|
|
||||||
if (confirmation) {
|
|
||||||
User.sendToken(floID, amount, "|" + remark).then(txid => {
|
|
||||||
console.warn(`Sent ${amount} to ${floID}`, txid);
|
|
||||||
notify(`Sent ${amount} to ${floID}. It may take a few mins to reflect in their wallet`, 'success');
|
|
||||||
hidePopup()
|
|
||||||
}).catch(error => console.error(error));
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
userUI.requestMoneyFromUser = function (floID, amount, remark) {
|
|
||||||
getConfirmation('Confirm', { message: `Do you want to REQUEST ${amount} from ${floID}?` }).then(confirmation => {
|
|
||||||
if (confirmation) {
|
|
||||||
User.requestToken(floID, amount, remark).then(result => {
|
|
||||||
console.log(`Requested ${amount} from ${floID}`, result);
|
|
||||||
notify(`Requested ${amount} from ${floID}`, 'success');
|
|
||||||
hidePopup()
|
|
||||||
}).catch(error => console.error(error));
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
userUI.renderCashierRequests = function (requests, error = null) {
|
userUI.renderCashierRequests = function (requests, error = null) {
|
||||||
if (error)
|
if (error)
|
||||||
return console.error(error);
|
return console.error(error);
|
||||||
@ -709,7 +685,7 @@ delegate(getRef('saved_ids_picker_list'), 'click', '.saved-id', e => {
|
|||||||
|
|
||||||
let currentUserAction;
|
let currentUserAction;
|
||||||
function showTokenTransfer(type) {
|
function showTokenTransfer(type) {
|
||||||
getRef('tt_button').textContent = type;
|
getRef('token_transfer__button').textContent = type;
|
||||||
currentUserAction = type;
|
currentUserAction = type;
|
||||||
if (type === 'send') {
|
if (type === 'send') {
|
||||||
getRef('token_transfer__title').textContent = 'Send money to FLO ID';
|
getRef('token_transfer__title').textContent = 'Send money to FLO ID';
|
||||||
@ -730,13 +706,44 @@ function showTokenTransfer(type) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
userUI.sendMoneyToUser = function (floID, amount, remark) {
|
||||||
|
getConfirmation('Confirm', { message: `Do you want to send ${amount} to ${getFloIdTitle(floID)}?`, confirmText: 'send' }).then(confirmation => {
|
||||||
|
if (confirmation) {
|
||||||
|
buttonLoader('token_transfer__button', true);
|
||||||
|
User.sendToken(floID, amount, "|" + remark).then(txid => {
|
||||||
|
console.warn(`Sent ${amount} to ${floID}`, txid);
|
||||||
|
notify(`Sent ${amount} to ${getFloIdTitle(floID)}. It may take a few mins to reflect in their wallet`, 'success');
|
||||||
|
hidePopup()
|
||||||
|
}).catch(error => notify(error, 'error'))
|
||||||
|
.finally(() => {
|
||||||
|
buttonLoader('token_transfer__button', false);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
userUI.requestMoneyFromUser = function (floID, amount, remark) {
|
||||||
|
getConfirmation('Confirm', { message: `Do you want to request ${amount} from ${getFloIdTitle(floID)}?`, confirmText: 'request' }).then(confirmation => {
|
||||||
|
if (confirmation) {
|
||||||
|
buttonLoader('token_transfer__button', true);
|
||||||
|
User.requestToken(floID, amount, remark).then(result => {
|
||||||
|
console.log(`Requested ${amount} from ${floID}`, result);
|
||||||
|
notify(`Requested ${amount} from ${getFloIdTitle(floID)}`, 'success');
|
||||||
|
hidePopup()
|
||||||
|
}).catch(error => notify(error, 'error'))
|
||||||
|
.finally(() => {
|
||||||
|
buttonLoader('token_transfer__button', false);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
function executeUserAction() {
|
function executeUserAction() {
|
||||||
const floID = getRef('token_transfer__receiver').value.trim(),
|
const floID = getRef('token_transfer__receiver').value.trim(),
|
||||||
amount = parseFloat(getRef('token_transfer__amount').value),
|
amount = parseFloat(getRef('token_transfer__amount').value),
|
||||||
remark = getRef('tt_remark').value.trim();
|
remark = getRef('token_transfer__remark').value.trim();
|
||||||
if (currentUserAction === 'send') {
|
if (currentUserAction === 'send') {
|
||||||
userUI.sendMoneyToUser(floID, amount, remark);
|
userUI.sendMoneyToUser(floID, amount, remark);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
userUI.requestMoneyFromUser(floID, amount, remark);
|
userUI.requestMoneyFromUser(floID, amount, remark);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user