Merge pull request #2641 from SelfKeyFoundation/release

Release 1.9.14
SelfKeyFoundation · Sep 24, 2021 · 8330313 · 8330313
2 parents 00d22f2 + 8704212
commit 8330313
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "selfkey-identity-wallet",
 	"productName": "SelfKey Identity Wallet",
-	"version": "1.9.13",
+	"version": "1.9.14",
 	"description": "The Official SelfKey Identity Wallet for Desktop",
 	"browser": [
 		"chrome"

diff --git a/src/common/transaction/operations.js b/src/common/transaction/operations.js
@@ -118,10 +118,13 @@ export const setTransactionFee = (newAddress, newAmount, newGasPrice, newGasLimi
 		let maxPriorityFee = 0;
 		if (featureIsEnabled('eip_1559')) {
 			if (!transaction.maxPriorityFee) {
-				maxPriorityFee =
-					state.ethGasStationInfo.ethGasStationInfo.fees.medium.suggestedMaxFeePerGas;
+				maxPriorityFee = Number(
+					parseFloat(
+						state.ethGasStationInfo.ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+					).toFixed(2)
+				);
 			} else {
-				maxPriorityFee = transaction.maxPriorityFee;
+				maxPriorityFee = parseFloat(transaction.maxPriorityFee);
 			}
 		}
 

diff --git a/src/renderer/did/create-did-popup-container.jsx b/src/renderer/did/create-did-popup-container.jsx
@@ -32,7 +32,7 @@ class CreateDIDPopupContainerComponent extends PureComponent {
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
 				: 1;
 		const ethFee = EthUnits.toEther((gasPrice + maxPriorityFee) * gasLimit, 'gwei');
 		const usdFee = ethFee * ethRate;

diff --git a/src/renderer/marketplace/bank-accounts/checkout/checkout-container.jsx b/src/renderer/marketplace/bank-accounts/checkout/checkout-container.jsx
@@ -40,7 +40,7 @@ class BankAccountsCheckoutContainer extends MarketplaceBankAccountsComponent {
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
 				: 1;
 		const price = jurisdiction.price;
 		const keyAmount = price / keyRate;

diff --git a/src/renderer/marketplace/incorporation/checkout/incorporations-checkout-container.jsx b/src/renderer/marketplace/incorporation/checkout/incorporations-checkout-container.jsx
@@ -39,7 +39,7 @@ class IncorporationsCheckoutContainer extends MarketplaceIncorporationsComponent
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
 				: 1;
 		const price = program.price;
 		const keyAmount = price / keyRate;

diff --git a/src/renderer/marketplace/keyfi/checkout/keyfi-checkout-container.jsx b/src/renderer/marketplace/keyfi/checkout/keyfi-checkout-container.jsx
@@ -42,7 +42,7 @@ class MarketplaceKeyFiCheckoutContainerComponent extends MarketplaceKeyFiCompone
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
 				: 1;
 		const price = product.price;
 		const ethPrice = price;

diff --git a/src/renderer/marketplace/keyfi/widget/keyfi-widget.jsx b/src/renderer/marketplace/keyfi/widget/keyfi-widget.jsx
@@ -48,7 +48,10 @@ const styles = theme => ({
 	},
 	actions: {
 		textAlign: 'center',
-		marginTop: '24px'
+		marginTop: '24px',
+		'& span': {
+			marginLeft: '10px'
+		}
 	},
 	ctabutton: {
 		backgroundColor: '#1E262E',

diff --git a/src/renderer/marketplace/notarization/process/request-notarization-container.jsx b/src/renderer/marketplace/notarization/process/request-notarization-container.jsx
@@ -99,7 +99,7 @@ class RequestNotarizationContainer extends MarketplaceNotariesComponent {
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
 				: 1;
 		const gasLimit = FIXED_GAS_LIMIT_PRICE;
 		const gasEthFee = EthUnits.toEther((gasPrice + maxPriorityFee) * gasLimit, 'gwei');

diff --git a/src/renderer/marketplace/passports/checkout/passports-checkout-container.jsx b/src/renderer/marketplace/passports/checkout/passports-checkout-container.jsx
@@ -39,7 +39,7 @@ class PassportsCheckoutContainerComponent extends MarketplacePassportsComponent
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
 				: 1;
 
 		const price = program.price;

diff --git a/src/renderer/transaction/send/components/transaction-fee-box.jsx b/src/renderer/transaction/send/components/transaction-fee-box.jsx
@@ -136,6 +136,17 @@ const styles = theme => ({
 	}
 });
 
+const SECOND_CUTOFF = 90;
+
+// Shows "seconds" as unit of time if under SECOND_CUTOFF, otherwise "minutes"
+const toHumanReadableTime = (milliseconds = 1) => {
+	const seconds = Math.ceil(milliseconds / 1000);
+	if (seconds <= SECOND_CUTOFF) {
+		return 'Likely in < ' + seconds + ' sec';
+	}
+	return 'Likely in < ' + Math.ceil(seconds / 60) + ' min';
+};
+
 export class TransactionFeeBoxComponent extends PureComponent {
 	state = {
 		showAdvanced: this.props.showAdvanced || false
@@ -156,19 +167,31 @@ export class TransactionFeeBoxComponent extends PureComponent {
 		if (!this.props.ethGasStationInfo || !this.props.ethGasStationInfo[type]) {
 			return;
 		}
-		if (this.props.eip1559) {
-			return this.props.ethGasStationInfo[type];
-		} else {
-			return this.props.ethGasStationInfo[type];
+		return this.props.ethGasStationInfo[type];
+	}
+
+	getMaxPriorityFee(type) {
+		if (
+			!this.props.ethGasStationInfo ||
+			!this.props.ethGasStationInfo[type] ||
+			!this.props.ethGasStationInfo.fees
+		) {
+			return;
 		}
+		const maxPriorityFee = parseFloat(
+			this.props.ethGasStationInfo.fees[this.typeTranslation(type)].suggestedMaxFeePerGas
+		).toFixed(2);
+		return maxPriorityFee;
 	}
 
 	getFeeInEth(type, digits = false) {
 		const gasPrice = this.getFee(type);
 		const gasLimit = this.props.gasLimit ? this.props.gasLimit : DEFAULT_ETH_GAS_LIMIT;
 
-		const maxFee = this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
-			.suggestedMaxFeePerGas;
+		const maxFee = parseFloat(
+			this.props.ethGasStationInfo.fees[this.typeTranslation(type)].suggestedMaxFeePerGas
+		);
+
 		const ethFee = EthUnits.toEther((gasPrice + maxFee) * gasLimit, 'gwei');
 		return digits ? Number.parseFloat(ethFee).toFixed(digits) : ethFee;
 	}
@@ -179,20 +202,14 @@ export class TransactionFeeBoxComponent extends PureComponent {
 		return ethFee * ethRate;
 	}
 
-	getTransactionTiming(data) {
+	getTransactionTiming(data, what) {
 		if (data && data.maxWaitTimeEstimate) {
-			return `Likely in < ${Math.ceil(data.maxWaitTimeEstimate / 1000 / 60)} min`;
+			return toHumanReadableTime(data.maxWaitTimeEstimate);
 		} else {
 			return '';
 		}
 	}
 
-	getMaxPriorityFee(data) {
-		if (data && data.maxPriorityFee) {
-			return data.maxPriorityFee;
-		}
-	}
-
 	toggleShowAdvanced() {
 		const { showAdvanced } = this.state;
 		this.setState({ ...this.state, showAdvanced: !showAdvanced });
@@ -221,6 +238,7 @@ export class TransactionFeeBoxComponent extends PureComponent {
 
 	setMaxPriorityFee = event => {
 		const value = event.target.value;
+
 		if (this.props.changeMaxPriorityFeeAction) {
 			this.props.changeMaxPriorityFeeAction(value);
 		}
@@ -234,8 +252,10 @@ export class TransactionFeeBoxComponent extends PureComponent {
 		}
 
 		const gasPrice = this.props.ethGasStationInfo[type];
-		const maxPriorityFee = this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
-			.suggestedMaxPriorityFeePerGas;
+		const maxPriorityFee = parseFloat(
+			this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
+				.suggestedMaxPriorityFeePerGas
+		);
 
 		if (changeMaxPriorityFeeAction) {
 			changeMaxPriorityFeeAction(maxPriorityFee);
@@ -267,7 +287,11 @@ export class TransactionFeeBoxComponent extends PureComponent {
 					<div className={classes.transactionFee}>
 						<div
 							className={`${
-								this.props.gasPrice === this.getFee('safeLow') ? 'selected' : ''
+								gasPrice === this.getFee('safeLow') &&
+								parseFloat(maxPriorityFee).toFixed(2) ===
+									this.getMaxPriorityFee('safeLow')
+									? 'selected'
+									: ''
 							}`}
 							onClick={() => this.selectPreDefinedGas('safeLow')}
 						>
@@ -301,13 +325,17 @@ export class TransactionFeeBoxComponent extends PureComponent {
 							</div>
 							<div className={classes.transactionExpectedTiming}>
 								<Typography variant="subtitle2" color="success">
-									{this.getTransactionTiming(ethGasStationInfo.fees.low)}
+									{this.getTransactionTiming(ethGasStationInfo.fees.high, 'low')}
 								</Typography>
 							</div>
 						</div>
 						<div
 							className={`${
-								this.props.gasPrice === this.getFee('average') ? 'selected' : ''
+								this.props.gasPrice === this.getFee('average') &&
+								parseFloat(maxPriorityFee).toFixed(2) ===
+									this.getMaxPriorityFee('average')
+									? 'selected'
+									: ''
 							}`}
 							onClick={() => this.selectPreDefinedGas('average')}
 						>
@@ -341,13 +369,20 @@ export class TransactionFeeBoxComponent extends PureComponent {
 							</div>
 							<div className={classes.transactionExpectedTiming}>
 								<Typography variant="subtitle2" color="success">
-									{this.getTransactionTiming(ethGasStationInfo.fees.medium)}
+									{this.getTransactionTiming(
+										ethGasStationInfo.fees.medium,
+										'medium'
+									)}
 								</Typography>
 							</div>
 						</div>
 						<div
 							className={`${
-								this.props.gasPrice === this.getFee('fast') ? 'selected' : ''
+								this.props.gasPrice === this.getFee('fast') &&
+								parseFloat(maxPriorityFee).toFixed(2) ===
+									this.getMaxPriorityFee('fast')
+									? 'selected'
+									: ''
 							}`}
 							onClick={() => this.selectPreDefinedGas('fast')}
 						>
@@ -381,7 +416,7 @@ export class TransactionFeeBoxComponent extends PureComponent {
 							</div>
 							<div className={classes.transactionExpectedTiming}>
 								<Typography variant="subtitle2" color="success">
-									{this.getTransactionTiming(ethGasStationInfo.fees.high)}
+									{this.getTransactionTiming(ethGasStationInfo.fees.low, 'high')}
 								</Typography>
 							</div>
 						</div>
@@ -418,7 +453,7 @@ export class TransactionFeeBoxComponent extends PureComponent {
 								<input
 									type="text"
 									className={classes.formControl}
-									value={Number.parseFloat(maxPriorityFee).toFixed(2)}
+									value={maxPriorityFee}
 									onChange={e => this.setMaxPriorityFee(e)}
 								/>
 							</div>