Skip to content

Commit 8aaee05

Browse files
authored
Merge branch 'master' into fix_signature
2 parents e19c4a1 + bfd58c4 commit 8aaee05

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

apps/remix-ide/src/app/components/vertical-icons.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// eslint-disable-next-line no-use-before-define
22
import React from 'react'
33
import ReactDOM from 'react-dom'
4-
import Registry from '../state/registry'
54
import packageJson from '../../../../../package.json'
65
import { Plugin } from '@remixproject/engine'
76
import { EventEmitter } from 'events'
87
import { IconRecord, RemixUiVerticalIconsPanel } from '@remix-ui/vertical-icons-panel'
98
import { Profile } from '@remixproject/plugin-utils'
10-
import { timeStamp } from 'console'
119

1210
const profile = {
1311
name: 'menuicons',
@@ -95,7 +93,6 @@ export class VerticalIcons extends Plugin {
9593
*/
9694
select (name: string) {
9795
// TODO: Only keep `this.emit` (issue#2210)
98-
console.log(name, this)
9996
this.emit('showContent', name)
10097
this.events.emit('showContent', name)
10198
}

libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
7272
const isDebugging = useRef<boolean>(false)
7373
const allTests = useRef<string[]>([])
7474
const selectedTests = useRef<string[]>([])
75+
const currentTestFiles:any = useRef([]) // stores files for which tests have been run
7576
const currentErrors:any = useRef([]) // eslint-disable-line @typescript-eslint/no-explicit-any
7677

7778
const defaultPath = 'tests'
@@ -104,7 +105,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
104105
}
105106
// if current file is changed while debugging and one of the files imported in test file are opened
106107
// do not clear the test results in SUT plugin
107-
if (isDebugging.current && testTab.allFilesInvolved.includes(file)) return
108+
if ((isDebugging.current && testTab.allFilesInvolved.includes(file)) || currentTestFiles.current.includes(file)) return
108109
allTests.current = []
109110
updateTestFileList()
110111
clearResults()
@@ -394,6 +395,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
394395

395396
const showTestsResult = () => {
396397
const filenames = Object.keys(testsResultByFilename)
398+
currentTestFiles.current = filenames
397399
for (const filename of filenames) {
398400
const fileTestsResult = testsResultByFilename[filename]
399401
const contracts = Object.keys(fileTestsResult)

libs/remix-ui/terminal/src/lib/components/RenderCall.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ const RenderCall = ({ tx, resolvedData, logs, index, plugin, showTableHash, txDe
2727
<div className="remix_ui_terminal_log" onClick={(event) => txDetails(event, tx)}>
2828
<CheckTxStatus tx={tx} type={txType} />
2929
<span>
30-
<span className="tx">[call]</span>
30+
<span className="remix_ui_terminal_tx">[call]</span>
3131
<div className='remix_ui_terminal_txItem'><span className='remix_ui_terminal_txItemTitle'>from:</span> {from}</div>
3232
<div className='remix_ui_terminal_txItem'><span className='remix_ui_terminal_txItemTitle'>to:</span> {to}</div>
3333
<div className='remix_ui_terminal_txItem'><span className='remix_ui_terminal_txItemTitle'>data:</span> {input}</div>
3434
</span>
3535
<div className='remix_ui_terminal_buttons'>
3636
<div className="remix_ui_terminal_debug btn btn-primary btn-sm" onClick={(event) => debug(event, tx)}>Debug</div>
3737
</div>
38-
<i className="remix_ui_terminal_terminal_arrow fas fa-angle-down"></i>
38+
<i className="remix_ui_terminal_arrow fas fa-angle-down"></i>
3939
</div>
4040
{showTableHash.includes(tx.hash) ? showTable({
4141
hash: tx.hash,

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "remix-project",
3-
"version": "0.21.2-dev",
3+
"version": "0.21.3-dev",
44
"license": "MIT",
55
"description": "Ethereum Remix Monorepo",
66
"keywords": [

0 commit comments

Comments
 (0)