From cafcb83a2426c6f47276d99c04d63eac7482a08c Mon Sep 17 00:00:00 2001 From: Phillip Lang Martinez <philliplangmartinez@gmail.com> Date: Tue, 30 Aug 2022 18:01:24 +0300 Subject: [PATCH] changed isSponsored logic --- .../core/become-minter/become-minter.src.js | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/qortal-ui-plugins/plugins/core/become-minter/become-minter.src.js b/qortal-ui-plugins/plugins/core/become-minter/become-minter.src.js index 0d110134..800aee8c 100644 --- a/qortal-ui-plugins/plugins/core/become-minter/become-minter.src.js +++ b/qortal-ui-plugins/plugins/core/become-minter/become-minter.src.js @@ -98,8 +98,7 @@ class BecomeMinter extends LitElement { async atMount() { this.changeLanguage(); - this.addressInfo = - window.parent.reduxStore.getState().app.accountInfo.addressInfo; + this.isPageLoading = true; try { const [nodeInfo, myRewardShareArray, mintingaccounts] = @@ -117,6 +116,8 @@ class BecomeMinter extends LitElement { myRewardShareArray[0]?.rewardSharePublicKey; this.isPageLoading = false; this.mintingAccountData = mintingaccounts; + this.addressInfo = + window.parent.reduxStore.getState().app.accountInfo.addressInfo; } catch (error) { console.error(error); @@ -147,15 +148,18 @@ class BecomeMinter extends LitElement { } render() { + const findMintingAccount = this.mintingAccountData?.find( - (ma) => ma.recipientAccount === window.parent.reduxStore.getState().app?.selectedAddress - ?.address + (ma) => ma.recipientAccount === window.parent.reduxStore.getState().app?.selectedAddress + ?.address ); - + + + const isAlreadySponsored = this.addressInfo?.error !== 124 && this.addressInfo?.level === 0 && - findMintingAccount; + this.addressInfo?.blocksMinted > 0 && this.addressInfo?.blocksMinted < 7200 return html` ${this.isPageLoading @@ -176,19 +180,20 @@ class BecomeMinter extends LitElement { </div> ${isAlreadySponsored - ? '' - : html` + ? '' + : html` <not-sponsored .atMount="${() => this.atMount()}" ></not-sponsored> `} ${!isAlreadySponsored - ? '' - : html` + ? '' + : html` <yes-sponsored .rewardSharePublicKey=${this - .rewardSharePublicKey} + .rewardSharePublicKey} .addressInfo=${this.addressInfo} + .isMinting=${!!findMintingAccount} ></yes-sponsored> `} </div>