Fix button and roundings

2025-03-28 08:15:54 +00:00 · 2022-08-29 20:08:50 +02:00 · 2022-08-29 20:08:50 +02:00 · cb252c3fa7
commit cb252c3fa7
parent 39b461d480
5 changed files with 240 additions and 308 deletions
--- a/package.json
+++ b/package.json
@ -36,7 +36,7 @@
    "electron-log": "4.4.8"
  },
  "devDependencies": {
-    "electron": "19.0.14",
+    "electron": "20.1.0",
    "electron-builder": "23.3.3",
    "electron-notarize": "1.2.1",
    "electron-packager": "16.0.0",
--- a/qortal-ui-core/src/components/sidenav-menu.js
+++ b/qortal-ui-core/src/components/sidenav-menu.js
@ -9,6 +9,7 @@ import '@vaadin/icons';

 import '../functional-components/side-menu.js';
 import '../functional-components/side-menu-item.js';
+import './start-minting.js'

 class SidenavMenu extends connect(store)(LitElement) {
 	static get properties() {
@ -44,13 +45,6 @@ class SidenavMenu extends connect(store)(LitElement) {
 					border-top: 1px solid var(--border);
 					outline: none;
 				}
-
-				.start-minting-wrapper {
-					position: absolute;
-					bottom: 130px;
-					left: 50%;
-					transform: translateX(calc(-50% - 10px));
-				}
 			`,
 		];
 	}
@ -59,9 +53,7 @@ class SidenavMenu extends connect(store)(LitElement) {
 		super();
 		this.urls = [];
 		this.nodeType = '';
-		this.theme = localStorage.getItem('qortalTheme')
-			? localStorage.getItem('qortalTheme')
-			: 'light';
+		this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light';
 		this.addressInfo = {};
 	}

@ -225,15 +217,15 @@ class SidenavMenu extends connect(store)(LitElement) {
 					</side-menu-item>
 					${this.renderNodeManagement()}
 				</side-menu-item>
+				<div style="margin-top: 20px;">
+					<start-minting></start-minting>
+				</div>
 			`;
 		}
 	}

 	renderNodeManagement() {
-		const checkNodeManagement =
-			store.getState().app.nodeConfig.knownNodes[
-				store.getState().app.nodeConfig.node
-			];
+		const checkNodeManagement = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node];
 		if ((checkNodeManagement.enableManagement = true)) {
 			return html`
 				<side-menu-item
--- a/qortal-ui-core/src/components/start-minting.js
+++ b/qortal-ui-core/src/components/start-minting.js
@ -7,22 +7,19 @@ import { asyncReplace } from 'lit/directives/async-replace.js';
 import '../functional-components/my-button.js';
 import { routes } from '../plugins/routes.js';
 import "@material/mwc-button"
-
 import '@material/mwc-dialog'


 async function* countDown(count, callback) {
-
-
 	while (count > 0) {
 		yield count--;
 		await new Promise((r) => setTimeout(r, 1000));
 		if (count === 0) {
-
 			callback()
 		}
 	}
 }
+
 class StartMinting extends connect(store)(LitElement) {
 	static get properties() {
 		return {
@ -195,27 +192,23 @@ class StartMinting extends connect(store)(LitElement) {

 	renderErrorMsg1() {
 		return html`${translate("startminting.smchange1")}`
-}
+	}

-renderErrorMsg2() {
+	renderErrorMsg2() {
 		return html`${translate("startminting.smchange2")}`
-}
+	}

-renderErrorMsg3() {
+	renderErrorMsg3() {
 		return html`${translate("startminting.smchange3")}`
-}
+	}

-renderErrorMsg4() {
+	renderErrorMsg4() {
 		return html`${translate("startminting.smchange4")}`
-}
+	}

-async getMintingAcccounts() {
-	const myNode =
-		store.getState().app.nodeConfig.knownNodes[
-		store.getState().app.nodeConfig.node
-		];
-	const nodeUrl =
-		myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
+	async getMintingAcccounts() {
+		const myNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node];
+		const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
 		const url = `${nodeUrl}/admin/mintingaccounts`;
 		try {
 			const res = await fetch(url);
@ -225,28 +218,19 @@ async getMintingAcccounts() {
 		} catch (error) {
 			this.errorMsg = this.renderErrorMsg1();
 		}
-}
+	}

-async changeStatus(value){
-	const myNode =
-		store.getState().app.nodeConfig.knownNodes[
-		store.getState().app.nodeConfig.node
-		];
-
-	const nodeUrl =
-		myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
+	async changeStatus(value){
+		const myNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node];
+		const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
 		this.status = value
-	const publicAddress =
-		window.parent.reduxStore.getState().app?.selectedAddress
-			?.base58PublicKey;
+		const publicAddress = window.parent.reduxStore.getState().app?.selectedAddress ?.base58PublicKey;
+
 		// Check to see if a sponsorship key on a newly-level 1 minter exists. If it does, remove it.
-	const findMintingAccountFromOtherUser = this.mintingAccountData.find(
-		(ma) => !ma.publicKey.includes(publicAddress)
-	);
+		const findMintingAccountFromOtherUser = this.mintingAccountData.find((ma) => !ma.publicKey.includes(publicAddress));
+
 		const removeMintingAccount = async (publicKey) => {
-
 			const url = `${nodeUrl}/admin/mintingaccounts?apiKey=${myNode.apiKey}`;
-
 			return await fetch(url, {
 				method: 'DELETE',
 				body: publicKey,
@ -255,7 +239,6 @@ async changeStatus(value){

 		const addMintingAccount = async (sponsorshipKeyValue) => {
 			const url = `${nodeUrl}/admin/mintingaccounts?apiKey=${myNode.apiKey}`;
-
 			return await fetch(url, {
 				method: 'POST',
 				body: sponsorshipKeyValue,
@ -287,8 +270,7 @@ async changeStatus(value){
 			this.errorMsg = this.renderErrorMsg3();
 			return;
 		}
-
-}
+	}

 async confirmRelationship(){
 	const myNode =
@ -337,38 +319,17 @@ async confirmRelationship(){
 	interval = setInterval(getAnswer, 5000);
 }

-renderStartMintingButton() {
-	const myNode =
-		store.getState().app.nodeConfig.knownNodes[
-		store.getState().app.nodeConfig.node
-		];
-
-	const nodeUrl =
-		myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
-
+	renderStartMintingButton() {
+		const myNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node];
+		const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
 		const mintingAccountData = this.mintingAccountData;
-
 		const addressInfo = window.parent.reduxStore.getState().app.accountInfo.addressInfo
+		const address = window.parent.reduxStore.getState().app?.selectedAddress?.address;
+		const nonce = window.parent.reduxStore.getState().app?.selectedAddress?.nonce;
+		const publicAddress = window.parent.reduxStore.getState().app?.selectedAddress ?.base58PublicKey;
+		const findMintingAccount = mintingAccountData.find((ma) => ma.mintingAccount === address);
+		const isMinterButKeyMintingKeyNotAssigned = addressInfo?.error !== 124 && addressInfo?.level >= 1 && !findMintingAccount;

-	const address =
-		window.parent.reduxStore.getState().app?.selectedAddress?.address;
-
-	const nonce =
-		window.parent.reduxStore.getState().app?.selectedAddress?.nonce;
-
-	const publicAddress =
-		window.parent.reduxStore.getState().app?.selectedAddress
-			?.base58PublicKey;
-			
-	
-	const findMintingAccount = mintingAccountData.find((ma) =>
-		ma.mintingAccount === address
-	);
-
-	const isMinterButKeyMintingKeyNotAssigned =
-		addressInfo?.error !== 124 &&
-		addressInfo?.level >= 1 &&
-		!findMintingAccount;
 		const makeTransactionRequest = async (lastRef) => {
 			let mylastRef = lastRef;
 			let rewarddialog1 = get('transactions.rewarddialog1');
@ -423,24 +384,18 @@ renderStartMintingButton() {
 			return myTransaction?.extraData?.rewardSharePrivateKey
 		};

-
 		const getLastRef = async () => {
 			const url = `${nodeUrl}/addresses/lastreference/${address}`;
-
 			const res = await fetch(url);
-
 			const data = await res.text();
-
 			return data;
 		};

 		const startMinting = async () => {
 			this.openDialogRewardShare = true
-
 			this.errorMsg = '';

 			try {
-
 				this.privateRewardShareKey = await createSponsorshipKey();
 				this.confirmRelationship(publicAddress)
 			} catch (error) {
@ -448,18 +403,12 @@ renderStartMintingButton() {
 				this.errorMsg = error?.data?.message || this.renderErrorMsg4();
 				return;
 			}
-
-
 		};

 		return html`
-			${isMinterButKeyMintingKeyNotAssigned
-			? html`
+			${isMinterButKeyMintingKeyNotAssigned ? html`
 				<div class="start-minting-wrapper">
-							<my-button
-								label="${translate(
-				'becomeMinterPage.bchange18'
-			)}"
+					<my-button label="${translate('becomeMinterPage.bchange18')}"
 						?isLoading=${false}
 						.onClick=${async () => {
 							await startMinting();
@ -469,21 +418,20 @@ renderStartMintingButton() {
 								});
 							}
 						}}
