RanchiMall/flowallet-testnet
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
sairaj mote 2022-06-03 02:27:13 +05:30
parent 51dd2b7de2
commit 02f4485480
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components.js
View File

@ -1244,7 +1244,7 @@ customElements.define('sm-popup', class extends HTMLElement {
this.popupContainer = this.shadowRoot.querySelector('.popup-container'); this.popupContainer = this.shadowRoot.querySelector('.popup-container');
this.backdrop = this.shadowRoot.querySelector('.background'); this.backdrop = this.shadowRoot.querySelector('.background');
this.popup = this.shadowRoot.querySelector('.popup'); this.dialogBox = this.shadowRoot.querySelector('.popup');
this.popupBodySlot = this.shadowRoot.querySelector('.popup-body slot'); this.popupBodySlot = this.shadowRoot.querySelector('.popup-body slot');
this.popupHeader = this.shadowRoot.querySelector('.popup-top'); this.popupHeader = this.shadowRoot.querySelector('.popup-top');
@ -1289,7 +1289,7 @@ customElements.define('sm-popup', class extends HTMLElement {
easing: 'ease' easing: 'ease'
} }
const initialAnimation = (window.innerWidth > 640) ? 'scale(1.1)' : `translateY(${this.offset ? `${this.offset}px` : '100%'})` const initialAnimation = (window.innerWidth > 640) ? 'scale(1.1)' : `translateY(${this.offset ? `${this.offset}px` : '100%'})`
this.animateTo(this.popup, [ this.animateTo(this.dialogBox, [
{ {
opacity: this.offset ? 1 : 0, opacity: this.offset ? 1 : 0,
transform: initialAnimation transform: initialAnimation
@ -1354,7 +1354,7 @@ customElements.define('sm-popup', class extends HTMLElement {
{ opacity: 1 }, { opacity: 1 },
{ opacity: 0 } { opacity: 0 }
], animOptions) ], animOptions)
this.animateTo(this.popup, [ this.animateTo(this.dialogBox, [
{ {
opacity: 1, opacity: 1,
transform: (window.innerWidth > 640) ? 'none' : `translateY(${this.offset ? `${this.offset}px` : '0'})` transform: (window.innerWidth > 640) ? 'none' : `translateY(${this.offset ? `${this.offset}px` : '0'})`
@ -1366,7 +1366,7 @@ customElements.define('sm-popup', class extends HTMLElement {
], animOptions).finished ], animOptions).finished
.finally(() => { .finally(() => {
this.popupContainer.classList.add('hide'); this.popupContainer.classList.add('hide');
this.popup.style = '' this.dialogBox.style = ''
this.removeAttribute('open'); this.removeAttribute('open');
if (this.forms.length) { if (this.forms.length) {
@ -1406,7 +1406,7 @@ customElements.define('sm-popup', class extends HTMLElement {
if (this.touchStartY < e.changedTouches[0].clientY) { if (this.touchStartY < e.changedTouches[0].clientY) {
this.offset = e.changedTouches[0].clientY - this.touchStartY; this.offset = e.changedTouches[0].clientY - this.touchStartY;
this.touchEndAnimation = window.requestAnimationFrame(() => { this.touchEndAnimation = window.requestAnimationFrame(() => {
this.popup.style.transform = `translateY(${this.offset}px)`; this.dialogBox.style.transform = `translateY(${this.offset}px)`;
}); });
} }
} }
@ -1415,7 +1415,7 @@ customElements.define('sm-popup', class extends HTMLElement {
this.touchEndTime = e.timeStamp; this.touchEndTime = e.timeStamp;
cancelAnimationFrame(this.touchEndAnimation); cancelAnimationFrame(this.touchEndAnimation);
this.touchEndY = e.changedTouches[0].clientY; this.touchEndY = e.changedTouches[0].clientY;
this.threshold = this.popup.getBoundingClientRect().height * 0.3; this.threshold = this.dialogBox.getBoundingClientRect().height * 0.3;
if (this.touchEndTime - this.touchStartTime > 200) { if (this.touchEndTime - this.touchStartTime > 200) {
if (this.touchEndY - this.touchStartY > this.threshold) { if (this.touchEndY - this.touchStartY > this.threshold) {
if (this.pinned) { if (this.pinned) {

44
index.html
View File

@ -93,7 +93,7 @@
Generate FLO ID Generate FLO ID
</button> </button>
<button id="retrieve_addr_btn" class="button primary-action interact" <button id="retrieve_addr_btn" class="button primary-action interact"
onclick="showPopup('retrieve_flo_id_popup')"> onclick="openPopup('retrieve_flo_id_popup')">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24"
width="24px" fill="#000000"> width="24px" fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -172,7 +172,7 @@
</div> </div>
</section> </section>
</div> </div>
<button id="add_address_button" class="button interact fab" onclick="showPopup('add_address_popup')"> <button id="add_address_button" class="button interact fab" onclick="openPopup('add_address_popup')">
<svg class="icon margin-right-0-5" xmlns="http://www.w3.org/2000/svg" height="24px" <svg class="icon margin-right-0-5" xmlns="http://www.w3.org/2000/svg" height="24px"
viewBox="0 0 24 24" width="24px" fill="#000000"> viewBox="0 0 24 24" width="24px" fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -328,7 +328,7 @@
<button class="button button--primary hide" id="fix_invalid_button" <button class="button button--primary hide" id="fix_invalid_button"
onclick="removeInvalid()">Fix</button> onclick="removeInvalid()">Fix</button>
<button class="button button--primary cta" id="sendBtn" type="submit" <button class="button button--primary cta" id="sendBtn" type="submit"
onclick="showPopup('get_private_key_popup')" disabled>Send</button> onclick="openPopup('get_private_key_popup')" disabled>Send</button>
</div> </div>
</sm-form> </sm-form>
</div> </div>
@ -416,7 +416,7 @@
<sm-popup id="add_address_popup"> <sm-popup id="add_address_popup">
<header slot="header" class="popup__header"> <header slot="header" class="popup__header">
<div class="flex align-center"> <div class="flex align-center">
<button class="popup__header__close" onclick="hidePopup()"> <button class="popup__header__close" onclick="closePopup()">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"
fill="#000000"> fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -438,7 +438,7 @@
<sm-popup id="edit_saved_popup"> <sm-popup id="edit_saved_popup">
<header slot="header" class="popup__header"> <header slot="header" class="popup__header">
<div class="flex align-center"> <div class="flex align-center">
<button class="popup__header__close" onclick="hidePopup()"> <button class="popup__header__close" onclick="closePopup()">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"
fill="#000000"> fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -472,7 +472,7 @@
<sm-popup id="create_flo_id_popup"> <sm-popup id="create_flo_id_popup">
<header slot="header" class="popup__header"> <header slot="header" class="popup__header">
<div class="flex align-center"> <div class="flex align-center">
<button class="popup__header__close" onclick="hidePopup()"> <button class="popup__header__close" onclick="closePopup()">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"
fill="#000000"> fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -499,7 +499,7 @@
<sm-popup id="retrieve_flo_id_popup"> <sm-popup id="retrieve_flo_id_popup">
<header slot="header" class="popup__header"> <header slot="header" class="popup__header">
<div class="flex align-center"> <div class="flex align-center">
<button class="popup__header__close" onclick="hidePopup()"> <button class="popup__header__close" onclick="closePopup()">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"
fill="#000000"> fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -546,7 +546,7 @@
<sm-popup id="saved_ids_popup"> <sm-popup id="saved_ids_popup">
<header slot="header" class="popup__header"> <header slot="header" class="popup__header">
<div class="grid gap-1"> <div class="grid gap-1">
<button class="popup__header__close justify-self-start" onclick="hidePopup()"> <button class="popup__header__close justify-self-start" onclick="closePopup()">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"
fill="#000000"> fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -567,7 +567,7 @@
</sm-popup> </sm-popup>
<sm-popup id="get_private_key_popup"> <sm-popup id="get_private_key_popup">
<header slot="header" class="popup__header"> <header slot="header" class="popup__header">
<button class="popup__header__close justify-self-start" onclick="hidePopup()"> <button class="popup__header__close justify-self-start" onclick="closePopup()">
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px"
fill="#000000"> fill="#000000">
<path d="M0 0h24v24H0V0z" fill="none" /> <path d="M0 0h24v24H0V0z" fill="none" />
@ -753,7 +753,7 @@
let zIndex = 10 let zIndex = 10
// function required for popups or modals to appear // function required for popups or modals to appear
function showPopup(popupId, pinned) { function openPopup(popupId, pinned) {
zIndex++ zIndex++
getRef(popupId).setAttribute('style', `z-index: ${zIndex}`) getRef(popupId).setAttribute('style', `z-index: ${zIndex}`)
getRef(popupId).show({ pinned }) getRef(popupId).show({ pinned })
@ -761,7 +761,7 @@
} }
// hides the popup or modal // hides the popup or modal
function hidePopup() { function closePopup() {
if (popupStack.peek() === undefined) if (popupStack.peek() === undefined)
return; return;
popupStack.peek().popup.hide() popupStack.peek().popup.hide()
@ -806,7 +806,7 @@
const getConfirmation = (title, options = {}) => { const getConfirmation = (title, options = {}) => {
return new Promise(resolve => { return new Promise(resolve => {
const { message, cancelText = 'Cancel', confirmText = 'OK' } = options const { message, cancelText = 'Cancel', confirmText = 'OK' } = options
showPopup('confirmation_popup', true) openPopup('confirmation_popup', true)
getRef('confirm_title').textContent = title; getRef('confirm_title').textContent = title;
getRef('confirm_message').textContent = message; getRef('confirm_message').textContent = message;
let cancelButton = getRef('confirmation_popup').children[2].children[0], let cancelButton = getRef('confirmation_popup').children[2].children[0],
@ -814,11 +814,11 @@
submitButton.textContent = confirmText submitButton.textContent = confirmText
cancelButton.textContent = cancelText cancelButton.textContent = cancelText
submitButton.onclick = () => { submitButton.onclick = () => {
hidePopup() closePopup()
resolve(true); resolve(true);
} }
cancelButton.onclick = () => { cancelButton.onclick = () => {
hidePopup() closePopup()
resolve(false); resolve(false);
} }
}) })
@ -894,7 +894,7 @@
document.querySelectorAll('sm-input[data-private-key]').forEach(input => input.customValidation = floCrypto.getPubKeyHex) document.querySelectorAll('sm-input[data-private-key]').forEach(input => input.customValidation = floCrypto.getPubKeyHex)
document.addEventListener('keyup', (e) => { document.addEventListener('keyup', (e) => {
if (e.key === 'Escape') { if (e.key === 'Escape') {
hidePopup() closePopup()
} }
}) })
document.addEventListener('copy', () => { document.addEventListener('copy', () => {
@ -1334,7 +1334,7 @@
const target = e.target.closest('.saved-id'); const target = e.target.closest('.saved-id');
getRef('edit_saved_id').setAttribute('value', target.dataset.floId) getRef('edit_saved_id').setAttribute('value', target.dataset.floId)
getRef('newAddrLabel').value = target.dataset.name getRef('newAddrLabel').value = target.dataset.name
showPopup('edit_saved_popup') openPopup('edit_saved_popup')
} else if (e.target.closest('.copy-saved-id')) { } else if (e.target.closest('.copy-saved-id')) {
const target = e.target.closest('.saved-id'); const target = e.target.closest('.saved-id');
navigator.clipboard.writeText(target.dataset.floId) navigator.clipboard.writeText(target.dataset.floId)
@ -1353,7 +1353,7 @@
const target = e.target.closest('.saved-id'); const target = e.target.closest('.saved-id');
getRef(`${openSavedIdPopupFor === 'sender' ? 'getBal_addr' : 'receiver'}`).value = target.dataset.floId getRef(`${openSavedIdPopupFor === 'sender' ? 'getBal_addr' : 'receiver'}`).value = target.dataset.floId
getRef(`${openSavedIdPopupFor === 'sender' ? 'getBal_addr' : 'receiver'}`).focusIn() getRef(`${openSavedIdPopupFor === 'sender' ? 'getBal_addr' : 'receiver'}`).focusIn()
hidePopup() closePopup()
}) })
getRef('filter_selector').addEventListener('change', async e => { getRef('filter_selector').addEventListener('change', async e => {
@ -1414,13 +1414,13 @@
}); });
getRef('created_flo_id').innerHTML = ''; getRef('created_flo_id').innerHTML = '';
getRef('created_flo_id').append(card); getRef('created_flo_id').append(card);
showPopup('create_flo_id_popup'); openPopup('create_flo_id_popup');
}); });
let openSavedIdPopupFor = null; let openSavedIdPopupFor = null;
function showFloIdPicker(type) { function showFloIdPicker(type) {
openSavedIdPopupFor = type; openSavedIdPopupFor = type;
showPopup('saved_ids_popup'); openPopup('saved_ids_popup');
} }
// Create array of objects from object of objects // Create array of objects from object of objects
@ -1483,7 +1483,7 @@
name = 'Unknown' name = 'Unknown'
compactIDB.addData('labels', name, floID).then((resolve) => { compactIDB.addData('labels', name, floID).then((resolve) => {
insertElementAlphabetically(name, render.savedIdCard(floID, name)) insertElementAlphabetically(name, render.savedIdCard(floID, name))
hidePopup() closePopup()
}).catch((error) => { }).catch((error) => {
notify('FLO ID already saved', 'error'); notify('FLO ID already saved', 'error');
}) })
@ -1535,7 +1535,7 @@
potentialTarget.remove(); potentialTarget.remove();
insertElementAlphabetically(name, clone) insertElementAlphabetically(name, clone)
} }
hidePopup() closePopup()
}).catch((error) => { }).catch((error) => {
console.error(error); console.error(error);
}) })
@ -1550,7 +1550,7 @@
if (toDelete) if (toDelete)
toDelete.remove(); toDelete.remove();
compactIDB.removeData('labels', getRef('edit_saved_id').value); compactIDB.removeData('labels', getRef('edit_saved_id').value);
hidePopup() closePopup()
} }
}) })
} }