Merge branch 'master' into feature/new-code-editor-ux

Author: hsy822

.circleci/config.yml

@@ -6,4 +6,4 @@ WALLET_CONNECT_PROJECT_ID=<project_id>
 NOIR_COMPILER_BASE_URL_DEV=<dev_base_endpoint>
 NOIR_COMPILER_BASE_URL_PROD=<prod_base_endpoint>
 NOIR_COMPILER_WS_URL_DEV=<dev_websocket_url>
-NOIR_COMPILER_WS_URL_PROD=<prod_websocket_url>
+NOIR_COMPILER_WS_URL_PROD=<prod_websocket_url>

.env.local

@@ -3,7 +3,7 @@ name: PRs reviews reminder
 on:
   schedule:
     - cron: "0 8 * * 1-5"
-    - cron: '55 8 * * 1-5'
+    - cron: '50 8 * * 1-5'
   workflow_dispatch:
 
 jobs:
@@ -19,7 +19,7 @@ jobs:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
         freeze-date: '2025-07-21T18:00:00Z'
     - name: Reminder for standup
-      if: github.event.schedule == '55 8 * * 1-5'
+      if: github.event.schedule == '50 8 * * 1-5'
       uses: Aniket-Engg/pr-reviews-reminder-action@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-reminder.yml

@@ -63,11 +63,11 @@
   "udapp.injectedTitle": "Unfortunately it's not possible to create an account using injected provider. Please create the account directly from your provider (i.e metamask or other of the same type).",
   "udapp.createSmartAccount": "Create Gnosis Safe Smart Account",
   "udapp.createSmartAccountAlpha": "Create Gnosis Safe Smart Account [ALPHA]",
-  "udapp.createSmartAccountDesc1":"ERC-4337 introduces smart contracts accounts, which are more advanced than traditional EOAs. These accounts offer features like multi-signature functionality, gasless transactions and custom transaction rules.",
-  "udapp.createSmartAccountDesc2":"These smart contract accounts are often referred to as Smart Accounts. A Safe Smart Account is a Smart Account with the multi-signature functionality of Gnosis Safe at its core.",
-  "udapp.createSmartAccountDesc3":"A Smart Account will be created with address listed below as the OWNER. The Owner account signs each transaction (user-operation) made using Smart Account.",
-  "udapp.createSmartAccountDesc4":"A Smart Account will, by default, have a PAYMASTER attached to it to execute GASLESS transactions. Currently, in Remix, the 4337 updates only work on the Gnosis Mainnet & Ethereum Sepolia testnet. ",
-  "udapp.createSmartAccountDesc5":"The Smart Account creation will require signing an initial transaction in the next step.",
+  "udapp.createSmartAccountDesc1":"ERC-4337 introduces smart contract accounts, also referred as Smart Accounts. These accounts are more advanced than traditional EOAs and offer features like multi-signature functionality, gasless transactions and custom transaction rules.",
+  "udapp.createSmartAccountDesc2":"A Safe Smart Account is a Smart Account with the multi-signature functionality of Gnosis Safe at its core.",
+  "udapp.createSmartAccountDesc3":"Here, a Smart Account will be created with address listed below as the OWNER. The Owner account signs each transaction (user-operation) made using Smart Account.",
+  "udapp.createSmartAccountDesc4":"This Smart Account will, by default, have a PAYMASTER attached to it to execute GASLESS transactions. Currently, in Remix, the ERC4337 updates only work for GNOSIS Mainnet & Ethereum SEPOLIA testnet. ",
+  "udapp.createSmartAccountDesc5":"Please note that the Smart Account creation will require signing an initial transaction on the next step.",
   "udapp.continue": "Continue",
   "udapp.authorize": "Authorize",
   "udapp.createNewAccount": "Create a new account",

apps/remix-dapp/src/locales/en/udapp.json

