diff --git a/core/src/components/app-view.js b/core/src/components/app-view.js index b18f9b22..1bf6a5fa 100644 --- a/core/src/components/app-view.js +++ b/core/src/components/app-view.js @@ -588,7 +588,6 @@ class AppView extends connect(store)(LitElement) { -
@@ -762,7 +761,6 @@ class AppView extends connect(store)(LitElement) { await this.botArrrTradebook() window.addEventListener('storage', async () => { - console.log('testing') this.tradeBotBtcBook = JSON.parse(localStorage.getItem(this.botBtcWallet) || "[]") this.tradeBotLtcBook = JSON.parse(localStorage.getItem(this.botLtcWallet) || "[]") this.tradeBotDogeBook = JSON.parse(localStorage.getItem(this.botDogeWallet) || "[]") diff --git a/core/src/components/friends-view/save-settings-qdn.js b/core/src/components/friends-view/save-settings-qdn.js index 9923229f..4634ac38 100644 --- a/core/src/components/friends-view/save-settings-qdn.js +++ b/core/src/components/friends-view/save-settings-qdn.js @@ -50,6 +50,9 @@ class SaveSettingsQdn extends connect(store)(LitElement) { this.fee = null; } static styles = css` + :host { + margin-right: 20px; + } .header { display: flex; align-items: center; @@ -97,7 +100,7 @@ class SaveSettingsQdn extends connect(store)(LitElement) { display: flex; align-items: center; gap: 10px; - font-size: 18px + font-size: 18px; } .accept-button:hover { @@ -117,7 +120,7 @@ class SaveSettingsQdn extends connect(store)(LitElement) { display: flex; align-items: center; gap: 10px; - font-size: 18px + font-size: 18px; } .undo-button:hover { @@ -162,11 +165,11 @@ class SaveSettingsQdn extends connect(store)(LitElement) { const tempSettingsData = JSON.parse( localStorage.getItem('temp-settings-data') || '{}' ); - if (tempSettingsData) { - } + + console.log({ response }); const userLists = response.userLists || []; const friendsFeed = response.friendsFeed; - const myMenuPlugs = response.myMenuPlugs + const myMenuPlugs = response.myMenuPlugs; this.valuesToBeSavedOnQdn = {}; if ( @@ -176,6 +179,8 @@ class SaveSettingsQdn extends connect(store)(LitElement) { tempSettingsData.userLists.timestamp < rawDataTimestamp)) ) { const friendList = userLists[0]; + const copyPayload = [...friendList]; + localStorage.setItem( 'friends-my-friend-list', JSON.stringify(friendList) @@ -184,7 +189,7 @@ class SaveSettingsQdn extends connect(store)(LitElement) { new CustomEvent('friends-my-friend-list-event', { bubbles: true, composed: true, - detail: friendList, + detail: copyPayload, }) ); } else if ( @@ -205,6 +210,8 @@ class SaveSettingsQdn extends connect(store)(LitElement) { (tempSettingsData.friendsFeed && tempSettingsData.friendsFeed.timestamp < rawDataTimestamp)) ) { + const copyPayload = [...friendsFeed]; + localStorage.setItem( 'friends-my-selected-feeds', JSON.stringify(friendsFeed) @@ -213,7 +220,7 @@ class SaveSettingsQdn extends connect(store)(LitElement) { new CustomEvent('friends-my-selected-feeds-event', { bubbles: true, composed: true, - detail: friendsFeed, + detail: copyPayload, }) ); } else if ( @@ -228,24 +235,29 @@ class SaveSettingsQdn extends connect(store)(LitElement) { }; } - if ( myMenuPlugs && (!tempSettingsData.myMenuPlugs || (tempSettingsData.myMenuPlugs && tempSettingsData.myMenuPlugs.timestamp < rawDataTimestamp)) ) { - localStorage.setItem( - 'myMenuPlugs', - JSON.stringify(myMenuPlugs) - ); - this.dispatchEvent( - new CustomEvent('myMenuPlugs-event', { - bubbles: true, - composed: true, - detail: myMenuPlugs, - }) - ); + if (Array.isArray(myMenuPlugs)) { + console.log('isArray') + const copyPayload = [...myMenuPlugs]; + + localStorage.setItem( + 'myMenuPlugs', + JSON.stringify(myMenuPlugs) + ); + + this.dispatchEvent( + new CustomEvent('myMenuPlugs-event', { + bubbles: true, + composed: true, + detail: copyPayload, + }) + ); + } } else if ( tempSettingsData.myMenuPlugs && tempSettingsData.myMenuPlugs.timestamp > rawDataTimestamp @@ -315,7 +327,9 @@ class SaveSettingsQdn extends connect(store)(LitElement) { stateChanged(state) { if ( - state.app.accountInfo && state.app.accountInfo.names.length && state.app.nodeStatus && + state.app.accountInfo && + state.app.accountInfo.names.length && + state.app.nodeStatus && state.app.nodeStatus.syncPercent !== this.syncPercentage ) { this.syncPercentage = state.app.nodeStatus.syncPercent; @@ -365,6 +379,9 @@ class SaveSettingsQdn extends connect(store)(LitElement) { const friendsFeed = JSON.parse( localStorage.getItem('friends-my-selected-feeds') || '[]' ); + const myMenuPlugs = JSON.parse( + localStorage.getItem('myMenuPlugs') || '[]' + ); let newObject; @@ -373,6 +390,7 @@ class SaveSettingsQdn extends connect(store)(LitElement) { version: 1, userLists: [friendsList], friendsFeed, + myMenuPlugs, }; } else if (this.settingsRawData) { const tempSettingsData = JSON.parse( @@ -383,6 +401,21 @@ class SaveSettingsQdn extends connect(store)(LitElement) { }; for (const key in tempSettingsData) { if (tempSettingsData[key].hasOwnProperty('data')) { + if ( + key === 'userLists' && + !Array.isArray(tempSettingsData[key].data) + ) + continue; + if ( + key === 'friendsFeed' && + !Array.isArray(tempSettingsData[key].data) + ) + continue; + if ( + key === 'myMenuPlugs' && + !Array.isArray(tempSettingsData[key].data) + ) + continue; newObject[key] = tempSettingsData[key].data; } } @@ -506,50 +539,52 @@ class SaveSettingsQdn extends connect(store)(LitElement) { : get('save.saving2')} > - -
-

${`${get('walletpage.wchange12')}: ${ - this.fee ? this.fee.feeToShow : '' - }`}

-
-
-
- - ${translate('save.saving4')} + +
+

+ ${`${get('walletpage.wchange12')}: ${ + this.fee ? this.fee.feeToShow : '' + }`} +

- - ${translate('browserpage.bchange28')} -
+
+ ${translate('save.saving4')} +
+
+ ${translate('browserpage.bchange28')} +
`} diff --git a/core/src/components/show-plugin.js b/core/src/components/show-plugin.js index 079bbd14..266df4a2 100644 --- a/core/src/components/show-plugin.js +++ b/core/src/components/show-plugin.js @@ -344,7 +344,6 @@ class ShowPlugin extends connect(store)(LitElement) { return html`
${this.tabs.map((tab, index) => { - console.log({tab}) let title = '' let icon = '' let count = 0 @@ -545,7 +544,6 @@ class ShowPlugin extends connect(store)(LitElement) { }) window.addEventListener('storage', () => { - console.log('show plugin') const checkLanguage = localStorage.getItem('qortalLanguage') const checkTheme = localStorage.getItem('qortalTheme') @@ -1470,9 +1468,13 @@ class NavBar extends connect(store)(LitElement) { await this.getMyFollowedNamesList() } - _updateMyMenuPlugins(event) { + async _updateMyMenuPlugins(event) { + await new Promise((res)=> { + setTimeout(() => { + res() + }, 1000); + }) const detail = event.detail - console.log({detailPlugs: detail}) this.myMenuPlugins = detail const addressInfo = this.addressInfo const isMinter = addressInfo?.error !== 124 && +addressInfo?.level > 0 @@ -1502,7 +1504,6 @@ class NavBar extends connect(store)(LitElement) { connectedCallback() { super.connectedCallback() - console.log('callback') window.addEventListener('myMenuPlugs-event', this._updateMyMenuPlugins) } disconnectedCallback() { @@ -1520,8 +1521,9 @@ class NavBar extends connect(store)(LitElement) { localStorage.removeItem("myMenuPlugs") myFile = file const newTabMenu = JSON.parse((myFile) || "[]") + const copyPayload = [...newTabMenu] localStorage.setItem("myMenuPlugs", JSON.stringify(newTabMenu)) - this.saveSettingToTemp(newTabMenu) + this.saveSettingToTemp(copyPayload) this.shadowRoot.getElementById('importTabMenutDialog').close() this.myMenuPlugins = JSON.parse(localStorage.getItem("myMenuPlugs") || "[]") this.firstUpdated() @@ -2004,9 +2006,10 @@ class NavBar extends connect(store)(LitElement) { if (myNameRes !== false) { oldMenuPlugs.push(newMenuPlugsItem) + const copyPayload = [...oldMenuPlugs] localStorage.setItem("myMenuPlugs", JSON.stringify(oldMenuPlugs)) - this.saveSettingToTemp(oldMenuPlugs) + this.saveSettingToTemp(copyPayload) let myplugstring2 = get("walletpage.wchange52") parentEpml.request('showSnackBar', `${myplugstring2}`) @@ -2068,9 +2071,10 @@ class NavBar extends connect(store)(LitElement) { if (myNameRes !== false) { oldMenuPlugs.push(newMenuPlugsItem) + const copyPayload = [...oldMenuPlugs] localStorage.setItem("myMenuPlugs", JSON.stringify(oldMenuPlugs)) - this.saveSettingToTemp(oldMenuPlugs) + this.saveSettingToTemp(copyPayload) let myplugstring2 = get("walletpage.wchange52") parentEpml.request('showSnackBar', `${myplugstring2}`) @@ -2138,9 +2142,10 @@ class NavBar extends connect(store)(LitElement) { } oldMenuPlugs.push(newMenuPlugsItem) + const copyPayload = [...oldMenuPlugs] localStorage.setItem("myMenuPlugs", JSON.stringify(oldMenuPlugs)) - this.saveSettingToTemp(oldMenuPlugs) + this.saveSettingToTemp(copyPayload) let myplugstring2 = get("walletpage.wchange52") parentEpml.request('showSnackBar', `${myplugstring2}`) @@ -2202,7 +2207,6 @@ class NavBar extends connect(store)(LitElement) { } renderRemoveIcon(appurl, appicon, appname, appid, appplugin) { - console.log({appurl, appname, appid}) return html`