remix-project-org · Aniket-Engg · Dec 3, 2025 · Dec 2, 2025 · Dec 2, 2025 · Dec 2, 2025
diff --git a/apps/remix-ide-e2e/src/tests/template_exp_modal.test.ts b/apps/remix-ide-e2e/src/tests/template_exp_modal.test.ts
@@ -240,6 +240,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem.github/workflows"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem.github/workflows/run-js-test.yml"]')
       .click('*[data-id="treeViewLitreeViewItem.github/workflows/run-js-test.yml"]')
+      .pause(1500)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`name: Running Mocha Chai Solidity Unit Tests`) !== -1,
           'Correct content')
@@ -259,6 +260,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem.github/workflows"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem.github/workflows/run-slither-action.yml"]')
       .click('*[data-id="treeViewLitreeViewItem.github/workflows/run-slither-action.yml"]')
+      .pause(1500)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`name: Slither Analysis`) !== -1,
           'Correct content')
@@ -276,6 +278,7 @@ module.exports = {
       .click('*[data-id="template-card-contractCreate2Factory-0"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/libs"]')
       .click('*[data-id="treeViewLitreeViewItemcontracts/libs/create2-factory.sol"]')
+      .pause(1500)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`contract Create2Factory {`) !== -1,
           'Correct content')
@@ -293,6 +296,7 @@ module.exports = {
       .click('*[data-id="template-card-contractDeployerScripts-1"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/contract-deployer/basic-contract-deploy.ts"]')
+      .pause(1500)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
           'Correct content')
