Merge branch 'master' into joe-patch-013

Author: joeizang

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

@@ -57,9 +57,9 @@
   "settings.analyticsDescription": "Control how Remix uses AI and analytics to improve your experience.",
   "settings.aiDescription": "The Remix AI Assistant enhances your coding experience with smart suggestions and automated insights. Manage how AI interacts with your code and data.",
   "settings.servicesDescription": "Configure the settings for connected services, including Github, IPFS, Swarm, Sindri and Etherscan.",
-  "settings.matomoAnalyticsNoCookies": "Matomo Analytics (no cookies)",
+  "settings.matomoAnalyticsNoCookies": "Matomo Analytics (necessary, no cookies)",
   "settings.matomoAnalyticsNoCookiesDescription": "Help improve Remix with anonymous usage data.",
-  "settings.matomoAnalyticsWithCookies": "Matomo Analytics (with cookies)",
+  "settings.matomoAnalyticsWithCookies": "Matomo Performance Analytics (with cookies)",
   "settings.matomoAnalyticsWithCookiesDescription": "Enable tracking with cookies for more detailed insights.",
   "settings.aiCopilot": "AI Copilot",
   "settings.aiCopilotDescription": "AI Copilot assists with code suggestions and improvements.",

apps/remix-ide/src/app/tabs/settings-tab.tsx

