Skip to content

Commit

Permalink
bug fixes for v0.6.8 release (#1652)
Browse files Browse the repository at this point in the history
* handle case where fees are null for a chain (#1644)

* add log import

* fix account view errors when request does not exist (#1643)

* bump version
  • Loading branch information
mholtzman authored Aug 29, 2023
1 parent 142aa91 commit a025d72
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/tray/Account/Account.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<AccountView
Expand All @@ -269,7 +269,7 @@ class _AccountBody extends React.Component {
{...this.props}
accountViewTitle={accountViewTitle}
>
{this.renderRequest(req, crumb.data)}
{req && this.renderRequest(req, crumb.data)}
</AccountView>
)
} else if (crumb.view === 'expandedModule') {
Expand Down
1 change: 1 addition & 0 deletions main/store/migrate/migrations/legacy/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frame",
"version": "0.6.7",
"version": "0.6.8",
"description": "System-wide web3",
"main": "compiled/main",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion resources/Components/Monitor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a025d72

Please sign in to comment.