From 08d3ead66859b133936c9fff25100095df6d1c84 Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Mon, 14 Aug 2023 15:29:51 -0400 Subject: [PATCH 1/4] handle case where fees are null for a chain (#1644) --- resources/Components/Monitor/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/Components/Monitor/index.js b/resources/Components/Monitor/index.js index 683aae7b2..497671e2a 100644 --- a/resources/Components/Monitor/index.js +++ b/resources/Components/Monitor/index.js @@ -161,7 +161,8 @@ class ChainSummaryComponent extends Component { // Optimism specific calculations const price = calculatedFees?.actualFee || gasPrice - const ethBaseFee = this.store('main.networksMeta.ethereum', 1, 'gas.price.fees.nextBaseFee') + const feeMarket = this.store('main.networksMeta.ethereum', 1, 'gas.price.fees') || {} + const { nextBaseFee: ethBaseFee } = feeMarket const optimismEstimate = (serializedTx, l2Limit) => { const l1Estimate = BigNumber(calculateOptimismL1DataFee(serializedTx, ethBaseFee)).shiftedBy(-9) From afd225c74518a9dc4ad863d0887447b8807e2aad Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Mon, 14 Aug 2023 16:20:05 -0400 Subject: [PATCH 2/4] add log import --- main/store/migrate/migrations/legacy/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/main/store/migrate/migrations/legacy/index.ts b/main/store/migrate/migrations/legacy/index.ts index 0b5f68fc8..1a0fbda41 100644 --- a/main/store/migrate/migrations/legacy/index.ts +++ b/main/store/migrate/migrations/legacy/index.ts @@ -4,6 +4,7 @@ import { v5 as uuidv5 } from 'uuid' import { z } from 'zod' +import log from 'electron-log' import { accountNS, isDefaultAccountName } from '../../../../../resources/domain/account' import { isWindows } from '../../../../../resources/platform' From 134b9b3951ef27371a68f3959965192a498ee408 Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Mon, 14 Aug 2023 15:29:41 -0400 Subject: [PATCH 3/4] fix account view errors when request does not exist (#1643) --- app/tray/Account/Account.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tray/Account/Account.js b/app/tray/Account/Account.js index a470433c2..fa7ccbec3 100644 --- a/app/tray/Account/Account.js +++ b/app/tray/Account/Account.js @@ -259,7 +259,7 @@ class _AccountBody extends React.Component { if (crumb.view === 'requestView') { const { accountId, requestId } = crumb.data const req = this.store('main.accounts', accountId, 'requests', requestId) - const accountViewTitle = this.getAccountViewTitle(req) + const accountViewTitle = (req && this.getAccountViewTitle(req)) || '' return ( - {this.renderRequest(req, crumb.data)} + {req && this.renderRequest(req, crumb.data)} ) } else if (crumb.view === 'expandedModule') { From 6218815b67530841cf010687e1a7e0bafbe3d9d7 Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Tue, 29 Aug 2023 12:20:01 -0400 Subject: [PATCH 4/4] bump version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 10936f0d1..3b4d14220 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "frame", - "version": "0.6.7", + "version": "0.6.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "frame", - "version": "0.6.7", + "version": "0.6.8", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 976432756..a9e3a877d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frame", - "version": "0.6.7", + "version": "0.6.8", "description": "System-wide web3", "main": "compiled/main", "scripts": {