-							></my-button>
+					>
+					</my-button>
 				</div>

-
 				<!-- Dialog for tracking the progress of starting minting -->
 			
-
 				${this.openDialogRewardShare ? html`
 					<div class="dialogCustom">
 						<div class="dialogCustomInner">
                    				<div class="dialog-header" >
 								<div class="row">
-						<h1>In progress  </h1> <div class=${`smallLoading marginLoader ${this.status > 3 && 'hide'}`}></div>
+								<h1>In progress</h1>
+								<div class=${`smallLoading marginLoader ${this.status > 3 && 'hide'}`}></div>
 							</div>
-                       
 							<hr />
 						</div>
 						<div class="dialog-container">
@ -538,31 +486,26 @@ renderStartMintingButton() {
 								@click=${() => {
 									this.openDialogRewardShare = false
 									this.errorMsg = ''
-
 								}}
                        				class="red"
                    				>
                    				${translate("general.close")}
                    				</mwc-button>
 						` : '' }
-					
 					</div>
 				</div>
 					
-				
 			 <!-- </mwc-dialog> -->
 			</div>
 					
 			` : ""}			
-					
-				  `
-			: ''}
+			` : ''}
 		`;
-}
+	}

-stateChanged(state) {
+	stateChanged(state) {
 		this.addressInfo = state.app.accountInfo.addressInfo;
-}
+	}
 }

 window.customElements.define('start-minting', StartMinting);
