Skip to content

Commit 6f934ad

Browse files
committed
fixes mainnet modal
1 parent 751d297 commit 6f934ad

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

apps/remix-ide/src/app/components/top-bar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ export class Topbar extends Plugin {
162162
async getLatestReleaseNotesUrl () {
163163
const response = await this.getLatestUpdates()
164164
const data: UpdateInfo[] = response
165-
const interim = data.find(x => x.action.label.includes('Release notes'))
166-
const targetUrl = interim.action.url
165+
const interim = data.find(x => x.action.label.toLowerCase().includes('release notes'))
166+
const targetUrl = interim?.action?.url
167167
const currentReleaseVersion = packageJson.version
168168
return [targetUrl, currentReleaseVersion]
169169
}

apps/remix-ide/src/blockchain/blockchain.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ export class Blockchain extends Plugin {
594594
// TODO: this try catch feels like an anti pattern, can/should be
595595
// removed, but for now keeping the original logic
596596
try {
597-
const fee = this.calculateFee(tx.gas, gasPrice)
597+
const fee = this.calculateFee(tx.gasLimit, gasPrice)
598598
txFeeText = ' ' + this.fromWei(fee, false, 'ether') + ' Ether'
599599
priceStatus = true
600600
} catch (e) {

libs/remix-ui/run-tab/src/lib/components/mainnet.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export function MainnetPrompt(props: MainnetProps) {
1616
if (gasPriceValue) onGasPriceChange(gasPriceValue)
1717
if (props.network && props.network.lastBlock && props.network.lastBlock.baseFeePerGas) {
1818
const baseFee = formatUnits(BigInt(props.network.lastBlock.baseFeePerGas), 'gwei')
19-
2019
setBaseFee(baseFee)
2120
onMaxFeeChange(baseFee)
2221
}
@@ -102,7 +101,7 @@ export function MainnetPrompt(props: MainnetProps) {
102101
<span className="text-dark me-2">
103102
<FormattedMessage id="udapp.gasLimit" />:
104103
</span>
105-
<span>{props.tx.gas}</span>
104+
<span>{props.tx.gasLimit}</span>
106105
</div>
107106
{props.network.lastBlock.baseFeePerGas ? (
108107
<div>
@@ -169,9 +168,9 @@ export function MainnetPrompt(props: MainnetProps) {
169168
</span>
170169
</div>
171170
</div>
172-
<div className="d-flex py-1 align-items-center form-check remixui_checkbox">
171+
<div className="d-flex py-1 align-items-center form-check">
173172
<input className="form-check-input" id="confirmsetting" type="checkbox" />
174-
<label className="m-0 form-check-label" htmlFor="confirmsetting">
173+
<label className="ms-1 mt-1 form-check-label" htmlFor="confirmsetting">
175174
<FormattedMessage id="udapp.mainnetText3" />
176175
</label>
177176
</div>

libs/remix-ui/run-tab/src/lib/types/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export interface Tx {
227227
from: string,
228228
to: string,
229229
data: string,
230-
gas: string
230+
gasLimit?: string
231231
}
232232

233233
export interface Network {

0 commit comments

Comments
 (0)