@@ -2,24 +2,24 @@ import { NightwatchBrowser } from 'nightwatch'
 import EventEmitter from 'events'
 
 class AssistantClearChat extends EventEmitter {
-    command(this: NightwatchBrowser): NightwatchBrowser {
-        this.api.perform((done) => {
-            clearChat(this.api, () => {
-                done()
-                this.emit('complete')
-            })
-        })
-        return this
-    }
+  command(this: NightwatchBrowser): NightwatchBrowser {
+    this.api.perform((done) => {
+      clearChat(this.api, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
 }
 
 function clearChat(browser: NightwatchBrowser, done: VoidFunction) {
-    browser
-        .execute(function () {
-            (window as any).remixAIChat.current.clearChat();
-        }, [])
+  browser
+    .execute(function () {
+      (window as any).remixAIChat.current.clearChat();
+    }, [])
 
-    done()
+  done()
 }
 
 module.exports = AssistantClearChat;

apps/remix-ide-e2e/src/commands/assistantClearChat.ts

@@ -30,7 +30,7 @@ function setAssistant(browser: NightwatchBrowser, provider: string, done: VoidFu
       selector: "//*[@data-id='remix-ai-streaming' and @data-streaming='false']",
     })
     //.pause()
-    .perform(() => done())  
+    .perform(() => done())
 }
 
 module.exports = SetAssistantProvider

apps/remix-ide-e2e/src/commands/assistantSetProvider.ts

@@ -3,6 +3,7 @@ import EventEmitter from 'events'
 
 class HideToolTips extends EventEmitter {
   command(this: NightwatchBrowser) {
+    console.log('Hiding tooltips...')
     browser
       .perform((done) => {
         browser.execute(function () {

apps/remix-ide-e2e/src/commands/hideToolTips.ts

@@ -5,5 +5,7 @@ rm -rf git/bare2.git
 rm -rf git
 mkdir -p git
 cd git
+git config --global user.name "ci-bot"
+git config --global user.email "[email protected]"
 git clone --bare https://github.com/ethereum/awesome-remix bare.git
 git clone --bare https://github.com/ethereum/awesome-remix bare2.git

apps/remix-ide-e2e/src/githttpbackend/setup.sh

@@ -8,7 +8,6 @@ type LoadPlugin = {
   url: string
 }
 
-
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export default function (browser: NightwatchBrowser, callback: VoidFunction, url?: string, preloadPlugins = true, loadPlugin?: LoadPlugin, hideToolTips: boolean = true): void {
   browser

apps/remix-ide-e2e/src/helpers/init.ts

@@ -22,15 +22,15 @@ module.exports = {
       .addFile('Untitled.sol', sources[0]['Untitled.sol'])
   },
   // Conversation starter button with data id 'explain-editor' doesn't exist anymore
-  'Should explain the contract #group1': function (browser: NightwatchBrowser) {
+  'Should contain message starters #group1': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('remixaiassistant')
       .waitForElementVisible('*[data-id="remix-ai-assistant-starter-0"]')
       .click('*[data-id="remix-ai-assistant-starter-0"]')
       .waitForElementVisible('*[data-id="remix-ai-assistant"]')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//div[contains(@class,"chat-bubble") and contains(.,"Explain what a modifier is")]'
+        selector: '//*[contains(@class,"chat-bubble") and contains(.,"What is a modifier?")]'
       })
       .waitForElementPresent({
         locateStrategy: 'xpath',
@@ -55,7 +55,6 @@ module.exports = {
         locateStrategy: 'xpath',
         selector: "//*[@data-id='remix-ai-streaming' and @data-streaming='false']"
       })
-
   },
   'Should select the AI assistant provider #group1': function (browser: NightwatchBrowser) {
     browser
@@ -81,21 +80,23 @@ module.exports = {
         locateStrategy: 'xpath',
         timeout: 120000
       })
-      .waitForElementPresent('*[data-id="remix-ai-assistant-ready"]')
+      // .waitForElementPresent('*[data-id="remix-ai-assistant-ready"]')
       .assistantAddContext('currentFile')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: `//*[contains(@class,"aiContext-file") and contains(.,"Untitled.sol")]`
+        selector: '//*[@data-id="composer-ai-add-context"]'
       })
+      .assert.containsText('*[data-id="composer-ai-add-context"]', 'Current File')
   },
   'Should add workspace as context to the AI assistant #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementPresent('*[data-id="remix-ai-assistant-ready"]')
       .assistantAddContext('workspace')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//*[contains(@class,"aiContext-file") and contains(.,"@workspace")]'
+        selector: '//*[@data-id="composer-ai-add-context"]'
       })
+      .assert.containsText('*[data-id="composer-ai-add-context"]', 'Workspace')
   },
 
   'Should add opened files as context to the AI assistant #group1': function (browser: NightwatchBrowser) {
@@ -113,8 +114,9 @@ module.exports = {
       .assistantAddContext('openedFiles')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//*[contains(@class,"aiContext-file") and contains(.,"anotherFile.sol")]'
+        selector: '//*[@data-id="composer-ai-add-context"]'
       })
+      .assert.containsText('*[data-id="composer-ai-add-context"]', 'Open Files')
   },
 
   'Should generate new workspace contract code with the AI assistant #group1': function (browser: NightwatchBrowser) {
@@ -153,7 +155,7 @@ module.exports = {
       .assistantWorkspace('comment all function', 'mistralai')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//div[contains(@class,"chat-bubble") and (contains(.,"Modified Files") or contains(.,"No Changes applied"))]',
+        selector: '//div[contains(@class,"chat-bubble") and (contains(.,"Modified Files") or contains(.,"No Changes applied") or contains(.,"No files modified"))]',
         timeout: 60000
       })
       .waitForElementPresent({
@@ -171,11 +173,11 @@ module.exports = {
         locateStrategy: 'xpath',
         timeout: 120000
       })
-      .waitForElementVisible('*[data-id="composer-ai-workspace-generate"]')
-      .click('*[data-id="composer-ai-workspace-generate"]')
+      .waitForElementVisible('*[data-id="remix-ai-workspace-generate"]')
+      .click('*[data-id="remix-ai-workspace-generate"]')
       .waitForElementVisible('*[data-id="generate-workspaceModalDialogModalBody-react"]')
-      .click('*[data-id="modalDialogCustomPromp"]')
-      .setValue('*[data-id="modalDialogCustomPromp"]', 'a simple ERC20 contract')
+      .click('*[data-id="modalDialogCustomTextarea"]')
+      .setValue('*[data-id="modalDialogCustomTextarea"]', 'a simple ERC20 contract')
       .click('*[data-id="generate-workspace-modal-footer-ok-react"]')
       .waitForElementVisible({
         locateStrategy: 'xpath',
@@ -201,7 +203,7 @@ module.exports = {
       .assistantWorkspace('remove all comments', 'openai')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//div[contains(@class,"chat-bubble") and (contains(.,"Modified Files") or contains(.,"No Changes applied"))]',
+        selector: '//div[contains(@class,"chat-bubble") and (contains(.,"Modified Files") or contains(.,"No Changes applied") or contains(.,"No files modified"))]',
         timeout: 60000
       })
       .waitForElementPresent({
@@ -221,7 +223,7 @@ module.exports = {
       .assistantWorkspace('remove all comments', 'anthropic')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//div[contains(@class,"chat-bubble") and (contains(.,"Modified Files") or contains(.,"No Changes applied"))]',
+        selector: '//div[contains(@class,"chat-bubble") and (contains(.,"Modified Files") or contains(.,"No Changes applied") or contains(.,"No files modified"))]',
         timeout: 60000
       })
       .waitForElementPresent({
@@ -268,4 +270,4 @@ module.exports = {
       .clickLaunchIcon('filePanel')
       .waitForElementNotVisible('*[data-id="remix-ai-assistant"]', 5000)
   },
-}
+}