--- a/qortal-ui-core/src/components/wallet-profile.js
+++ b/qortal-ui-core/src/components/wallet-profile.js
@ -6,8 +6,6 @@ import { translate, translateUnsafeHTML } from 'lit-translate'
 import '@polymer/paper-toast'
 import '@material/mwc-icon-button'

-import './start-minting.js'
-
 class WalletProfile extends connect(store)(LitElement) {
    static get properties() {
        return {
@ -90,7 +88,6 @@ class WalletProfile extends connect(store)(LitElement) {
                    <p id="blocksMinted">${translate("walletprofile.blocksminted")} - ${this.accountInfo.addressInfo.blocksMinted + this.accountInfo.addressInfo.blocksMintedAdjustment}</p>
                    <p id="address">${this.wallet.addresses[0].address}</p>
                </div>
-                <start-minting></start-minting>
            </div>
            <paper-toast id="toast" horizontal-align="right" vertical-align="top" vertical-offset="64"></paper-toast>
        `
--- a/qortal-ui-crypto/api/transactions/PaymentTransaction.js
+++ b/qortal-ui-crypto/api/transactions/PaymentTransaction.js
@ -36,7 +36,7 @@ export default class PaymentTransaction extends TransactionBase {
    }

    set amount(amount) {
-        this._amount = amount * store.getState().config.coin.decimals
+        this._amount = Math.round(amount * store.getState().config.coin.decimals)
        this._amountBytes = this.constructor.utils.int64ToBytes(this._amount)
    }