Merge pull request #2632 from SelfKeyFoundation/release

Release 1.9.12
SelfKeyFoundation · Sep 13, 2021 · 1f0f602 · 1f0f602
2 parents 85af64f + 2f5113a
commit 1f0f602
Show file tree

Hide file tree

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

diff --git a/src/main/marketplace/inventory/inventory-service.js b/src/main/marketplace/inventory/inventory-service.js
@@ -127,8 +127,11 @@ export class SelfkeyInventoryFetcher extends InventoryFetcher {
 		}
 	}
 	async fetchData(category) {
+		if (category === 'other' || !category) {
+			return;
+		}
 		if (!dataEndpoints[category]) {
-			throw new Error('unknown_data_category');
+			throw new Error(`unknown_data_category ${category}`);
 		}
 		try {
 			let fetched = await request.get({ url: dataEndpoints[category], json: true });

diff --git a/src/renderer/did/create-did-popup-container.jsx b/src/renderer/did/create-did-popup-container.jsx
@@ -29,7 +29,10 @@ class CreateDIDPopupContainerComponent extends PureComponent {
 
 	getPaymentParameters = _ => {
 		const { ethRate, ethGasStationInfo, cryptoCurrency, gasLimit } = this.props;
-		const gasPrice = ethGasStationInfo.medium.suggestedMaxFeePerGas;
+		const gasPrice =
+			ethGasStationInfo && ethGasStationInfo.medium
+				? ethGasStationInfo.medium.suggestedMaxFeePerGas
+				: 0;
 		const ethFee = EthUnits.toEther(gasPrice * 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
@@ -37,7 +37,10 @@ class BankAccountsCheckoutContainer extends MarketplaceBankAccountsComponent {
 
 	getPaymentParameters() {
 		const { keyRate, ethRate, ethGasStationInfo, cryptoCurrency, jurisdiction } = this.props;
-		const gasPrice = ethGasStationInfo.medium.suggestedMaxFeePerGas;
+		const gasPrice =
+			ethGasStationInfo && ethGasStationInfo.medium
+				? ethGasStationInfo.medium.suggestedMaxFeePerGas
+				: 0;
 		const price = jurisdiction.price;
 		const keyAmount = price / keyRate;
 		const gasLimit = FIXED_GAS_LIMIT_PRICE;

diff --git a/src/renderer/marketplace/incorporation/checkout/incorporations-checkout-container.jsx b/src/renderer/marketplace/incorporation/checkout/incorporations-checkout-container.jsx
@@ -36,7 +36,10 @@ class IncorporationsCheckoutContainer extends MarketplaceIncorporationsComponent
 
 	getPaymentParameters() {
 		const { keyRate, ethRate, ethGasStationInfo, cryptoCurrency, program } = this.props;
-		const gasPrice = ethGasStationInfo.medium.suggestedMaxFeePerGas;
+		const gasPrice =
+			ethGasStationInfo && ethGasStationInfo.medium
+				? ethGasStationInfo.medium.suggestedMaxFeePerGas
+				: 0;
 		const price = program.price;
 		const keyAmount = price / keyRate;
 		const gasLimit = FIXED_GAS_LIMIT_PRICE;

diff --git a/src/renderer/marketplace/keyfi/checkout/keyfi-checkout-container.jsx b/src/renderer/marketplace/keyfi/checkout/keyfi-checkout-container.jsx
@@ -39,7 +39,10 @@ class MarketplaceKeyFiCheckoutContainerComponent extends MarketplaceKeyFiCompone
 
 	getPaymentParameters() {
 		const { keyRate, ethRate, ethGasStationInfo, cryptoCurrency, product } = this.props;
-		const gasPrice = ethGasStationInfo.medium.suggestedMaxFeePerGas;
+		const gasPrice =
+			ethGasStationInfo && ethGasStationInfo.medium
+				? ethGasStationInfo.medium.suggestedMaxFeePerGas
+				: 0;
 		const price = product.price;
 		const ethPrice = price;
 		const keyPrice = price * 0.8;

diff --git a/src/renderer/marketplace/notarization/process/request-notarization-container.jsx b/src/renderer/marketplace/notarization/process/request-notarization-container.jsx
@@ -96,7 +96,10 @@ class RequestNotarizationContainer extends MarketplaceNotariesComponent {
 
 	getPaymentParameters() {
 		const { ethRate, ethGasStationInfo } = this.props;
-		const gasPrice = ethGasStationInfo.medium.suggestedMaxFeePerGas;
+		const gasPrice =
+			ethGasStationInfo && ethGasStationInfo.medium
+				? ethGasStationInfo.medium.suggestedMaxFeePerGas
+				: 0;
 		const gasLimit = FIXED_GAS_LIMIT_PRICE;
 		const gasEthFee = EthUnits.toEther(gasPrice * gasLimit, 'gwei');
 		const gasUsdFee = gasEthFee * ethRate;

diff --git a/src/renderer/marketplace/passports/checkout/passports-checkout-container.jsx b/src/renderer/marketplace/passports/checkout/passports-checkout-container.jsx
@@ -36,7 +36,10 @@ class PassportsCheckoutContainerComponent extends MarketplacePassportsComponent
 
 	getPaymentParameters() {
 		const { keyRate, ethRate, ethGasStationInfo, cryptoCurrency, program } = this.props;
-		const gasPrice = ethGasStationInfo.medium.suggestedMaxFeePerGas;
+		const gasPrice =
+			ethGasStationInfo && ethGasStationInfo.medium
+				? ethGasStationInfo.medium.suggestedMaxFeePerGas
+				: 0;
 		const price = program.price;
 		const keyAmount = price / keyRate;
 		const gasLimit = FIXED_GAS_LIMIT_PRICE;