From 96316786f7f35dc5b9f6f99fda3d81e4e4d060c0 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Mon, 26 Jul 2021 10:38:18 +0200 Subject: [PATCH 1/7] ipfs url in UI --- libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx index 60fbb830b5..8b9a369565 100644 --- a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx +++ b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx @@ -1,7 +1,7 @@ import IpfsClient from 'ipfs-mini' const ipfsNodes = [ - new IpfsClient({ host: 'ipfs.komputing.org', port: 443, protocol: 'https' }), + new IpfsClient({ host: 'ipfs.remixproject.org', port: 443, protocol: 'https' }), new IpfsClient({ host: 'ipfs.infura.io', port: 5001, protocol: 'https' }), new IpfsClient({ host: '127.0.0.1', port: 5001, protocol: 'http' }) ] From d8123db8fa850d21d9bdf06e490351f2abe9a1c8 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 26 Jul 2021 15:24:16 +0200 Subject: [PATCH 2/7] do notstart WT for embedded or precodeselected cases --- apps/remix-ide/src/app.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index aa17788170..95374611f4 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -361,6 +361,10 @@ Please make a backup of your contracts and start using http://remix.ethereum.org settings ]) + + const queryParams = new QueryParams() + const params = queryParams.get() + const onAcceptMatomo = () => { _paq.push(['forgetUserOptOut']) // @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used @@ -368,12 +372,21 @@ Please make a backup of your contracts and start using http://remix.ethereum.org settings.updateMatomoAnalyticsChoice(true) const el = document.getElementById('modal-dialog') el.parentElement.removeChild(el) + startWalkthroughService() } const onDeclineMatomo = () => { settings.updateMatomoAnalyticsChoice(false) _paq.push(['optUserOut']) const el = document.getElementById('modal-dialog') el.parentElement.removeChild(el) + startWalkthroughService() + } + + const startWalkthroughService = () => { + const walkthroughService = new WalkthroughService(localStorage) + if (!params.code && !params.url && !params.minimizeterminal && !params.gist && !params.minimizesidepanel) { + walkthroughService.start() + } } // Ask to opt in to Matomo for remix, remix-alpha and remix-beta @@ -469,8 +482,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org await appManager.activatePlugin(['settings']) await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport']) - const queryParams = new QueryParams() - const params = queryParams.get() // Set workspace after initial activation if (Array.isArray(workspace)) { @@ -505,9 +516,4 @@ Please make a backup of your contracts and start using http://remix.ethereum.org if (params.embed) framingService.embed() framingService.start(params) - - const walkthroughService = new WalkthroughService(localStorage) - if (!params.code) { - walkthroughService.start() - } } From b941700f1457d7498250dd6a5d7cf45de590e532 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 26 Jul 2021 15:55:43 +0200 Subject: [PATCH 3/7] covered the cases when matomo is already accepted --- apps/remix-ide/src/app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 95374611f4..ed9e03b5f5 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -516,4 +516,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org if (params.embed) framingService.embed() framingService.start(params) + + startWalkthroughService() } From 2cf4ba536f235011f477167848e0e1e1ac70485a Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 26 Jul 2021 16:21:20 +0200 Subject: [PATCH 4/7] linter --- apps/remix-ide/src/app.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index ed9e03b5f5..f1751e2a86 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -361,7 +361,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org settings ]) - const queryParams = new QueryParams() const params = queryParams.get() @@ -482,7 +481,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org await appManager.activatePlugin(['settings']) await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport']) - // Set workspace after initial activation if (Array.isArray(workspace)) { appManager.activatePlugin(workspace).then(async () => { From eb040e4c674268069407020531af979bd5195cd2 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Mon, 26 Jul 2021 19:25:05 +0530 Subject: [PATCH 5/7] fix #1400 --- .../static-analyser/src/lib/remix-ui-static-analyser.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx index a4419dc6f8..f7c109bdad 100644 --- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx +++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx @@ -65,7 +65,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { useEffect(() => { compilation(props.analysisModule, dispatch) - }, []) + }, [props]) useEffect(() => { setWarningState({}) From 7be4409687400627556e69840bf1b7980a44a069 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Mon, 26 Jul 2021 19:31:45 +0530 Subject: [PATCH 6/7] removed extra params --- apps/remix-ide/src/app/tabs/analysis-tab.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js index b3bba2705c..e9efe9f302 100644 --- a/apps/remix-ide/src/app/tabs/analysis-tab.js +++ b/apps/remix-ide/src/app/tabs/analysis-tab.js @@ -50,9 +50,7 @@ class AnalysisTab extends ViewPlugin { renderComponent () { ReactDOM.render( , From e8e5952d88bf18cae43d69cda8db634917f0084a Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Tue, 27 Jul 2021 13:26:47 +0530 Subject: [PATCH 7/7] fix react useeffect to reset --- .../static-analyser/src/lib/remix-ui-static-analyser.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx index f7c109bdad..2369404a90 100644 --- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx +++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx @@ -91,7 +91,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither('visible') }) return () => { } - }, [props.analysisModule]) + }, [props]) const message = (name, warning, more, fileName, locationString) : string => { return (`