diff --git a/apps/remix-ide/src/app/components/vertical-icons.tsx b/apps/remix-ide/src/app/components/vertical-icons.tsx index 0d78b22fb7..4d54c5a855 100644 --- a/apps/remix-ide/src/app/components/vertical-icons.tsx +++ b/apps/remix-ide/src/app/components/vertical-icons.tsx @@ -73,7 +73,10 @@ export class VerticalIcons extends Plugin { Object.keys(this.icons).map((o) => { this.icons[o].active = false }) - this.icons[name].active = true + + if (this.icons[name]) { + this.icons[name].active = true + } this.renderComponent() }) } diff --git a/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json b/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json index a7cc252c1a..6541753d86 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json +++ b/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json @@ -1,12 +1,13 @@ { "remixUiTabs.tooltipText1": "Run script (CTRL + SHIFT + S)", "remixUiTabs.tooltipText2": "Compile CTRL + S", - "remixUiTabs.tooltipText3": "Select .sol or .yul file to compile or a .ts or .js file and run it", - "remixUiTabs.tooltipText4": "Select .sol file to use AI tools [BETA]", + "remixUiTabs.tooltipText3": "Select .sol or .yul file to compile OR a .ts or .js file to run", + "remixUiTabs.tooltipText4": "To explain a contract, choose a .sol file", "remixUiTabs.tooltipText5": "Explain the contract(s) in current file [BETA]", "remixUiTabs.tooltipText6": "Enable Remix AI Copilot [BETA]", "remixUiTabs.tooltipText7": "Disable Remix AI Copilot [BETA]", - "remixUiTabs.tooltipText8": "Remix AI Tools Documentation [BETA]", + "remixUiTabs.tooltipText8": "Remix AI Tools Documentation", + "remixUiTabs.tooltipTextDisabledCopilot": "To use Remix AI Copilot, choose a .sol file", "remixUiTabs.zoomOut": "Zoom out", "remixUiTabs.zoomIn": "Zoom in" } diff --git a/apps/remix-ide/src/app/tabs/locales/en/udapp.json b/apps/remix-ide/src/app/tabs/locales/en/udapp.json index a7ee39b3e5..2f0ba01f02 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/udapp.json +++ b/apps/remix-ide/src/app/tabs/locales/en/udapp.json @@ -9,7 +9,7 @@ "udapp._comment_value.tsx": "libs/remix-ui/run-tab/src/lib/components/value.tsx", "udapp.value": "Value", - "udapp.tooltipText5": "Enter an amount and choose its unit", + "udapp.tooltipText5": "Enter an amount to be sent with transaction and choose its unit", "udapp._comment_contractDropdownUI.tsx": "libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx", "udapp.contract": "Contract", @@ -50,15 +50,15 @@ "udapp.hash": "hash", "udapp.signature": "signature", "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.createNewAccount": "Create a new account", + "udapp.createNewAccount": "Create new account", "udapp.web3Title": "Creating an account is possible only in Personal mode. Please go to Settings to enable it.", "udapp.defaultTitle": "Unfortunately it's not possible to create an account using an external wallet ({selectExEnv}).", "udapp.text1": "Please provide a Passphrase for the account creation", "udapp.tooltipText1": "Account list is empty, please make sure the current provider is properly connected to remix", "udapp.modalTitle1": "Passphrase to sign a message", "udapp.modalMessage1": "Enter your passphrase for this account to sign the message", - "udapp.copyAccount": "Copy account to clipboard", - "udapp.signMsgUsingAccount": "Sign a message using this account", + "udapp.copyAccount": "Copy account", + "udapp.signMsgUsingAccount": "Sign using this account", "udapp._comment_environment.tsx": "libs/remix-ui/run-tab/src/lib/components/environment.tsx", "udapp.environment": "Environment", diff --git a/libs/remix-ui/run-tab/src/lib/components/account.tsx b/libs/remix-ui/run-tab/src/lib/components/account.tsx index cc3779a879..d7097a1ab0 100644 --- a/libs/remix-ui/run-tab/src/lib/components/account.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/account.tsx @@ -200,11 +200,17 @@ export function AccountUI(props: AccountProps) {
@@ -224,12 +230,6 @@ export function AccountUI(props: AccountProps) { ))} -
- -
- }> - -
) diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx index d12cef0bd1..c9a45a599b 100644 --- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx @@ -26,7 +26,12 @@ export function EnvironmentUI(props: EnvironmentProps) { }> - + + + + }> + + @@ -65,12 +70,6 @@ export function EnvironmentUI(props: EnvironmentProps) { ))} - - }> - - - - ) diff --git a/libs/remix-ui/run-tab/src/lib/components/gasLimit.tsx b/libs/remix-ui/run-tab/src/lib/components/gasLimit.tsx index f5e6a3ec96..5c0403fb6b 100644 --- a/libs/remix-ui/run-tab/src/lib/components/gasLimit.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/gasLimit.tsx @@ -51,7 +51,7 @@ export function GasLimitUI(props: GasPriceProps) { -
+
-
diff --git a/libs/remix-ui/run-tab/src/lib/components/value.tsx b/libs/remix-ui/run-tab/src/lib/components/value.tsx index ae9634286f..53e72eb91c 100644 --- a/libs/remix-ui/run-tab/src/lib/components/value.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/value.tsx @@ -49,7 +49,7 @@ export function ValueUI(props: ValueProps) { -
+
}> - - +
+ +
) diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx index a4448ea338..050cb9d539 100644 --- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx +++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx @@ -1,5 +1,7 @@ import { ViewPlugin } from '@remixproject/engine-web' import React, {useState, useRef, useReducer, useEffect, useCallback} from 'react' // eslint-disable-line +import { CustomTooltip } from '@remix-ui/helper' +const _paq = (window._paq = window._paq || []) import { AppModal, AlertModal, ModalTypes } from '@remix-ui/app' import { labels, textDark, textSecondary } from './constants' @@ -449,9 +451,23 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => { const copilotSettings = () => (
-
+
+ }> + { + window.open("https://remix-ide.readthedocs.io/en/latest/ai.html") + _paq.push(['trackEvent', 'ai', 'solcoder', 'documentation']) + }} + > + + +
diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index b54502b26d..81c78ea868 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -193,7 +193,7 @@ export const TabsUI = (props: TabsUIProps) => { > - - {tabsState.currentExt === 'sol'? ( - - ) : ( - - )} - - } - > - - - - { tabsState.currentExt === 'sol'? ( - !ai_switch ? ( - - ) : () - ) : ( - - )} - - } - > - - - }> - { - window.open("https://remix-ide.readthedocs.io/en/latest/ai.html") - _paq.push(['trackEvent', 'ai', 'solcoder', 'documentation']) - }} + + + + + { tabsState.currentExt === 'sol'? ( + !ai_switch ? ( + + ) : () + ) : ( + + )} + + } > - - { + await props.plugin.call('settings', 'updateCopilotChoice', !ai_switch) + setAI_switch(!ai_switch) + ai_switch ? _paq.push(['trackEvent', 'ai', 'solcoder', 'copilot_enabled']) : _paq.push(['trackEvent', 'ai', 'solcoder', 'copilot_disabled']) + }} > - AI - - - + + + +
- }> - props.onZoomOut()}> - - }> - props.onZoomIn()}> - +
+ }> + props.onZoomOut()}> + + }> + props.onZoomIn()}> + +