Merge branch 'master' into circom-matomo

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

@@ -82,7 +82,8 @@
 
   "udapp.solScan.iconTooltip": "Click to scan this contract for vulnerabilities using third-party SolidityScan [BETA]",
   "udapp.solScan.modalTitle": "Permission to share code",
-  "udapp.solScan.modalMessage": "To scan the contract for vulnerabilities & possible risks, smart contract code will be shared to third-party SolidityScan (https://solidityscan.com/).\n\n Would you like to continue?",
+  "udapp.solScan.modalMessage": "To scan the contract for vulnerabilities & possible risks, smart contract code will be shared to third-party SolidityScan. ",
+  "udapp.solScan.likeToContinue": "Would you like to continue?",
   "udapp.solScan.modalOkLabel": "Continue",
   "udapp.solScan.modalCancelLabel": "Cancel",
   "udapp.solScan.errModalTitle": "Scan error",

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

@@ -295,7 +295,6 @@ export function UniversalDappUI(props: UdappProps) {
           }
           await props.plugin.call('notification', 'modal', modal)
         }
-
       })
     }
   }
@@ -305,7 +304,11 @@ export function UniversalDappUI(props: UdappProps) {
     const modal: AppModal = {
       id: 'SolidityScanPermissionHandler',
       title: <FormattedMessage id="udapp.solScan.modalTitle" />,
-      message: <FormattedMessage id="udapp.solScan.modalMessage" />,
+      message: <div className='d-flex flex-column'>
+        <span><FormattedMessage id="udapp.solScan.modalMessage" />
+          <a href={'https://solidityscan.com'} target="_blank" >Learn more</a></span><br/>
+        <FormattedMessage id="udapp.solScan.likeToContinue" />
+      </div>,
       okLabel: <FormattedMessage id="udapp.solScan.modalOkLabel" />,
       okFn: handleScanContinue,
       cancelLabel: <FormattedMessage id="udapp.solScan.modalCancelLabel" />
@@ -407,7 +410,7 @@ export function UniversalDappUI(props: UdappProps) {
                 </CustomTooltip>
               )}
               <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappSolScanTooltip" tooltipText={<FormattedMessage id="udapp.solScan.iconTooltip" />}>
-                <i className="fas fa-qrcode p-0" onClick={askPermissionToScan}></i>
+                <i className="fas fa-qrcode p-0" style={{ padding: "0.15rem" }} onClick={askPermissionToScan}></i>
               </CustomTooltip>
             </div>
           </div>