Merge branch 'master' into extend-modal

Author: joeizang

apps/learneth/src/redux/models/workshop.ts

@@ -184,7 +184,10 @@ const Model: ModelType = {
           }
         }
       }
-      (<any>window)._paq.push(['trackEvent', 'learneth', 'load_repo', payload.name])
+      // we don't need to track the default repos
+      if (payload.name !== 'ethereum/remix-workshops' && payload.name !== 'remix-project-org/remix-workshops') {
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'load_repo', payload.name])
+      }
     },
     *resetAll({ payload }, { put }) {
       yield put({

apps/remix-ide-e2e/src/tests/matomo.test.ts

@@ -325,9 +325,7 @@ module.exports = {
         return (window as any)._paq
       }, [], (res) => {
         const expectedEvents = [
-          ["trackEvent", "App", "Preload", "start"],
-          ["trackEvent", "Storage", "activate", "indexedDB"],
-          ["trackEvent", "App", "load"],
+          ["trackEvent", "Storage", "activate", "indexedDB"]
         ];
 
         const actualEvents = (res as any).value;

apps/remix-ide/src/app.ts

@@ -232,7 +232,7 @@ class AppComponent {
       '6fd22d6fe5549ad4c4d8fd3ca0b7816b.mod': 35 // remix desktop
     }
 
-    _paq.push(['trackEvent', 'App', 'load']);
+    // _paq.push(['trackEvent', 'App', 'load']);
     this.matomoConfAlreadySet = Registry.getInstance().get('config').api.exists('settings/matomo-perf-analytics')
     this.matomoCurrentSetting = Registry.getInstance().get('config').api.get('settings/matomo-perf-analytics')
 

apps/remix-ide/src/app/components/preload.tsx

@@ -10,7 +10,7 @@ import './styles/preload.css'
 import isElectron from 'is-electron'
 const _paq = (window._paq = window._paq || [])
 
-_paq.push(['trackEvent', 'App', 'Preload', 'start'])
+// _paq.push(['trackEvent', 'App', 'Preload', 'start'])
 
 export const Preload = (props: any) => {
   const [tip, setTip] = useState<string>('')

apps/remix-ide/src/app/plugins/storage.ts

@@ -23,7 +23,7 @@ export class StoragePlugin extends Plugin {
       }
     }
     const _paq = (window as any)._paq = (window as any)._paq || []
-    _paq.push(['trackEvent', 'Storage', 'used', this.formatString(storage)]);
+    // _paq.push(['trackEvent', 'Storage', 'used', this.formatString(storage)]);
     return storage
   }
 

libs/remix-ui/remix-ai-assistant/src/components/contextOptMenu.tsx

@@ -15,7 +15,7 @@ export default function GroupListMenu(props: GroupListMenuProps) {
       {props.groupList.map((item, index) => (
         <button
           key={`${item.label}-${index}`}
-          className="btn btn-light"
+          className={`btn btn-light border border-0`}
           data-id={item.dataId}
           onClick={() => {
             props.setChoice(item.stateValue)

libs/remix-ui/remix-ai-assistant/src/components/prompt.tsx

@@ -118,7 +118,7 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
             <div className="btn-group btn-group-sm" role="group">
               <button
                 type="button"
-                className={`btn ${aiMode === 'ask' ? 'btn-primary' : 'btn-outline-secondary'} px-2`}
+                className={`btn btn-sm ${aiMode === 'ask' ? 'btn-primary' : 'btn-outline-secondary'} px-2`}
                 onClick={() => {
                   setAiMode('ask')
                   _paq.push(['trackEvent', 'remixAI', 'ModeSwitch', 'ask'])
@@ -129,7 +129,7 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
               </button>
               <button
                 type="button"
-                className={`btn ${aiMode === 'edit' ? 'btn-primary' : 'btn-outline-secondary'} px-2`}
+                className={`btn btn-sm ${aiMode === 'edit' ? 'btn-primary' : 'btn-outline-secondary'} px-2`}
                 onClick={() => {
                   setAiMode('edit')
                   _paq.push(['trackEvent', 'remixAI', 'ModeSwitch', 'edit'])

libs/remix-ui/remix-ai-assistant/src/components/remix-ui-remix-ai-assistant.tsx

@@ -52,6 +52,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
   const [selectedModel, setSelectedModel] = useState<string | null>(null)
   const [isOllamaFailureFallback, setIsOllamaFailureFallback] = useState(false)
   const [aiMode, setAiMode] = useState<'ask' | 'edit'>('ask')
+  const [themeTracker, setThemeTracker] = useState(null)
 
   const historyRef = useRef<HTMLDivElement | null>(null)
   const modelBtnRef = useRef(null)
@@ -205,6 +206,15 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
   //   fetchAssistantChoice()
   // }, [props.plugin])
 
+  useEffect(() => {
+    props.plugin.on('theme', 'themeChanged', (theme) => {
+      setThemeTracker(theme)
+    })
+    return () => {
+      props.plugin.off('theme', 'themeChanged')
+    }
+  })
+
   // bubble messages up to parent
   useEffect(() => {
     props.onMessagesChange?.(messages)

libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx

@@ -483,7 +483,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     compileIcon.current.classList.remove('remixui_spinningIcon')
     compileIcon.current.classList.remove('remixui_bouncingIcon')
     if (!state.autoCompile || (state.autoCompile && state.matomoAutocompileOnce)) {
-      _paq.push(['trackEvent', 'compiler', 'compiled', 'solCompilationFinishedTriggeredByUser'])
+      // _paq.push(['trackEvent', 'compiler', 'compiled', 'solCompilationFinishedTriggeredByUser'])
       _paq.push(['trackEvent', 'compiler', 'compiled', 'with_config_file_' + state.useFileConfiguration])
       _paq.push(['trackEvent', 'compiler', 'compiled', 'with_version_' + _retrieveVersion()])
       if (state.autoCompile && state.matomoAutocompileOnce) {