@@ -15,7 +15,7 @@ const _paq = (window._paq = window._paq || [])
 const profile = {
   name: 'settings',
   displayName: 'Settings',
-  methods: ['get', 'updateCopilotChoice', 'getCopilotSetting'],
+  methods: ['get', 'updateCopilotChoice', 'getCopilotSetting', 'updateMatomoPerfAnalyticsChoice'],
   events: [],
   icon: 'assets/img/settings.webp',
   description: 'Remix-IDE settings',

apps/remix-ide/src/app/tabs/web3-provider.js

@@ -55,6 +55,7 @@ export class Web3ProviderModule extends Plugin {
               if (payload.method === 'eth_sendTransaction') {
                 if (payload.params.length && !payload.params[0].to && message.result) {
                   setTimeout(async () => {
+                    this.emit('transactionBroadcasted', message.result)
                     const receipt = await this.tryTillReceiptAvailable(message.result)
                     if (!receipt.contractAddress) {
                       console.log('receipt available but contract address not present', receipt)

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -797,8 +797,29 @@ export class Blockchain extends Plugin {
       (_) => this.executionContext.currentblockGasLimit()
     )
 
+    const logTransaction = (txhash, origin) => {
+      this.detectNetwork((error, network) => {
+        console.log(`transaction sent: ${txhash}`, network)
+        if (network && network.id) {
+          _paq.push(['trackEvent', 'udapp', `sendTransaction-from-${origin}`, `${txhash}-${network.id}`])
+        } else {
+          try {
+            const networkString = JSON.stringify(network)
+            _paq.push(['trackEvent', 'udapp', `sendTransaction-from-${origin}`, `${txhash}-${networkString}`])
+          } catch (e) {
+            _paq.push(['trackEvent', 'udapp', `sendTransaction-from-${origin}`, `${txhash}-unknownnetwork`])
+          }
+        }
+      })
+    }
+
+    this.on('web3Provider', 'transactionBroadcasted', (txhash) => {
+      logTransaction(txhash, 'plugin')
+    })
+
     web3Runner.event.register('transactionBroadcasted', (txhash, isUserOp) => {
       if (isUserOp) _paq.push(['trackEvent', 'udapp', 'safeSmartAccount', `txBroadcastedFromSmartAccount`])
+      logTransaction(txhash, 'gui')
       this.executionContext.detectNetwork(async (error, network) => {
         if (error || !network) return
         if (network.name === 'VM') return

libs/remix-ui/settings/src/lib/remix-ui-settings.tsx

@@ -96,13 +96,9 @@ const settingsSections: SettingsSection[] = [
     { options: [{
       name: 'matomo-analytics',
       label: 'settings.matomoAnalyticsNoCookies',
+      headerClass: 'text-secondary',
       type: 'toggle',
       description: 'settings.matomoAnalyticsNoCookiesDescription',
-      footnote: {
-        text: 'Learn more about analytics',
-        link: 'https://matomo.org/',
-        styleClass: 'text-primary'
-      }
     }, {
       name: 'matomo-perf-analytics',
       label: 'settings.matomoAnalyticsWithCookies',

libs/remix-ui/settings/src/lib/settings-section.tsx

@@ -39,17 +39,16 @@ export const SettingsSectionUI: React.FC<SettingsSectionUIProps> = ({ plugin, se
   const handleToggle = (name: string) => {
     if (state[name]) {
       const newValue = !state[name].value
-
       dispatch({ type: 'SET_LOADING', payload: { name: name } })
       dispatch({ type: 'SET_VALUE', payload: { name: name, value: newValue } })
-      // _paq.push(['disableCookies'])
       if (!newValue && formUIData[name]) {
         Object.keys(formUIData[name]).forEach((key) => {
           dispatch({ type: 'SET_VALUE', payload: { name: key, value: '' } })
         })
         dispatch({ type: 'SET_TOAST_MESSAGE', payload: { value: 'Credentials removed' } })
       }
       if (name === 'copilot/suggest/activate') plugin.emit('copilotChoiceUpdated', newValue)
+      if (name === 'matomo-perf-analytics') plugin.call('settings', 'updateMatomoPerfAnalyticsChoice', newValue)
       if (name === 'text-wrap') plugin.emit('textWrapChoiceUpdated', newValue)
     } else {
       console.error('Setting does not exist: ', name)
@@ -94,15 +93,15 @@ export const SettingsSectionUI: React.FC<SettingsSectionUIProps> = ({ plugin, se
                   return (
                     <div className={`card border-0 rounded-0 ${isLastOption ? 'pt-3 pb-0' : isFirstOption ? 'border-bottom pb-3' : 'border-bottom py-3'}`} key={optionIndex}>
                       <div className="d-flex align-items-center">
-                        <h5 data-id={`settingsTab${option.name}Label`} className={`${isDark ? 'text-white' : 'text-black'} m-0`}>
+                        <h5 data-id={`settingsTab${option.name}Label`} className={`${option.headerClass || (isDark ? 'text-white' : 'text-black')} m-0`}>
                           <FormattedMessage id={option.label} />
                           {option.labelIconTooltip ?
                             <CustomTooltip tooltipText={<FormattedMessage id={option.labelIconTooltip} />}><i className={option.labelIcon}></i></CustomTooltip> :
                             option.labelIcon && <i className={option.labelIcon}></i>
                           }
                         </h5>
                         <div className="ms-auto">
-                          {option.type === 'toggle' && <ToggleSwitch id={option.name} isOn={toggleValue} onClick={() => handleToggle(option.name)} />}
+                          {option.type === 'toggle' && <ToggleSwitch id={option.name} isOn={toggleValue} onClick={() => handleToggle(option.name)} disabled = {option.name === "matomo-analytics" ? true : false}/>}
                           {option.type === 'select' && <div style={{ minWidth: '110px' }}><SelectDropdown value={selectValue} options={option.selectOptions} name={option.name} dispatch={dispatch as any} /></div>}
                           {option.type === 'button' && <button className="btn btn-secondary btn-sm" onClick={() => handleButtonClick(option.buttonOptions)}><FormattedMessage id={option.buttonOptions.label} /></button>}
                         </div>

libs/remix-ui/settings/src/types/index.ts

@@ -47,6 +47,7 @@ export interface SettingsSection {
       name: keyof SettingsState,
       label: string,
       labelIcon?: string,
+      headerClass?: string,
       labelIconTooltip?: string,
       description?: string | JSX.Element,
       footnote?: {