Skip to content

Commit 248db9a

Browse files
glitch-txsglitch-txs
authored
Merge branch 'master' into master
2 parents 6355341 + 607ff9f commit 248db9a

File tree

26 files changed

+86
-65
lines changed

26 files changed

+86
-65
lines changed

‎.github/workflows/pr-reminder.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
with:
1616
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
17-
freeze-date: '2024-01-29T18:00:00Z'
17+
freeze-date: '2024-02-12T18:00:00Z'

‎apps/circuit-compiler/src/app/components/feedback.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
4545
<RenderIf condition={response.type === 'Error'}>
4646
<div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-danger`} data-id="circuit_feedback">
4747
<FeedbackAlert
48-
message={response.message}
49-
location={ response.labels[0] ? response.labels[0].message + ` ${filePathToId[response.labels[0].file_id]}:${response.labels[0].range.start}:${response.labels[0].range.end}` : null}
48+
message={response.message + (response.labels[0] ? ": " + response.labels[0].message + ` ${filePathToId[response.labels[0].file_id]}:${response.labels[0].range.start}:${response.labels[0].range.end}` : '')}
5049
askGPT={ () => handleAskGPT(response) } />
5150
</div>
5251
</RenderIf>
5352
<RenderIf condition={(response.type === 'Warning') && !hideWarnings}>
5453
<div className={`circuit_feedback ${response.type.toLowerCase()} alert alert-warning`} data-id="circuit_feedback">
5554
<FeedbackAlert
5655
message={response.message}
57-
location={null}
5856
askGPT={() => { handleAskGPT(response) }} />
5957
</div>
6058
</RenderIf>

‎apps/circuit-compiler/src/app/components/feedbackAlert.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FeedbackAlertProps } from '../types'
33
import { RenderIf } from '@remix-ui/helper'
44
import {CopyToClipboard} from '@remix-ui/clipboard'
55

6-
export function FeedbackAlert ({ message, location, askGPT }: FeedbackAlertProps) {
6+
export function FeedbackAlert ({ message, askGPT }: FeedbackAlertProps) {
77
const [ showAlert, setShowAlert] = useState<boolean>(true)
88

99
const handleCloseAlert = () => {
@@ -14,17 +14,17 @@ export function FeedbackAlert ({ message, location, askGPT }: FeedbackAlertProps
1414
<RenderIf condition={showAlert}>
1515
<>
1616
<span> { message } </span>
17-
<RenderIf condition={location !== null}>
18-
<span> { location }</span>
19-
</RenderIf>
2017
<div className="close" data-id="renderer" onClick={handleCloseAlert}>
2118
<i className="fas fa-times"></i>
2219
</div>
2320
<div className="d-flex pt-1 flex-row-reverse">
2421
<span className="ml-3 pt-1 py-1" >
2522
<CopyToClipboard content={message} className="p-0 m-0 far fa-copy error" direction={'top'} />
2623
</span>
27-
<span className="border border-success text-success btn-sm" onClick={askGPT}>ASK GPT</span>
24+
<span className="border border-success text-success btn-sm" onClick={(e) => {
25+
e.stopPropagation()
26+
askGPT()
27+
}}>ASK GPT</span>
2828
</div>
2929
</>
3030
</RenderIf>

‎apps/circuit-compiler/src/app/types/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export type CompilerReport = {
7272

7373
export type FeedbackAlertProps = {
7474
message: string,
75-
location: string,
7675
askGPT: () => void
7776
}
7877

‎apps/remix-ide/src/app/tabs/locales/en/panel.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"panel.documentation": "Documentation",
55
"panel.description": "Description",
66
"panel.maintainedByRemix": "Maintained by Remix",
7+
"panel.maintainedExternally": "Not maintained by Remix",
78
"panel.pluginInfo": "Plugin info",
89
"panel.linkToDoc": "Link to documentation",
910
"panel.makeAnissue": "Make an issue"

‎apps/remix-ide/src/app/tabs/locales/en/pluginManager.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"pluginManager.ok": "OK",
3434
"pluginManager.cancel": "Cancel",
3535
"pluginManager.maintainedByRemix": "Maintained by Remix",
36+
"pluginManager.maintainedExternally": "Not maintained by Remix",
3637
"pluginManager.linkToDoc": "Link to documentation",
3738
"pluginManager.versionAlpha": "Version Alpha",
3839
"pluginManager.versionBeta": "Version Beta",

‎libs/ghaction-helper/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/ghaction-helper",
3-
"version": "0.1.20",
3+
"version": "0.1.21",
44
"description": "Solidity Tests GitHub Action Helper",
55
"main": "src/index.js",
66
"scripts": {
@@ -19,17 +19,17 @@
1919
},
2020
"homepage": "https://github.com/ethereum/remix-project#readme",
2121
"devDependencies": {
22-
"@remix-project/remix-solidity": "^0.5.26",
22+
"@remix-project/remix-solidity": "^0.5.27",
2323
"@types/chai": "^4.3.4",
2424
"typescript": "^4.9.3"
2525
},
2626
"dependencies": {
2727
"@ethereum-waffle/chai": "^3.4.4",
28-
"@remix-project/remix-simulator": "^0.2.40",
28+
"@remix-project/remix-simulator": "^0.2.41",
2929
"chai": "^4.3.7",
3030
"ethers": "^5.7.2",
3131
"web3": "^4.1.1"
3232
},
3333
"types": "./src/index.d.ts",
34-
"gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844"
34+
"gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca"
3535
}

‎libs/remix-analyzer/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-analyzer",
3-
"version": "0.5.49",
3+
"version": "0.5.50",
44
"description": "Tool to perform static analysis on Solidity smart contracts",
55
"scripts": {
66
"test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
2525
"@ethereumjs/tx": "^4.1.1",
2626
"@ethereumjs/util": "^8.0.5",
2727
"@ethereumjs/vm": "^6.4.1",
28-
"@remix-project/remix-astwalker": "^0.0.70",
29-
"@remix-project/remix-lib": "^0.5.47",
28+
"@remix-project/remix-astwalker": "^0.0.71",
29+
"@remix-project/remix-lib": "^0.5.48",
3030
"async": "^2.6.2",
3131
"ethers": "^5.4.2",
3232
"ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
5050
"typescript": "^3.7.5"
5151
},
5252
"typings": "src/index.d.ts",
53-
"gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844",
53+
"gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca",
5454
"main": "./src/index.js"
5555
}

‎libs/remix-astwalker/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-astwalker",
3-
"version": "0.0.70",
3+
"version": "0.0.71",
44
"description": "Tool to walk through Solidity AST",
55
"main": "src/index.js",
66
"scripts": {
@@ -37,7 +37,7 @@
3737
"@ethereumjs/tx": "^4.1.1",
3838
"@ethereumjs/util": "^8.0.5",
3939
"@ethereumjs/vm": "^6.4.1",
40-
"@remix-project/remix-lib": "^0.5.47",
40+
"@remix-project/remix-lib": "^0.5.48",
4141
"@types/tape": "^4.2.33",
4242
"async": "^2.6.2",
4343
"ethers": "^5.4.2",
@@ -53,6 +53,6 @@
5353
"tap-spec": "^5.0.0"
5454
},
5555
"typings": "src/index.d.ts",
56-
"gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844",
56+
"gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca",
5757
"types": "./src/index.d.ts"
5858
}

‎libs/remix-debug/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-debug",
3-
"version": "0.5.40",
3+
"version": "0.5.41",
44
"description": "Tool to debug Ethereum transactions",
55
"contributors": [
66
{
@@ -26,10 +26,10 @@
2626
"@ethereumjs/tx": "^4.1.1",
2727
"@ethereumjs/util": "^8.0.5",
2828
"@ethereumjs/vm": "^6.4.1",
29-
"@remix-project/remix-astwalker": "^0.0.70",
30-
"@remix-project/remix-lib": "^0.5.47",
31-
"@remix-project/remix-simulator": "^0.2.40",
32-
"@remix-project/remix-solidity": "^0.5.26",
29+
"@remix-project/remix-astwalker": "^0.0.71",
30+
"@remix-project/remix-lib": "^0.5.48",
31+
"@remix-project/remix-simulator": "^0.2.41",
32+
"@remix-project/remix-solidity": "^0.5.27",
3333
"ansi-gray": "^0.1.1",
3434
"async": "^2.6.2",
3535
"color-support": "^1.1.3",
@@ -69,6 +69,6 @@
6969
},
7070
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
7171
"typings": "src/index.d.ts",
72-
"gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844",
72+
"gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca",
7373
"types": "./src/index.d.ts"
7474
}

0 commit comments

Comments
 (0)