Merge branch 'master' into dragdroptest

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

@@ -926,6 +926,7 @@ export const EditorUI = (props: EditorUIProps) => {
       if (freeFunctionNode) {
         executeFreeFunctionAction.label = intl.formatMessage({ id: 'editor.executeFreeFunction2' }, { name: freeFunctionNode.name })
         freeFunctionAction = editor.addAction(executeFreeFunctionAction)
+        freeFunctionCondition.set(true)
       }
 
       const functionImpl = nodesAtPosition.find((node) => node.kind === 'function')
@@ -945,7 +946,6 @@ export const EditorUI = (props: EditorUIProps) => {
         executeSolgptExplainFunctionAction.label = intl.formatMessage({ id: 'editor.explainFunctionSol' })
         solgptExplainFunctionAction = editor.addAction(executeSolgptExplainFunctionAction)
       }
-      freeFunctionCondition.set(!!freeFunctionNode)
     }
     contextmenu._onContextMenu = (...args) => {
       if (args[0]) args[0].event?.preventDefault()

libs/remix-ui/run-tab/src/lib/components/environment.tsx

@@ -23,7 +23,7 @@ export function EnvironmentUI(props: EnvironmentProps) {
     'L2 - Arbitrum': 'https://bridge.arbitrum.io/'
   }
 
-  const isL2 = (providerDisplayName: string) => providerDisplayName === 'L2 - Optimism' || providerDisplayName === 'L2 - Arbitrum'
+  const isL2 = (providerDisplayName: string) => providerDisplayName && (providerDisplayName.startsWith('L2 - Optimism') || providerDisplayName.startsWith('L2 - Arbitrum'))
   return (
     <div className="udapp_crow">
       <label id="selectExEnv" className="udapp_settingsLabel">
@@ -44,14 +44,14 @@ export function EnvironmentUI(props: EnvironmentProps) {
           <Dropdown.Toggle as={CustomToggle} id="dropdown-custom-components" className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control" icon={null}>
             {isL2(currentProvider && currentProvider.displayName)}
             {currentProvider && currentProvider.displayName}
-            {currentProvider && bridges[currentProvider.displayName] && (
+            {currentProvider && bridges[currentProvider.displayName.substring(0, 13)] && (
               <CustomTooltip placement={'auto-end'} tooltipClasses="text-nowrap" tooltipId="info-recorder" tooltipText={<FormattedMessage id="udapp.tooltipText3" />}>
                 <i
                   style={{ fontSize: 'medium' }}
                   className={'ml-2 fa fa-rocket-launch'}
                   aria-hidden="true"
                   onClick={() => {
-                    window.open(bridges[currentProvider.displayName], '_blank')
+                    window.open(bridges[currentProvider.displayName.substring(0, 13)], '_blank')
                   }}
                 ></i>
               </CustomTooltip>