From 565bed7b162996928c704af78b34d593f456e2e7 Mon Sep 17 00:00:00 2001 From: Phillip Lang Martinez Date: Tue, 30 Aug 2022 18:01:11 +0300 Subject: [PATCH 1/2] added isMinting var --- .../core/become-minter/components/yes-sponsored.src.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qortal-ui-plugins/plugins/core/become-minter/components/yes-sponsored.src.js b/qortal-ui-plugins/plugins/core/become-minter/components/yes-sponsored.src.js index 7eaa3ba4..81b61f0e 100644 --- a/qortal-ui-plugins/plugins/core/become-minter/components/yes-sponsored.src.js +++ b/qortal-ui-plugins/plugins/core/become-minter/components/yes-sponsored.src.js @@ -19,6 +19,7 @@ class YesSponsored extends LitElement { return { addressInfo: { type: Object }, rewardSharePublicKey: { type: String }, + isMinting: {type: Boolean} }; } @@ -27,6 +28,7 @@ class YesSponsored extends LitElement { this.addressInfo = {}; this.rewardSharePublicKey = ''; + this.isMinting = false } static styles = [pageStyles]; @@ -63,7 +65,12 @@ class YesSponsored extends LitElement {
+ ${this.isMinting ? html`

${translate('becomeMinterPage.bchange12')}

+ ` : html` +

${translate('mintingpage.mchange9')}

+ `} +
Date: Tue, 30 Aug 2022 18:01:24 +0300 Subject: [PATCH 2/2] 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 {
${isAlreadySponsored - ? '' - : html` + ? '' + : html` `} ${!isAlreadySponsored - ? '' - : html` + ? '' + : html` `}