From 55780750f3351908a05481489126898009e4da33 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Mon, 3 Oct 2022 11:18:39 +0200 Subject: [PATCH] Update Tray and reward --- electron.js | 46 ++- img/icons/png/tray/tray.png | Bin 0 -> 847 bytes img/icons/png/tray/tray@1.5x.png | Bin 0 -> 1181 bytes img/icons/png/tray/tray@2x.png | Bin 0 -> 1500 bytes img/icons/png/tray/tray@3x.png | Bin 0 -> 2247 bytes img/icons/png/tray/tray@4x.png | Bin 0 -> 2891 bytes .../plugins/core/minting/minting-info.src.js | 263 ++++++++++-------- 7 files changed, 183 insertions(+), 126 deletions(-) create mode 100644 img/icons/png/tray/tray.png create mode 100644 img/icons/png/tray/tray@1.5x.png create mode 100644 img/icons/png/tray/tray@2x.png create mode 100644 img/icons/png/tray/tray@3x.png create mode 100644 img/icons/png/tray/tray@4x.png diff --git a/electron.js b/electron.js index c681af40..0f02b952 100644 --- a/electron.js +++ b/electron.js @@ -56,36 +56,60 @@ function createWindow() { minWidth: 700, minHeight: 640, icon: iconPath(), - title: "Qortal", + title: "Qortal UI", autoHideMenuBar: true, webPreferences: { nodeIntegration: false, partition: 'persist:webviewsession', enableRemoteModule: false, - nativeWindowOpen: false, + nativeWindowOpen: false, sandbox: true }, show: false }) - myWindow.maximize(); - myWindow.show(); + myWindow.maximize() + myWindow.show() myWindow.loadURL('http://localhost:12388/app/wallet') myWindow.on('closed', function () { myWindow = null }) + myWindow.on('minimize',function(event) { + event.preventDefault() + myWindow.hide() + }) } + + const createTray = () => { - let myTray = new Tray(path.join(__dirname, 'img', 'icons', 'png', '32x32.png')) - const contextMenu = Menu.buildFromTemplate([{ - label: "Quit", click() { - myTray.destroy(); - app.quit(); + let myTray = new Tray(__dirname + '/img/icons/png/tray/tray.png') + const contextMenu = Menu.buildFromTemplate([ + { + label: `Qortal UI v${app.getVersion()}`, + enabled: false, + }, + { + type: 'separator', }, - }]) + { + label: 'Show Qortal UI', + click: function () { + myWindow.maximize() + myWindow.show() + }, + }, + { + label: 'Quit', + click() { + myTray.destroy() + app.quit() + }, + }, + ]) myTray.setTitle("QORTAL UI") - myTray.setToolTip("QORTAL UI") + myTray.setToolTip(`Qortal UI v${app.getVersion()}`) myTray.setContextMenu(contextMenu) + myTray.on("double-click", () => myWindow.maximize() , myWindow.show()) } const isLock = app.requestSingleInstanceLock(); diff --git a/img/icons/png/tray/tray.png b/img/icons/png/tray/tray.png new file mode 100644 index 0000000000000000000000000000000000000000..8804297b9dff74c6c5c641cc6680cc90fe9ab196 GIT binary patch literal 847 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)TbHX z6XFU~@c;jRhJ~M*SAGF9fZ+R||LY$Aw%Gm6ZtwRkPyhV*3ljYM@BfAOf3JS{`|lr! zd++nVM_<7#5Dx{EUib;&v#t69G*e>3R|t3C%RlU^zA!BRl5_T__=c~HE51l>{91JW zXUo-JikrVOtoXvU`U~gkFRELfR0Nt?i(eI@Xep~MT#=7bY%gQec z@BQw(@vG|M&$mB84tVwBU*Wl*K#Q1Gewlga*Y;BRk9_A@^X2yEzbU7F2(J4oy8f&1y01U~{@?xLkI$j+ylcK_Z2k7> z_rE0%e%tQ-1`LOV_kX|n@o&we-wTf|0R|d_T1k)}C>9vl+?PH2_3P0xiHYytO%z|h zo^`^TrH_8CUk~C+urFKY&aSd!?Kz-A#w2fd7smfgy7zz_&H|6fVj%4S#%?FG?SPC& zo-U3d5|=~!uZJCS5NJ!Ex;3eDSx!zwKzLzKYN*iSW|j>KH>#iil|NLt^V9y>@8|sF zX6Tsn=C!E7`A?VGI4+v@}R zN{e3XRQN0McyaQgQ=X=)e+n^q8Lkpuow!Mgb-_PoR>irCJkNKW^X6=xaL_e4e%r0^ z>*h0AyYk+@6O@+=41eqG@a4-NA;o?Bj$RA-_2&D(z<+;!nVDVt`cG)ZCudo<7$1w^ zE1}0#F2~G0e)de+!I;E-$KSR0lMwFx^mZVxG z7o`Fz1|tI_16>1ST_cka14}C-11keFT?11q1A|YQE7egnoT7 M)78&qol`;+0OG^4vH$=8 literal 0 HcmV?d00001 diff --git a/img/icons/png/tray/tray@1.5x.png b/img/icons/png/tray/tray@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..c24eb414069a04d7cbe22c9441cb050983a6d062 GIT binary patch literal 1181 zcmZ`$3s96*6ut`r3kby{UT(HbJj0cr6+|{go&g~Xt~Ay-O)LwAIt_0s90L^7w7|$7 zwu>QUvkS}nO)`Lji-7_KNeGKTNDI^={EyxJcmKbOJ!WvmJNMr2o^!r)?sw1qIDsE! zW#M800I-UQju1d}+E`3uxZjiA`3b_7cS7Sr0ca?-)C*0Z&Bzu+g@M|;EEP1^qG&-J z0QnvO6cz)ZgRa6q0LVoESV{tb_cZ{H8IsO}dtu)7gae6@kU-P4Ya?bXL*e0{LFnna zd2-K>`2H@U{h?lG_%A@y28#Y!ZJ1btxM}>Ur5@=vd^0GuNIVhT#C*aSRsUPvz7CVm zkx+(-4E688|EE2~sU2-NkfJaI=U-YXvYP;swPQmXhdRtiiWiV|NpD$=npL4FNk{b%l4){TLw!D}gMHw3;IkO@J5D*(W8aPy5b*zk za|HZD5P@mXImHS|t|%D3D4}7V5&cFs#OTNCmD|UIA>m9+L};Sd@SA03hi@SE zXY5R-+F$arV5YVc%FKZCzt%h`mcrwSdFrOe^R*}V@%PDcw?OqiAZ3rG<=T99aMZ7X zS7RDh!MvrKx3k^mB2LJT6=Yox=DS{u^=oczv1E$ea&q#wdb2K_6dgMp=zut=UPMv+ znzM7!$R*|eo|WFKLhZgXVdY{-Q~z?f6ZT2Tr|}2)!eWzxp5%`Tn{3toVY`|_!vX@; z;c2cRa@IhzAG>6yZA`Cw5#xwQy`A|EpQO~+jQXrK1xazHdou7G!)P^OU`WwA#i^u=~ literal 0 HcmV?d00001 diff --git a/img/icons/png/tray/tray@2x.png b/img/icons/png/tray/tray@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f97882fd32c898bbf4927daff60576cc94205fc8 GIT binary patch literal 1500 zcmaJ<3s4hB7~UiVArS#3ZBRgs7LsihwBEq7wu`v?xV%20B%UAQhiT ztyXY~RWU)z%YcAXp^hay3MvwcfR9RrP~@R^ms~En>qTdr>a^Y2{lESG{r}x>cmE^d zVIelG*(?BnO{g>|lEQiBVa1?q(B-^eDX>TsuN4DOb&_q2Wm25BH!>s;ly^F5&5?1^ z$h81u@Bzro2EahMGDiT|2LUiD13+{RfR9s(8X{H#KwlTWCMuW;AW8D-GaQ_pidE|w zN|>R1MS0#eoslemjxTFK#kX_~!$yPY-HLf)B1qyr$A{$qS3ivYHxA?E(t7j-O1#kq zPb-DrM!lt!eM?h2F>sXt&ZR40ehre>YZ%rMV;FI^-{4b+S}5V=4JftGlz~8uWW{ql@Rp8J0u-?I zHF!<4u7234H<2x4rs%tRn=;s{6rNd*#I@=t4aBNOloG})g-f2|7Y1?PdNllwPH!Y% zVgz+B&ssFU&oHVdhEO7>$FM+!1mD)7M$)koNxzQ`yrv$Q?3pwrcVM&15y@@c{w|Cl zNa`14YQ4PMu&V>h>NaF{V>{dR!Uk0Jr;+-v*EpeghI`bawm-pJTJ-8MlaU~AYmJe2 zbnG%%P>0U0MD}%I4<<}W?Rtj_nSuh zhFg+CGl}Dqnnk|fKE`p!!z0Z^Q$Vl3M#H^D%MlLK3r_O~`ga(VlX&UQrJ7!UqRBT` ztIc&hGdOrg$goK48Bbhfam>ZdT+Os?pN0g{NV?Z!idd&eH}9oT`esO4cde$%dVXk- zIBI!&oGgbI9spCUDN`-2*#hQIXzWp0*Z+TOu}Y-e6PZUfEc(akI4| zGa^{1DtEc;FKW10PD9UQl@C_V^r9`;z8+p@-&hl`(k#X%yMyYyqkL`x& zxcGbbrsue+&qGTbSp2n}ayP4<2eNybEcbIWS<}|XveIfCVK|mm5*txm(IT_UTPIe~ z4)G2!^QIq8VRqZI5}G(%0k_#9sIy2ohqo$myit0N{&luop~l!BdD9JFPMy9|T$$|# z$v0J%InAWCM`xGC)QH$lq=*{izA>E6b)q_(L~u_lP^dp zsf_pX$qg1?u4m3#8E4fhz2sS`s!m7{w`KU%Dp+G<&YSwe1r_Hn71*zNtnRzpbDXp4 z;7xW$N_vL&udmWm({cSTS7-^#gr*Cst%X$8EKCdDlolVGwp|pLx}5?bfCP{iwA4%B v8wITp2_O;V=LHEx5cDcZx#+!wz6Mk literal 0 HcmV?d00001 diff --git a/img/icons/png/tray/tray@3x.png b/img/icons/png/tray/tray@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..16683dafe940fc8587c13ce3705df114afc295b6 GIT binary patch literal 2247 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 literal 0 HcmV?d00001 diff --git a/img/icons/png/tray/tray@4x.png b/img/icons/png/tray/tray@4x.png new file mode 100644 index 0000000000000000000000000000000000000000..5bcfd37e92d9f795e871d60b93273ff430b4b3bf GIT binary patch literal 2891 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 literal 0 HcmV?d00001 diff --git a/qortal-ui-plugins/plugins/core/minting/minting-info.src.js b/qortal-ui-plugins/plugins/core/minting/minting-info.src.js index c75517d9..c6ede253 100644 --- a/qortal-ui-plugins/plugins/core/minting/minting-info.src.js +++ b/qortal-ui-plugins/plugins/core/minting/minting-info.src.js @@ -30,10 +30,11 @@ class MintingInfo extends LitElement { static get styles() { return css` - * { - --mdc-theme-surface: var(--white); - --mdc-dialog-content-ink-color: var(--black); - } + * { + --mdc-theme-surface: var(--white); + --mdc-dialog-content-ink-color: var(--black); + } + @keyframes moveInBottom { 0% { opacity: 0; @@ -349,40 +350,40 @@ class MintingInfo extends LitElement { const getAdminInfo = () => { parentEpml.request("apiCall", { url: `/admin/info` }).then((res) => { - setTimeout(() => { this.adminInfo = res; }, 1); - }); - setTimeout(getAdminInfo, 30000); + setTimeout(() => { this.adminInfo = res; }, 1) + }) + setTimeout(getAdminInfo, 30000) }; const getNodeInfo = () => { parentEpml.request("apiCall", { url: `/admin/status` }).then((res) => { - this.nodeInfo = res; + this.nodeInfo = res // Now look up the sample block getSampleBlock() }); - setTimeout(getNodeInfo, 30000); + setTimeout(getNodeInfo, 30000) }; const getSampleBlock = () => { - let callBlock = parseFloat(this.nodeInfo.height) - 1440; + let callBlock = parseFloat(this.nodeInfo.height) - 1440 parentEpml.request("apiCall", { url: `/blocks/byheight/${callBlock}` }).then((res) => { - setTimeout(() => { this.sampleBlock = res; }, 1); - }); - }; + setTimeout(() => { this.sampleBlock = res }, 1) + }) + } const getAddressInfo = () => { parentEpml.request('apiCall', { url: `/addresses/${window.parent.reduxStore.getState().app.selectedAddress.address}` }).then((res) => { - setTimeout(() => { this.addressInfo = res; }, 1); + setTimeout(() => { this.addressInfo = res }, 1) }); - setTimeout(getAddressInfo, 30000); - }; + setTimeout(getAddressInfo, 30000) + } const getAddressLevel = () => { parentEpml.request('apiCall', { url: `/addresses/online/levels` }).then((res) => { - setTimeout(() => { this.addressLevel = res; }, 1); + setTimeout(() => { this.addressLevel = res }, 1) }); - setTimeout(getAddressLevel, 30000); - }; + setTimeout(getAddressLevel, 30000) + } window.addEventListener('storage', () => { const checkLanguage = localStorage.getItem('qortalLanguage') @@ -407,35 +408,34 @@ class MintingInfo extends LitElement { if (!selectedAddress || Object.entries(selectedAddress).length === 0) return this.selectedAddress = selectedAddress }) - }); + }) parentEpml.ready().then(() => { parentEpml.subscribe("config", async c => { if (!configLoaded) { - setTimeout(getAdminInfo, 1); - setTimeout(getNodeInfo, 1); - setTimeout(getAddressInfo, 1); - setTimeout(getAddressLevel, 1); - configLoaded = true; + setTimeout(getAdminInfo, 1) + setTimeout(getNodeInfo, 1) + setTimeout(getAddressInfo, 1) + setTimeout(getAddressLevel, 1) + configLoaded = true } - this.config = JSON.parse(c); + this.config = JSON.parse(c) }) parentEpml.subscribe('copy_menu_switch', async value => { - if (value === 'false' && window.getSelection().toString().length !== 0) this.clearSelection(); + if (value === 'false' && window.getSelection().toString().length !== 0) this.clearSelection() }) - }); - - parentEpml.imReady(); + }) + parentEpml.imReady() } changeTheme() { const checkTheme = localStorage.getItem('qortalTheme') if (checkTheme === 'dark') { - this.theme = 'dark'; + this.theme = 'dark' } else { - this.theme = 'light'; + this.theme = 'light' } - document.querySelector('html').setAttribute('theme', this.theme); + document.querySelector('html').setAttribute('theme', this.theme) } changeLanguage() { @@ -459,23 +459,23 @@ class MintingInfo extends LitElement { _averageBlockTime() { let avgBlockString = (this.adminInfo.currentTimestamp - this.sampleBlock.timestamp).toString(); - let averageTimeString = ((avgBlockString / 1000) / 1440).toFixed(2); - let averageBlockTimeString = (averageTimeString).toString(); - return "" + averageBlockTimeString; + let averageTimeString = ((avgBlockString / 1000) / 1440).toFixed(2) + let averageBlockTimeString = (averageTimeString).toString() + return "" + averageBlockTimeString } _timeCalc() { - let timeString = (this.adminInfo.currentTimestamp - this.sampleBlock.timestamp).toString(); - let averageString = ((timeString / 1000) / 1440).toFixed(2); - let averageBlockDay = (86400 / averageString).toFixed(2); - let averageBlockDayString = (averageBlockDay).toString(); - return "" + averageBlockDayString; + let timeString = (this.adminInfo.currentTimestamp - this.sampleBlock.timestamp).toString() + let averageString = ((timeString / 1000) / 1440).toFixed(2) + let averageBlockDay = (86400 / averageString).toFixed(2) + let averageBlockDayString = (averageBlockDay).toString() + return "" + averageBlockDayString } _dayReward() { - let rewardString = (this._timeCalc() * this._blockReward()).toFixed(2); - let rewardDayString = (rewardString).toString(); - return "" + rewardDayString; + let rewardString = (this._timeCalc() * this._blockReward()).toFixed(2) + let rewardDayString = (rewardString).toString() + return "" + rewardDayString } _mintingStatus() { @@ -498,21 +498,21 @@ class MintingInfo extends LitElement { renderMintingHelp() { if (this._mintingStatus() === "Not Minting") { - return html`${translate("mintingpage.mchange9")}
==>
${translate("mintingpage.mchange7")}
this.shadowRoot.querySelector("#becomeMinterDialog").show()}>help_outline ${translate("mintingpage.mchange31")}`; + return html`${translate("mintingpage.mchange9")}
==>
${translate("mintingpage.mchange7")}
this.shadowRoot.querySelector("#becomeMinterDialog").show()}>help_outline ${translate("mintingpage.mchange31")}` } else { return html`${translate("mintingpage.mchange6")}` } } _levelUpDays() { - let countDays = ((this._blocksNeed() - (this.addressInfo.blocksMinted + this.addressInfo.blocksMintedAdjustment)) / this._timeCalc()).toFixed(2); - let countString = (countDays).toString(); - return "" + countString; + let countDays = ((this._blocksNeed() - (this.addressInfo.blocksMinted + this.addressInfo.blocksMintedAdjustment)) / this._timeCalc()).toFixed(2) + let countString = (countDays).toString() + return "" + countString } _levelUpBlocks() { - let countBlocksString = (this._blocksNeed() - (this.addressInfo.blocksMinted + this.addressInfo.blocksMintedAdjustment)).toString(); - return "" + countBlocksString; + let countBlocksString = (this._blocksNeed() - (this.addressInfo.blocksMinted + this.addressInfo.blocksMintedAdjustment)).toString() + return "" + countBlocksString } _blocksNeed() { @@ -593,25 +593,25 @@ class MintingInfo extends LitElement { if (this.addressInfo.level === 0) { return "0" } else if (this.addressInfo.level === 1) { - return "5" + return "6" } else if (this.addressInfo.level === 2) { - return "5" + return "6" } else if (this.addressInfo.level === 3) { - return "10" + return "13" } else if (this.addressInfo.level === 4) { - return "10" + return "13" } else if (this.addressInfo.level === 5) { - return "15" + return "19" } else if (this.addressInfo.level === 6) { - return "15" + return "19" } else if (this.addressInfo.level === 7) { - return "20" + return "26" } else if (this.addressInfo.level === 8) { - return "20" + return "26" } else if (this.addressInfo.level === 9) { - return "25" + return "32" } else if (this.addressInfo.level === 10) { - return "25" + return "32" } } @@ -647,29 +647,38 @@ class MintingInfo extends LitElement { _countLevels() { if (this.addressInfo.level === 0) { - let countTier0 = (this.addressLevel[0].count).toString(); - return "" + countTier0; + let countTier0 = (this.addressLevel[0].count).toString() + return "" + countTier0 } else if (this.addressInfo.level === 1) { - let countTier10 = (this.addressLevel[1].count + this.addressLevel[2].count).toString(); - return "" + countTier10; + let countTier10 = (this.addressLevel[1].count + this.addressLevel[2].count).toString() + return "" + countTier10 } else if (this.addressInfo.level === 2) { - let countTier11 = (this.addressLevel[1].count + this.addressLevel[2].count).toString(); - return "" + countTier11; + let countTier11 = (this.addressLevel[1].count + this.addressLevel[2].count).toString() + return "" + countTier11 } else if (this.addressInfo.level === 3) { - let countTier20 = (this.addressLevel[3].count + this.addressLevel[4].count).toString(); - return "" + countTier20; + let countTier20 = (this.addressLevel[3].count + this.addressLevel[4].count).toString() + return "" + countTier20 } else if (this.addressInfo.level === 4) { - let countTier21 = (this.addressLevel[3].count + this.addressLevel[4].count).toString(); - return "" + countTier21; + let countTier21 = (this.addressLevel[3].count + this.addressLevel[4].count).toString() + return "" + countTier21 } else if (this.addressInfo.level === 5) { - let countTier30 = (this.addressLevel[5].count + this.addressLevel[6].count).toString(); - return "" + countTier30; + let countTier30 = (this.addressLevel[5].count + this.addressLevel[6].count).toString() + return "" + countTier30 } else if (this.addressInfo.level === 6) { - let countTier31 = (this.addressLevel[5].count + this.addressLevel[6].count).toString(); - return "" + countTier31; + let countTier31 = (this.addressLevel[5].count + this.addressLevel[6].count).toString() + return "" + countTier31 + } else if (this.addressInfo.level === 7) { + let countTier40 = (this.addressLevel[7].count + this.addressLevel[8].count).toString() + return "" + countTier40 + } else if (this.addressInfo.level === 8) { + let countTier41 = (this.addressLevel[7].count + this.addressLevel[8].count).toString() + return "" + countTier41 + } else if (this.addressInfo.level === 9) { + let countTier50 = (this.addressLevel[9].count + this.addressLevel[10].count).toString() + return "" + countTier50 } else if (this.addressInfo.level === 10) { - let countTier101 = (this.addressLevel[7].count).toString(); - return "" + countTier101; + let countTier51 = (this.addressLevel[9].count + this.addressLevel[10].count).toString() + return "" + countTier51 } } @@ -677,33 +686,45 @@ class MintingInfo extends LitElement { if (this.addressInfo.level === 0) { return "0" } else if (this.addressInfo.level === 1) { - let countReward10 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count)).toFixed(8); - let countReward11 = (countReward10).toString(); - return "" + countReward11; + let countReward10 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count)).toFixed(8) + let countReward11 = (countReward10).toString() + return "" + countReward11 } else if (this.addressInfo.level === 2) { - let countReward20 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count)).toFixed(8); - let countReward21 = (countReward20).toString(); - return "" + countReward21; + let countReward20 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count)).toFixed(8) + let countReward21 = (countReward20).toString() + return "" + countReward21 } else if (this.addressInfo.level === 3) { - let countReward30 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count)).toFixed(8); - let countReward31 = (countReward30).toString(); + let countReward30 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count)).toFixed(8) + let countReward31 = (countReward30).toString() return "" + countReward31; } else if (this.addressInfo.level === 4) { - let countReward40 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count)).toFixed(8); + let countReward40 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count)).toFixed(8) let countReward41 = (countReward40).toString(); return "" + countReward41; } else if (this.addressInfo.level === 5) { - let countReward50 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count)).toFixed(8); + let countReward50 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count)).toFixed(8) let countReward51 = (countReward50).toString(); return "" + countReward51; } else if (this.addressInfo.level === 6) { - let countReward60 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count)).toFixed(8); - let countReward61 = (countReward60).toString(); - return "" + countReward61; + let countReward60 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count)).toFixed(8) + let countReward61 = (countReward60).toString() + return "" + countReward61 + } else if (this.addressInfo.level === 7) { + let countReward70 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[7].count + this.addressLevel[8].count)).toFixed(8) + let countReward71 = (countReward70).toString() + return "" + countReward71 + } else if (this.addressInfo.level === 8) { + let countReward80 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[7].count + this.addressLevel[8].count)).toFixed(8) + let countReward81 = (countReward80).toString() + return "" + countReward81 + } else if (this.addressInfo.level === 9) { + let countReward90 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[9].count + this.addressLevel[10].count)).toFixed(8) + let countReward91 = (countReward90).toString() + return "" + countReward91 } else if (this.addressInfo.level === 10) { - let countReward100 = ((this._blockReward() / 100 * this._tierPercent()) / this.addressLevel[7].count).toFixed(8); - let countReward101 = (countReward100).toString(); - return "" + countReward101; + let countReward100 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[9].count + this.addressLevel[10].count)).toFixed(8) + let countReward101 = (countReward100).toString() + return "" + countReward101 } } @@ -711,33 +732,45 @@ class MintingInfo extends LitElement { if (this.addressInfo.level === 0) { return "0" } else if (this.addressInfo.level === 1) { - let countRewardDay10 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count) * this._timeCalc()).toFixed(8); - let countRewardDay11 = (countRewardDay10).toString(); - return "" + countRewardDay11; + let countRewardDay10 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count) * this._timeCalc()).toFixed(8) + let countRewardDay11 = (countRewardDay10).toString() + return "" + countRewardDay11 } else if (this.addressInfo.level === 2) { - let countRewardDay20 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count) * this._timeCalc()).toFixed(8); - let countRewardDay21 = (countRewardDay20).toString(); - return "" + countRewardDay21; + let countRewardDay20 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[1].count + this.addressLevel[2].count) * this._timeCalc()).toFixed(8) + let countRewardDay21 = (countRewardDay20).toString() + return "" + countRewardDay21 } else if (this.addressInfo.level === 3) { - let countRewardDay30 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count) * this._timeCalc()).toFixed(8); - let countRewardDay31 = (countRewardDay30).toString(); - return "" + countRewardDay31; + let countRewardDay30 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count) * this._timeCalc()).toFixed(8) + let countRewardDay31 = (countRewardDay30).toString() + return "" + countRewardDay31 } else if (this.addressInfo.level === 4) { - let countRewardDay40 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count) * this._timeCalc()).toFixed(8); - let countRewardDay41 = (countRewardDay40).toString(); - return "" + countRewardDay41; + let countRewardDay40 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[3].count + this.addressLevel[4].count) * this._timeCalc()).toFixed(8) + let countRewardDay41 = (countRewardDay40).toString() + return "" + countRewardDay41 } else if (this.addressInfo.level === 5) { - let countRewardDay50 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count) * this._timeCalc()).toFixed(8); - let countRewardDay51 = (countRewardDay50).toString(); - return "" + countRewardDay51; + let countRewardDay50 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count) * this._timeCalc()).toFixed(8) + let countRewardDay51 = (countRewardDay50).toString() + return "" + countRewardDay51 } else if (this.addressInfo.level === 6) { - let countRewardDay60 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count) * this._timeCalc()).toFixed(8); - let countRewardDay61 = (countRewardDay60).toString(); - return "" + countRewardDay61; + let countRewardDay60 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[5].count + this.addressLevel[6].count) * this._timeCalc()).toFixed(8) + let countRewardDay61 = (countRewardDay60).toString() + return "" + countRewardDay61 + } else if (this.addressInfo.level === 7) { + let countRewardDay70 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[7].count + this.addressLevel[8].count) * this._timeCalc()).toFixed(8) + let countRewardDay71 = (countRewardDay70).toString() + return "" + countRewardDay71 + } else if (this.addressInfo.level === 8) { + let countRewardDay80 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[7].count + this.addressLevel[8].count) * this._timeCalc()).toFixed(8) + let countRewardDay81 = (countRewardDay80).toString() + return "" + countRewardDay81 + } else if (this.addressInfo.level === 9) { + let countRewardDay90 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[9].count + this.addressLevel[10].count) * this._timeCalc()).toFixed(8) + let countRewardDay91 = (countRewardDay90).toString() + return "" + countRewardDay91 } else if (this.addressInfo.level === 10) { - let countRewardDay100 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[7].count) * this._timeCalc()).toFixed(8); - let countRewardDay101 = (countRewardDay100).toString(); - return "" + countRewardDay101; + let countRewardDay100 = ((this._blockReward() / 100 * this._tierPercent()) / (this.addressLevel[9].count + this.addressLevel[10].count) * this._timeCalc()).toFixed(8) + let countRewardDay101 = (countRewardDay100).toString() + return "" + countRewardDay101 } } @@ -747,8 +780,8 @@ class MintingInfo extends LitElement { } isEmptyArray(arr) { - if (!arr) return true; - return arr.length === 0; + if (!arr) return true + return arr.length === 0 } }