@@ -311,6 +315,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/etherscan"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/etherscan/receiptGuidScript.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/etherscan/receiptGuidScript.ts"]')
+      .pause(1500)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const receiptStatus = async (apikey: string, guid: string, isProxyContract?: boolean) => {`) !== -1,
           'Correct content')

diff --git a/libs/remix-api/src/lib/plugins/matomo/events/file-events.ts b/libs/remix-api/src/lib/plugins/matomo/events/file-events.ts
@@ -1,15 +1,22 @@
 /**
  * File Events - File explorer and workspace management tracking events
- * 
+ *
  * This file contains all file management related Matomo events.
  */
 
 import { MatomoEventBase } from '../core/base-types';
 
 export interface FileExplorerEvent extends MatomoEventBase {
   category: 'fileExplorer';
-  action: 
+  action:
     | 'contextMenu'
+    | 'createMenuButtonOpen'
+    | 'createBlankFile'
+    | 'createNewFile'
+    | 'createNewFolder'
+    | 'importFromIpfs'
+    | 'importFromLocalFileSystem'
+    | 'importFromHttps'
     | 'workspaceMenu'
     | 'fileAction'
     | 'deleteKey'
@@ -22,22 +29,22 @@ export interface FileExplorerEvent extends MatomoEventBase {
 
 export interface WorkspaceEvent extends MatomoEventBase {
   category: 'workspace';
-  action: 
+  action:
     | 'switchWorkspace'
     | 'template'
     | 'GIT';
 }
 
 export interface StorageEvent extends MatomoEventBase {
   category: 'Storage';
-  action: 
+  action:
     | 'activate'
     | 'error';
 }
 
 export interface BackupEvent extends MatomoEventBase {
   category: 'Backup';
-  action: 
+  action:
     | 'create'
     | 'restore'
     | 'error'

diff --git a/libs/remix-api/src/lib/plugins/matomo/events/tools-events.ts b/libs/remix-api/src/lib/plugins/matomo/events/tools-events.ts
@@ -117,12 +117,17 @@ export interface TemplateExplorerModalEvent extends MatomoEventBase {
     | 'topCardCreateFileWithAi'
     | 'topCardImportFiles'
     | 'topCardCreateContractWithWizard'
-    | 'topCardCreateBlank'
+    | 'topCardContractWizardCreateFile'
+    | 'clearFilterButtonClick'
+    | 'tagSelected'
+    | 'topCardCreateBlankWorkspace'
+    | 'topCardCreateBlankFile'
     | 'createWorkspaceWithBasicTemplate'
     | 'contractTypeSelectedInContractWizard'
     | 'initializeAsGitRepoSelectedInContractWizard'
     | 'initializeAsGitRepoSelectedInOtherTemplates'
     | 'createWorkspaceWithContractWizard'
+    | 'createFileWithContractWizard'
     | 'createWorkspaceWithGenericTemplate'
     | 'importFiles'
     | 'importHttps'

diff --git a/libs/remix-core-plugin/src/lib/compiler-content-imports.ts b/libs/remix-core-plugin/src/lib/compiler-content-imports.ts
@@ -136,6 +136,9 @@ export class CompilerImports extends Plugin {
       await this.setToken()
       resolved = await this.urlResolver.resolve(url, [], force)
       const { content, cleanUrl, type } = resolved
+      if (content && (content as string).includes('500 Internal server error') ) {
+        return cb(new Error('500 Internal server error'))
+      }
       cb(null, content, cleanUrl, type, url)
     } catch (e) {
       return cb(new Error('not found ' + url))

diff --git a/libs/remix-ui/git/src/lib/listeners.ts b/libs/remix-ui/git/src/lib/listeners.ts
@@ -25,7 +25,7 @@ class AsyncDebouncedQueue {
 
   enqueue(callback: AsyncCallback, customDelay?: number): void {
     if (this.queues.has(callback)) {
-      clearTimeout(this.queues.get(callback)!.timer);
+      clearTimeout(this.queues.get(callback)?.timer);
     }
 
     const timer = setTimeout(async () => {

diff --git a/libs/remix-ui/run-tab/src/lib/actions/account.ts b/libs/remix-ui/run-tab/src/lib/actions/account.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { shortenAddress } from "@remix-ui/helper"
 import { RunTab } from "../types/run-tab"
 import { trackMatomoEvent } from '@remix-api'

diff --git a/libs/remix-ui/settings/src/lib/mcp-server-manager.tsx b/libs/remix-ui/settings/src/lib/mcp-server-manager.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React, { useState, useEffect } from 'react'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { IMCPServer } from '@remix/remix-ai-core'
@@ -86,10 +87,17 @@ export const IMCPServerManager: React.FC<IMCPServerManagerProps> = ({ plugin })
     try {
       setIsSaving(true)
 
+      // Validate required fields
+      if (!formData.name || !formData.transport) {
+        console.error('Name and transport are required fields')
+        setIsSaving(false)
+        return
+      }
+
       const server: IMCPServer = {
-        name: formData.name!,
+        name: formData.name,
         description: formData.description,
-        transport: formData.transport!,
+        transport: formData.transport,
         command: formData.transport === 'stdio' ? formData.command : undefined,
         args: formData.transport === 'stdio' ? formData.args : undefined,
         url: formData.transport !== 'stdio' ? formData.url : undefined,
@@ -493,4 +501,4 @@ export const IMCPServerManager: React.FC<IMCPServerManagerProps> = ({ plugin })
       </div>
     </div>
   )
-}
+}
diff --git a/libs/remix-ui/tabs/src/lib/components/DropdownMenu.tsx b/libs/remix-ui/tabs/src/lib/components/DropdownMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React, { useState, useRef, useEffect } from 'react'
 import './DropdownMenu.css'
 import { ArrowRightSm } from '@remix-ui/tabs'

diff --git a/libs/remix-ui/template-explorer-modal/src/components/contract-wizard.tsx b/libs/remix-ui/template-explorer-modal/src/components/contract-wizard.tsx
@@ -108,6 +108,7 @@ export function ContractWizard () {
 
     dispatch({ type: TemplateExplorerWizardAction.SET_WORKSPACE_NAME, payload: value.toUpperCase() })
     dispatch({ type: TemplateExplorerWizardAction.SET_WORKSPACE_TEMPLATE, payload: templateMap[value] })
+    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'contractTypeSelectedInContractWizard', name: value.toUpperCase(), isClick: true })
   }
 
   const validateAndCreateWorkspace = async () => {
@@ -122,7 +123,7 @@ export function ContractWizard () {
       contractContent: state.contractCode,
       contractName: state.tokenName
     })
-    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithContractWizard', name: 'success' })
+    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithContractWizard', name: state.workspaceTemplateChosen.value, isClick: true })
     facade.closeWizard()
   }
 
@@ -132,7 +133,7 @@ export function ContractWizard () {
       await facade.plugin.call('fileManager', 'mkdir', 'contracts')
     }
     await facade.plugin.call('fileManager', 'writeFileNoRewrite', `/contracts/${state.contractName}.sol`, state.contractCode)
-    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'addContractFileToWorkspace' })
+    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'addContractFileToWorkspace', name: state.contractName, isClick: true })
     facade.closeWizard()
     await facade.plugin.call('fileManager', 'open', `/contracts/${state.contractName}.sol`)
     await facade.plugin.call('notification', 'toast', 'Contract file created successfully')

diff --git a/libs/remix-ui/template-explorer-modal/src/components/generateWorkspaceWithAi.tsx b/libs/remix-ui/template-explorer-modal/src/components/generateWorkspaceWithAi.tsx
@@ -29,22 +29,22 @@ export function GenerateWorkspaceWithAi() {
             }
 
             await plugin.call('remixaiassistant', 'handleExternalMessage', 'Please wait while the workspace is being generated!')
-            trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiRequestSent', name: state.workspaceName })
+            trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiRequestSent', name: state.workspaceName, isClick: true })
             const result = await plugin.call('remixAI' as any, 'generate', state.workspaceName, statusCallback)
             if (result.includes('No payload')) {
               await plugin.call('remixaiassistant', 'handleExternalMessage', 'Unfortunately, the workspace generation failed. Please try again with a different prompt.')
-              trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiFailed', name: state.workspaceName })
+              trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiFailed', name: state.workspaceName, isClick: true })
               return
             }
 
             if (result.toLowerCase().includes('failed') && result.toLowerCase().includes('please try again with')) {
               await plugin.call('remixaiassistant', 'handleExternalMessage', 'Unfortunately, the workspace generation failed. Please try again with a different prompt.')
-              trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiFailed', name: state.workspaceName })
+              trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiFailed', name: state.workspaceName, isClick: true })
               return
             }
 
             await plugin.call('remixaiassistant', 'handleExternalMessage', 'The workspace has been generated successfully!')
-            trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiSucceeded', name: state.workspaceName })
+            trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithAiSucceeded', name: state.workspaceName, isClick: true })
           }}>
             <i className="fa-solid fa-magic me-2"></i>
           Generate my Workspace

diff --git a/libs/remix-ui/template-explorer-modal/src/components/genericWorkspaceTemplate.tsx b/libs/remix-ui/template-explorer-modal/src/components/genericWorkspaceTemplate.tsx
@@ -89,7 +89,6 @@ export function GenericWorkspaceTemplate() {
               <input data-id={`initializeAsGitRepo-${state.workspaceTemplateChosen.value}`} className="form-check-input" type="checkbox" id="initGit" checked={state.initializeAsGitRepo}
                 onChange={(e) => {
                   dispatch({ type: ContractWizardAction.INITIALIZE_AS_GIT_REPO_UPDATE, payload: e.target.checked })
-                  trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'initializeAsGitRepoSelectedInOtherTemplates', name: 'success' })
                 }} />
               <label className="form-check-label" htmlFor="initGit">Initialize as a Git repository</label>
             </>
@@ -106,7 +105,7 @@ export function GenericWorkspaceTemplate() {
               contractContent: state.contractCode,
               contractName: state.tokenName
             })
-            trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithGenericTemplate', name: 'success' })
+            trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'createWorkspaceWithGenericTemplate', name: state.workspaceTemplateChosen.value, isClick: true })
             facade.closeWizard()
           }}>Finish</button>
         </div>

diff --git a/libs/remix-ui/template-explorer-modal/src/components/importFromIpfs.tsx b/libs/remix-ui/template-explorer-modal/src/components/importFromIpfs.tsx
@@ -25,7 +25,7 @@ export function ImportFromIpfs(props: any) {
         const type = externalResourceName.startsWith('ipfs://') ? 'ipfs' : 'https'
         await facade.processLoadingExternalUrls(externalResourceName, type)
         facade.closeWizard()
-        trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'importFiles', name: externalResourceName.startsWith('ipf') ? 'importFromIpfs' : 'importFromHttps' })
+        trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'importFiles', name: externalResourceName.startsWith('ipf') ? 'importFromIpfs' : 'importFromHttps', isClick: true })
       }}
       disabled={externalResourceName.length < 7}
       >

diff --git a/libs/remix-ui/template-explorer-modal/src/components/template-explorer-body.tsx b/libs/remix-ui/template-explorer-modal/src/components/template-explorer-body.tsx
@@ -3,6 +3,7 @@ import { TemplateExplorer } from './template-explorer'
 import { TopCards } from './topCards'
 import { TemplateExplorerContext } from '../../context/template-explorer-context'
 import { NotFound } from './notfound'
+import { MatomoCategories } from '@remix-api'
 
 export function TemplateExplorerBody() {
   const { selectedTag, allTags, handleTagClick, clearFilter, dedupedTemplates, state, theme, trackMatomoEvent } = useContext(TemplateExplorerContext)
@@ -30,7 +31,10 @@ export function TemplateExplorerBody() {
                     <span
                       key={tag as any}
                       className={`template-tag badge rounded-pill p-2 fw-light ${selectedTag === tag ? 'badge rounded-pill text-info p-2 fw-light' : 'badge rounded-pill text-bg-light p-2 fw-light'}`}
-                      onClick={() => handleTagClick(tag as any)}
+                      onClick={() => {
+                        handleTagClick(tag as any)
+                        trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'tagSelected', name: tag, isClick: true })
+                      }}
                     >
                       {tag as any}
                     </span>
@@ -39,7 +43,10 @@ export function TemplateExplorerBody() {
                     <small>
                       <span
                         className="p-0 ms-2 text-warning fw-light"
-                        onClick={clearFilter}
+                        onClick={() => {
+                          clearFilter()
+                          trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'clearFilterButtonClick', isClick: true })
+                        }}
                       >
                 Clear filter
                       </span>

diff --git a/libs/remix-ui/template-explorer-modal/src/components/template-explorer.tsx b/libs/remix-ui/template-explorer-modal/src/components/template-explorer.tsx
@@ -44,13 +44,13 @@ export function TemplateExplorer() {
                     if (item.value === 'cookbook') {
                       await plugin.call('manager', 'activatePlugin', 'cookbookdev')
                       await plugin.call('sidePanel', 'focus', 'cookbookdev')
-                      trackMatomoEvent({ category: 'templateExplorerModal', action: 'selectWorkspaceTemplate', value: item.value })
+                      trackMatomoEvent({ category: 'templateExplorerModal', action: 'selectWorkspaceTemplate', value: item.value, isClick: true })
                       facade.closeWizard()
                       return
                     }
                     dispatch({ type: TemplateExplorerWizardAction.SET_WORKSPACE_TEMPLATE_TYPE, payload: item.value })
                     facade.switchWizardScreen(dispatch, item, template, templateCategoryStrategy)
-                    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'selectWorkspaceTemplate', name: item.value })
+                    trackMatomoEvent({ category: MatomoCategories.TEMPLATE_EXPLORER_MODAL, action: 'selectWorkspaceTemplate', name: item.value, isClick: true })
                     if (item.displayName.toLowerCase().includes('ai')) {
                       await plugin.call('sidePanel', 'pinView', await plugin.call('remixaiassistant', 'getProfile'))
                     }